Commit Graph

263 Commits

Author SHA1 Message Date
Tim Pope
8993abb9f1 Set bufhidden=delete in historical buffers 2011-08-15 23:17:42 -04:00
Tim Pope
6c0649ed9b Fix redraw issue after :Gbrowse 2011-08-12 17:50:58 -04:00
Tim Pope
7991e832a3 Prioritize our own tags 2011-08-11 11:03:18 -04:00
Tim Pope
8548a9c621 <C-R><C-G> in Gstatus recalls cursor line filename 2011-08-09 15:16:17 -04:00
Tim Pope
78b405fd52 Support core.autocrlf=false on Windows
Fixes #99.
2011-08-09 11:18:50 -04:00
Tim Pope
a0f5c0445e Restore options when turning off diff mode 2011-08-07 19:53:03 -04:00
Tim Pope
299a037564 Rename confusing w:fugitive_restore 2011-08-07 19:51:45 -04:00
Tim Pope
c10d7cc5f8 Reference homepage not email 2011-08-06 16:55:57 -04:00
Tim Pope
4453370768 Fix trailing blank line when editing index files
I can't consistently reproduce this, but a binary write is the logical
thing to do in this case, and seems to work.
2011-06-13 22:38:13 -04:00
Tim Pope
a38f25f78b Close diffs when navigating from :Gstatus 2011-06-12 23:10:06 -04:00
Tim Pope
35d6717d6a Work around "always" color option 2011-05-27 14:51:18 -04:00
Tim Pope
c872a54675 Fix :Gcommit % 2011-05-10 08:31:41 -04:00
Tim Pope
b089a2b7ce Fix :Gcommit on csh and Windows 2011-05-09 20:02:30 -04:00
Tim Pope
216c85afe0 Fix history browsing on csh and Windows 2011-05-09 13:31:19 -04:00
Tim Pope
b75a131805 Drop noautowrite rendered irrelevant by system() 2011-05-09 13:07:39 -04:00
Tim Pope
aaf5b34366 Fix garbling on :Gcommit when nothing is staged
Fixes #68.
2011-05-09 08:37:24 -04:00
Tim Pope
05000b1872 Fix garbage during :Gcommit with alternate screen
When running Vim in a terminal with an alternate screen buffer, :Gcommit
trashes the screen in a way that requires a redraw to fix.  Circumvent
this by using system() rather than `silent !`.  Fixes #68.
2011-05-09 01:27:15 -04:00
Tim Pope
f112f9b830 fugitive.vim 1.2 2011-04-28 23:36:12 -04:00
Tim Pope
0184570176 Revert "Preserve alternate file in :Gmove"
This reverts commit 68b3f3b3d6.  Since
:saveas changes the alternate file, :Gmove should too.
2011-04-28 21:23:47 -04:00
Tim Pope
5e25040a97 Support "(modified content, untracked content)" 2011-04-26 08:44:49 -04:00
Tim Pope
bb191c1939 Really work around Vim parser idiosyncrasy 2011-04-26 08:35:02 -04:00
Tim Pope
4a5f1df129 Fix closing of status window in :Gcommit 2011-04-25 15:17:19 -04:00
Tim Pope
081832380c Work around Vim parser idiosyncrasy 2011-04-25 15:14:55 -04:00
Tim Pope
b11669a2eb Perform automatic :diffupdate after conflict dp 2011-04-25 14:32:42 -04:00
Tim Pope
aebbbd335e Map dp in stage conflict to do the right thing 2011-04-25 11:50:19 -04:00
Tim Pope
3366704c8f Enable - on headings in :Gstatus 2011-04-23 22:15:28 -04:00
Tim Pope
a71120ca8f Cope with new "Changes not staged" heading 2011-04-23 22:06:30 -04:00
Tim Pope
68b3f3b3d6 Preserve alternate file in :Gmove 2011-04-22 13:06:27 -04:00
Tim Pope
3ad9b0d9fa Don't clobber alternate file when committing 2011-04-22 12:59:03 -04:00
Tim Pope
e047558bee Support :Gcommit on older Git versions 2011-04-19 18:24:33 -04:00
Daniel Hahler
4b69204679 Handle non-readable .git dirs.
This can happen when a normal user edits/views some files in /etc, which
is maintained using git/etckeeper, and /etc/.git is only readable by
root.
2011-04-18 03:27:28 -04:00
Tim Pope
3026076ab5 Simplify csh special cases 2011-04-04 23:15:19 -04:00
Alexander Kahn
762bfa7979 Use https for GitHub URL 2011-03-08 05:23:45 +08:00
Tim Pope
2e4c9236d6 Implement :Gwq 2011-02-27 14:35:08 -05:00
Tim Pope
3933bfdc57 Prefer ds to dh for horizontal diff map 2011-02-27 13:15:10 -05:00
Tim Pope
2c0574594d Cease supporting :Gread! 2011-02-27 13:15:09 -05:00
Tim Pope
389efdcf14 Open current branch commits on :Gbrowse HEAD 2011-02-26 20:55:04 -05:00
Tim Pope
1e6d7c8a40 Fix use of throw 2011-02-26 20:12:34 -05:00
Tim Pope
d5f8446158 Let :Gdiff :/ diff against the work tree version 2011-02-26 18:55:47 -05:00
Tim Pope
383b2a43df Handle arbitrary :Gbrowse revision 2011-02-26 17:59:15 -05:00
Tim Pope
95311ab2d9 Ignore rev-parse warnings 2011-02-26 13:45:24 -05:00
Tim Pope
ca4e18c81f Allow -/ and :/ to refer to current work tree file 2011-02-26 12:39:19 -05:00
Tim Pope
1eeff6c349 :Gbrowse takes remote tracking branch into account 2011-02-24 16:31:50 -05:00
Tim Pope
9e05d7ee03 Allow :Gbrowse @git://... 2011-02-24 15:57:00 -05:00
Tim Pope
d6615891c2 Provide :Gbrowse to open code in web browser 2011-02-21 17:54:23 -05:00
Tim Pope
af9d44f91b Add filetype specific tags 2011-02-07 15:04:28 -05:00
Michael Geddes
156123520b Handle win32 change in behaviour of fnamemodify in 7.3
Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2011-01-09 17:40:37 -05:00
Tim Pope
33ea0aa4e7 Support submodules in :Gstatus 2011-01-08 16:52:40 -05:00
Tim Pope
9bbea8a2a1 Work around Vim parser idiosyncrasy 2011-01-04 15:04:47 -05:00
Tim Pope
882597d17e Fix trailing slash issues 2011-01-04 14:59:59 -05:00
Tim Pope
64ead8ea1c Don't overwrite paste buffer in :Gread 2010-12-27 23:50:32 -05:00
Tim Pope
ab35c2d9ab Allow :Gmove in a directory 2010-12-27 23:27:03 -05:00
Tim Pope
affce710e2 Mitigate conflict with DirDiff plugin
This plugin tries to be helpful about disabling diff mode when a diff
window closes, which was confusing DirDiff. We can mitigate that but
only disabling diff mode when b:git_dir matches.
2010-11-13 20:26:53 -05:00
Tim Pope
a5e9b2e93e Fix blind copy/paste 2010-11-13 20:15:53 -05:00
Tim Pope
22a832f958 Fix focus anomaly when closing a split
This is seemingly the cause of an incompatibility with the DirDiff
plugin.
2010-11-13 20:04:34 -05:00
Tim Pope
e954d364f5 Rename :Ghdiff to :Gsdiff 2010-11-05 19:45:08 -04:00
Tim Pope
0b4e32180b Fix restoration of :lcd after :Gblame
The restore of :lcd was happening after the split, meaning it was taking
effect in the wrong window.
2010-11-05 18:17:26 -04:00
Tim Pope
b3f38c4886 Add :Gvdiff and :Ghdiff aliases
I haven't decided if this will become the preferred interface or not.
2010-10-24 17:52:59 -04:00
Tim Pope
6ba88784a2 Add :Gvdiff alias for :Gdiff 2010-10-24 17:52:24 -04:00
Tim Pope
e64870df9c Fix error after empty commit message 2010-10-24 13:40:07 -04:00
Tim Pope
de602e3676 Remove debugging statement 2010-10-24 13:39:58 -04:00
Tim Pope
119fd9e1ad <C-N> and <C-P> in :Gstatus cycle between files 2010-09-15 23:24:05 -04:00
Tim Pope
24efca8f4f Fix :Gcommit with noisy pre-commit hook 2010-09-09 11:17:45 -04:00
Tim Pope
9d02bf0868 :Gwrite! calls git add --force 2010-08-21 22:52:45 -04:00
Tim Pope
45fe471b44 Attempt to address GitHub issue #16 2010-08-18 22:20:28 -04:00
Tim Pope
a8bd148683 Rename fugitive#buffer().name() to spec()
In rails.vim, path() and name() have the opposite (and dare I say more
intuitive) semantic of that found in fugitive.vim.  An outright switch
would be a little violent, so for now, rename name() to spec() (as in
"file spec").
2010-08-04 09:29:22 -04:00
Tim Pope
ea89d6ec12 FileType does not have <amatch> as path 2010-08-04 09:29:22 -04:00
Tim Pope
15282dde17 Tighten check of 'tags' for duplicate 2010-08-03 09:22:27 -04:00
Tim Pope
bdab318cc6 Fix setting of 'tags' 2010-08-02 16:52:39 -04:00
Tim Pope
ea588a104c Point 'tags' at .git/tags 2010-07-28 14:45:48 -04:00
Tim Pope
2b9faa8c7f Press dh in :Gstatus to do a horizontal diff 2010-07-28 09:14:25 -04:00
Tim Pope
562ab96b2f Whitespace fix 2010-07-26 11:22:52 -04:00
Michael Geddes
794c21484d Expose config settings and user signature.
Adds config() and user() to the fugitive#buffer() interface.

Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2010-06-28 14:39:21 -04:00
Tim Pope
7390538db0 Jump to horizontal diff on "index ..." lines 2010-06-28 11:50:44 -04:00
Tim Pope
8fcc5cb349 Fix :Gblame with csh 2010-06-08 11:08:05 -04:00
Michael Geddes
3121f01f59 Allow applying from git diffs to work under win32.
The introduction of using 'chcp' in the git.cmd wrapper was causing the
piped in values to be gobbled by the chcp in the call to update-index.

Signed-off-by: Michael Geddes <vimmer@frog.wheelycreek.net>
2010-06-02 23:44:42 -04:00
Tim Pope
ffcc12de5f Fix endif error 2010-06-02 23:43:33 -04:00
Tim Pope
6c44c4795e Only :diffoff in 'diff' buffers 2010-05-25 16:48:34 -04:00
Tim Pope
27e2212ac0 Fix indent 2010-05-25 16:32:09 -04:00
Tim Pope
2ed441fde7 Use window not buffer variable for window restore 2010-05-25 15:34:53 -04:00
Tim Pope
66812106e8 Add missing clear of augroup 2010-05-25 15:32:35 -04:00
Tim Pope
24c5a45431 Disable diff more more aggressively 2010-04-14 11:05:53 -04:00
Tim Pope
1f0bc8cff9 :Gdiff! splits horizontally 2010-04-14 10:49:21 -04:00
Tim Pope
ccfc60e550 fugitive.vim 1.1 2010-03-21 17:18:43 -04:00
Tim Pope
57393e7956 D in :Gstatus not on a file invokes :Git diff 2010-03-19 21:48:41 -04:00
Tim Pope
4975e76935 D in :Gstatus invokes :Gdiff 2010-03-19 21:23:41 -04:00
Tim Pope
e3e31ce9d7 Fix error in :Gmove 2010-03-19 21:06:08 -04:00
Tim Pope
56b8ad786b Allow double quotes in :Git and :Ggrep arguments
:Git and :Ggrep were defined with the -bar flag, which enables chaining
(`:Ggrep foo | copen`) but also comments (`:Ggrep foo " find foo).  The
former is useful but the latter prevents one from using double quotes
with commands.  Instead, let's disable -bar and fake it in the
implementation.

:Git implements chaining in a way that's hopefully the same as the way
Vim itself chains.  :Ggrep is a little different; it only chains after a
quote or a space so that `:Ggrep -e 'foo|bar'|copen` works as one would
expect.
2010-03-19 19:59:08 -04:00
Tim Pope
6b55a997a9 Finish pending commit even if exiting Vim 2010-03-11 22:15:35 -05:00
Tim Pope
b812cb3bcd Skip duplicate "Signed-off-by" [Wincent Colaiuta] 2010-03-10 19:44:38 -05:00
Tim Pope
13fd856db9 Strip .exe from completed Git commands 2010-03-10 19:37:49 -05:00
Tim Pope
1548f141e0 Fix restoring of $GIT_INDEX_FILE 2010-03-09 19:13:28 -05:00
Tim Pope
f05eb566e6 Use forward slashes in tab complete on Windows 2010-03-09 19:03:44 -05:00
Tim Pope
43290adc85 Fix :Gblame on Windows 2010-03-09 08:43:57 -05:00
Tim Pope
5f64bb35c9 Leave pager enabled on win32 git invocation 2010-03-08 22:57:18 -05:00
Tim Pope
f41e5c9679 Attempt to support 'noshellslash' on Windows 2010-03-08 22:51:10 -05:00
Tim Pope
9c86a7d379 Pass :Gblame flags along to git-blame 2010-03-05 22:28:53 -05:00
Tim Pope
0c99745853 Delete blame buffers when closed 2010-02-16 09:28:00 -05:00
Tim Pope
190d8f6647 fugitive.vim 1.0 2010-02-15 14:03:22 -05:00
Tim Pope
809745222e Simplify include guard 2010-02-15 14:03:04 -05:00
Tim Pope
85b119d69c Fix :Gdiff path/to/file 2010-02-14 15:55:09 -05:00
Tim Pope
d527faa6cb Update tag line 2010-02-14 14:16:30 -05:00
Tim Pope
7ff4723967 Add some overly clever undocumented mappings 2010-02-14 13:57:57 -05:00
Tim Pope
55c47729ef Select neighboring file after "-" in :Gstatus 2010-02-14 13:06:43 -05:00
Tim Pope
1e7648cfdd Autodetect need for uppercase statusline flag 2010-02-10 10:07:56 -05:00
Tim Pope
bd0fddbd8b Fire on cwd when no arguments are given to Vim 2010-02-07 21:54:40 -05:00
Tim Pope
e13fd3e1c6 Formally deprecate :Gread! 2010-02-07 21:53:23 -05:00
Tim Pope
a27c0fc633 Add optional statusline indicator 2010-02-02 23:46:04 -05:00
Tim Pope
b3affc834d Add trailing slash to :Gmove completion 2010-01-31 16:04:10 -05:00
Tim Pope
06d6684d08 Compare timestamps as integers 2010-01-30 00:38:00 -05:00
Tim Pope
eb48c6c284 In :Gdiff, newest file is shown on right 2010-01-30 00:31:10 -05:00
Tim Pope
a67e43c294 Warn about git-branch-info.vim stupidity 2010-01-24 23:07:19 -05:00
Tim Pope
d28b1e7cf4 Work around git-branch-info.vim stupidity 2010-01-24 22:59:42 -05:00
Tim Pope
4bbeec5938 Map P and ~ in :Gblame 2010-01-15 13:37:00 -05:00
Tim Pope
14cb4d2ea5 Partial support for csh and cmd.exe
Both csh and cmd.exe are painful to script and may never be completely
supported.  In both cases, you will be better suited by just overriding
the shell:

  set shell=/bin/sh

Use of cmd.exe currently requires you to set shellslash.
2010-01-13 22:05:28 -05:00
Tim Pope
8681f64dbf Standardize technique for temporary cd 2010-01-13 17:50:18 -05:00
Tim Pope
a792da75c4 Be flexible with path delimiter in detection 2010-01-13 17:39:54 -05:00
Tim Pope
2ed42806b6 Remove debugging statement 2010-01-13 17:38:07 -05:00
Tim Pope
dc63e2d890 Press p in :Gstatus to add/reset --patch 2010-01-11 23:29:40 -05:00
Tim Pope
7593d30b46 Unmap jumps that don't work in :Gstatus 2010-01-11 20:20:55 -05:00
Tim Pope
79339bfa81 :Gread is now equivalent to :Gread! 2010-01-11 15:21:43 -05:00
Tim Pope
bfdcdf1fbd :Gwrite in :Gstatus invokes :Gcommit 2010-01-10 00:04:58 -05:00
Tim Pope
ec49a84cb7 Add :Gcommit 2010-01-09 23:43:16 -05:00
Tim Pope
1b960e1e56 Fix jump for "# Your branch ... 'localbranch'" 2010-01-09 23:21:02 -05:00
Tim Pope
6f4266da7c Fix lack of shell escaping 2010-01-09 22:56:52 -05:00
Tim Pope
8b3cd645fd Fix issue with status reloading 2010-01-09 19:17:43 -05:00
Tim Pope
ecb2157d7e Deprecate :Gread with no range or bang
In the future, :Gread will become equivalent to :Gread!, and :.Gread
will be required in order to read into a buffer without replacing it.
2010-01-09 19:12:45 -05:00
Tim Pope
6eaa4604ff Enable readable editing of *index*.lock
Among other things, this means running :Gstatus when $GIT_INDEX_FILE is
set (e.g., when git commit is running) shows a more revealing filename.
2010-01-09 18:23:43 -05:00
Tim Pope
93bd4c8944 Tighten up some equality checks 2010-01-09 18:23:43 -05:00
Tim Pope
969ba4f3bc Add missing "abort" to some status functions 2010-01-09 18:23:43 -05:00
Tim Pope
eea103b042 Update email address 2010-01-09 18:23:43 -05:00
Tim Pope
26edba9dec Fix :0Gread to operate at very top of file 2010-01-09 13:41:51 -05:00
Tim Pope
43e752dcfd Allow overriding :Glog summary format
One can now set fugitive_summary_format to change the message in :Glog.
The default is

  let g:fugitive_summary_format = '%s'

This isn't documented yet because it might be taken away.
2009-12-14 00:01:31 -05:00
Tim Pope
063d1fcaa9 Remove "." from 'path' in "fugitive://" files
Having "." in 'path' causes commands like :find to dump one in
never-never land when invoked from a "fugitive://" file.
2009-12-13 19:49:35 -05:00
Tim Pope
037ce62894 Pass :Glog arguments to git-log 2009-11-14 23:47:17 -05:00
Tim Pope
1ed26db43a Don't show "parent " line in first commit 2009-11-11 21:38:51 -05:00
Tim Pope
9f6af8031c Don't assume buffer().commit() is a hash or stage 2009-11-11 00:16:02 -05:00
Tim Pope
4e77ba13c6 Fix :Glog when run from a file in .git/ 2009-11-10 22:26:08 -05:00
Tim Pope
9761434605 Quiet some "E171: Missing :endif" errors
If you throw an exception inside of a conditional, Vim Script, with its
infinite wisdom, will complain that that it never saw the matching
:endif.  Rearrange to put the exception outside the conditional where
possible.
2009-11-10 21:17:21 -05:00
Tim Pope
cf41683ac1 Expose function to reload status window
autocmd FocusGained * call fugitive#reload_status()
2009-11-03 22:23:58 -05:00
Tim Pope
aa72be3a09 Don't delete unloaded buffers in :Gwrite 2009-10-23 14:02:01 -04:00
Tim Pope
5676b909e9 Accept a count or selection with - in :Gstatus 2009-10-22 22:23:28 -04:00
Tim Pope
42e0208276 Run autocommands after writing to index 2009-10-22 22:23:28 -04:00
Tim Pope
6ebcc05312 Remove hard-coded git executable reference 2009-10-22 22:11:23 -04:00
Tim Pope
39be3515c9 Add :Gstatus with "-" map to stage and unstage 2009-10-19 22:11:40 -04:00
Tim Pope
a4496e0d0b Support :Git with no arguments 2009-10-19 21:56:55 -04:00
Tim Pope
b248cddf91 Prevent bells during :Gwrite 2009-10-19 21:43:12 -04:00
Tim Pope
68c7df4e2a Guard against a count in all maps 2009-10-18 22:43:08 -04:00
Tim Pope
c71408d5c1 Fix tab restoration edge case in :Gwrite 2009-10-18 19:54:30 -04:00
Tim Pope
51569b5ea2 Jump on a rename or "diff --git" line 2009-10-18 18:12:36 -04:00