[PATCH 2 of 2] Vim script: Adaptation from CVS to Mercurial - resent
Mathieu Clabaut
mathieu.clabaut at gmail.com
Tue Jul 11 13:45:28 UTC 2006
# HG changeset patch
# User "Mathieu Clabaut
<mathieu.clabaut at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=mathieu.clabaut@gmail.com>
>"
# Date 1152567916 -7200
# Node ID 457846f400e8da1f94aeb721693a5578f01509eb
# Parent 61f2008cd6bf6d60e920b232e42d0690642b08b0
Vim script: Adaptation from CVS to Mercurial
diff -r 61f2008cd6bf -r 457846f400e8 contrib/vim/hgcommand.txt
--- a/contrib/vim/hgcommand.txt Mon Jul 10 23:39:08 2006 +0200
+++ b/contrib/vim/hgcommand.txt Mon Jul 10 23:45:16 2006 +0200
@@ -1,33 +1,33 @@
-*cvscommand.txt* CVSCommand
+*hgcommand.txt* HGCommand
For instructions on installing this file, type
:help add-local-help
inside Vim.
-Author: Bob Hiestand
<bob.hiestand at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=bob.hiestand@gmail.com>
>
-Credits: Benji Fisher's excellent MatchIt documentation
-
-==============================================================================
-1.
Contents *cvscommand-contents*
-
- Installation : |cvscommand-install|
- CVSCommand Intro : |cvscommand|
- CVSCommand Manual : |cvscommand-manual|
- Customization : |cvscommand-customize|
- SSH "integration" : |cvscommand-ssh|
- Bugs : |cvscommand-bugs|
-
-==============================================================================
-
-2. CVSCommand Installation *cvscommand-install*
-
-The CVSCommand plugin comprises two files, cvscommand.vim and
cvscommand.txt
-(this file). In order to install the plugin, place the cvscommand.vim file
+Author: Mathieu Clabaut
<mathieu.clabaut at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=mathieu.clabaut@gmail.com>
>
+Credits: Bob Hiestand <bob.hiestand at gmail.com
<https://mail.google.com/mail?view=cm&tf=0&to=bob.hiestand@gmail.com>>
+
+==============================================================================
+1. Contents *hgcommand-contents*
+
+ Installation : |hgcommand-install|
+ HGCommand Intro : |hgcommand|
+ HGCommand Manual : |hgcommand-manual|
+ Customization : |hgcommand-customize|
+ SSH "integration" : |hgcommand-ssh|
+ Bugs : |hgcommand-bugs|
+
+==============================================================================
+
+2. HGCommand Installation *hgcommand-install*
+
+The HGCommand plugin comprises two files, hgcommand.vim and hgcommand.txt
+(this file). In order to install the plugin, place the hgcommand.vim file
into a plugin' directory in your runtime path (please see
|add-global-plugin|
and |'runtimepath'|.
-CVSCommand may be customized by setting variables, creating maps, and
-specifying event handlers. Please see |cvscommand-customize| for more
+HGCommand may be customized by setting variables, creating maps, and
+specifying event handlers. Please see |hgcommand-customize| for more
details.
This help file can be included in the VIM help system by copying it into a
@@ -37,90 +37,82 @@ command, specifying the full path of the
==============================================================================
-3. CVSCommand Intro *cvscommand*
- *cvscommand-intro*
-
-The CVSCommand plugin provides global ex commands for manipulating
-CVS-controlled source files. In general, each command operates on the
current
-buffer and accomplishes a separate cvs function, such as update, commit,
log,
-and others (please see |cvscommand-commands| for a list of all available
+3. HGCommand Intro *hgcommand*
+ *hgcommand-intro*
+
+The HGCommand plugin provides global ex commands for manipulating
+HG-controlled source files. In general, each command operates on the
current
+buffer and accomplishes a separate hg function, such as update, commit,
log,
+and others (please see |hgcommand-commands| for a list of all available
commands). The results of each operation are displayed in a scratch buffer.
Several buffer variables are defined for those scratch buffers (please see
-|cvscommand-buffer-variables|).
+|hgcommand-buffer-variables|).
The notion of "current file" means either the current buffer, or, in the
case
of a directory buffer, the file on the current line within the buffer.
-For convenience, any CVSCommand invoked on a CVSCommand scratch buffer acts
as
+For convenience, any HGCommand invoked on a HGCommand scratch buffer acts
as
though it was invoked on the original file and splits the screen so that the
output appears in a new window.
Many of the commands accept revisions as arguments. By default, most
operate
on the most recent revision on the current branch if no revision is
specified
-(though see |CVSCommandInteractive| to prompt instead).
-
-Each CVSCommand is mapped to a key sequence starting with the <Leader>
+(though see |HGCommandInteractive| to prompt instead).
+
+Each HGCommand is mapped to a key sequence starting with the <Leader>
keystroke. The default mappings may be overridden by supplying different
mappings before the plugin is loaded, such as in the vimrc, in the standard
fashion for plugin mappings. For examples, please see
-|cvscommand-mappings-override|.
-
-The CVSCommand plugin may be configured in several ways. For more details,
-please see |cvscommand-customize|.
-
-==============================================================================
-
-4. CVSCommand Manual *cvscommand-manual*
-
-4.1 CVSCommand
commands *cvscommand-commands*
-
-CVSCommand defines the following commands:
-
-|:CVSAdd|
-|:CVSAnnotate|
-|:CVSCommit|
-|:CVSDiff|
-|:CVSEdit|
-|:CVSEditors|
-|:CVSGotoOriginal|
-|:CVSLog|
-|:CVSRevert|
-|:CVSReview|
-|:CVSStatus|
-|:CVSUnedit|
-|:CVSUpdate|
-|:CVSVimDiff|
-|:CVSWatch|
-|:CVSWatchAdd|
-|:CVSWatchOn|
-|:CVSWatchOff|
-|:CVSWatchRemove|
-|:CVSWatchers|
-
-:CVSAdd *:CVSAdd*
-
-This command performs "cvs add" on the current file. Please note, this
does
+|hgcommand-mappings-override|.
+
+The HGCommand plugin may be configured in several ways. For more details,
+please see |hgcommand-customize|.
+
+==============================================================================
+
+4. HGCommand Manual *hgcommand-manual*
+
+4.1 HGCommand commands *hgcommand-commands*
+
+HGCommand defines the following commands:
+
+|:HGAdd|
+|:HGAnnotate|
+|:HGCommit|
+|:HGDiff|
+|:HGGotoOriginal|
+|:HGLog|
+|:HGRevert|
+|:HGReview|
+|:HGStatus|
+|:HGUnedit|
+|:HGUpdate|
+|:HGVimDiff|
+
+:HGAdd *:HGAdd*
+
+This command performs "hg add" on the current file. Please note, this does
not commit the newly-added file.
-:CVSAnnotate *:CVSAnnotate*
-
-This command performs "cvs annotate" on the current file. If an argument
is
+:HGAnnotate *:HGAnnotate*
+
+This command performs "hg annotate" on the current file. If an argument is
given, the argument is used as a revision number to display. If not given
an
argument, it uses the most recent version of the file on the current branch.
-Additionally, if the current buffer is a CVSAnnotate buffer already, the
+Additionally, if the current buffer is a HGAnnotate buffer already, the
version number on the current line is used.
-If the |CVSCommandAnnotateParent| variable is set to a non-zero value, the
+If the |HGCommandAnnotateParent| variable is set to a non-zero value, the
version previous to the one on the current line is used instead. This
allows
one to navigate back to examine the previous version of a line.
-The filetype of the CVSCommand scratch buffer is set to 'CVSAnnotate', to
take
+The filetype of the HGCommand scratch buffer is set to 'HGAnnotate', to
take
advantage of the bundled syntax file.
-:CVSCommit[!] *:CVSCommit*
-
-If called with arguments, this performs "cvs commit" using the arguments as
+:HGCommit[!] *:HGCommit*
+
+If called with arguments, this performs "hg commit" using the arguments as
the log message.
If '!' is used with no arguments, an empty log message is committed.
@@ -131,79 +123,74 @@ log message. The commit can be abandone
log message. The commit can be abandoned if the log message buffer is
deleted
or wiped before being written.
-Alternatively, the mapping that is used to invoke :CVSCommit (by default
-<Leader>cc) can be used in the log message buffer to immediately
commit. This
-is useful if the |CVSCommandCommitOnWrite| variable is set to 0 to disable
the
+Alternatively, the mapping that is used to invoke :HGCommit (by default
+<Leader>hgc) can be used in the log message buffer to immediately commit.
+This
+is useful if the |HGCommandCommitOnWrite| variable is set to 0 to disable
the
normal commit-on-write behavior.
-:CVSDiff *:CVSDiff*
-
-With no arguments, this performs "cvs diff" on the current file against the
+:HGDiff *:HGDiff*
+
+With no arguments, this performs "hg diff" on the current file against the
current repository version.
-With one argument, "cvs diff" is performed on the current file against the
+With one argument, "hg diff" is performed on the current file against the
specified revision.
-With two arguments, cvs diff is performed between the specified
+With two arguments, hg diff is performed between the specified
revisions of the current file.
-This command uses the 'CVSCommandDiffOpt' variable to specify diff options.
+This command uses the 'HGCommandDiffOpt' variable to specify diff options.
If that variable does not exist, then 'wbBc' is assumed. If you wish to
have
no options, then set it to the empty string.
-:CVSEdit *:CVSEdit*
-
-This command performs "cvs edit" on the current file. Yes, the output
buffer
-in this case is almost completely useless.
-
-:CVSEditors *:CVSEditors*
-
-This command performs "cvs edit" on the current file.
-
-:CVSGotoOriginal *:CVSGotoOriginal*
+
+This command performs "hg edit" on the current file.
+
+:HGGotoOriginal *:HGGotoOriginal*
This command returns the current window to the source buffer, if the current
-buffer is a CVS command output buffer.
-
-:CVSGotoOriginal!
-
-Like ":CVSGotoOriginal" but also executes :bufwipeout on all CVS command
+buffer is a HG command output buffer.
+
+:HGGotoOriginal!
+
+Like ":HGGotoOriginal" but also executes :bufwipeout on all HG command
output buffers for the source buffer.
-:CVSLog *:CVSLog*
-
-Performs "cvs log" on the current file.
+:HGLog *:HGLog*
+
+Performs "hg log" on the current file.
If an argument is given, it is passed as an argument to the "-r" option of
-"cvs log".
-
-:CVSRevert *:CVSRevert*
+"hg log".
+
+:HGRevert *:HGRevert*
Replaces the current file with the most recent version from the repository
in
order to wipe out any undesired changes.
-:CVSReview *:CVSReview*
+:HGReview *:HGReview*
Retrieves a particular version of the current file. If no argument is
given,
the most recent version of the file on the current branch is retrieved.
Otherwise, the specified version is retrieved.
-:CVSStatus *:CVSStatus*
-
-Performs "cvs status" on the current file.
-
-:CVSUnedit *:CVSUnedit*
-
-Performs "cvs unedit" on the current file. Again, yes, the output buffer
here
+:HGStatus *:HGStatus*
+
+Performs "hg status" on the current file.
+
+:HGUnedit *:HGUnedit*
+
+Performs "hg unedit" on the current file. Again, yes, the output buffer
here
is basically useless.
-:CVSUpdate *:CVSUpdate*
-
-Performs "cvs update" on the current file. This intentionally does not
+:HGUpdate *:HGUpdate*
+
+Performs "hg update" on the current file. This intentionally does not
automatically reload the current buffer, though vim should prompt the user
to
do so if the underlying file is altered by this command.
-:CVSVimDiff *:CVSVimDiff*
+:HGVimDiff *:HGVimDiff*
With no arguments, this prompts the user for a revision and then uses
vimdiff
to display the differences between the current file and the specified
@@ -226,97 +213,66 @@ versions. Additionally, invoking the co
versions. Additionally, invoking the command on a different file will close
the previous vimdiff buffers.
-:CVSWatch *:CVSWatch*
-
-This command takes an argument which must be one of
[on|off|add|remove]. The
-command performs "cvs watch" with the given argument on the current file.
-
-:CVSWatchAdd *:CVSWatchAdd*
-
-This command is an alias for ":CVSWatch add"
-
-:CVSWatchOn *:CVSWatchOn*
-
-This command is an alias for ":CVSWatch on"
-
-:CVSWatchOff *:CVSWatchOff*
-
-This command is an alias for ":CVSWatch off"
-
-:CVSWatchRemove
*:CVSWatchRemove*
-
-This command is an alias for ":CVSWatch remove"
-
-:CVSWatchers *:CVSWatchers*
-
-This command performs "cvs watchers" on the current file.
-
-4.2 Mappings
*cvscommand-mappings*
+
+4.2 Mappings *hgcommand-mappings*
By default, a mapping is defined for each command. These mappings execute
the
default (no-argument) form of each command.
-<Leader>ca CVSAdd
-<Leader>cn CVSAnnotate
-<Leader>cc CVSCommit
-<Leader>cd CVSDiff
-<Leader>ce CVSEdit
-<Leader>ci CVSEditors
-<Leader>cg CVSGotoOriginal
-<Leader>cG CVSGotoOriginal!
-<Leader>cl CVSLog
-<Leader>cr CVSReview
-<Leader>cs CVSStatus
-<Leader>ct CVSUnedit
-<Leader>cu CVSUpdate
-<Leader>cv CVSVimDiff
-<Leader>cwv CVSWatchers
-<Leader>cwa CVSWatchAdd
-<Leader>cwn CVSWatchOn
-<Leader>cwf CVSWatchOff
-<Leader>cwf CVSWatchRemove
-
-
*cvscommand-mappings-override*
+<Leader>hga HGAdd
+<Leader>hgn HGAnnotate
+<Leader>hgc HGCommit
+<Leader>hgd HGDiff
+<Leader>hgg HGGotoOriginal
+<Leader>hgG HGGotoOriginal!
+<Leader>hgl HGLog
+<Leader>hgr HGReview
+<Leader>hgs HGStatus
+<Leader>hgt HGUnedit
+<Leader>hgu HGUpdate
+<Leader>hgv HGVimDiff
+
+
*hgcommand-mappings-override*
The default mappings can be overriden by user-provided instead by mapping to
<Plug>CommandName. This is especially useful when these mappings collide
with
other existing mappings (vim will warn of this during plugin initialization,
but will not clobber the existing mappings).
-For instance, to override the default mapping for :CVSAdd to set it to
'\add',
+For instance, to override the default mapping for :HGAdd to set it to
'\add',
add the following to the vimrc:
-nmap \add <Plug>CVSAdd
-
-4.3 Automatic buffer variables
*cvscommand-buffer-variables*
-
-Several buffer variables are defined in each CVSCommand result buffer.
These
+nmap \add <Plug>HGAdd
+
+4.3 Automatic buffer variables *hgcommand-buffer-variables*
+
+Several buffer variables are defined in each HGCommand result
buffer. These
may be useful for additional customization in callbacks defined in the event
-handlers (please see |cvscommand-events|).
+handlers (please see |hgcommand-events|).
The following variables are automatically defined:
-b:cvsOrigBuffNR
*b:cvsOrigBuffNR*
+b:hgOrigBuffNR *b:hgOrigBuffNR*
This variable is set to the buffer number of the source file.
-b:cvscmd *b:cvscmd*
-
-This variable is set to the name of the cvs command that created the result
+b:hgcmd *b:hgcmd*
+
+This variable is set to the name of the hg command that created the result
buffer.
==============================================================================
-5. Configuration and customization
*cvscommand-customize*
- *cvscommand-config*
-
-The CVSCommand plugin can be configured in two ways: by setting
configuration
-variables (see |cvscommand-options|) or by defining CVSCommand event
handlers
-(see |cvscommand-events|). Additionally, the CVSCommand plugin provides
-several option for naming the CVS result buffers (see |cvscommand-naming|)
and
-supported a customized status line (see |cvscommand-statusline| and
-|cvscommand-buffer-management|).
-
-5.1 CVSCommand configuration variables *cvscommand-options*
+5. Configuration and customization
*hgcommand-customize*
+ *hgcommand-config*
+
+The HGCommand plugin can be configured in two ways: by setting
configuration
+variables (see |hgcommand-options|) or by defining HGCommand event handlers
+(see |hgcommand-events|). Additionally, the HGCommand plugin provides
+several option for naming the HG result buffers (see |hgcommand-naming|)
and
+supported a customized status line (see |hgcommand-statusline| and
+|hgcommand-buffer-management|).
+
+5.1 HGCommand configuration variables *hgcommand-options*
Several variables affect the plugin's behavior. These variables are checked
at time of execution, and may be defined at the window, buffer, or global
@@ -325,181 +281,181 @@ level and are checked in that order of p
The following variables are available:
-|CVSCommandAnnotateParent|
-|CVSCommandCommitOnWrite|
-|CVSCommandCVSExec|
-|CVSCommandDeleteOnHide|
-|CVSCommandDiffOpt|
-|CVSCommandDiffSplit|
-|CVSCommandEdit|
-|CVSCommandEnableBufferSetup|
-|CVSCommandInteractive|
-|CVSCommandNameMarker|
-|CVSCommandNameResultBuffers|
-|CVSCommandSplit|
-
-CVSCommandAnnotateParent *CVSCommandAnnotateParent*
+|HGCommandAnnotateParent|
+|HGCommandCommitOnWrite|
+|HGCommandHGExec|
+|HGCommandDeleteOnHide|
+|HGCommandDiffOpt|
+|HGCommandDiffSplit|
+|HGCommandEdit|
+|HGCommandEnableBufferSetup|
+|HGCommandInteractive|
+|HGCommandNameMarker|
+|HGCommandNameResultBuffers|
+|HGCommandSplit|
+
+HGCommandAnnotateParent *HGCommandAnnotateParent*
This variable, if set to a non-zero value, causes the zero-argument form of
-CVSAnnotate when invoked on a CVSAnnotate buffer to go to the version
previous
+HGAnnotate when invoked on a HGAnnotate buffer to go to the version
previous
to that displayed on the current line. If not set, it defaults to 0.
-CVSCommandCommitOnWrite
*CVSCommandCommitOnWrite*
-
-This variable, if set to a non-zero value, causes the pending cvs commit
+HGCommandCommitOnWrite *HGCommandCommitOnWrite*
+
+This variable, if set to a non-zero value, causes the pending hg commit
to take place immediately as soon as the log message buffer is written.
-If set to zero, only the CVSCommit mapping will cause the pending commit to
+If set to zero, only the HGCommit mapping will cause the pending commit to
occur. If not set, it defaults to 1.
-CVSCommandCVSExec *CVSCommandCVSExec*
-
-This variable controls the executable used for all CVS commands If not
set,
-it defaults to "cvs".
-
-CVSCommandDeleteOnHide *CVSCommandDeleteOnHide*
-
-This variable, if set to a non-zero value, causes the temporary CVS result
+HGCommandHGExec *HGCommandHGExec*
+
+This variable controls the executable used for all HG commands If not set,
+it defaults to "hg".
+
+HGCommandDeleteOnHide *HGCommandDeleteOnHide*
+
+This variable, if set to a non-zero value, causes the temporary HG result
buffers to automatically delete themselves when hidden.
-CVSCommandDiffOpt *CVSCommandDiffOpt*
+HGCommandDiffOpt *HGCommandDiffOpt*
This variable, if set, determines the options passed to the diff command of
-CVS. If not set, it defaults to 'wbBc'.
-
-CVSCommandDiffSplit *CVSCommandDiffSplit*
-
-This variable overrides the |CVSCommandSplit| variable, but only for
buffers
-created with |:CVSVimDiff|.
-
-CVSCommandEdit *CVSCommandEdit*
+HG. If not set, it defaults to 'wbBc'.
+
+HGCommandDiffSplit *HGCommandDiffSplit*
+
+This variable overrides the |HGCommandSplit| variable, but only for buffers
+created with |:HGVimDiff|.
+
+HGCommandEdit *HGCommandEdit*
This variable controls whether the original buffer is replaced ('edit') or
split ('split'). If not set, it defaults to 'edit'.
-CVSCommandEnableBufferSetup *CVSCommandEnableBufferSetup*
-
-This variable, if set to a non-zero value, activates CVS buffer management
-mode see (|cvscommand-buffer-management|). This mode means that two buffer
-variables, 'CVSRevision' and 'CVSBranch', are set if the file is
-CVS-controlled. This is useful for displaying version information in the
+HGCommandEnableBufferSetup *HGCommandEnableBufferSetup*
+
+This variable, if set to a non-zero value, activates HG buffer management
+mode see (|hgcommand-buffer-management|). This mode means that two buffer
+variables, 'HGRevision' and 'HGBranch', are set if the file is
+HG-controlled. This is useful for displaying version information in the
status bar.
-CVSCommandInteractive *CVSCommandInteractive*
+HGCommandInteractive *HGCommandInteractive*
This variable, if set to a non-zero value, causes appropriate commands (for
-the moment, only |:CVSReview|) to query the user for a revision to use
instead
+the moment, only |:HGReview|) to query the user for a revision to use
instead
of the current revision if none is specified.
-CVSCommandNameMarker *CVSCommandNameMarker*
+HGCommandNameMarker *HGCommandNameMarker*
This variable, if set, configures the special attention-getting characters
-that appear on either side of the cvs buffer type in the buffer name. This
-has no effect unless |CVSCommandNameResultBuffers| is set to a true
value. If
+that appear on either side of the hg buffer type in the buffer name. This
+has no effect unless |HGCommandNameResultBuffers| is set to a true
value. If
not set, it defaults to '_'.
-CVSCommandNameResultBuffers *CVSCommandNameResultBuffers*
-
-This variable, if set to a true value, causes the cvs result buffers to be
-named in the old way ('<source file name> _<cvs command>_'). If not set
+HGCommandNameResultBuffers *HGCommandNameResultBuffers*
+
+This variable, if set to a true value, causes the hg result buffers to be
+named in the old way ('<source file name> _<hg command>_'). If not set
or set to a false value, the result buffer is nameless.
-CVSCommandSplit *CVSCommandSplit*
+HGCommandSplit *HGCommandSplit*
This variable controls the orientation of the various window splits that
-may occur (such as with CVSVimDiff, when using a CVS command on a CVS
-command buffer, or when the |CVSCommandEdit| variable is set to 'split'.
+may occur (such as with HGVimDiff, when using a HG command on a HG
+command buffer, or when the |HGCommandEdit| variable is set to 'split'.
If set to 'horizontal', the resulting windows will be on stacked on top of
one another. If set to 'vertical', the resulting windows will be
side-by-side. If not set, it defaults to 'horizontal' for all but
-CVSVimDiff windows.
-
-5.2 CVSCommand events *cvscommand-events*
-
-For additional customization, CVSCommand can trigger user-defined events.
+HGVimDiff windows.
+
+5.2 HGCommand events *hgcommand-events*
+
+For additional customization, HGCommand can trigger user-defined events.
Event handlers are provided by defining User event autocommands (see
-|autocommand|, |User|) in the CVSCommand group with patterns matching the
+|autocommand|, |User|) in the HGCommand group with patterns matching the
event name.
For instance, the following could be added to the vimrc to provide a 'q'
-mapping to quit a CVSCommand scratch buffer:
-
-augroup CVSCommand
- au CVSCommand User CVSBufferCreated silent! nmap <unique> <buffer> q:
bwipeout<cr>
+mapping to quit a HGCommand scratch buffer:
+
+augroup HGCommand
+ au HGCommand User HGBufferCreated silent! nmap <unique> <buffer> q:
bwipeout<cr>
augroup END
The following hooks are available:
-CVSBufferCreated This event is fired just after a cvs command
+HGBufferCreated This event is fired just after a hg command
result buffer is created and filled with the
- result of a cvs command. It is executed
within
- the context of the CVS command buffer. The
- CVSCommand buffer variables may be useful
for
+ result of a hg command. It is executed
within
+ the context of the HG command buffer. The
+ HGCommand buffer variables may be useful for
handlers of this event (please see
- |cvscommand-buffer-variables|).
-
-CVSBufferSetup This event is fired just after CVS buffer
setup
+ |hgcommand-buffer-variables|).
+
+HGBufferSetup This event is fired just after HG buffer
setup
occurs, if enabled.
-CVSPluginInit This event is fired when the CVSCommand
plugin
+HGPluginInit This event is fired when the HGCommand
plugin
first loads.
-CVSPluginFinish This event is fired just after the
CVSCommand
+HGPluginFinish This event is fired just after the HGCommand
plugin loads.
-CVSVimDiffFinish This event is fired just after the
CVSVimDiff
+HGVimDiffFinish This event is fired just after the HGVimDiff
command executes to allow customization of,
for instance, window placement and focus.
-5.3 CVSCommand buffer naming *cvscommand-naming*
-
-By default, the buffers containing the result of CVS commands are nameless
+5.3 HGCommand buffer naming *hgcommand-naming*
+
+By default, the buffers containing the result of HG commands are nameless
scratch buffers. It is intended that buffer variables of those buffers be
used to customize the statusline option so that the user may fully control
the
display of result buffers.
If the old-style naming is desired, please enable the
-|CVSCommandNameResultBuffers| variable. Then, each result buffer will
receive
-a unique name that includes the source file name, the CVS command, and any
+|HGCommandNameResultBuffers| variable. Then, each result buffer will
receive
+a unique name that includes the source file name, the HG command, and any
extra data (such as revision numbers) that were part of the command.
-5.4 CVSCommand status line support
*cvscommand-statusline*
+5.4 HGCommand status line
support *hgcommand-statusline*
It is intended that the user will customize the |'statusline'| option to
-include CVS result buffer attributes. A sample function that may be used
in
-the |'statusline'| option is provided by the plugin,
CVSGetStatusLine(). In
+include HG result buffer attributes. A sample function that may be used in
+the |'statusline'| option is provided by the plugin, HGGetStatusLine(). In
order to use that function in the status line, do something like the
following:
-set statusline=%<%f\ %{CVSGetStatusLine()}\ %h%m%r%=%l,%c%V\ %P
-
-of which %{CVSGetStatusLine()} is the relevant portion.
-
-The sample CVSGetStatusLine() function handles both CVS result buffers and
-CVS-managed files if CVSCommand buffer management is enabled (please see
-|cvscommand-buffer-management|).
-
-5.5 CVSCommand buffer management
*cvscommand-buffer-management*
-
-The CVSCommand plugin can operate in buffer management mode, which means
that
-it attempts to set two buffer variables ('CVSRevision' and 'CVSBranch')
upon
-entry into a buffer. This is rather slow because it means that 'cvs
status'
+set statusline=%<%f\ %{HGGetStatusLine()}\ %h%m%r%=%l,%c%V\ %P
+
+of which %{HGGetStatusLine()} is the relevant portion.
+
+The sample HGGetStatusLine() function handles both HG result buffers and
+HG-managed files if HGCommand buffer management is enabled (please see
+|hgcommand-buffer-management|).
+
+5.5 HGCommand buffer
management *hgcommand-buffer-management*
+
+The HGCommand plugin can operate in buffer management mode, which means
that
+it attempts to set two buffer variables ('HGRevision' and 'HGBranch') upon
+entry into a buffer. This is rather slow because it means that 'hg status'
will be invoked at each entry into a buffer (during the |BufEnter|
autocommand).
This mode is disabled by default. In order to enable it, set the
-|CVSCommandEnableBufferSetup| variable to a true (non-zero)
value. Enabling
+|HGCommandEnableBufferSetup| variable to a true (non-zero) value. Enabling
this mode simply provides the buffer variables mentioned above. The user
must
explicitly include those in the |'statusline'| option if they are to appear
in
-the status line (but see |cvscommand-statusline| for a simple way to do
that).
-
-==============================================================================
-
-6. SSH "integration" *cvscommand-ssh*
+the status line (but see |hgcommand-statusline| for a simple way to do
that).
+
+==============================================================================
+
+6. SSH "integration" *hgcommand-ssh*
The following instructions are intended for use in integrating the
-cvscommand.vim plugin with an SSH-based CVS environment.
-
-Familiarity with SSH and CVS are assumed.
+hgcommand.vim plugin with an SSH-based HG environment.
+
+Familiarity with SSH and HG are assumed.
These instructions assume that the intent is to have a message box pop up in
order to allow the user to enter a passphrase. If, instead, the user is
@@ -507,18 +463,18 @@ 6.1.1 and 6.1.2 (and optionally 6.1.4) n
6.1.1 and 6.1.2 (and optionally 6.1.4) need to be followed; ssh should then
work transparently.
-6.1 Environment settings *cvscommand-ssh-env*
-
-6.1.1 CVSROOT should be set to something like:
+6.1 Environment settings *hgcommand-ssh-env*
+
+6.1.1 HGROOT should be set to something like:
:ext:user at host:/path_to_repository
-6.1.2 CVS_RSH should be set to:
+6.1.2 HG_RSH should be set to:
ssh
- Together, those settings tell CVS to use ssh as the transport when
- performing CVS calls.
+ Together, those settings tell HG to use ssh as the transport when
+ performing HG calls.
6.1.3 SSH_ASKPASS should be set to the password-dialog program. In my case,
running gnome, it's set to:
@@ -527,14 +483,14 @@ 6.1.3 SSH_ASKPASS should be set to the p
This tells SSH how to get passwords if no input is available.
-6.1.4 OPTIONAL. You may need to set SSH_SERVER to the location of the cvs
+6.1.4 OPTIONAL. You may need to set SSH_SERVER to the location of the hg
executable on the remote (server) machine.
-6.2 CVS wrapper
program *cvscommand-ssh-wrapper*
+6.2 HG wrapper program *hgcommand-ssh-wrapper*
Now you need to convince SSH to use the password-dialog program. This means
-you need to execute SSH (and therefore CVS) without standard input. The
-following script is a simple perl wrapper that dissasociates the CVS
command
+you need to execute SSH (and therefore HG) without standard input. The
+following script is a simple perl wrapper that dissasociates the HG command
from the current terminal. Specific steps to do this may vary from system
to
system; the following example works for me on linux.
@@ -544,34 +500,34 @@ open STDIN, '/dev/null';
open STDIN, '/dev/null';
fork and do {wait; exit;};
setsid;
-exec('cvs', @ARGV);
-
-6.3 Configuring cvscommand.vim *cvscommand-ssh-config*
-
-At this point, you should be able to use your wrapper script to invoke CVS
with
-various commands, and get the password dialog. All that's left is to make
CVS
+exec('hg', @ARGV);
+
+6.3 Configuring hgcommand.vim *hgcommand-ssh-config*
+
+At this point, you should be able to use your wrapper script to invoke HG
with
+various commands, and get the password dialog. All that's left is to make
HG
use your newly-created wrapper script.
-6.3.1 Tell cvscommand.vim what CVS executable to use. The easiest way to
do this
+6.3.1 Tell hgcommand.vim what HG executable to use. The easiest way to do
this
is globally, by putting the following in your .vimrc:
- let CVSCommandCVSExec=/path/to/cvs/wrapper/script
-
-6.4 Where to go from here *cvscommand-ssh-other*
-
-The script given above works even when non-SSH CVS connections are used,
-except possibly when interactively entering the message for CVS commit log
-(depending on the editor you use... VIM works fine). Since the
cvscommand.vim
+ let HGCommandHGExec=/path/to/hg/wrapper/script
+
+6.4 Where to go from here *hgcommand-ssh-other*
+
+The script given above works even when non-SSH HG connections are used,
+except possibly when interactively entering the message for HG commit log
+(depending on the editor you use... VIM works fine). Since the
hgcommand.vim
plugin handles that message without a terminal, the wrapper script can be
used
all the time.
-This allows mixed-mode operation, where some work is done with SSH-based
CVS
+This allows mixed-mode operation, where some work is done with SSH-based HG
repositories, and others with pserver or local access.
It is possible, though beyond the scope of the plugin, to dynamically set
the
-CVS executable based on the CVSROOT for the file being edited. The user
-events provided (such as CVSBufferCreated and CVSBufferSetup) can be used
to
-set a buffer-local value (b:CVSCommandCVSExec) to override the CVS
executable
+HG executable based on the HGROOT for the file being edited. The user
+events provided (such as HGBufferCreated and HGBufferSetup) can be used to
+set a buffer-local value (b:HGCommandHGExec) to override the HG executable
on a file-by-file basis. Alternatively, much the same can be done (less
automatically) by the various project-oriented plugins out there.
@@ -580,11 +536,11 @@ too often.
too often.
==============================================================================
-9.
Tips *cvscommand-tips*
+9.
Tips *hgcommand-tips*
9.1 Split window annotation, by Michael Anderson
-:nmap <Leader>cN :vs<CR><C-w>h<Leader>cn:vertical res 40<CR>
+:nmap <Leader>hgN :vs<CR><C-w>h<Leader>hgn:vertical res 40<CR>
\ggdddd:set scb<CR>:set nowrap<CR><C-w>lgg:set scb<CR>
\:set nowrap<CR>
@@ -599,17 +555,11 @@ 3) Your own code still has syntax highli
==============================================================================
-8. Known bugs *cvscommand-bugs*
+8. Known bugs *hgcommand-bugs*
Please let me know if you run across any.
-CVSUnedit may, if a file is changed from the repository, provide prompt
text
-to determine whether the changes should be thrown away. Currently, that
text
-shows up in the CVS result buffer as information; there is no way for the
user
-to actually respond to the prompt and the CVS unedit command does
nothing. If
-this really bothers anyone, please let me know.
-
-CVSVimDiff, when using the original (real) source buffer as one of the diff
+HGVimDiff, when using the original (real) source buffer as one of the diff
buffers, uses some hacks to try to restore the state of the original buffer
when the scratch buffer containing the other version is destroyed. There
may
still be bugs in here, depending on many configuration details.
diff -r 61f2008cd6bf -r 457846f400e8 contrib/vim/hgcommand.vim
--- a/contrib/vim/hgcommand.vim Mon Jul 10 23:39:08 2006 +0200
+++ b/contrib/vim/hgcommand.vim Mon Jul 10 23:45:16 2006 +0200
@@ -1,77 +1,44 @@
" vim600: set foldmethod=marker:
"
-" Vim plugin to assist in working with CVS-controlled files.
+" Vim plugin to assist in working with HG-controlled files.
"
" Last Change: 2006/02/22
" Version: 1.76
-" Maintainer: Bob Hiestand
<bob.hiestand at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=bob.hiestand@gmail.com>
>
+" Maintainer: Mathieu Clabaut <
mathieu.clabaut at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=mathieu.clabaut@gmail.com>
>
" License: This file is placed in the public domain.
" Credits: {{{1
-" Mathieu Clabaut for many suggestions and improvements.
-"
-" Suresh Govindachar and Jeeva Chelladhurai for finding
waaaay
-" too many bugs.
-"
-" Suresh Govindachar (again!) for finding the
-" fully-folded-last-line-delete bug.
-"
-" Albrecht Gass for the Delete-on-Hide behavior suggestion.
-"
-" Joe MacDonald for finding the CVS log message header bug
and
-" pointing out that buffer refreshes are needed after CVS
-" \%(un\)\?edit.
-"
-" Srinath Avadhanula for the suggestion and original patch
for
-" the CVSCommitOnWrite option and mapping hot key.
-"
-" John Sivak for helping to debug Windows issues and
suggesting
-" the CVSEditors and CVSWatchers commands.
-"
-" Igor Levko for the patch to recognize numerical sticky
tags.
-"
-" Domink Strasser for the patch to correct the status line
for
-" CVSAdd'd files.
-"
-" Weerapong Sirikanya for finding a bug with CVSCommit and
-" autochdir.
-"
-" David Gotz for finding a bug with CVSVimDiff buffer
splitting
-" and original buffer restoration.
-"
-" CJ van den Berg for the patch to not change working
directory
-" when editing a non-CVS file.
-"
-" Luca Gerli for noticing bad behavior for keywords in files
-" after commit if split windows are used.
+" Bob Hiestand <
bob.hiestand at gmail.com<https://mail.google.com/mail?view=cm&tf=0&to=bob.hiestand@gmail.com>>
for the fabulous
+" cvscommand.vim from which this script was directly created
by
+" means of sed commands and minor tweaks.
" Section: Documentation {{{1
"
-" Provides functions to invoke various CVS commands on the current file
+" Provides functions to invoke various HG commands on the current file
" (either the current buffer, or, in the case of an directory buffer, the
file
" on the current line). The output of the commands is captured in a new
-" scratch window. For convenience, if the functions are invoked on a CVS
-" output window, the original file is used for the cvs operation instead
after
-" the window is split. This is primarily useful when running CVSCommit and
-" you need to see the changes made, so that CVSDiff is usable and shows up
in
+" scratch window. For convenience, if the functions are invoked on a HG
+" output window, the original file is used for the hg operation instead
after
+" the window is split. This is primarily useful when running HGCommit and
+" you need to see the changes made, so that HGDiff is usable and shows up
in
" another window.
"
" Command documentation {{{2
"
-" CVSAdd Performs "cvs add" on the current file.
-"
-" CVSAnnotate Performs "cvs annotate" on the current file. If an
+" HGAdd Performs "hg add" on the current file.
+"
+" HGAnnotate Performs "hg annotate" on the current file. If an
" argument is given, the argument is used as a revision
" number to display. If not given an argument, it uses the
" most recent version of the file on the current branch.
-" Additionally, if the current buffer is a CVSAnnotate
buffer
+" Additionally, if the current buffer is a HGAnnotate
buffer
" already, the version number on the current line is used.
"
-" If the 'CVSCommandAnnotateParent' variable is set to a
+" If the 'HGCommandAnnotateParent' variable is set to a
" non-zero value, the version previous to the one on the
" current line is used instead. This allows one to
navigate
" back to examine the previous version of a line.
"
-" CVSCommit[!] If called with arguments, this performs "cvs commit"
using
+" HGCommit[!] If called with arguments, this performs "hg commit" using
" the arguments as the log message.
"
" If '!' is used, an empty log message is committed.
@@ -83,40 +50,34 @@
" message. The commit can be abandoned if the log message
" buffer is deleted or wiped before being written.
"
-" CVSDiff With no arguments, this performs "cvs diff" on the
current
-" file. With one argument, "cvs diff" is performed on the
+" HGDiff With no arguments, this performs "hg diff" on the current
+" file. With one argument, "hg diff" is performed on the
" current file against the specified revision. With two
-" arguments, cvs diff is performed between the specified
+" arguments, hg diff is performed between the specified
" revisions of the current file. This command uses the
-" 'CVSCommandDiffOpt' variable to specify diff
options. If
+" 'HGCommandDiffOpt' variable to specify diff options. If
" that variable does not exist, then 'wbBc' is assumed. If
" you wish to have no options, then set it to the empty
" string.
"
-" CVSEdit Performs "cvs edit" on the current file.
-"
-" CVSEditors Performs "cvs editors" on the current file.
-"
-" CVSGotoOriginal Returns the current window to the source buffer if the
-" current buffer is a CVS output buffer.
-"
-" CVSLog Performs "cvs log" on the current file.
-"
-" CVSRevert Replaces the modified version of the current file with
the
+" HGGotoOriginal Returns the current window to the source buffer if the
+" current buffer is a HG output buffer.
+"
+" HGLog Performs "hg log" on the current file.
+"
+" HGRevert Replaces the modified version of the current file with
the
" most recent version from the repository.
"
-" CVSReview Retrieves a particular version of the current file. If
no
+" HGReview Retrieves a particular version of the current file. If
no
" argument is given, the most recent version of the file on
" the current branch is retrieved. The specified revision
is
" retrieved into a new buffer.
"
-" CVSStatus Performs "cvs status" on the current file.
-"
-" CVSUnedit Performs "cvs unedit" on the current file.
-"
-" CVSUpdate Performs "cvs update" on the current file.
-"
-" CVSVimDiff With no arguments, this prompts the user for a revision
and
+" HGStatus Performs "hg status" on the current file.
+"
+" HGUpdate Performs "hg update" on the current file.
+"
+" HGVimDiff With no arguments, this prompts the user for a revision
and
" then uses vimdiff to display the differences between the
" current file and the specified revision. If no revision
is
" specified, the most recent version of the file on the
@@ -139,171 +100,150 @@
" command on a different file will close the previous
vimdiff
" buffers.
"
-" CVSWatch Takes an argument which must be one of
[on|off|add|remove].
-" Performs "cvs watch" with the given argument on the
current
-" file.
-"
-" CVSWatchers Performs "cvs watchers" on the current file.
-"
-" CVSWatchAdd Alias for "CVSWatch add"
-"
-" CVSWatchOn Alias for "CVSWatch on"
-"
-" CVSWatchOff Alias for "CVSWatch off"
-"
-" CVSWatchRemove Alias for "CVSWatch remove"
"
" Mapping documentation: {{{2
"
" By default, a mapping is defined for each command. User-provided mappings
" can be used instead by mapping to <Plug>CommandName, for instance:
"
-" nnoremap ,ca <Plug>CVSAdd
+" nnoremap ,ca <Plug>HGAdd
"
" The default mappings are as follow:
"
-" <Leader>ca CVSAdd
-" <Leader>cn CVSAnnotate
-" <Leader>cc CVSCommit
-" <Leader>cd CVSDiff
-" <Leader>ce CVSEdit
-" <Leader>ci CVSEditors
-" <Leader>cg CVSGotoOriginal
-" <Leader>cG CVSGotoOriginal!
-" <Leader>cl CVSLog
-" <Leader>cr CVSReview
-" <Leader>cs CVSStatus
-" <Leader>ct CVSUnedit
-" <Leader>cu CVSUpdate
-" <Leader>cv CVSVimDiff
-" <Leader>cwv CVSWatchers
-" <Leader>cwa CVSWatchAdd
-" <Leader>cwn CVSWatchOn
-" <Leader>cwa CVSWatchOff
-" <Leader>cwr CVSWatchRemove
+" <Leader>hga HGAdd
+" <Leader>hgn HGAnnotate
+" <Leader>hgc HGCommit
+" <Leader>hgd HGDiff
+" <Leader>hgg HGGotoOriginal
+" <Leader>hgG HGGotoOriginal!
+" <Leader>hgl HGLog
+" <Leader>hgr HGReview
+" <Leader>hgs HGStatus
+" <Leader>hgu HGUpdate
+" <Leader>hgv HGVimDiff
"
" Options documentation: {{{2
"
" Several variables are checked by the script to determine behavior as
follow:
"
-" CVSCommandAnnotateParent
+" HGCommandAnnotateParent
" This variable, if set to a non-zero value, causes the zero-argument form
-" of CVSAnnotate when invoked on a CVSAnnotate buffer to go to the
version
+" of HGAnnotate when invoked on a HGAnnotate buffer to go to the version
" previous to that displayed on the current line. If not set, it defaults
" to 0.
"
-" CVSCommandCommitOnWrite
-" This variable, if set to a non-zero value, causes the pending cvs
commit
+" HGCommandCommitOnWrite
+" This variable, if set to a non-zero value, causes the pending hg commit
" to take place immediately as soon as the log message buffer is written.
-" If set to zero, only the CVSCommit mapping will cause the pending
commit
+" If set to zero, only the HGCommit mapping will cause the pending commit
" to occur. If not set, it defaults to 1.
"
-" CVSCommandDeleteOnHide
-" This variable, if set to a non-zero value, causes the temporary CVS
result
+" HGCommandDeleteOnHide
+" This variable, if set to a non-zero value, causes the temporary HG
result
" buffers to automatically delete themselves when hidden.
"
-" CVSCommandDiffOpt
+" HGCommandDiffOpt
" This variable, if set, determines the options passed to the diff command
-" of CVS. If not set, it defaults to 'wbBc'.
-"
-" CVSCommandDiffSplit
-" This variable overrides the CVSCommandSplit variable, but only for
buffers
-" created with CVSVimDiff.
-"
-" CVSCommandEdit
+" of HG. If not set, it defaults to 'wbBc'.
+"
+" HGCommandDiffSplit
+" This variable overrides the HGCommandSplit variable, but only for
buffers
+" created with HGVimDiff.
+"
+" HGCommandEdit
" This variable controls whether the original buffer is replaced ('edit')
or
" split ('split'). If not set, it defaults to 'edit'.
"
-" CVSCommandEnableBufferSetup
-" This variable, if set to a non-zero value, activates CVS buffer
management
-" mode. This mode means that two buffer variables, 'CVSRevision' and
-" 'CVSBranch', are set if the file is CVS-controlled. This is useful for
+" HGCommandEnableBufferSetup
+" This variable, if set to a non-zero value, activates HG buffer
management
+" mode. This mode means that two buffer variables, 'HGRevision' and
+" 'HGBranch', are set if the file is HG-controlled. This is useful for
" displaying version information in the status bar.
"
-" CVSCommandInteractive
+" HGCommandInteractive
" This variable, if set to a non-zero value, causes appropriate functions
(for
-" the moment, only CVSReview) to query the user for a revision to use
+" the moment, only HGReview) to query the user for a revision to use
" instead of the current revision if none is specified.
"
-" CVSCommandNameMarker
+" HGCommandNameMarker
" This variable, if set, configures the special attention-getting
characters
-" that appear on either side of the cvs buffer type in the buffer name.
-" This has no effect unless 'CVSCommandNameResultBuffers' is set to a
true
+" that appear on either side of the hg buffer type in the buffer name.
+" This has no effect unless 'HGCommandNameResultBuffers' is set to a true
" value. If not set, it defaults to '_'.
"
-" CVSCommandNameResultBuffers
-" This variable, if set to a true value, causes the cvs result buffers to
be
-" named in the old way ('<source file name> _<cvs command>_'). If not
set
+" HGCommandNameResultBuffers
+" This variable, if set to a true value, causes the hg result buffers to
be
+" named in the old way ('<source file name> _<hg command>_'). If not set
" or set to a false value, the result buffer is nameless.
"
-" CVSCommandSplit
+" HGCommandSplit
" This variable controls the orientation of the various window splits that
-" may occur (such as with CVSVimDiff, when using a CVS command on a CVS
-" command buffer, or when the 'CVSCommandEdit' variable is set to
'split'.
+" may occur (such as with HGVimDiff, when using a HG command on a HG
+" command buffer, or when the 'HGCommandEdit' variable is set to 'split'.
" If set to 'horizontal', the resulting windows will be on stacked on top
of
" one another. If set to 'vertical', the resulting windows will be
" side-by-side. If not set, it defaults to 'horizontal' for all but
-" CVSVimDiff windows.
+" HGVimDiff windows.
"
" Event documentation {{{2
-" For additional customization, cvscommand.vim uses User event
autocommand
-" hooks. Each event is in the CVSCommand group, and different patterns
+" For additional customization, hgcommand.vim uses User event autocommand
+" hooks. Each event is in the HGCommand group, and different patterns
" match the various hooks.
"
" For instance, the following could be added to the vimrc to provide a 'q'
-" mapping to quit a CVS buffer:
-"
-" augroup CVSCommand
-" au CVSCommand User CVSBufferCreated silent! nmap <unique> <buffer> q
:bwipeout<cr>
+" mapping to quit a HG buffer:
+"
+" augroup HGCommand
+" au HGCommand User HGBufferCreated silent! nmap <unique> <buffer> q
:bwipeout<cr>
" augroup END
"
" The following hooks are available:
"
-" CVSBufferCreated This event is fired just after a cvs command
+" HGBufferCreated This event is fired just after a hg command
" result buffer is created and filled with the
-" result of a cvs command. It is executed
within
+" result of a hg command. It is executed
within
" the context of the new buffer.
"
-" CVSBufferSetup This event is fired just after CVS buffer
setup
+" HGBufferSetup This event is fired just after HG buffer
setup
" occurs, if enabled.
"
-" CVSPluginInit This event is fired when the CVSCommand
plugin
+" HGPluginInit This event is fired when the HGCommand plugin
" first loads.
"
-" CVSPluginFinish This event is fired just after the
CVSCommand
+" HGPluginFinish This event is fired just after the HGCommand
" plugin loads.
"
-" CVSVimDiffFinish This event is fired just after the
CVSVimDiff
+" HGVimDiffFinish This event is fired just after the HGVimDiff
" command executes to allow customization of,
" for instance, window placement and focus.
"
" Section: Plugin header {{{1
-" loaded_cvscommand is set to 1 when the initialization begins, and 2 when
it
+" loaded_hgcommand is set to 1 when the initialization begins, and 2 when
it
" completes. This allows various actions to only be taken by functions
after
" system initialization.
-if exists("loaded_cvscommand")
+if exists("loaded_hgcommand")
finish
endif
-let loaded_cvscommand = 1
+let loaded_hgcommand = 1
if v:version < 602
- echohl WarningMsg|echomsg "CVSCommand 1.69 or later requires VIM 6.2 or
later"|echohl None
+ echohl WarningMsg|echomsg "HGCommand 1.69 or later requires VIM 6.2 or
later"|echohl None
finish
endif
" Section: Event group setup {{{1
-augroup CVSCommand
+augroup HGCommand
augroup END
" Section: Plugin initialization {{{1
-silent do CVSCommand User CVSPluginInit
+silent do HGCommand User HGPluginInit
" Section: Script variable initialization {{{1
-let s:CVSCommandEditFileRunning = 0
+let s:HGCommandEditFileRunning = 0
unlet! s:vimDiffRestoreCmd
unlet! s:vimDiffSourceBuffer
unlet! s:vimDiffBufferCount
@@ -311,24 +251,24 @@ unlet! s:vimDiffScratchList
" Section: Utility functions {{{1
-" Function: s:CVSResolveLink() {{{2
+" Function: s:HGResolveLink() {{{2
" Fully resolve the given file name to remove shortcuts or symbolic links.
-function! s:CVSResolveLink(fileName)
+function! s:HGResolveLink(fileName)
let resolved = resolve(a:fileName)
if resolved != a:fileName
- let resolved = s:CVSResolveLink(resolved)
+ let resolved = s:HGResolveLink(resolved)
endif
return resolved
endfunction
-" Function: s:CVSChangeToCurrentFileDir() {{{2
-" Go to the directory in which the current CVS-controlled file is located.
-" If this is a CVS command buffer, first switch to the original file.
-
-function! s:CVSChangeToCurrentFileDir(fileName)
+" Function: s:HGChangeToCurrentFileDir() {{{2
+" Go to the directory in which the current HG-controlled file is located.
+" If this is a HG command buffer, first switch to the original file.
+
+function! s:HGChangeToCurrentFileDir(fileName)
let oldCwd=getcwd()
- let fileName=s:CVSResolveLink(a:fileName)
+ let fileName=s:HGResolveLink(a:fileName)
let newCwd=fnamemodify(fileName, ':h')
if strlen(newCwd) > 0
execute 'cd' escape(newCwd, ' ')
@@ -336,11 +276,11 @@ function! s:CVSChangeToCurrentFileDir(fi
return oldCwd
endfunction
-" Function: s:CVSGetOption(name, default) {{{2
+" Function: s:HGGetOption(name, default) {{{2
" Grab a user-specified option to override the default provided. Options
are
" searched in the window, buffer, then global spaces.
-function! s:CVSGetOption(name, default)
+function! s:HGGetOption(name, default)
if exists("s:" . a:name . "Override")
execute "return s:".a:name."Override"
elseif exists("w:" . a:name)
@@ -354,19 +294,19 @@ function! s:CVSGetOption(name, default)
endif
endfunction
-" Function: s:CVSEditFile(name, origBuffNR) {{{2
+" Function: s:HGEditFile(name, origBuffNR) {{{2
" Wrapper around the 'edit' command to provide some helpful error text if
the
" current buffer can't be abandoned. If name is provided, it is used;
" otherwise, a nameless scratch buffer is used.
" Returns: 0 if successful, -1 if an error occurs.
-function! s:CVSEditFile(name, origBuffNR)
+function! s:HGEditFile(name, origBuffNR)
"Name parameter will be pasted into expression.
let name = escape(a:name, ' *?\')
- let editCommand = s:CVSGetOption('CVSCommandEdit', 'edit')
+ let editCommand = s:HGGetOption('HGCommandEdit', 'edit')
if editCommand != 'edit'
- if s:CVSGetOption('CVSCommandSplit', 'horizontal') == 'horizontal'
+ if s:HGGetOption('HGCommandSplit', 'horizontal') == 'horizontal'
if name == ""
let editCommand = 'rightbelow new'
else
@@ -388,28 +328,28 @@ function! s:CVSEditFile(name, origBuffNR
endif
" Protect against useless buffer set-up
- let s:CVSCommandEditFileRunning = s:CVSCommandEditFileRunning + 1
+ let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning + 1
try
execute editCommand
finally
- let s:CVSCommandEditFileRunning = s:CVSCommandEditFileRunning - 1
+ let s:HGCommandEditFileRunning = s:HGCommandEditFileRunning - 1
endtry
- let b:CVSOrigBuffNR=a:origBuffNR
- let b:CVSCommandEdit='split'
-endfunction
-
-" Function: s:CVSCreateCommandBuffer(cmd, cmdName, statusText, filename)
{{{2
+ let b:HGOrigBuffNR=a:origBuffNR
+ let b:HGCommandEdit='split'
+endfunction
+
+" Function: s:HGCreateCommandBuffer(cmd, cmdName, statusText, filename)
{{{2
" Creates a new scratch buffer and captures the output from execution of the
" given command. The name of the scratch buffer is returned.
-function! s:CVSCreateCommandBuffer(cmd,
...
[Message clipped]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20060711/f59a812f/attachment-0003.html>
More information about the Mercurial
mailing list