--- a/contrib/vim/hgcommand.vim Tue Jul 18 18:35:47 2006 +0200
+++ b/contrib/vim/hgcommand.vim Tue Jul 18 18:35:47 2006 +0200
@@ -315,6 +315,7 @@
function! s:HGGetStatusVars(revisionVar, branchVar, repositoryVar)
let hgBufferCheck=s:HGCurrentBufferCheck()
+ "echomsg "DBG : in HGGetStatusVars"
if hgBufferCheck == -1
return ""
endif
@@ -326,15 +327,19 @@
let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " root "
let roottext=system(hgCommand)
" Suppress ending null char ! Does it work in window ?
- let roottext=substitute(roottext, '.$', '', "")
+ let roottext=substitute(roottext,'^.*/\([^/\n\r]*\)\n\_.*$','\1','')
if match(getcwd()."/".fileNameWithoutLink, roottext) == -1
return ""
endif
+ let returnExpression = ""
let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " status -mardui " . fileName
let statustext=system(hgCommand)
if(v:shell_error)
return ""
endif
+ if a:repositoryVar != ""
+ let returnExpression=returnExpression . " | let " . a:repositoryVar . "='" . roottext . "'"
+ endif
if match(statustext, '^[?I]') >= 0
let revision="NEW"
elseif match(statustext, '^[R]') >= 0
@@ -343,32 +348,23 @@
let revision="DELETED"
elseif match(statustext, '^[A]') >= 0
let revision="ADDED"
- endif
+ else
+ " The file is tracked, we can try to get is revision number
+ let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " parents -b "
+ let statustext=system(hgCommand)
+ if(v:shell_error)
+ return ""
+ endif
+ let revision=substitute(statustext, '^changeset:\s*\(\d\+\):.*\_$\_.*$', '\1', "")
- let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " parents -b "
- let statustext=system(hgCommand)
- if(v:shell_error)
- return ""
- endif
- if exists('revision')
- let returnExpression = "let " . a:revisionVar . "='" . revision . "'"
- else
- let revision=substitute(statustext, '^changeset:\s*\(\d\+\):.*\_$\_.*$', '\1', "")
- let returnExpression = "let " . a:revisionVar . "='" . revision . "'"
+ if a:branchVar != "" && match(statustext, '^\_.*\_^branch:') >= 0
+ let branch=substitute(statustext, '^\_.*\_^branch:\s*\(\S\+\)\n\_.*$', '\1', "")
+ let returnExpression=returnExpression . " | let " . a:branchVar . "='" . branch . "'"
+ endif
endif
-
- if a:branchVar != "" && match(statustext, '^\_.*\_^branch:') >= 0
- let branch=substitute(statustext, '^\_.*\_^branch:\s*\(\S\+\)\n\_.*$', '\1', "")
- let returnExpression=returnExpression . " | let " . a:branchVar . "='" . branch . "'"
+ if (exists('revision'))
+ let returnExpression = "let " . a:revisionVar . "='" . revision . "' " . returnExpression
endif
- if a:repositoryVar != ""
- let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " root "
- let roottext=system(hgCommand)
- let repository=substitute(roottext,'^.*/\([^/\n\r]*\)\n\_.*$','\1','')
- let returnExpression=returnExpression . " | let " . a:repositoryVar . "='" . repository . "'"
- endif
-
-
return returnExpression
finally
@@ -436,6 +432,11 @@
if origBuffer != a:hgBuffer
call setbufvar(origBuffer, "HGBufferSetup", 0)
endif
+ else
+ "We are presumably in the original buffer
+ let b:HGBufferSetup = 0
+ "We do the setup now as now event will be triggered allowing it later.
+ call s:HGSetupBuffer()
endif
return a:hgBuffer
endfunction
@@ -612,6 +613,7 @@
augroup HGCommandPlugin
au!
au BufEnter * call s:HGSetupBuffer()
+ au BufWritePost * call s:HGSetupBuffer()
" Force resetting up buffer on external file change (HG update)
au FileChangedShell * call s:HGSetupBuffer(1)
augroup END
@@ -758,8 +760,7 @@
\ ':call <SID>HGFinishCommit("' . messageFileName . '",' .
\ '"' . newCwd . '",' .
\ '"' . realFileName . '",' .
- \ hgBufferCheck . ')<CR>'.
- \ ':call <SID>HGBufferSetup(1)<CR>'
+ \ hgBufferCheck . ')<CR>'
silent 0put ='HG: ----------------------------------------------------------------------'
silent put =\"HG: Enter Log. Lines beginning with `HG:' are removed automatically\"
@@ -912,7 +913,6 @@
" Function: s:HGUpdate() {{{2
function! s:HGUpdate()
return s:HGMarkOrigBufferForSetup(s:HGDoCommand('update', 'update', ''))
- call s:HGSetupBuffer(1)
endfunction
" Function: s:HGVimDiff(...) {{{2