diff options
Diffstat (limited to 'doc/hg.1.html')
| -rw-r--r-- | doc/hg.1.html | 2358 |
1 files changed, 479 insertions, 1879 deletions
diff --git a/doc/hg.1.html b/doc/hg.1.html index 9a0a22f..381787f 100644 --- a/doc/hg.1.html +++ b/doc/hg.1.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> <title>hg</title> <meta name="author" content="Matt Mackall <mpm@selenic.com>" /> <meta name="organization" content="Mercurial" /> @@ -30,35 +30,43 @@ <div class="contents htmlonly topic" id="contents"> <p class="topic-title first">Contents</p> <ul class="simple"> -<li><a class="reference internal" href="#synopsis" id="id39">Synopsis</a></li> -<li><a class="reference internal" href="#description" id="id40">Description</a></li> -<li><a class="reference internal" href="#command-elements" id="id41">Command Elements</a></li> -<li><a class="reference internal" href="#options" id="id42">Options</a></li> -<li><a class="reference internal" href="#commands" id="id43">Commands</a></li> -<li><a class="reference internal" href="#date-formats" id="id44">Date Formats</a></li> -<li><a class="reference internal" href="#diff-formats" id="id45">Diff Formats</a></li> -<li><a class="reference internal" href="#environment-variables" id="id46">Environment Variables</a></li> -<li><a class="reference internal" href="#using-additional-features" id="id47">Using Additional Features</a></li> -<li><a class="reference internal" href="#specifying-file-sets" id="id48">Specifying File Sets</a></li> -<li><a class="reference internal" href="#id1" id="id49">Glossary</a></li> -<li><a class="reference internal" href="#syntax-for-mercurial-ignore-files" id="id50">Syntax for Mercurial Ignore Files</a></li> -<li><a class="reference internal" href="#configuring-hgweb" id="id51">Configuring hgweb</a></li> -<li><a class="reference internal" href="#id4" id="id52">Merge Tools</a></li> -<li><a class="reference internal" href="#specifying-multiple-revisions" id="id53">Specifying Multiple Revisions</a></li> -<li><a class="reference internal" href="#file-name-patterns" id="id54">File Name Patterns</a></li> -<li><a class="reference internal" href="#working-with-phases" id="id55">Working with Phases</a></li> +<li><a class="reference internal" href="#synopsis" id="id36">Synopsis</a></li> +<li><a class="reference internal" href="#description" id="id37">Description</a></li> +<li><a class="reference internal" href="#command-elements" id="id38">Command Elements</a></li> +<li><a class="reference internal" href="#options" id="id39">Options</a></li> +<li><a class="reference internal" href="#commands" id="id40">Commands</a></li> +<li><a class="reference internal" href="#date-formats" id="id41">Date Formats</a></li> +<li><a class="reference internal" href="#diff-formats" id="id42">Diff Formats</a></li> +<li><a class="reference internal" href="#environment-variables" id="id43">Environment Variables</a></li> +<li><a class="reference internal" href="#using-additional-features" id="id44">Using additional features</a></li> +<li><a class="reference internal" href="#specifying-file-sets" id="id45">Specifying File Sets</a></li> +<li><a class="reference internal" href="#id1" id="id46">Glossary</a></li> +<li><a class="reference internal" href="#syntax-for-mercurial-ignore-files" id="id47">syntax for Mercurial ignore files</a></li> +<li><a class="reference internal" href="#id2" id="id48">Synopsis</a></li> +<li><a class="reference internal" href="#id3" id="id49">Description</a></li> +<li><a class="reference internal" href="#syntax" id="id50">Syntax</a></li> +<li><a class="reference internal" href="#example" id="id51">Example</a></li> +<li><a class="reference internal" href="#configuring-hgweb" id="id52">Configuring hgweb</a></li> +<li><a class="reference internal" href="#id4" id="id53">Merge Tools</a></li> +<li><a class="reference internal" href="#specifying-multiple-revisions" id="id54">Specifying Multiple Revisions</a></li> +<li><a class="reference internal" href="#file-name-patterns" id="id55">File Name Patterns</a></li> <li><a class="reference internal" href="#specifying-single-revisions" id="id56">Specifying Single Revisions</a></li> <li><a class="reference internal" href="#specifying-revision-sets" id="id57">Specifying Revision Sets</a></li> <li><a class="reference internal" href="#subrepositories" id="id58">Subrepositories</a></li> -<li><a class="reference internal" href="#template-usage" id="id59">Template Usage</a></li> -<li><a class="reference internal" href="#url-paths" id="id60">URL Paths</a></li> -<li><a class="reference internal" href="#id5" id="id61">Extensions</a></li> -<li><a class="reference internal" href="#files" id="id62">Files</a></li> -<li><a class="reference internal" href="#bugs" id="id63">Bugs</a></li> -<li><a class="reference internal" href="#see-also" id="id64">See Also</a></li> -<li><a class="reference internal" href="#author" id="id65">Author</a></li> -<li><a class="reference internal" href="#resources" id="id66">Resources</a></li> -<li><a class="reference internal" href="#copying" id="id67">Copying</a></li> +<li><a class="reference internal" href="#adding-a-subrepository" id="id59">Adding a Subrepository</a></li> +<li><a class="reference internal" href="#synchronizing-a-subrepository" id="id60">Synchronizing a Subrepository</a></li> +<li><a class="reference internal" href="#deleting-a-subrepository" id="id61">Deleting a Subrepository</a></li> +<li><a class="reference internal" href="#interaction-with-mercurial-commands" id="id62">Interaction with Mercurial Commands</a></li> +<li><a class="reference internal" href="#remapping-subrepositories-sources" id="id63">Remapping Subrepositories Sources</a></li> +<li><a class="reference internal" href="#template-usage" id="id64">Template Usage</a></li> +<li><a class="reference internal" href="#url-paths" id="id65">URL Paths</a></li> +<li><a class="reference internal" href="#id5" id="id66">Extensions</a></li> +<li><a class="reference internal" href="#files" id="id67">Files</a></li> +<li><a class="reference internal" href="#bugs" id="id68">Bugs</a></li> +<li><a class="reference internal" href="#see-also" id="id69">See Also</a></li> +<li><a class="reference internal" href="#author" id="id70">Author</a></li> +<li><a class="reference internal" href="#resources" id="id71">Resources</a></li> +<li><a class="reference internal" href="#copying" id="id72">Copying</a></li> </ul> </div> <div class="section" id="synopsis"> @@ -200,15 +208,13 @@ repository.</p> <p>New files are ignored if they match any of the patterns in <tt class="docutils literal">.hgignore</tt>. As with add, these changes take effect at the next commit.</p> -<p>Use the -s/--similarity option to detect renamed files. This +<p>Use the -s/--similarity option to detect renamed files. With a +parameter greater than 0, this compares every removed file with +every added file and records those similar enough as renames. This option takes a percentage between 0 (disabled) and 100 (files must -be identical) as its parameter. With a parameter greater than 0, -this compares every removed file with every added file and records -those similar enough as renames. Detecting renamed files this way +be identical) as its parameter. Detecting renamed files this way can be expensive. After using this option, <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status <span class="pre">-C</span></tt></a> can be -used to check which files were identified as moved or renamed. If -not specified, -s/--similarity defaults to 100 and only renames of -identical files are detected.</p> +used to check which files were identified as moved or renamed.</p> <p>Returns 0 if all files are successfully added.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -282,18 +288,6 @@ nor desirable.</p> <kbd><span class="option">-l</span>, <span class="option">--line-number</span></kbd></td> </tr> <tr><td> </td><td>show line number at the first appearance</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-w</span>, <span class="option">--ignore-all-space</span></kbd></td> -</tr> -<tr><td> </td><td>ignore white space when comparing lines</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-b</span>, <span class="option">--ignore-space-change</span></kbd></td> -</tr> -<tr><td> </td><td>ignore changes in the amount of white space</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-B</span>, <span class="option">--ignore-blank-lines</span></kbd></td> -</tr> -<tr><td> </td><td>ignore changes whose lines are all blank</td></tr> <tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> @@ -314,21 +308,6 @@ hg archive [OPTION]... DEST directory; use -r/--rev to specify a different revision.</p> <p>The archive type is automatically detected based on file extension (or override using -t/--type).</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">create a zip file containing the 1.0 release:</p> -<pre class="literal-block"> -hg archive -r 1.0 project-1.0.zip -</pre> -</li> -<li><p class="first">create a tarball excluding .hg files:</p> -<pre class="literal-block"> -hg archive project.tar.gz -X ".hg*" -</pre> -</li> -</ul> -</div> <p>Valid types are:</p> <table class="docutils field-list" frame="void" rules="none"> <col class="field-name" /> @@ -394,21 +373,14 @@ current working directory.</p> <p>If REV is the parent of the working directory, then this new changeset is committed automatically. Otherwise, hg needs to merge the changes and the merged result is left uncommitted.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">backout cannot be used to fix either an unwanted or -incorrect merge.</p> -</div> -<div class="verbose container"> <p>By default, the pending changeset will have one parent, -maintaining a linear history. With --merge, the pending -changeset will instead have two parents: the old parent of the -working directory and a new child of REV that simply undoes REV.</p> -<p>Before version 1.7, the behavior without --merge was equivalent -to specifying --merge followed by <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a> to -cancel the merge and leave the child of REV as a head to be -merged separately.</p> -</div> +maintaining a linear history. With --merge, the pending changeset +will instead have two parents: the old parent of the working +directory and a new child of REV that simply undoes REV.</p> +<p>Before version 1.7, the behavior without --merge was equivalent to +specifying --merge followed by <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a> to cancel +the merge and leave the child of REV as a head to be merged +separately.</p> <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> <p>Returns 0 on success.</p> <p>Options:</p> @@ -421,14 +393,14 @@ merged separately.</p> <td>merge with old dirstate parent after backout</td></tr> <tr><td class="option-group"> <kbd><span class="option">--parent</span></kbd></td> -<td>parent to choose when backing out merge (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>revision to backout</td></tr> +<td>parent to choose when backing out merge</td></tr> <tr><td class="option-group"> <kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> <td>specify merge tool</td></tr> <tr><td class="option-group"> +<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> +<td>revision to backout</td></tr> +<tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> <tr><td class="option-group"> @@ -465,74 +437,10 @@ or announce that it has found the bad revision.</p> <p>As a shortcut, you can also use the revision argument to mark a revision as good or bad without checking it out first.</p> <p>If you supply a command, it will be used for automatic bisection. -The environment variable HG_NODE will contain the ID of the -changeset being tested. The exit status of the command will be -used to mark revisions as good or bad: status 0 means good, 125 -means to skip the revision, 127 (command not found) will abort the -bisection, and any other non-zero exit status means the revision -is bad.</p> -<div class="verbose container"> -<p>Some examples:</p> -<ul> -<li><p class="first">start a bisection with known bad revision 12, and good revision 34:</p> -<pre class="literal-block"> -hg bisect --bad 34 -hg bisect --good 12 -</pre> -</li> -<li><p class="first">advance the current bisection by marking current revision as good or -bad:</p> -<pre class="literal-block"> -hg bisect --good -hg bisect --bad -</pre> -</li> -<li><p class="first">mark the current revision, or a known revision, to be skipped (eg. if -that revision is not usable because of another issue):</p> -<pre class="literal-block"> -hg bisect --skip -hg bisect --skip 23 -</pre> -</li> -<li><p class="first">forget the current bisection:</p> -<pre class="literal-block"> -hg bisect --reset -</pre> -</li> -<li><p class="first">use 'make && make tests' to automatically find the first broken -revision:</p> -<pre class="literal-block"> -hg bisect --reset -hg bisect --bad 34 -hg bisect --good 12 -hg bisect --command 'make && make tests' -</pre> -</li> -<li><p class="first">see all changesets whose states are already known in the current -bisection:</p> -<pre class="literal-block"> -hg log -r "bisect(pruned)" -</pre> -</li> -<li><p class="first">see the changeset currently being bisected (especially useful -if running with -U/--noupdate):</p> -<pre class="literal-block"> -hg log -r "bisect(current)" -</pre> -</li> -<li><p class="first">see all changesets that took part in the current bisection:</p> -<pre class="literal-block"> -hg log -r "bisect(range)" -</pre> -</li> -<li><p class="first">with the graphlog extension, you can even get a nice graph:</p> -<pre class="literal-block"> -hg log --graph -r "bisect(range)" -</pre> -</li> -</ul> -<p>See <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more about the <cite>bisect()</cite> keyword.</p> -</div> +Its exit status will be used to mark revisions as good or bad: +status 0 means good, 125 means to skip the revision, 127 +(command not found) will abort the bisection, and any other +non-zero exit status means the revision is bad.</p> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -568,10 +476,10 @@ hg log --graph -r "bisect(range)" <pre class="literal-block"> hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME] </pre> -<p>Bookmarks are pointers to certain commits that move when committing. -Bookmarks are local. They can be renamed, copied and deleted. It is -possible to use <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge NAME</tt></a> to merge from a given bookmark, and -<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update NAME</tt></a> to update to a given bookmark.</p> +<p>Bookmarks are pointers to certain commits that move when +committing. Bookmarks are local. They can be renamed, copied and +deleted. It is possible to use bookmark names in <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge</tt></a> and +<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a> to merge and update respectively to a given bookmark.</p> <p>You can use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark NAME</tt></a> to set a bookmark on the working directory's parent revision with the given name. If you specify a revision using -r REV (where REV may be an existing bookmark), @@ -580,10 +488,6 @@ the bookmark is assigned to that revision.</p> push</tt></a> and <a class="reference external" href="hg.1.html#pull"><tt class="docutils literal">hg help pull</tt></a>). This requires both the local and remote repositories to support bookmarks. For versions prior to 1.8, this means the bookmarks extension must be enabled.</p> -<p>With -i/--inactive, the new bookmark will not be made the active -bookmark. If -r/--rev is given, the new bookmark will not be made -active even if -i/--inactive is not given. If no NAME is given, the -current active bookmark will be marked inactive.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> <col class="option" /> @@ -603,7 +507,7 @@ current active bookmark will be marked inactive.</p> <td>rename a given bookmark</td></tr> <tr><td class="option-group"> <kbd><span class="option">-i</span>, <span class="option">--inactive</span></kbd></td> -<td>mark a bookmark inactive</td></tr> +<td>do not mark a new bookmark active</td></tr> </tbody> </table> </div> @@ -612,12 +516,6 @@ current active bookmark will be marked inactive.</p> <pre class="literal-block"> hg branch [-fC] [NAME] </pre> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Branch names are permanent and global. Use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark</tt></a> to create a -light-weight bookmark instead. See <a class="reference external" href="hg.1.html#glossary"><tt class="docutils literal">hg help glossary</tt></a> for more -information about named branches and bookmarks.</p> -</div> <p>With no argument, show the current branch name. With one argument, set the working directory branch name (the branch will not exist in the repository until the next commit). Standard practice @@ -630,6 +528,12 @@ the parent of the working directory, negating a previous branch change.</p> <p>Use the command <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a> to switch to an existing branch. Use <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit <span class="pre">--close-branch</span></tt></a> to mark this branch as closed.</p> +<div class="note"> +<p class="first admonition-title">Note</p> +<p class="last">Branch names are permanent. Use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark</tt></a> to create a +light-weight bookmark instead. See <a class="reference external" href="hg.1.html#glossary"><tt class="docutils literal">hg help glossary</tt></a> for more +information about named branches and bookmarks.</p> +</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -784,36 +688,37 @@ hg clone [OPTION]... SOURCE [DEST] basename of the source.</p> <p>The location of the source is added to the new repository's <tt class="docutils literal">.hg/hgrc</tt> file, as the default to be used for future pulls.</p> -<p>Only local paths and <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs are supported as -destinations. For <tt class="docutils literal"><span class="pre">ssh://</span></tt> destinations, no working directory or -<tt class="docutils literal">.hg/hgrc</tt> will be created on the remote side.</p> -<p>To pull only a subset of changesets, specify one or more revisions -identifiers with -r/--rev or branches with -b/--branch. The -resulting clone will contain only the specified changesets and -their ancestors. These options (or 'clone src#rev dest') imply ---pull, even for local source repositories. Note that specifying a -tag will include the tagged changeset but not the changeset -containing the tag.</p> -<p>To check out a particular version, use -u/--update, or --U/--noupdate to create a clone with no working directory.</p> -<div class="verbose container"> -<p>For efficiency, hardlinks are used for cloning whenever the -source and destination are on the same filesystem (note this -applies only to the repository data, not to the working -directory). Some filesystems, such as AFS, implement hardlinking -incorrectly, but do not report errors. In these cases, use the ---pull option to avoid hardlinking.</p> -<p>In some cases, you can clone repositories and the working -directory using full hardlinks with</p> +<p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for valid source format details.</p> +<p>It is possible to specify an <tt class="docutils literal"><span class="pre">ssh://</span></tt> URL as the destination, but no +<tt class="docutils literal">.hg/hgrc</tt> and working directory will be created on the remote side. +Please see <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for important details about <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs.</p> +<p>A set of changesets (tags, or branch names) to pull may be specified +by listing each changeset (tag, or branch name) with -r/--rev. +If -r/--rev is used, the cloned repository will contain only a subset +of the changesets of the source repository. Only the set of changesets +defined by all -r/--rev options (including all their ancestors) +will be pulled into the destination repository. +No subsequent changesets (including subsequent tags) will be present +in the destination.</p> +<p>Using -r/--rev (or 'clone src#rev dest') implies --pull, even for +local source repositories.</p> +<p>For efficiency, hardlinks are used for cloning whenever the source +and destination are on the same filesystem (note this applies only +to the repository data, not to the working directory). Some +filesystems, such as AFS, implement hardlinking incorrectly, but +do not report errors. In these cases, use the --pull option to +avoid hardlinking.</p> +<p>In some cases, you can clone repositories and the working directory +using full hardlinks with</p> <pre class="literal-block"> $ cp -al REPO REPOCLONE </pre> <p>This is the fastest way to clone, but it is not always safe. The operation is not atomic (making sure REPO is not modified during -the operation is up to you) and you have to make sure your -editor breaks hardlinks (Emacs and most Linux Kernel tools do -so). Also, this is not compatible with certain extensions that -place their metadata under the .hg directory, such as mq.</p> +the operation is up to you) and you have to make sure your editor +breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, +this is not compatible with certain extensions that place their +metadata under the .hg directory, such as mq.</p> <p>Mercurial will update the working directory to the first applicable revision from this list:</p> <ol class="loweralpha simple"> @@ -828,42 +733,6 @@ latest head of that branch)</li> <li>the tipmost head of the default branch</li> <li>tip</li> </ol> -<p>Examples:</p> -<ul> -<li><p class="first">clone a remote repository to a new directory named hg/:</p> -<pre class="literal-block"> -hg clone http://selenic.com/hg -</pre> -</li> -<li><p class="first">create a lightweight local clone:</p> -<pre class="literal-block"> -hg clone project/ project-feature/ -</pre> -</li> -<li><p class="first">clone from an absolute path on an ssh server (note double-slash):</p> -<pre class="literal-block"> -hg clone ssh://user@server//home/projects/alpha/ -</pre> -</li> -<li><p class="first">do a high-speed clone over a LAN while checking out a -specified version:</p> -<pre class="literal-block"> -hg clone --uncompressed http://server/repo -u 1.5 -</pre> -</li> -<li><p class="first">create a repository without changesets after a particular revision:</p> -<pre class="literal-block"> -hg clone -r 04e544 experimental/ good/ -</pre> -</li> -<li><p class="first">clone (and track) a particular named branch:</p> -<pre class="literal-block"> -hg clone http://selenic.com/hg#stable -</pre> -</li> -</ul> -</div> -<p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for details on specifying URLs.</p> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -917,17 +786,6 @@ filenames or -I/-X filters.</p> configured editor where you can enter a message. In case your commit fails, you will find a backup of your message in <tt class="docutils literal"><span class="pre">.hg/last-message.txt</span></tt>.</p> -<p>The --amend flag can be used to amend the parent of the -working directory with a new commit that contains the changes -in the parent in addition to those currently reported by <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>, -if there are any. The old commit is stored in a backup bundle in -<tt class="docutils literal"><span class="pre">.hg/strip-backup</span></tt> (see <a class="reference external" href="hg.1.html#bundle"><tt class="docutils literal">hg help bundle</tt></a> and <a class="reference external" href="hg.1.html#unbundle"><tt class="docutils literal">hg help unbundle</tt></a> -on how to restore it).</p> -<p>Message, user and date are taken from the amended commit unless -specified. When a message isn't specified on the command line, -the editor will open with the message of the amended commit.</p> -<p>It is not possible to amend public changesets (see <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>) -or changesets that have children.</p> <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> <p>Returns 0 on success, 1 if nothing changed.</p> <p>Options:</p> @@ -943,9 +801,6 @@ or changesets that have children.</p> <kbd><span class="option">--close-branch</span></kbd></td> <td>mark a branch as closed, hiding it from the branch list</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--amend</span></kbd></td> -<td>amend the parent of the working dir</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> <tr><td class="option-group"> @@ -962,10 +817,7 @@ or changesets that have children.</p> <td>record the specified date as commit date</td></tr> <tr><td class="option-group"> <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> -<td>record the specified user as committer</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td> -<td><p class="first">recurse into subrepositories</p> +<td><p class="first">record the specified user as committer</p> <p class="last">aliases: ci</p> </td></tr> </tbody> @@ -1035,38 +887,6 @@ files it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results.</p> <p>Use the -g/--git option to generate diffs in the git extended diff format. For more information, read <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a>.</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">compare a file in the current working directory to its parent:</p> -<pre class="literal-block"> -hg diff foo.c -</pre> -</li> -<li><p class="first">compare two historical versions of a directory, with rename info:</p> -<pre class="literal-block"> -hg diff --git -r 1.0:1.2 lib/ -</pre> -</li> -<li><p class="first">get change stats relative to the last change on some date:</p> -<pre class="literal-block"> -hg diff --stat -r "date('may 2')" -</pre> -</li> -<li><p class="first">diff all newly-added files that contain a keyword:</p> -<pre class="literal-block"> -hg diff "set:added() and grep(GNU)" -</pre> -</li> -<li><p class="first">compare a revision and its parents:</p> -<pre class="literal-block"> -hg diff -c 9353 # compare against first parent -hg diff -r 9353^:9353 # same using revset syntax -hg diff -r 9353^2:9353 # compare against the second parent -</pre> -</li> -</ul> -</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1128,7 +948,7 @@ hg diff -r 9353^2:9353 # compare against the second parent <div class="section" id="export"> <h2>export</h2> <pre class="literal-block"> -hg export [OPTION]... [-o OUTFILESPEC] [-r] REV... +hg export [OPTION]... [-o OUTFILESPEC] REV... </pre> <p>Print the changeset header and diffs for one or more revisions.</p> <p>The information shown in the changeset header is: author, date, @@ -1158,8 +978,6 @@ given using a format string. The formatting rules are as follows:</p> </tr> <tr class="field"><th class="field-name"><tt class="docutils literal">%h</tt>:</th><td class="field-body">short-form changeset hash (12 hexadecimal digits)</td> </tr> -<tr class="field"><th class="field-name"><tt class="docutils literal">%m</tt>:</th><td class="field-body">first line of the commit message (only alphanumeric characters)</td> -</tr> <tr class="field"><th class="field-name"><tt class="docutils literal">%n</tt>:</th><td class="field-body">zero-padded sequence number, starting at 1</td> </tr> <tr class="field"><th class="field-name"><tt class="docutils literal">%r</tt>:</th><td class="field-body">zero-padded changeset revision number</td> @@ -1173,29 +991,6 @@ diff anyway, probably with undesirable results.</p> format. See <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a> for more information.</p> <p>With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge.</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">use export and import to transplant a bugfix to the current -branch:</p> -<pre class="literal-block"> -hg export -r 9353 | hg import - -</pre> -</li> -<li><p class="first">export all the changesets between two revisions to a file with -rename information:</p> -<pre class="literal-block"> -hg export --git -r 123:150 > changes.txt -</pre> -</li> -<li><p class="first">split outgoing changes into a series of patches with -descriptive names:</p> -<pre class="literal-block"> -hg export -r "outgoing()" -o "%n-%m.patch" -</pre> -</li> -</ul> -</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1235,21 +1030,6 @@ after the next commit.</p> entire project history, and it does not delete them from the working directory.</p> <p>To undo a forget before the next commit, see <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a>.</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">forget newly-added binary files:</p> -<pre class="literal-block"> -hg forget "set:added() and binary()" -</pre> -</li> -<li><p class="first">forget files that would be excluded by .hgignore:</p> -<pre class="literal-block"> -hg forget "set:hgignore()" -</pre> -</li> -</ul> -</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1265,98 +1045,6 @@ hg forget "set:hgignore()" </tbody> </table> </div> -<div class="section" id="graft"> -<h2>graft</h2> -<pre class="literal-block"> -hg graft [OPTION]... [-r] REV... -</pre> -<p>This command uses Mercurial's merge logic to copy individual -changes from other branches without merging branches in the -history graph. This is sometimes known as 'backporting' or -'cherry-picking'. By default, graft will copy user, date, and -description from the source changesets.</p> -<p>Changesets that are ancestors of the current revision, that have -already been grafted, or that are merges will be skipped.</p> -<p>If --log is specified, log messages will have a comment appended -of the form:</p> -<pre class="literal-block"> -(grafted from CHANGESETHASH) -</pre> -<p>If a graft merge results in conflicts, the graft process is -interrupted so that the current merge can be manually resolved. -Once all conflicts are addressed, the graft process can be -continued with the -c/--continue option.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">The -c/--continue option does not reapply earlier options.</p> -</div> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">copy a single change to the stable branch and edit its description:</p> -<pre class="literal-block"> -hg update stable -hg graft --edit 9393 -</pre> -</li> -<li><p class="first">graft a range of changesets with one exception, updating dates:</p> -<pre class="literal-block"> -hg graft -D "2085::2093 and not 2091" -</pre> -</li> -<li><p class="first">continue a graft after resolving conflicts:</p> -<pre class="literal-block"> -hg graft -c -</pre> -</li> -<li><p class="first">show the source of a grafted changeset:</p> -<pre class="literal-block"> -hg log --debug -r tip -</pre> -</li> -</ul> -</div> -<p>Returns 0 on successful completion.</p> -<p>Options:</p> -<table class="docutils option-list" frame="void" rules="none"> -<col class="option" /> -<col class="description" /> -<tbody valign="top"> -<tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>revisions to graft</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-c</span>, <span class="option">--continue</span></kbd></td> -<td>resume interrupted graft</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td> -<td>invoke editor on commit messages</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--log</span></kbd></td> -<td>append graft info to log message</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-D</span>, <span class="option">--currentdate</span></kbd></td> -</tr> -<tr><td> </td><td>record the current date as commit date</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-U</span>, <span class="option">--currentuser</span></kbd></td> -</tr> -<tr><td> </td><td>record the current user as committer</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td> -<td>record the specified date as commit date</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> -<td>record the specified user as committer</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> -<td>specify merge tool</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-n</span>, <span class="option">--dry-run</span></kbd></td> -<td>do not perform actions, just print output</td></tr> -</tbody> -</table> -</div> <div class="section" id="grep"> <h2>grep</h2> <pre class="literal-block"> @@ -1423,7 +1111,7 @@ use the --all flag.</p> <div class="section" id="heads"> <h2>heads</h2> <pre class="literal-block"> -hg heads [-ct] [-r STARTREV] [REV]... +hg heads [-ac] [-r STARTREV] [REV]... </pre> <p>With no arguments, show all repository branch heads.</p> <p>Repository "heads" are changesets with no child changesets. They are @@ -1488,9 +1176,6 @@ topic.</p> <tr><td class="option-group"> <kbd><span class="option">-c</span>, <span class="option">--command</span></kbd></td> <td>show only help for commands</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-k</span>, <span class="option">--keyword</span></kbd></td> -<td>show topics matching keyword</td></tr> </tbody> </table> </div> @@ -1507,26 +1192,6 @@ a list of tags, and a list of bookmarks.</p> repository.</p> <p>Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle.</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">generate a build identifier for the working directory:</p> -<pre class="literal-block"> -hg id --id > build-id.dat -</pre> -</li> -<li><p class="first">find the revision corresponding to a tag:</p> -<pre class="literal-block"> -hg id -n -r 1.3 -</pre> -</li> -<li><p class="first">check the most recent revision of a remote repository:</p> -<pre class="literal-block"> -hg id -r tip http://selenic.com/hg/ -</pre> -</li> -</ul> -</div> <p>Returns 0 if successful.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1551,16 +1216,7 @@ hg id -r tip http://selenic.com/hg/ <tr><td class="option-group" colspan="2"> <kbd><span class="option">-B</span>, <span class="option">--bookmarks</span></kbd></td> </tr> -<tr><td> </td><td>show bookmarks</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-e</span>, <span class="option">--ssh</span></kbd></td> -<td>specify ssh command to use</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--remotecmd</span></kbd></td> -<td>specify hg command to run on the remote side</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--insecure</span></kbd></td> -<td><p class="first">do not verify server certificate (ignoring web.cacerts config)</p> +<tr><td> </td><td><p class="first">show bookmarks</p> <p class="last">aliases: id</p> </td></tr> </tbody> @@ -1595,36 +1251,10 @@ repository, not touching the working directory. Without --exact, patches will be applied on top of the working directory parent revision.</p> <p>With -s/--similarity, hg will attempt to discover renames and -copies in the patch in the same way as <a class="reference external" href="hg.1.html#addremove"><tt class="docutils literal">hg addremove</tt></a>.</p> +copies in the patch in the same way as 'addremove'.</p> <p>To read a patch from standard input, use "-" as the patch name. If a URL is specified, the patch will be downloaded from it. See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">import a traditional patch from a website and detect renames:</p> -<pre class="literal-block"> -hg import -s 80 http://example.com/bugfix.patch -</pre> -</li> -<li><p class="first">import a changeset from an hgweb server:</p> -<pre class="literal-block"> -hg import http://www.selenic.com/hg/rev/5ca8c111e9aa -</pre> -</li> -<li><p class="first">import all the patches in an Unix-style mbox:</p> -<pre class="literal-block"> -hg import incoming-patches.mbox -</pre> -</li> -<li><p class="first">attempt to exactly restore an exported changeset (not always -possible):</p> -<pre class="literal-block"> -hg import --exact proposed-fix.patch -</pre> -</li> -</ul> -</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1638,9 +1268,6 @@ hg import --exact proposed-fix.patch <kbd><span class="option">-b</span>, <span class="option">--base</span></kbd></td> <td>base path (DEPRECATED)</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td> -<td>invoke editor on commit messages</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>skip check for outstanding uncommitted changes</td></tr> <tr><td class="option-group"> @@ -1731,9 +1358,6 @@ changesets twice if the incoming is followed by a pull.</p> <kbd><span class="option">--stat</span></kbd></td> <td>output diffstat-style summary of changes</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td> -<td>show the revision DAG</td></tr> -<tr><td class="option-group"> <kbd><span class="option">--style</span></kbd></td> <td>display using template map file</td></tr> <tr><td class="option-group"> @@ -1831,13 +1455,16 @@ hg log [OPTION]... [FILE] </pre> <p>Print the revision history of the specified files or the entire project.</p> -<p>If no revision range is specified, the default is <tt class="docutils literal">tip:0</tt> unless ---follow is set, in which case the working directory parent is -used as the starting revision.</p> <p>File history is shown without following rename or copy history of files. Use -f/--follow with a filename to follow history across renames and copies. --follow without a filename will only show -ancestors or descendants of the starting revision.</p> +ancestors or descendants of the starting revision. --follow-first +only follows the first parent of merge revisions.</p> +<p>If no revision range is specified, the default is <tt class="docutils literal">tip:0</tt> unless +--follow is set, in which case the working directory parent is +used as the starting revision. You can specify a revision set for +log, see <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more information.</p> +<p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> <p>By default this command prints revision number and changeset id, tags, non-trivial parents, user, date and time, and a summary for each commit. When the -v/--verbose switch is used, the list of @@ -1849,68 +1476,6 @@ changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:.</p> </div> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">for performance reasons, log FILE may omit duplicate changes -made on branches and will not show deletions. To see all -changes including duplicates and deletions, use the --removed -switch.</p> -</div> -<div class="verbose container"> -<p>Some examples:</p> -<ul> -<li><p class="first">changesets with full descriptions and file lists:</p> -<pre class="literal-block"> -hg log -v -</pre> -</li> -<li><p class="first">changesets ancestral to the working directory:</p> -<pre class="literal-block"> -hg log -f -</pre> -</li> -<li><p class="first">last 10 commits on the current branch:</p> -<pre class="literal-block"> -hg log -l 10 -b . -</pre> -</li> -<li><p class="first">changesets showing all modifications of a file, including removals:</p> -<pre class="literal-block"> -hg log --removed file.c -</pre> -</li> -<li><p class="first">all changesets that touch a directory, with diffs, excluding merges:</p> -<pre class="literal-block"> -hg log -Mp lib/ -</pre> -</li> -<li><p class="first">all revision numbers that match a keyword:</p> -<pre class="literal-block"> -hg log -k bug --template "{rev}\n" -</pre> -</li> -<li><p class="first">check if a given changeset is included is a tagged release:</p> -<pre class="literal-block"> -hg log -r "a21ccf and ancestor(1.9)" -</pre> -</li> -<li><p class="first">find all changesets by some user in a date range:</p> -<pre class="literal-block"> -hg log -k alice -d "may 2008 to jul 2008" -</pre> -</li> -<li><p class="first">summary of all changesets after the last tag:</p> -<pre class="literal-block"> -hg log -r "last(tagged())::" --template "{desc|firstline}\n" -</pre> -</li> -</ul> -</div> -<p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> -<p>See <a class="reference external" href="hg.1.html#revisions"><tt class="docutils literal">hg help revisions</tt></a> and <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for more about -specifying revisions.</p> -<p>See <a class="reference external" href="hg.1.html#templates"><tt class="docutils literal">hg help templates</tt></a> for more about pre-packaged styles and -specifying custom templates.</p> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -1922,7 +1487,7 @@ specifying custom templates.</p> <td>follow changeset history, or file history across copies and renames</td></tr> <tr><td class="option-group"> <kbd><span class="option">--follow-first</span></kbd></td> -<td>only follow the first parent of merge changesets (DEPRECATED)</td></tr> +<td>only follow the first parent of merge changesets</td></tr> <tr><td class="option-group"> <kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td> <td>show revisions matching date spec</td></tr> @@ -1941,7 +1506,7 @@ specifying custom templates.</p> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-m</span>, <span class="option">--only-merges</span></kbd></td> </tr> -<tr><td> </td><td>show only merges (DEPRECATED)</td></tr> +<tr><td> </td><td>show only merges</td></tr> <tr><td class="option-group"> <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> <td>revisions committed by user</td></tr> @@ -1956,7 +1521,7 @@ specifying custom templates.</p> <td>do not display revision or any of its ancestors</td></tr> <tr><td class="option-group"> <kbd><span class="option">--hidden</span></kbd></td> -<td>show hidden changesets (DEPRECATED)</td></tr> +<td>show hidden changesets</td></tr> <tr><td class="option-group"> <kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td> <td>show patch</td></tr> @@ -1974,9 +1539,6 @@ specifying custom templates.</p> <kbd><span class="option">--stat</span></kbd></td> <td>output diffstat-style summary of changes</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td> -<td>show the revision DAG</td></tr> -<tr><td class="option-group"> <kbd><span class="option">--style</span></kbd></td> <td>display using template map file</td></tr> <tr><td class="option-group"> @@ -2052,14 +1614,14 @@ all changes.</p> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>force a merge with outstanding changes</td></tr> <tr><td class="option-group"> +<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> +<td>specify merge tool</td></tr> +<tr><td class="option-group"> <kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> <td>revision to merge</td></tr> <tr><td class="option-group"> <kbd><span class="option">-P</span>, <span class="option">--preview</span></kbd></td> <td>review revisions to merge (no merge is performed)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> -<td>specify merge tool</td></tr> </tbody> </table> </div> @@ -2112,9 +1674,6 @@ be pushed if a push was requested.</p> <kbd><span class="option">--stat</span></kbd></td> <td>output diffstat-style summary of changes</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td> -<td>show the revision DAG</td></tr> -<tr><td class="option-group"> <kbd><span class="option">--style</span></kbd></td> <td>display using template map file</td></tr> <tr><td class="option-group"> @@ -2190,44 +1749,6 @@ source is written as <tt class="docutils literal">default</tt> in <tt class="doc <p>See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for more information.</p> <p>Returns 0 on success.</p> </div> -<div class="section" id="phase"> -<h2>phase</h2> -<pre class="literal-block"> -hg phase [-p|-d|-s] [-f] [-r] REV... -</pre> -<p>With no argument, show the phase name of specified revisions.</p> -<p>With one of -p/--public, -d/--draft or -s/--secret, change the -phase value of the specified revisions.</p> -<p>Unless -f/--force is specified, <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg phase</tt></a> won't move changeset from a -lower phase to an higher phase. Phases are ordered as follows:</p> -<pre class="literal-block"> -public < draft < secret -</pre> -<p>Return 0 on success, 1 if no phases were changed or some could not -be changed.</p> -<p>Options:</p> -<table class="docutils option-list" frame="void" rules="none"> -<col class="option" /> -<col class="description" /> -<tbody valign="top"> -<tr><td class="option-group"> -<kbd><span class="option">-p</span>, <span class="option">--public</span></kbd></td> -<td>set changeset phase to public</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-d</span>, <span class="option">--draft</span></kbd></td> -<td>set changeset phase to draft</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-s</span>, <span class="option">--secret</span></kbd></td> -<td>set changeset phase to secret</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> -<td>allow to move boundary backward</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>target revision</td></tr> -</tbody> -</table> -</div> <div class="section" id="pull"> <h2>pull</h2> <pre class="literal-block"> @@ -2297,9 +1818,6 @@ only create a new branch without forcing other changes.</p> changesets on all branches.</p> <p>If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository.</p> -<p>If -B/--bookmark is used, the specified bookmarked revision, its -ancestors, and the bookmark will be pushed to the remote -repository.</p> <p>Please see <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for important details about <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs. If DESTINATION is omitted, a default path will be used.</p> <p>Returns 0 if push was successful, 1 if nothing to push.</p> @@ -2351,66 +1869,28 @@ suggests it.</p> <pre class="literal-block"> hg remove [OPTION]... FILE... </pre> -<p>Schedule the indicated files for removal from the current branch.</p> -<p>This command schedules the files to be removed at the next commit. -To undo a remove before that, see <a class="reference external" href="hg.1.html#revert"><tt class="docutils literal">hg revert</tt></a>. To undo added -files, see <a class="reference external" href="hg.1.html#forget"><tt class="docutils literal">hg forget</tt></a>.</p> -<div class="verbose container"> -<p>-A/--after can be used to remove only files that have already -been deleted, -f/--force can be used to force deletion, and -Af -can be used to remove files from the next revision without -deleting them from the working directory.</p> +<p>Schedule the indicated files for removal from the repository.</p> +<p>This only removes files from the current branch, not from the +entire project history. -A/--after can be used to remove only +files that have already been deleted, -f/--force can be used to +force deletion, and -Af can be used to remove files from the next +revision without deleting them from the working directory.</p> <p>The following table details the behavior of remove for different file states (columns) and option combinations (rows). The file -states are Added [A], Clean [C], Modified [M] and Missing [!] -(as reported by <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>). The actions are Warn, Remove -(from branch) and Delete (from disk):</p> -<table border="1" class="docutils"> -<colgroup> -<col width="47%" /> -<col width="13%" /> -<col width="13%" /> -<col width="13%" /> -<col width="13%" /> -</colgroup> -<thead valign="bottom"> -<tr><th class="head"> </th> -<th class="head"> </th> -<th class="head"> </th> -<th class="head"> </th> -<th class="head"> </th> -</tr> -</thead> -<tbody valign="top"> -<tr><td>none</td> -<td>W</td> -<td>RD</td> -<td>W</td> -<td>R</td> -</tr> -<tr><td>-f</td> -<td>R</td> -<td>RD</td> -<td>RD</td> -<td>R</td> -</tr> -<tr><td>-A</td> -<td>W</td> -<td>W</td> -<td>W</td> -<td>R</td> -</tr> -<tr><td>-Af</td> -<td>R</td> -<td>R</td> -<td>R</td> -<td>R</td> -</tr> -</tbody> -</table> +states are Added [A], Clean [C], Modified [M] and Missing [!] (as +reported by <a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a>). The actions are Warn, Remove (from +branch) and Delete (from disk):</p> +<pre class="literal-block"> + A C M ! +none W RD W R +-f R RD RD R +-A W W W R +-Af R R R R +</pre> <p>Note that remove never deletes files in Added [A] state from the working directory, not even if option --force is specified.</p> -</div> +<p>This command schedules the files to be removed at the next commit. +To undo a remove before that, see <a class="reference external" href="hg.1.html#revert"><tt class="docutils literal">hg revert</tt></a>.</p> <p>Returns 0 on success, 1 if any warnings encountered.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -2483,8 +1963,7 @@ non-interactive merging using the <tt class="docutils literal">internal:merge</t setting, or a command-line merge tool like <tt class="docutils literal">diff3</tt>. The resolve command is used to manage the files involved in a merge, after <a class="reference external" href="hg.1.html#merge"><tt class="docutils literal">hg merge</tt></a> has been run, and before <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit</tt></a> is run (i.e. the -working directory must have two parents). See <a class="reference external" href="hg.1.html#merge-tools"><tt class="docutils literal">hg help -<span class="pre">merge-tools</span></tt></a> for information on configuring merge tools.</p> +working directory must have two parents).</p> <p>The resolve command can be used in the following ways:</p> <ul class="simple"> <li><a class="reference external" href="hg.1.html#resolve"><tt class="docutils literal">hg resolve <span class="pre">[--tool</span> TOOL] <span class="pre">FILE...</span></tt></a>: attempt to re-merge the specified @@ -2492,8 +1971,7 @@ files, discarding any previous merge attempts. Re-merging is not performed for files already marked as resolved. Use <tt class="docutils literal"><span class="pre">--all/-a</span></tt> to select all unresolved files. <tt class="docutils literal"><span class="pre">--tool</span></tt> can be used to specify the merge tool used for the given files. It overrides the HGMERGE -environment variable and your configuration files. Previous file -contents are saved with a <tt class="docutils literal">.orig</tt> suffix.</li> +environment variable and your configuration files.</li> <li><a class="reference external" href="hg.1.html#resolve"><tt class="docutils literal">hg resolve <span class="pre">-m</span> [FILE]</tt></a>: mark a file as having been resolved (e.g. after having manually fixed-up the files). The default is to mark all unresolved files.</li> @@ -2523,14 +2001,14 @@ commit after a conflicting merge.</p> <tr><td class="option-group"> <kbd><span class="option">-u</span>, <span class="option">--unmark</span></kbd></td> <td>mark files as unresolved</td></tr> +<tr><td class="option-group"> +<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> +<td>specify merge tool</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-n</span>, <span class="option">--no-status</span></kbd></td> </tr> <tr><td> </td><td>hide status prefix</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> -<td>specify merge tool</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> <tr><td class="option-group"> @@ -2547,8 +2025,7 @@ hg revert [OPTION]... [-r REV] [NAME]... <div class="note"> <p class="first admonition-title">Note</p> <p class="last">To check out earlier revisions, you should use <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update REV</tt></a>. -To cancel an uncommitted merge (and lose your changes), use -<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p> +To cancel a merge (and lose your changes), use <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p> </div> <p>With no revision specified, revert the specified files or directories to the contents they had in the parent of the working directory. @@ -2580,10 +2057,9 @@ To disable these backups, use --no-backup.</p> <tr><td class="option-group"> <kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> <td>revert to the specified revision</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-C</span>, <span class="option">--no-backup</span></kbd></td> -</tr> -<tr><td> </td><td>do not save backup copies of files</td></tr> +<tr><td class="option-group"> +<kbd><span class="option">--no-backup</span></kbd></td> +<td>do not save backup copies of files</td></tr> <tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> @@ -2608,10 +2084,8 @@ any dirstate changes since that time. This command does not alter the working directory.</p> <p>Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a -repository.</p> -<div class="verbose container"> -<p>For example, the following commands are transactional, and their -effects can be rolled back:</p> +repository. For example, the following commands are transactional, +and their effects can be rolled back:</p> <ul class="simple"> <li>commit</li> <li>import</li> @@ -2619,10 +2093,6 @@ effects can be rolled back:</p> <li>push (with this repository as the destination)</li> <li>unbundle</li> </ul> -<p>To avoid permanent data loss, rollback will refuse to rollback a -commit transaction if it isn't checked out. Use --force to -override this protection.</p> -</div> <p>This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction back locally is ineffective (someone else may already have pulled @@ -2638,9 +2108,6 @@ may fail if a rollback is performed.</p> <tr><td class="option-group"> <kbd><span class="option">-n</span>, <span class="option">--dry-run</span></kbd></td> <td>do not perform actions, just print output</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> -<td>ignore safety measures</td></tr> </tbody> </table> </div> @@ -2797,27 +2264,6 @@ C = clean I = ignored = origin of the previous file listed as A (added) </pre> -<div class="verbose container"> -<p>Examples:</p> -<ul> -<li><p class="first">show changes in the working directory relative to a -changeset:</p> -<pre class="literal-block"> -hg status --rev 9353 -</pre> -</li> -<li><p class="first">show all changes including copies in an existing changeset:</p> -<pre class="literal-block"> -hg status --copies --change 9353 -</pre> -</li> -<li><p class="first">get a NUL separated list of added files, suitable for xargs:</p> -<pre class="literal-block"> -hg status -an0 -</pre> -</li> -</ul> -</div> <p>Returns 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -3027,16 +2473,14 @@ hg update [-c] [-C] [-d DATE] [[-r] REV] </pre> <p>Update the repository's working directory to the specified changeset. If no changeset is specified, update to the tip of the -current named branch and move the current bookmark (see <a class="reference external" href="hg.1.html#bookmarks"><tt class="docutils literal">hg help -bookmarks</tt></a>).</p> +current named branch.</p> +<p>If the changeset is not a descendant of the working directory's +parent, the update is aborted. With the -c/--check option, the +working directory is checked for uncommitted changes; if none are +found, the working directory is updated to the specified +changeset.</p> <p>Update sets the working directory's parent revison to the specified changeset (see <a class="reference external" href="hg.1.html#parents"><tt class="docutils literal">hg help parents</tt></a>).</p> -<p>If the changeset is not a descendant or ancestor of the working -directory's parent, the update is aborted. With the -c/--check -option, the working directory is checked for uncommitted changes; if -none are found, the working directory is updated to the specified -changeset.</p> -<div class="verbose container"> <p>The following rules apply when the working directory contains uncommitted changes:</p> <ol class="arabic simple"> @@ -3053,9 +2497,6 @@ uncommitted changes are preserved.</li> <li>With the -C/--clean option, uncommitted changes are discarded and the working directory is updated to the requested changeset.</li> </ol> -</div> -<p>To cancel an uncommitted merge (and lose your changes), use -<a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update <span class="pre">--clean</span> .</tt></a>.</p> <p>Use null as the changeset to remove the working directory (like <a class="reference external" href="hg.1.html#clone"><tt class="docutils literal">hg clone <span class="pre">-U</span></tt></a>).</p> <p>If you want to revert just one file to an older revision, use @@ -3267,7 +2708,7 @@ set appropriately if this Mercurial is not installed system-wide.</dd> </dl> </div> <div class="section" id="using-additional-features"> -<span id="extensions"></span><h1><a class="toc-backref" href="#contents">Using Additional Features</a></h1> +<span id="extensions"></span><h1><a class="toc-backref" href="#contents">Using additional features</a></h1> <p>Mercurial has the ability to add new features through the use of extensions. Extensions may add new commands, add options to existing commands, change the default behavior of commands, or @@ -3310,7 +2751,7 @@ baz = ! </tr> <tr class="field"><th class="field-name">bugzilla:</th><td class="field-body">hooks for integrating with the Bugzilla bug tracker</td> </tr> -<tr class="field"><th class="field-name">children:</th><td class="field-body">command to display child changesets (DEPRECATED)</td> +<tr class="field"><th class="field-name">children:</th><td class="field-body">command to display child changesets</td> </tr> <tr class="field"><th class="field-name">churn:</th><td class="field-body">command to display statistics about repository history</td> </tr> @@ -3322,9 +2763,7 @@ baz = ! </tr> <tr class="field"><th class="field-name">extdiff:</th><td class="field-body">command to allow external programs to compare revisions</td> </tr> -<tr class="field"><th class="field-name">factotum:</th><td class="field-body">http authentication with factotum</td> -</tr> -<tr class="field"><th class="field-name">fetch:</th><td class="field-body">pull, update and merge in one command (DEPRECATED)</td> +<tr class="field"><th class="field-name">fetch:</th><td class="field-body">pull, update and merge in one command</td> </tr> <tr class="field"><th class="field-name">gpg:</th><td class="field-body">commands to sign and verify changesets</td> </tr> @@ -3336,19 +2775,15 @@ baz = ! </tr> <tr class="field"><th class="field-name">highlight:</th><td class="field-body">syntax highlighting for hgweb (requires Pygments)</td> </tr> -<tr class="field"><th class="field-name">histedit:</th><td class="field-body">interactive history editing</td> -</tr> <tr class="field"><th class="field-name">inotify:</th><td class="field-body">accelerate status report using Linux's inotify service</td> </tr> <tr class="field"><th class="field-name">interhg:</th><td class="field-body">expand expressions into changelog and summaries</td> </tr> <tr class="field"><th class="field-name">keyword:</th><td class="field-body">expand keywords in tracked files</td> </tr> -<tr class="field"><th class="field-name">largefiles:</th><td class="field-body">track large binary files</td> -</tr> <tr class="field"><th class="field-name">mq:</th><td class="field-body">manage a stack of patches</td> </tr> -<tr class="field"><th class="field-name">notify:</th><td class="field-body">hooks for sending email push notifications</td> +<tr class="field"><th class="field-name">notify:</th><td class="field-body">hooks for sending email notifications at commit/push time</td> </tr> <tr class="field"><th class="field-name">pager:</th><td class="field-body">browse command output with an external pager</td> </tr> @@ -3381,7 +2816,7 @@ baz = ! </blockquote> </div> <div class="section" id="specifying-file-sets"> -<span id="fileset"></span><span id="filesets"></span><h1><a class="toc-backref" href="#contents">Specifying File Sets</a></h1> +<span id="filesets"></span><span id="fileset"></span><h1><a class="toc-backref" href="#contents">Specifying File Sets</a></h1> <p>Mercurial supports a functional language for selecting a set of files.</p> <p>Like other file patterns, this pattern type is indicated by a prefix, @@ -3450,8 +2885,6 @@ considered if this predicate is used.</dd> <li>4k - 1MB (files from 4096 bytes to 1048576 bytes)</li> </ul> </dd> -<dt><tt class="docutils literal"><span class="pre">subrepo([pattern])</span></tt></dt> -<dd>Subrepositories whose paths match the given pattern.</dd> <dt><tt class="docutils literal">symlink()</tt></dt> <dd>File that is marked as a symlink.</dd> <dt><tt class="docutils literal">unknown()</tt></dt> @@ -3479,7 +2912,7 @@ hg locate "set:grep(magic) and not binary()" </li> <li><p class="first">Find C files in a non-standard encoding:</p> <pre class="literal-block"> -hg locate "set:**.c and not encoding('UTF-8')" +hg locate "set:**.c and not encoding(ascii)" </pre> </li> <li><p class="first">Revert copies of large binary files:</p> @@ -3611,7 +3044,7 @@ changeset is much more appropriate than checkout in this context.</p> <dt>Child changeset</dt> <dd>See 'Changeset, child'.</dd> <dt>Close changeset</dt> -<dd>See 'Head, closed branch'</dd> +<dd>See 'Changeset, close'.</dd> <dt>Closed branch</dt> <dd>See 'Branch, closed'.</dd> <dt>Clone</dt> @@ -3671,10 +3104,6 @@ changeset, known as the parent of the working directory. See 'Parent, working directory'. The state may be modified by changes to the files introduced manually or by a merge. The repository metadata exists in the .hg directory inside the working directory.</dd> -<dt>Draft</dt> -<dd>Changesets in the draft phase have not been shared with publishing -repositories and may thus be safely changed by history-modifying -extensions. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd> <dt>Graph</dt> <dd>See DAG and <a class="reference external" href="hg.1.html#graphlog"><tt class="docutils literal">hg help graphlog</tt></a>.</dd> <dt>Head</dt> @@ -3687,13 +3116,10 @@ usual targets for update and merge operations.</p> <dt>Head, branch</dt> <dd>A changeset with no descendants on the same named branch.</dd> <dt>Head, closed branch</dt> -<dd><p class="first">A changeset that marks a head as no longer interesting. The closed +<dd>A changeset that marks a head as no longer interesting. The closed head is no longer listed by <a class="reference external" href="hg.1.html#heads"><tt class="docutils literal">hg heads</tt></a>. A branch is considered closed when all its heads are closed and consequently is not -listed by <a class="reference external" href="hg.1.html#branches"><tt class="docutils literal">hg branches</tt></a>.</p> -<p class="last">Closed heads can be re-opened by committing new changeset as the -child of the changeset that marks a head as closed.</p> -</dd> +listed by <a class="reference external" href="hg.1.html#branches"><tt class="docutils literal">hg branches</tt></a>.</dd> <dt>Head, repository</dt> <dd>A topological head which has not been closed.</dd> <dt>Head, topological</dt> @@ -3746,13 +3172,6 @@ are <a class="reference external" href="hg.1.html#summary"><tt class="docutils l changeset into another.</p> <p class="last">Example: "You will need to patch that revision."</p> </dd> -<dt>Phase</dt> -<dd>A per-changeset state tracking how the changeset has been or -should be shared. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd> -<dt>Public</dt> -<dd>Changesets in the public phase have been shared with publishing -repositories and are therefore considered immutable. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help -phases</tt></a>.</dd> <dt>Pull</dt> <dd>An operation in which changesets in a remote repository which are not in the local repository are brought into the local @@ -3795,9 +3214,6 @@ pointing to the data.</dd> <dt>Root</dt> <dd>A changeset that has only the null changeset as its parent. Most repositories have only a single root changeset.</dd> -<dt>Secret</dt> -<dd>Changesets in the secret phase may not be shared via push, pull, -or clone. See <a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>.</dd> <dt>Tag</dt> <dd>An alternative name given to a changeset. Tags can be used in all places where Mercurial expects a changeset ID, e.g., with @@ -3827,15 +3243,16 @@ the working directory to that of a specific changeset. See </dl> </div> <div class="section" id="syntax-for-mercurial-ignore-files"> -<span id="ignore"></span><span id="hgignore"></span><h1><a class="toc-backref" href="#contents">Syntax for Mercurial Ignore Files</a></h1> +<span id="ignore"></span><span id="hgignore"></span><h1><a class="toc-backref" href="#contents">syntax for Mercurial ignore files</a></h1> +</div> <div class="section" id="id2"> -<h2>Synopsis</h2> +<h1><a class="toc-backref" href="#contents">Synopsis</a></h1> <p>The Mercurial system uses a file called <tt class="docutils literal">.hgignore</tt> in the root directory of a repository to control its behavior when it searches for files that it is not currently tracking.</p> </div> <div class="section" id="id3"> -<h2>Description</h2> +<h1><a class="toc-backref" href="#contents">Description</a></h1> <p>The working directory of a Mercurial repository will often contain files that should not be tracked by Mercurial. These include backup files created by editors and build products created by compilers. @@ -3856,13 +3273,9 @@ configure these files.</p> <p>To control Mercurial's handling of files that it manages, many commands support the <tt class="docutils literal"><span class="pre">-I</span></tt> and <tt class="docutils literal"><span class="pre">-X</span></tt> options; see <a class="reference external" href="hg.1.html#<command>"><tt class="docutils literal">hg help <command></tt></a> and <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p> -<p>Files that are already tracked are not affected by .hgignore, even -if they appear in .hgignore. An untracked file X can be explicitly -added with <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add X</tt></a>, even if X would be excluded by a pattern -in .hgignore.</p> </div> <div class="section" id="syntax"> -<h2>Syntax</h2> +<h1><a class="toc-backref" href="#contents">Syntax</a></h1> <p>An ignore file is a plain text file consisting of a list of patterns, with one pattern per line. Empty lines are skipped. The <tt class="docutils literal">#</tt> character is treated as a comment character, and the <tt class="docutils literal">\</tt> character @@ -3886,14 +3299,9 @@ follow, until another syntax is selected.</p> the form <tt class="docutils literal">*.c</tt> will match a file ending in <tt class="docutils literal">.c</tt> in any directory, and a regexp pattern of the form <tt class="docutils literal">\.c$</tt> will do the same. To root a regexp pattern, start it with <tt class="docutils literal">^</tt>.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Patterns specified in other than <tt class="docutils literal">.hgignore</tt> are always rooted. -Please see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p> -</div> </div> <div class="section" id="example"> -<h2>Example</h2> +<h1><a class="toc-backref" href="#contents">Example</a></h1> <p>Here is an example ignore file.</p> <pre class="literal-block"> # use glob syntax. @@ -3908,16 +3316,14 @@ syntax: regexp ^\.pc/ </pre> </div> -</div> <div class="section" id="configuring-hgweb"> <span id="hgweb"></span><h1><a class="toc-backref" href="#contents">Configuring hgweb</a></h1> <p>Mercurial's internal web server, hgweb, can serve either a single -repository, or a tree of repositories. In the second case, repository -paths and global options can be defined using a dedicated -configuration file common to <a class="reference external" href="hg.1.html#serve"><tt class="docutils literal">hg serve</tt></a>, <tt class="docutils literal">hgweb.wsgi</tt>, -<tt class="docutils literal">hgweb.cgi</tt> and <tt class="docutils literal">hgweb.fcgi</tt>.</p> -<p>This file uses the same syntax as other Mercurial configuration files -but recognizes only the following sections:</p> +repository, or a collection of them. In the latter case, a special +configuration file can be used to specify the repository paths to use +and global web configuration options.</p> +<p>This file uses the same syntax as other Mercurial configuration files, +but only the following sections are recognized:</p> <blockquote> <ul class="simple"> <li>web</li> @@ -3925,43 +3331,44 @@ but recognizes only the following sections:</p> <li>collections</li> </ul> </blockquote> -<p>The <tt class="docutils literal">web</tt> options are thorougly described in <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>.</p> -<p>The <tt class="docutils literal">paths</tt> section maps URL paths to paths of repositories in the -filesystem. hgweb will not expose the filesystem directly - only -Mercurial repositories can be published and only according to the -configuration.</p> -<p>The left hand side is the path in the URL. Note that hgweb reserves -subpaths like <tt class="docutils literal">rev</tt> or <tt class="docutils literal">file</tt>, try using different names for -nested repositories to avoid confusing effects.</p> -<p>The right hand side is the path in the filesystem. If the specified -path ends with <tt class="docutils literal">*</tt> or <tt class="docutils literal">**</tt> the filesystem will be searched -recursively for repositories below that point. -With <tt class="docutils literal">*</tt> it will not recurse into the repositories it finds (except for -<tt class="docutils literal">.hg/patches</tt>). -With <tt class="docutils literal">**</tt> it will also search inside repository working directories -and possibly find subrepositories.</p> -<p>In this example:</p> +<p>The <tt class="docutils literal">web</tt> section can specify all the settings described in the web +section of the hgrc(5) documentation. See <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a> for +information on where to find the manual page.</p> +<p>The <tt class="docutils literal">paths</tt> section provides mappings of physical repository +paths to virtual ones. For instance:</p> <pre class="literal-block"> [paths] -/projects/a = /srv/tmprepos/a -/projects/b = c:/repos/b -/ = /srv/repos/* -/user/bob = /home/bob/repos/** +projects/a = /foo/bar +projects/b = /baz/quux +web/root = /real/root/* +/ = /real/root2/* +virtual/root2 = /real/root2/** </pre> <ul class="simple"> <li>The first two entries make two repositories in different directories appear under the same directory in the web interface</li> -<li>The third entry will publish every Mercurial repository found in -<tt class="docutils literal">/srv/repos/</tt>, for instance the repository <tt class="docutils literal">/srv/repos/quux/</tt> -will appear as <tt class="docutils literal"><span class="pre">http://server/quux/</span></tt></li> -<li>The fourth entry will publish both <tt class="docutils literal"><span class="pre">http://server/user/bob/quux/</span></tt> -and <tt class="docutils literal"><span class="pre">http://server/user/bob/quux/testsubrepo/</span></tt></li> +<li>The third entry maps every Mercurial repository found in '/real/root' +into 'web/root'. This format is preferred over the [collections] one, +since using absolute paths as configuration keys is not supported on every +platform (especially on Windows).</li> +<li>The fourth entry is a special case mapping all repositories in +'/real/root2' in the root of the virtual directory.</li> +<li>The fifth entry recursively finds all repositories under the real +root, and maps their relative paths under the virtual root.</li> </ul> -<p>The <tt class="docutils literal">collections</tt> section is deprecated and has been superseeded by -<tt class="docutils literal">paths</tt>.</p> +<p>The <tt class="docutils literal">collections</tt> section provides mappings of trees of physical +repositories paths to virtual ones, though the paths syntax is generally +preferred. For instance:</p> +<pre class="literal-block"> +[collections] +/foo = /foo +</pre> +<p>Here, the left side will be stripped off all repositories found in the +right side. Thus <tt class="docutils literal">/foo/bar</tt> and <tt class="docutils literal">foo/quux/baz</tt> will be listed as +<tt class="docutils literal">bar</tt> and <tt class="docutils literal">quux/baz</tt> respectively.</p> </div> <div class="section" id="id4"> -<span id="mergetools"></span><span id="merge-tools"></span><h1><a class="toc-backref" href="#contents">Merge Tools</a></h1> +<span id="merge-tools"></span><h1><a class="toc-backref" href="#contents">Merge Tools</a></h1> <p>To merge files Mercurial uses merge tools.</p> <p>A merge tool combines two different versions of a file into a merged file. Merge tools are given the two files and the greatest common @@ -3991,28 +3398,28 @@ GUI is available if the tool requires a GUI.</p> <p>There are some internal merge tools which can be used. The internal merge tools are:</p> <dl class="docutils"> -<dt><tt class="docutils literal">internal:dump</tt></dt> -<dd>Creates three versions of the files to merge, containing the -contents of local, other and base. These files can then be used to -perform a merge manually. If the file to be merged is named -<tt class="docutils literal">a.txt</tt>, these files will accordingly be named <tt class="docutils literal">a.txt.local</tt>, -<tt class="docutils literal">a.txt.other</tt> and <tt class="docutils literal">a.txt.base</tt> and they will be placed in the -same directory as <tt class="docutils literal">a.txt</tt>.</dd> +<dt><tt class="docutils literal">internal:merge</tt></dt> +<dd>Uses the internal non-interactive simple merge algorithm for merging +files. It will fail if there are any conflicts and leave markers in +the partially merged file.</dd> <dt><tt class="docutils literal">internal:fail</tt></dt> <dd>Rather than attempting to merge files that were modified on both branches, it marks them as unresolved. The resolve command must be used to resolve these conflicts.</dd> <dt><tt class="docutils literal">internal:local</tt></dt> <dd>Uses the local version of files as the merged version.</dd> -<dt><tt class="docutils literal">internal:merge</tt></dt> -<dd>Uses the internal non-interactive simple merge algorithm for merging -files. It will fail if there are any conflicts and leave markers in -the partially merged file.</dd> <dt><tt class="docutils literal">internal:other</tt></dt> <dd>Uses the other version of files as the merged version.</dd> <dt><tt class="docutils literal">internal:prompt</tt></dt> <dd>Asks the user which of the local or the other version to keep as the merged version.</dd> +<dt><tt class="docutils literal">internal:dump</tt></dt> +<dd>Creates three versions of the files to merge, containing the +contents of local, other and base. These files can then be used to +perform a merge manually. If the file to be merged is named +<tt class="docutils literal">a.txt</tt>, these files will accordingly be named <tt class="docutils literal">a.txt.local</tt>, +<tt class="docutils literal">a.txt.other</tt> and <tt class="docutils literal">a.txt.base</tt> and they will be placed in the +same directory as <tt class="docutils literal">a.txt</tt>.</dd> </dl> <p>Internal tools are always available and do not require a GUI but will by default not handle symlinks or binary files.</p> @@ -4056,7 +3463,7 @@ configuration of merge tools.</p> </div> </div> <div class="section" id="specifying-multiple-revisions"> -<span id="mrevs"></span><span id="multirevs"></span><h1><a class="toc-backref" href="#contents">Specifying Multiple Revisions</a></h1> +<span id="multirevs"></span><span id="mrevs"></span><h1><a class="toc-backref" href="#contents">Specifying Multiple Revisions</a></h1> <p>When Mercurial accepts more than one revision, they may be specified individually, or provided as a topologically continuous range, separated by the ":" character.</p> @@ -4075,11 +3482,6 @@ at a time.</p> <p>By default, Mercurial treats filenames as shell-style extended glob patterns.</p> <p>Alternate pattern notations must be specified explicitly.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Patterns specified in <tt class="docutils literal">.hgignore</tt> are not rooted. -Please see <a class="reference external" href="hg.1.html#hgignore"><tt class="docutils literal">hg help hgignore</tt></a> for details.</p> -</div> <p>To use a plain path name without any pattern matching, start it with <tt class="docutils literal">path:</tt>. These path names must completely match starting at the current repository root.</p> @@ -4121,103 +3523,8 @@ listfile0:list.txt read list from list.txt with null byte delimiters </pre> <p>See also <a class="reference external" href="hg.1.html#filesets"><tt class="docutils literal">hg help filesets</tt></a>.</p> </div> -<div class="section" id="working-with-phases"> -<span id="phases"></span><h1><a class="toc-backref" href="#contents">Working with Phases</a></h1> -<div class="section" id="what-are-phases"> -<h2>What are phases?</h2> -<p>Phases are a system for tracking which changesets have been or should -be shared. This helps prevent common mistakes when modifying history -(for instance, with the mq or rebase extensions).</p> -<p>Each changeset in a repository is in one of the following phases:</p> -<blockquote> -<ul class="simple"> -<li>public : changeset is visible on a public server</li> -<li>draft : changeset is not yet published</li> -<li>secret : changeset should not be pushed, pulled, or cloned</li> -</ul> -</blockquote> -<p>These phases are ordered (public < draft < secret) and no changeset -can be in a lower phase than its ancestors. For instance, if a -changeset is public, all its ancestors are also public. Lastly, -changeset phases should only be changed towards the public phase.</p> -</div> -<div class="section" id="how-are-phases-managed"> -<h2>How are phases managed?</h2> -<p>For the most part, phases should work transparently. By default, a -changeset is created in the draft phase and is moved into the public -phase when it is pushed to another repository.</p> -<p>Once changesets become public, extensions like mq and rebase will -refuse to operate on them to prevent creating duplicate changesets. -Phases can also be manually manipulated with the <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg phase</tt></a> command -if needed. See <a class="reference external" href="hg.1.html#-v"><tt class="docutils literal">hg help <span class="pre">-v</span> phase</tt></a> for examples.</p> -</div> -<div class="section" id="phases-and-servers"> -<h2>Phases and servers</h2> -<p>Normally, all servers are <tt class="docutils literal">publishing</tt> by default. This means:</p> -<pre class="literal-block"> -- all draft changesets that are pulled or cloned appear in phase -public on the client - -- all draft changesets that are pushed appear as public on both -client and server - -- secret changesets are neither pushed, pulled, or cloned -</pre> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Pulling a draft changeset from a publishing server does not mark it -as public on the server side due to the read-only nature of pull.</p> -</div> -<p>Sometimes it may be desirable to push and pull changesets in the draft -phase to share unfinished work. This can be done by setting a -repository to disable publishing in its configuration file:</p> -<pre class="literal-block"> -[phases] -publish = False -</pre> -<p>See <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a> for more information on config files.</p> -<div class="note"> -<p class="first admonition-title">Note</p> -<p class="last">Servers running older versions of Mercurial are treated as -publishing.</p> -</div> -</div> -<div class="section" id="examples"> -<h2>Examples</h2> -<blockquote> -<ul> -<li><p class="first">list changesets in draft or secret phase:</p> -<pre class="literal-block"> -hg log -r "not public()" -</pre> -</li> -<li><p class="first">change all secret changesets to draft:</p> -<pre class="literal-block"> -hg phase --draft "secret()" -</pre> -</li> -<li><p class="first">forcibly move the current changeset and descendants from public to draft:</p> -<pre class="literal-block"> -hg phase --force --draft . -</pre> -</li> -<li><p class="first">show a list of changeset revision and phase:</p> -<pre class="literal-block"> -hg log --template "{rev} {phase}\n" -</pre> -</li> -<li><p class="first">resynchronize draft changesets relative to a remote repository:</p> -<pre class="literal-block"> -hg phase -fd 'outgoing(URL)' -</pre> -</li> -</ul> -</blockquote> -<p>See <a class="reference external" href="hg.1.html#phase"><tt class="docutils literal">hg help phase</tt></a> for more information on manually manipulating phases.</p> -</div> -</div> <div class="section" id="specifying-single-revisions"> -<span id="revs"></span><span id="revisions"></span><h1><a class="toc-backref" href="#contents">Specifying Single Revisions</a></h1> +<span id="revisions"></span><span id="revs"></span><h1><a class="toc-backref" href="#contents">Specifying Single Revisions</a></h1> <p>Mercurial supports several ways to specify individual revisions.</p> <p>A plain integer is treated as a revision number. Negative integers are treated as sequential offsets from the tip, with -1 denoting the tip, @@ -4228,12 +3535,12 @@ identifier.</p> unique revision identifier and is referred to as a short-form identifier. A short-form identifier is only valid if it is the prefix of exactly one full-length identifier.</p> -<p>Any other string is treated as a bookmark, tag, or branch name. A -bookmark is a movable pointer to a revision. A tag is a permanent name -associated with a revision. A branch name denotes the tipmost revision -of that branch. Bookmark, tag, and branch names must not contain the ":" -character.</p> -<p>The reserved name "tip" always identifies the most recent revision.</p> +<p>Any other string is treated as a tag or branch name. A tag name is a +symbolic name associated with a revision identifier. A branch name +denotes the tipmost revision of that branch. Tag and branch names must +not contain the ":" character.</p> +<p>The reserved name "tip" is a special tag that always identifies the +most recent revision.</p> <p>The reserved name "null" indicates the null revision. This is the revision of an empty repository, and the parent of revision 0.</p> <p>The reserved name "." indicates the working directory parent. If no @@ -4242,14 +3549,15 @@ uncommitted merge is in progress, "." is the revision of the first parent.</p> </div> <div class="section" id="specifying-revision-sets"> -<span id="revset"></span><span id="revsets"></span><h1><a class="toc-backref" href="#contents">Specifying Revision Sets</a></h1> +<span id="revsets"></span><span id="revset"></span><h1><a class="toc-backref" href="#contents">Specifying Revision Sets</a></h1> <p>Mercurial supports a functional language for selecting a set of revisions.</p> <p>The language supports a number of predicates which are joined by infix operators. Parenthesis can be used for grouping.</p> -<p>Identifiers such as branch names may need quoting with single or -double quotes if they contain characters like <tt class="docutils literal">-</tt> or if they match -one of the predefined predicates.</p> +<p>Identifiers such as branch names must be quoted with single or double +quotes if they contain characters outside of +<tt class="docutils literal"><span class="pre">[._a-zA-Z0-9\x80-\xff]</span></tt> or if they match one of the predefined +predicates.</p> <p>Special characters can be used in quoted identifiers by escaping them, e.g., <tt class="docutils literal">\n</tt> is interpreted as a newline. To prevent them from being interpreted, strings can be prefixed with <tt class="docutils literal">r</tt>, e.g. <tt class="docutils literal"><span class="pre">r'...'</span></tt>.</p> @@ -4302,31 +3610,13 @@ for n == 2, the second parent of changeset in x.</dd> <dd>Changesets that are ancestors of a changeset in set.</dd> <dt><tt class="docutils literal">author(string)</tt></dt> <dd>Alias for <tt class="docutils literal">user(string)</tt>.</dd> -<dt><tt class="docutils literal">bisect(string)</tt></dt> -<dd><p class="first">Changesets marked in the specified bisect status:</p> -<ul class="last simple"> -<li><tt class="docutils literal">good</tt>, <tt class="docutils literal">bad</tt>, <tt class="docutils literal">skip</tt>: csets explicitly marked as good/bad/skip</li> -<li><tt class="docutils literal">goods</tt>, <tt class="docutils literal">bads</tt> : csets topologicaly good/bad</li> -<li><tt class="docutils literal">range</tt> : csets taking part in the bisection</li> -<li><tt class="docutils literal">pruned</tt> : csets that are goods, bads or skipped</li> -<li><tt class="docutils literal">untested</tt> : csets whose fate is yet unknown</li> -<li><tt class="docutils literal">ignored</tt> : csets ignored due to DAG topology</li> -<li><tt class="docutils literal">current</tt> : the cset currently being bisected</li> -</ul> -</dd> +<dt><tt class="docutils literal">bisected(string)</tt></dt> +<dd>Changesets marked in the specified bisect state (good, bad, skip).</dd> <dt><tt class="docutils literal"><span class="pre">bookmark([name])</span></tt></dt> -<dd><p class="first">The named bookmark or all bookmarks.</p> -<p class="last">If <cite>name</cite> starts with <cite>re:</cite>, the remainder of the name is treated as -a regular expression. To match a bookmark that actually starts with <cite>re:</cite>, -use the prefix <cite>literal:</cite>.</p> -</dd> +<dd>The named bookmark or all bookmarks.</dd> <dt><tt class="docutils literal">branch(string or set)</tt></dt> -<dd><p class="first">All changesets belonging to the given branch or the branches of the given -changesets.</p> -<p class="last">If <cite>string</cite> starts with <cite>re:</cite>, the remainder of the name is treated as -a regular expression. To match a branch that actually starts with <cite>re:</cite>, -use the prefix <cite>literal:</cite>.</p> -</dd> +<dd>All changesets belonging to the given branch or the branches of the given +changesets.</dd> <dt><tt class="docutils literal">children(set)</tt></dt> <dd>Child changesets of changesets in set.</dd> <dt><tt class="docutils literal">closed()</tt></dt> @@ -4334,43 +3624,16 @@ use the prefix <cite>literal:</cite>.</p> <dt><tt class="docutils literal">contains(pattern)</tt></dt> <dd>Revision contains a file matching pattern. See <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for information about file patterns.</dd> -<dt><tt class="docutils literal"><span class="pre">converted([id])</span></tt></dt> -<dd>Changesets converted from the given identifier in the old repository if -present, or all converted changesets if no identifier is specified.</dd> <dt><tt class="docutils literal">date(interval)</tt></dt> <dd>Changesets within the interval, see <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a>.</dd> <dt><tt class="docutils literal">desc(string)</tt></dt> <dd>Search commit message for string. The match is case-insensitive.</dd> <dt><tt class="docutils literal">descendants(set)</tt></dt> <dd>Changesets which are descendants of changesets in set.</dd> -<dt><tt class="docutils literal"><span class="pre">destination([set])</span></tt></dt> -<dd>Changesets that were created by a graft, transplant or rebase operation, -with the given revisions specified as the source. Omitting the optional set -is the same as passing all().</dd> -<dt><tt class="docutils literal">draft()</tt></dt> -<dd>Changeset in draft phase.</dd> -<dt><tt class="docutils literal">extinct()</tt></dt> -<dd>Obsolete changesets with obsolete descendants only.</dd> -<dt><tt class="docutils literal">extra(label, [value])</tt></dt> -<dd><p class="first">Changesets with the given label in the extra metadata, with the given -optional value.</p> -<p class="last">If <cite>value</cite> starts with <cite>re:</cite>, the remainder of the value is treated as -a regular expression. To match a value that actually starts with <cite>re:</cite>, -use the prefix <cite>literal:</cite>.</p> -</dd> <dt><tt class="docutils literal">file(pattern)</tt></dt> -<dd><p class="first">Changesets affecting files matched by pattern.</p> -<p class="last">For a faster but less accurate result, consider using <tt class="docutils literal">filelog()</tt> -instead.</p> -</dd> +<dd>Changesets affecting files matched by pattern.</dd> <dt><tt class="docutils literal">filelog(pattern)</tt></dt> -<dd><p class="first">Changesets connected to the specified filelog.</p> -<p class="last">For performance reasons, <tt class="docutils literal">filelog()</tt> does not show every changeset -that affects the requested file(s). See <a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg help log</tt></a> for details. For -a slower, more accurate result, use <tt class="docutils literal">file()</tt>.</p> -</dd> -<dt><tt class="docutils literal">first(set, [n])</tt></dt> -<dd>An alias for limit().</dd> +<dd>Changesets connected to the specified filelog.</dd> <dt><tt class="docutils literal"><span class="pre">follow([file])</span></tt></dt> <dd>An alias for <tt class="docutils literal">::.</tt> (ancestors of the working copy's first parent). If a filename is specified, the history of the given file is followed, @@ -4388,29 +3651,10 @@ to ensure special escape characters are handled correctly. Unlike <dt><tt class="docutils literal">keyword(string)</tt></dt> <dd>Search commit message, user name, and names of changed files for string. The match is case-insensitive.</dd> -<dt><tt class="docutils literal">last(set, [n])</tt></dt> -<dd>Last n members of set, defaulting to 1.</dd> -<dt><tt class="docutils literal">limit(set, [n])</tt></dt> -<dd>First n members of set, defaulting to 1.</dd> -<dt><tt class="docutils literal">matching(revision [, field])</tt></dt> -<dd><p class="first">Changesets in which a given set of fields match the set of fields in the -selected revision or set.</p> -<p>To match more than one field pass the list of fields to match separated -by spaces (e.g. <tt class="docutils literal">author description</tt>).</p> -<p>Valid fields are most regular revision fields and some special fields.</p> -<p>Regular revision fields are <tt class="docutils literal">description</tt>, <tt class="docutils literal">author</tt>, <tt class="docutils literal">branch</tt>, -<tt class="docutils literal">date</tt>, <tt class="docutils literal">files</tt>, <tt class="docutils literal">phase</tt>, <tt class="docutils literal">parents</tt>, <tt class="docutils literal">substate</tt>, <tt class="docutils literal">user</tt> -and <tt class="docutils literal">diff</tt>. -Note that <tt class="docutils literal">author</tt> and <tt class="docutils literal">user</tt> are synonyms. <tt class="docutils literal">diff</tt> refers to the -contents of the revision. Two revisions matching their <tt class="docutils literal">diff</tt> will -also match their <tt class="docutils literal">files</tt>.</p> -<p>Special fields are <tt class="docutils literal">summary</tt> and <tt class="docutils literal">metadata</tt>: -<tt class="docutils literal">summary</tt> matches the first line of the description. -<tt class="docutils literal">metadata</tt> is equivalent to matching <tt class="docutils literal">description user date</tt> -(i.e. it matches the main metadata fields).</p> -<p class="last"><tt class="docutils literal">metadata</tt> is the default field which is used when no fields are -specified. You can match more than one field at a time.</p> -</dd> +<dt><tt class="docutils literal">last(set, n)</tt></dt> +<dd>Last n members of set.</dd> +<dt><tt class="docutils literal">limit(set, n)</tt></dt> +<dd>First n members of set.</dd> <dt><tt class="docutils literal">max(set)</tt></dt> <dd>Changeset with highest revision number in set.</dd> <dt><tt class="docutils literal">merge()</tt></dt> @@ -4419,14 +3663,6 @@ specified. You can match more than one field at a time.</p> <dd>Changeset with lowest revision number in set.</dd> <dt><tt class="docutils literal">modifies(pattern)</tt></dt> <dd>Changesets modifying files matched by pattern.</dd> -<dt><tt class="docutils literal">obsolete()</tt></dt> -<dd>Mutable changeset with a newer version.</dd> -<dt><tt class="docutils literal"><span class="pre">origin([set])</span></tt></dt> -<dd>Changesets that were specified as a source for the grafts, transplants or -rebases that created the given revisions. Omitting the optional set is the -same as passing all(). If a changeset created by these operations is itself -specified as a source for one of these operations, only the source changeset -for the first operation is selected.</dd> <dt><tt class="docutils literal"><span class="pre">outgoing([path])</span></tt></dt> <dd>Changesets not found in the specified destination repository, or the default push location.</dd> @@ -4437,18 +3673,8 @@ default push location.</dd> <dt><tt class="docutils literal"><span class="pre">parents([set])</span></tt></dt> <dd>The set of all parents for all changesets in set, or the working directory.</dd> <dt><tt class="docutils literal">present(set)</tt></dt> -<dd><p class="first">An empty set, if any revision in set isn't found; otherwise, -all revisions in set.</p> -<p class="last">If any of specified revisions is not present in the local repository, -the query is normally aborted. But this predicate allows the query -to continue even in such cases.</p> -</dd> -<dt><tt class="docutils literal">public()</tt></dt> -<dd>Changeset in public phase.</dd> -<dt><tt class="docutils literal"><span class="pre">remote([id</span> <span class="pre">[,path]])</span></tt></dt> -<dd>Local revision that corresponds to the given identifier in a -remote repository, if present. Here, the '.' identifier is a -synonym for the current local branch.</dd> +<dd>An empty set, if any revision in set isn't found; otherwise, +all revisions in set.</dd> <dt><tt class="docutils literal">removes(pattern)</tt></dt> <dd>Changesets which remove files matching pattern.</dd> <dt><tt class="docutils literal">rev(number)</tt></dt> @@ -4456,9 +3682,7 @@ synonym for the current local branch.</dd> <dt><tt class="docutils literal">reverse(set)</tt></dt> <dd>Reverse order of set.</dd> <dt><tt class="docutils literal">roots(set)</tt></dt> -<dd>Changesets in set with no parent changeset in set.</dd> -<dt><tt class="docutils literal">secret()</tt></dt> -<dd>Changeset in secret phase.</dd> +<dd>Changesets with no parent changeset in set.</dd> <dt><tt class="docutils literal">sort(set[, <span class="pre">[-]key...])</span></tt></dt> <dd><p class="first">Sort set by keys. The default sort order is ascending, specify a key as <tt class="docutils literal"><span class="pre">-key</span></tt> to sort in descending order.</p> @@ -4473,14 +3697,8 @@ as <tt class="docutils literal"><span class="pre">-key</span></tt> to sort in de </dd> <dt><tt class="docutils literal"><span class="pre">tag([name])</span></tt></dt> <dd>The specified tag by name, or all tagged revisions if no name is given.</dd> -<dt><tt class="docutils literal">unstable()</tt></dt> -<dd>Non-obsolete changesets with obsolete ancestors.</dd> <dt><tt class="docutils literal">user(string)</tt></dt> -<dd><p class="first">User name contains string. The match is case-insensitive.</p> -<p class="last">If <cite>string</cite> starts with <cite>re:</cite>, the remainder of the string is treated as -a regular expression. To match a user that actually contains <cite>re:</cite>, use -the prefix <cite>literal:</cite>.</p> -</dd> +<dd>User name contains string. The match is case-insensitive.</dd> </dl> <p>New predicates (known as "aliases") can be defined, using any combination of existing predicates or other aliases. An alias definition looks like:</p> @@ -4547,39 +3765,35 @@ hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())&quo </ul> </div> <div class="section" id="subrepositories"> -<span id="subrepo"></span><span id="subrepos"></span><h1><a class="toc-backref" href="#contents">Subrepositories</a></h1> +<span id="subrepos"></span><span id="subrepo"></span><h1><a class="toc-backref" href="#contents">Subrepositories</a></h1> <p>Subrepositories let you nest external repositories or projects into a parent Mercurial repository, and make commands operate on them as a -group.</p> -<p>Mercurial currently supports Mercurial, Git, and Subversion -subrepositories.</p> +group. External Mercurial and Subversion projects are currently +supported.</p> <p>Subrepositories are made of three components:</p> <ol class="arabic"> <li><p class="first">Nested repository checkouts. They can appear anywhere in the -parent working directory.</p> +parent working directory, and are Mercurial clones or Subversion +checkouts.</p> </li> -<li><p class="first">Nested repository references. They are defined in <tt class="docutils literal">.hgsub</tt>, which -should be placed in the root of working directory, and +<li><p class="first">Nested repository references. They are defined in <tt class="docutils literal">.hgsub</tt> and tell where the subrepository checkouts come from. Mercurial subrepositories are referenced like:</p> <blockquote> <p>path/to/nested = <a class="reference external" href="https://example.com/nested/repo/path">https://example.com/nested/repo/path</a></p> </blockquote> -<p>Git and Subversion subrepos are also supported:</p> -<blockquote> -<p>path/to/nested = [git]git://example.com/nested/repo/path -path/to/nested = [svn]https://example.com/nested/trunk/path</p> -</blockquote> <p>where <tt class="docutils literal">path/to/nested</tt> is the checkout location relatively to the parent Mercurial root, and <tt class="docutils literal"><span class="pre">https://example.com/nested/repo/path</span></tt> is the source repository path. The source can also reference a -filesystem path.</p> +filesystem path. Subversion repositories are defined with:</p> +<blockquote> +<p>path/to/nested = [svn]https://example.com/nested/trunk/path</p> +</blockquote> <p>Note that <tt class="docutils literal">.hgsub</tt> does not exist by default in Mercurial repositories, you have to create and add it to the parent repository before using subrepositories.</p> </li> -<li><p class="first">Nested repository states. They are defined in <tt class="docutils literal">.hgsubstate</tt>, which -is placed in the root of working directory, and +<li><p class="first">Nested repository states. They are defined in <tt class="docutils literal">.hgsubstate</tt> and capture whatever information is required to restore the subrepositories to the state they were committed in a parent repository changeset. Mercurial automatically record the nested @@ -4590,8 +3804,9 @@ repositories states when committing in the parent repository.</p> </div> </li> </ol> +</div> <div class="section" id="adding-a-subrepository"> -<h2>Adding a Subrepository</h2> +<h1><a class="toc-backref" href="#contents">Adding a Subrepository</a></h1> <p>If <tt class="docutils literal">.hgsub</tt> does not exist, create it and add it to the parent repository. Clone or checkout the external projects where you want it to live in the parent repository. Edit <tt class="docutils literal">.hgsub</tt> and add the @@ -4600,7 +3815,7 @@ subrepository is tracked and the next commit will record its state in <tt class="docutils literal">.hgsubstate</tt> and bind it to the committed changeset.</p> </div> <div class="section" id="synchronizing-a-subrepository"> -<h2>Synchronizing a Subrepository</h2> +<h1><a class="toc-backref" href="#contents">Synchronizing a Subrepository</a></h1> <p>Subrepos do not automatically track the latest changeset of their sources. Instead, they are updated to the changeset that corresponds with the changeset checked out in the top-level changeset. This is so @@ -4611,49 +3826,43 @@ subrepo at the desired revision, test in the top-level repo, then commit in the parent repository to record the new combination.</p> </div> <div class="section" id="deleting-a-subrepository"> -<h2>Deleting a Subrepository</h2> +<h1><a class="toc-backref" href="#contents">Deleting a Subrepository</a></h1> <p>To remove a subrepository from the parent repository, delete its reference from <tt class="docutils literal">.hgsub</tt>, then remove its files.</p> </div> <div class="section" id="interaction-with-mercurial-commands"> -<h2>Interaction with Mercurial Commands</h2> +<h1><a class="toc-backref" href="#contents">Interaction with Mercurial Commands</a></h1> <table class="docutils field-list" frame="void" rules="none"> <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name">add:</th><td class="field-body">add does not recurse in subrepos unless -S/--subrepos is -specified. However, if you specify the full path of a file in a -subrepo, it will be added even without -S/--subrepos specified. -Git and Subversion subrepositories are currently silently +specified. Subversion subrepositories are currently silently ignored.</td> </tr> <tr class="field"><th class="field-name">archive:</th><td class="field-body">archive does not recurse in subrepositories unless -S/--subrepos is specified.</td> </tr> <tr class="field"><th class="field-name">commit:</th><td class="field-body">commit creates a consistent snapshot of the state of the -entire project and its subrepositories. If any subrepositories -have been modified, Mercurial will abort. Mercurial can be made -to instead commit all modified subrepositories by specifying --S/--subrepos, or setting "ui.commitsubrepos=True" in a -configuration file (see <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>). After there are no -longer any modified subrepositories, it records their state and -finally commits it in the parent repository.</td> +entire project and its subrepositories. It does this by first +attempting to commit all modified subrepositories, then recording +their state and finally committing it in the parent +repository. Mercurial can be made to abort if any subrepository +content is modified by setting "ui.commitsubrepos=no" in a +configuration file (see <a class="reference external" href="hg.1.html#config"><tt class="docutils literal">hg help config</tt></a>).</td> </tr> <tr class="field"><th class="field-name">diff:</th><td class="field-body">diff does not recurse in subrepos unless -S/--subrepos is specified. Changes are displayed as usual, on the subrepositories -elements. Git and Subversion subrepositories are currently -silently ignored.</td> -</tr> -<tr class="field"><th class="field-name">forget:</th><td class="field-body">forget currently only handles exact file matches in subrepos. -Git and Subversion subrepositories are currently silently ignored.</td> +elements. Subversion subrepositories are currently silently +ignored.</td> </tr> <tr class="field"><th class="field-name">incoming:</th><td class="field-body">incoming does not recurse in subrepos unless -S/--subrepos -is specified. Git and Subversion subrepositories are currently -silently ignored.</td> +is specified. Subversion subrepositories are currently silently +ignored.</td> </tr> <tr class="field"><th class="field-name">outgoing:</th><td class="field-body">outgoing does not recurse in subrepos unless -S/--subrepos -is specified. Git and Subversion subrepositories are currently -silently ignored.</td> +is specified. Subversion subrepositories are currently silently +ignored.</td> </tr> <tr class="field"><th class="field-name">pull:</th><td class="field-body">pull is not recursive since it is not clear what to pull prior to running <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update</tt></a>. Listing and retrieving all @@ -4664,7 +3873,7 @@ case.</td> <tr class="field"><th class="field-name">push:</th><td class="field-body">Mercurial will automatically push all subrepositories first when the parent repository is being pushed. This ensures new subrepository changes are available when referenced by top-level -repositories. Push is a no-op for Subversion subrepositories.</td> +repositories.</td> </tr> <tr class="field"><th class="field-name">status:</th><td class="field-body">status does not recurse into subrepositories unless -S/--subrepos is specified. Subrepository changes are displayed as @@ -4682,16 +3891,15 @@ can require network access when using subrepositories.</td> </table> </div> <div class="section" id="remapping-subrepositories-sources"> -<h2>Remapping Subrepositories Sources</h2> +<h1><a class="toc-backref" href="#contents">Remapping Subrepositories Sources</a></h1> <p>A subrepository source location may change during a project life, invalidating references stored in the parent repository history. To fix this, rewriting rules can be defined in parent repository <tt class="docutils literal">hgrc</tt> file or in Mercurial configuration. See the <tt class="docutils literal">[subpaths]</tt> section in hgrc(5) for more details.</p> </div> -</div> <div class="section" id="template-usage"> -<span id="style"></span><span id="template"></span><span id="templates"></span><span id="templating"></span><h1><a class="toc-backref" href="#contents">Template Usage</a></h1> +<span id="templates"></span><span id="templating"></span><h1><a class="toc-backref" href="#contents">Template Usage</a></h1> <p>Mercurial allows you to customize output of commands through templates. You can either pass in a template from the command line, via the --template option, or select an existing @@ -4720,8 +3928,6 @@ keywords are usually available for templating a log-like command:</p> <tbody valign="top"> <tr class="field"><th class="field-name">author:</th><td class="field-body">String. The unmodified author of the changeset.</td> </tr> -<tr class="field"><th class="field-name">bisect:</th><td class="field-body">String. The changeset bisection status.</td> -</tr> <tr class="field"><th class="field-name">bookmarks:</th><td class="field-body">List of strings. Any bookmarks associated with the changeset.</td> </tr> @@ -4747,7 +3953,7 @@ default.</td> their sources.</td> </tr> <tr class="field"><th class="field-name" colspan="2">file_copies_switch:</th></tr> -<tr class="field"><td> </td><td class="field-body">List of strings. Like "file_copies" but displayed +<tr><td> </td><td class="field-body">List of strings. Like "file_copies" but displayed only if the --copied switch is set.</td> </tr> <tr class="field"><th class="field-name">file_dels:</th><td class="field-body">List of strings. Files removed by this changeset.</td> @@ -4761,19 +3967,11 @@ changeset.</td> changeset.</td> </tr> <tr class="field"><th class="field-name" colspan="2">latesttagdistance:</th></tr> -<tr class="field"><td> </td><td class="field-body">Integer. Longest path to the latest tag.</td> +<tr><td> </td><td class="field-body">Integer. Longest path to the latest tag.</td> </tr> <tr class="field"><th class="field-name">node:</th><td class="field-body">String. The changeset identification hash, as a 40 hexadecimal digit string.</td> </tr> -<tr class="field"><th class="field-name">parents:</th><td class="field-body">List of strings. The parents of the changeset in "rev:node" -format. If the changeset has only one "natural" parent (the predecessor -revision) nothing is shown.</td> -</tr> -<tr class="field"><th class="field-name">phase:</th><td class="field-body">String. The changeset phase name.</td> -</tr> -<tr class="field"><th class="field-name">phaseidx:</th><td class="field-body">Integer. The changeset phase index.</td> -</tr> <tr class="field"><th class="field-name">rev:</th><td class="field-body">Integer. The repository-local changeset revision number.</td> </tr> <tr class="field"><th class="field-name">tags:</th><td class="field-body">List of strings. Any tags associated with the changeset.</td> @@ -4817,8 +4015,6 @@ address, and extracts just the domain component. Example: <tt class="docutils li address. Example: <tt class="docutils literal">User <user@example.com></tt> becomes <tt class="docutils literal">user@example.com</tt>.</td> </tr> -<tr class="field"><th class="field-name">emailuser:</th><td class="field-body">Any text. Returns the user portion of an email address.</td> -</tr> <tr class="field"><th class="field-name">escape:</th><td class="field-body">Any text. Replaces the special XML/XHTML characters "&", "<" and ">" with XML entities.</td> </tr> @@ -4848,8 +4044,7 @@ filter.</td> <tr class="field"><th class="field-name">obfuscate:</th><td class="field-body">Any text. Returns the input text rendered as a sequence of XML entities.</td> </tr> -<tr class="field"><th class="field-name">person:</th><td class="field-body">Any text. Returns the name before an email address, -interpreting it as per RFC 5322.</td> +<tr class="field"><th class="field-name">person:</th><td class="field-body">Any text. Returns the text before an email address.</td> </tr> <tr class="field"><th class="field-name">rfc3339date:</th><td class="field-body">Date. Returns a date using the Internet date format specified in RFC 3339: "2009-08-18T13:00:13+02:00".</td> @@ -4860,11 +4055,6 @@ headers: "Tue, 18 Aug 2009 13:00:13 +0200".</td> <tr class="field"><th class="field-name">short:</th><td class="field-body">Changeset hash. Returns the short form of a changeset hash, i.e. a 12 hexadecimal digit string.</td> </tr> -<tr class="field"><th class="field-name">shortbisect:</th><td class="field-body">Any text. Treats <cite>text</cite> as a bisection status, and -returns a single-character representing the status (G: good, B: bad, -S: skipped, U: untested, I: ignored). Returns single space if <cite>text</cite> -is not a valid bisection status.</td> -</tr> <tr class="field"><th class="field-name">shortdate:</th><td class="field-body">Date. Returns a date like "2006-09-18".</td> </tr> <tr class="field"><th class="field-name">stringify:</th><td class="field-body">Any type. Turns the value into text by converting values into @@ -4881,8 +4071,7 @@ first starting with a tab character.</td> <tr class="field"><th class="field-name">urlescape:</th><td class="field-body">Any text. Escapes all "special" characters. For example, "foo bar" becomes "foo%20bar".</td> </tr> -<tr class="field"><th class="field-name">user:</th><td class="field-body">Any text. Returns a short representation of a user name or email -address.</td> +<tr class="field"><th class="field-name">user:</th><td class="field-body">Any text. Returns the user portion of an email address.</td> </tr> </tbody> </table> @@ -4959,45 +4148,42 @@ prefer it over 'default' if both are defined.</dd> <p>This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.</p> <div class="contents htmlonly local topic" id="id6"> <ul class="simple"> -<li><a class="reference internal" href="#acl" id="id68">acl</a></li> -<li><a class="reference internal" href="#bugzilla" id="id69">bugzilla</a></li> -<li><a class="reference internal" href="#children" id="id70">children</a></li> -<li><a class="reference internal" href="#churn" id="id71">churn</a></li> -<li><a class="reference internal" href="#color" id="id72">color</a></li> -<li><a class="reference internal" href="#convert" id="id73">convert</a></li> -<li><a class="reference internal" href="#eol" id="id74">eol</a></li> -<li><a class="reference internal" href="#extdiff" id="id75">extdiff</a></li> -<li><a class="reference internal" href="#factotum" id="id76">factotum</a></li> -<li><a class="reference internal" href="#fetch" id="id77">fetch</a></li> -<li><a class="reference internal" href="#gpg" id="id78">gpg</a></li> -<li><a class="reference internal" href="#graphlog" id="id79">graphlog</a></li> -<li><a class="reference internal" href="#hgcia" id="id80">hgcia</a></li> -<li><a class="reference internal" href="#hgk" id="id81">hgk</a></li> -<li><a class="reference internal" href="#highlight" id="id82">highlight</a></li> -<li><a class="reference internal" href="#histedit" id="id83">histedit</a></li> -<li><a class="reference internal" href="#inotify" id="id84">inotify</a></li> -<li><a class="reference internal" href="#interhg" id="id85">interhg</a></li> -<li><a class="reference internal" href="#keyword" id="id86">keyword</a></li> -<li><a class="reference internal" href="#largefiles" id="id87">largefiles</a></li> -<li><a class="reference internal" href="#mq" id="id88">mq</a></li> -<li><a class="reference internal" href="#notify" id="id89">notify</a></li> -<li><a class="reference internal" href="#pager" id="id90">pager</a></li> -<li><a class="reference internal" href="#patchbomb" id="id91">patchbomb</a></li> -<li><a class="reference internal" href="#progress" id="id92">progress</a></li> -<li><a class="reference internal" href="#purge" id="id93">purge</a></li> -<li><a class="reference internal" href="#rebase" id="id94">rebase</a></li> -<li><a class="reference internal" href="#record" id="id95">record</a></li> -<li><a class="reference internal" href="#relink" id="id96">relink</a></li> -<li><a class="reference internal" href="#schemes" id="id97">schemes</a></li> -<li><a class="reference internal" href="#share" id="id98">share</a></li> -<li><a class="reference internal" href="#transplant" id="id99">transplant</a></li> -<li><a class="reference internal" href="#win32mbcs" id="id100">win32mbcs</a></li> -<li><a class="reference internal" href="#win32text" id="id101">win32text</a></li> -<li><a class="reference internal" href="#zeroconf" id="id102">zeroconf</a></li> +<li><a class="reference internal" href="#acl" id="id73">acl</a></li> +<li><a class="reference internal" href="#bugzilla" id="id74">bugzilla</a></li> +<li><a class="reference internal" href="#children" id="id75">children</a></li> +<li><a class="reference internal" href="#churn" id="id76">churn</a></li> +<li><a class="reference internal" href="#color" id="id77">color</a></li> +<li><a class="reference internal" href="#convert" id="id78">convert</a></li> +<li><a class="reference internal" href="#eol" id="id79">eol</a></li> +<li><a class="reference internal" href="#extdiff" id="id80">extdiff</a></li> +<li><a class="reference internal" href="#fetch" id="id81">fetch</a></li> +<li><a class="reference internal" href="#gpg" id="id82">gpg</a></li> +<li><a class="reference internal" href="#graphlog" id="id83">graphlog</a></li> +<li><a class="reference internal" href="#hgcia" id="id84">hgcia</a></li> +<li><a class="reference internal" href="#hgk" id="id85">hgk</a></li> +<li><a class="reference internal" href="#highlight" id="id86">highlight</a></li> +<li><a class="reference internal" href="#inotify" id="id87">inotify</a></li> +<li><a class="reference internal" href="#interhg" id="id88">interhg</a></li> +<li><a class="reference internal" href="#keyword" id="id89">keyword</a></li> +<li><a class="reference internal" href="#mq" id="id90">mq</a></li> +<li><a class="reference internal" href="#notify" id="id91">notify</a></li> +<li><a class="reference internal" href="#pager" id="id92">pager</a></li> +<li><a class="reference internal" href="#patchbomb" id="id93">patchbomb</a></li> +<li><a class="reference internal" href="#progress" id="id94">progress</a></li> +<li><a class="reference internal" href="#purge" id="id95">purge</a></li> +<li><a class="reference internal" href="#rebase" id="id96">rebase</a></li> +<li><a class="reference internal" href="#record" id="id97">record</a></li> +<li><a class="reference internal" href="#relink" id="id98">relink</a></li> +<li><a class="reference internal" href="#schemes" id="id99">schemes</a></li> +<li><a class="reference internal" href="#share" id="id100">share</a></li> +<li><a class="reference internal" href="#transplant" id="id101">transplant</a></li> +<li><a class="reference internal" href="#win32mbcs" id="id102">win32mbcs</a></li> +<li><a class="reference internal" href="#win32text" id="id103">win32text</a></li> +<li><a class="reference internal" href="#zeroconf" id="id104">zeroconf</a></li> </ul> </div> <div class="section" id="acl"> -<h2><a class="toc-backref" href="#id68">acl</a></h2> +<h2><a class="toc-backref" href="#id73">acl</a></h2> <p>hooks for controlling repository access</p> <p>This hook makes it possible to allow or deny write access to given branches and paths of a repository when receiving incoming changesets @@ -5033,8 +4219,6 @@ either:</p> <li>a comma-separated list containing users and groups, or</li> <li>an asterisk, to match anyone;</li> </ul> -<p>You can add the "!" prefix to a user or group name to invert the sense -of the match.</p> </div> <div class="section" id="path-based-access-control"> <h3>Path-based Access Control</h3> @@ -5124,59 +4308,22 @@ docs/** = doc_writer # under the "images" folder: images/** = jack, @designers -# Everyone (except for "user6" and "@hg-denied" - see acl.deny above) -# will have write access to any file under the "resources" folder -# (except for 1 file. See acl.deny): +# Everyone (except for "user6" - see acl.deny above) will have write +# access to any file under the "resources" folder (except for 1 +# file. See acl.deny): src/main/resources/** = * .hgtags = release_engineer </pre> -<div class="section" id="examples-using-the-prefix"> -<h4>Examples using the "!" prefix</h4> -<p>Suppose there's a branch that only a given user (or group) should be able to -push to, and you don't want to restrict access to any other branch that may -be created.</p> -<p>The "!" prefix allows you to prevent anyone except a given user or group to -push changesets in a given branch or path.</p> -<p>In the examples below, we will: -1) Deny access to branch "ring" to anyone but user "gollum" -2) Deny access to branch "lake" to anyone but members of the group "hobbit" -3) Deny access to a file to anyone but user "gollum"</p> -<pre class="literal-block"> -[acl.allow.branches] -# Empty - -[acl.deny.branches] - -# 1) only 'gollum' can commit to branch 'ring'; -# 'gollum' and anyone else can still commit to any other branch. -ring = !gollum - -# 2) only members of the group 'hobbit' can commit to branch 'lake'; -# 'hobbit' members and anyone else can still commit to any other branch. -lake = !@hobbit - -# You can also deny access based on file paths: - -[acl.allow] -# Empty - -[acl.deny] -# 3) only 'gollum' can change the file below; -# 'gollum' and anyone else can still change any other file. -/misty/mountains/cave/ring = !gollum -</pre> -</div> </div> </div> <div class="section" id="bugzilla"> -<h2><a class="toc-backref" href="#id69">bugzilla</a></h2> +<h2><a class="toc-backref" href="#id74">bugzilla</a></h2> <p>hooks for integrating with the Bugzilla bug tracker</p> <p>This hook extension adds comments on bugs in Bugzilla when changesets that refer to bugs by Bugzilla ID are seen. The comment is formatted using the Mercurial template mechanism.</p> -<p>The bug references can optionally include an update for Bugzilla of the -hours spent working on the bug. Bugs can also be marked fixed.</p> +<p>The hook does not change bug status.</p> <p>Three basic modes of access to Bugzilla are provided:</p> <ol class="arabic simple"> <li>Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.</li> @@ -5193,20 +4340,19 @@ permission to read Bugzilla configuration details and the necessary MySQL user and password to have full access rights to the Bugzilla database. For these reasons this access mode is now considered deprecated, and will not be updated for new Bugzilla versions going -forward. Only adding comments is supported in this access mode.</p> +forward.</p> <p>Access via XMLRPC needs a Bugzilla username and password to be specified in the configuration. Comments are added under that username. Since the configuration must be readable by all Mercurial users, it is recommended that the rights of that user are restricted in Bugzilla to the minimum -necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.</p> +necessary to add comments.</p> <p>Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends email to the Bugzilla email interface to submit comments to bugs. The From: address in the email is set to the email address of the Mercurial user, so the comment appears to come from the Mercurial user. In the event that the Mercurial user email is not recognised by Bugzilla as a Bugzilla user, the email associated with the Bugzilla username used to log into -Bugzilla is used instead as the source of the comment. Marking bugs fixed -works on all supported Bugzilla versions.</p> +Bugzilla is used instead as the source of the comment.</p> <p>Configuration items common to all access modes:</p> <dl class="docutils"> <dt>bugzilla.version</dt> @@ -5231,31 +4377,11 @@ including 2.18.</td> </table> </dd> <dt>bugzilla.regexp</dt> -<dd>Regular expression to match bug IDs for update in changeset commit message. -It must contain one "()" named group <tt class="docutils literal"><ids></tt> containing the bug -IDs separated by non-digit characters. It may also contain -a named group <tt class="docutils literal"><hours></tt> with a floating-point number giving the -hours worked on the bug. If no named groups are present, the first -"()" group is assumed to contain the bug IDs, and work time is not -updated. The default expression matches <tt class="docutils literal">Bug 1234</tt>, <tt class="docutils literal">Bug no. 1234</tt>, -<tt class="docutils literal">Bug number 1234</tt>, <tt class="docutils literal">Bugs 1234,5678</tt>, <tt class="docutils literal">Bug 1234 and 5678</tt> and -variations thereof, followed by an hours number prefixed by <tt class="docutils literal">h</tt> or -<tt class="docutils literal">hours</tt>, e.g. <tt class="docutils literal">hours 1.5</tt>. Matching is case insensitive.</dd> -<dt>bugzilla.fixregexp</dt> -<dd>Regular expression to match bug IDs for marking fixed in changeset -commit message. This must contain a "()" named group <tt class="docutils literal"><ids>` containing -the bug IDs separated by <span class="pre">non-digit</span> characters. It may also contain -a named group <span class="pre">``<hours></span></tt> with a floating-point number giving the -hours worked on the bug. If no named groups are present, the first -"()" group is assumed to contain the bug IDs, and work time is not -updated. The default expression matches <tt class="docutils literal">Fixes 1234</tt>, <tt class="docutils literal">Fixes bug 1234</tt>, -<tt class="docutils literal">Fixes bugs 1234,5678</tt>, <tt class="docutils literal">Fixes 1234 and 5678</tt> and -variations thereof, followed by an hours number prefixed by <tt class="docutils literal">h</tt> or -<tt class="docutils literal">hours</tt>, e.g. <tt class="docutils literal">hours 1.5</tt>. Matching is case insensitive.</dd> -<dt>bugzilla.fixstatus</dt> -<dd>The status to set a bug to when marking fixed. Default <tt class="docutils literal">RESOLVED</tt>.</dd> -<dt>bugzilla.fixresolution</dt> -<dd>The resolution to set a bug to when marking fixed. Default <tt class="docutils literal">FIXED</tt>.</dd> +<dd>Regular expression to match bug IDs in changeset commit message. +Must contain one "()" group. The default expression matches <tt class="docutils literal">Bug +1234</tt>, <tt class="docutils literal">Bug no. 1234</tt>, <tt class="docutils literal">Bug number 1234</tt>, <tt class="docutils literal">Bugs 1234,5678</tt>, +<tt class="docutils literal">Bug 1234 and 5678</tt> and variations thereof. Matching is case +insensitive.</dd> <dt>bugzilla.style</dt> <dd>The style file to use when formatting comments.</dd> <dt>bugzilla.template</dt> @@ -5436,10 +4562,8 @@ Changeset commit comment. Bug 1234. </pre> </div> <div class="section" id="children"> -<h2><a class="toc-backref" href="#id70">children</a></h2> -<p>command to display child changesets (DEPRECATED)</p> -<p>This extension is deprecated. You should use <a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg log <span class="pre">-r</span> -"children(REV)"</tt></a> instead.</p> +<h2><a class="toc-backref" href="#id75">children</a></h2> +<p>command to display child changesets</p> <div class="section" id="id7"> <h3>Commands</h3> <div class="section" id="id8"> @@ -5472,7 +4596,7 @@ argument to --rev if given) is printed.</p> </div> </div> <div class="section" id="churn"> -<h2><a class="toc-backref" href="#id71">churn</a></h2> +<h2><a class="toc-backref" href="#id76">churn</a></h2> <p>command to display statistics about repository history</p> <div class="section" id="id9"> <h3>Commands</h3> @@ -5553,7 +4677,7 @@ a .hgchurn file will be looked for in the working directory root.</p> </div> </div> <div class="section" id="color"> -<h2><a class="toc-backref" href="#id72">color</a></h2> +<h2><a class="toc-backref" href="#id77">color</a></h2> <p>colorize output from some commands</p> <p>This extension modifies the status and resolve commands to add color to their output to reflect file status, the qseries command to add @@ -5602,9 +4726,6 @@ branches.active = none branches.closed = black bold branches.current = green branches.inactive = none - -tags.normal = green -tags.local = black bold </pre> <p>The available effects in terminfo mode are 'blink', 'bold', 'dim', 'inverse', 'invisible', 'italic', 'standout', and 'underline'; in @@ -5643,7 +4764,7 @@ mode = terminfo disable color.</p> </div> <div class="section" id="convert"> -<h2><a class="toc-backref" href="#id73">convert</a></h2> +<h2><a class="toc-backref" href="#id78">convert</a></h2> <p>import revisions from foreign VCS repositories into Mercurial</p> <div class="section" id="id11"> <h3>Commands</h3> @@ -5778,17 +4899,17 @@ options, which you can set on the command line with <tt class="docutils literal" <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.hg.ignoreerrors:</th></tr> -<tr class="field"><td> </td><td class="field-body">ignore integrity errors when reading. +<tr><td> </td><td class="field-body">ignore integrity errors when reading. Use it to fix Mercurial repositories with missing revlogs, by converting from and to Mercurial. Default is False.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.hg.saverev:</th></tr> -<tr class="field"><td> </td><td class="field-body">store original revision ID in changeset -(forces target IDs to change). It takes a boolean argument and -defaults to False.</td> +<tr><td> </td><td class="field-body">store original revision ID in changeset +(forces target IDs to change). It takes and boolean argument +and defaults to False.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.hg.startrev:</th></tr> -<tr class="field"><td> </td><td class="field-body">convert start revision and its descendants. +<tr><td> </td><td class="field-body">convert start revision and its descendants. It takes a hg revision identifier and defaults to 0.</td> </tr> </tbody> @@ -5811,18 +4932,18 @@ sandbox is ignored.</p> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.cvsps.cache:</th></tr> -<tr class="field"><td> </td><td class="field-body">Set to False to disable remote log caching, +<tr><td> </td><td class="field-body">Set to False to disable remote log caching, for testing and debugging purposes. Default is True.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.cvsps.fuzz:</th></tr> -<tr class="field"><td> </td><td class="field-body">Specify the maximum time (in seconds) that is +<tr><td> </td><td class="field-body">Specify the maximum time (in seconds) that is allowed between commits with identical user and log message in a single changeset. When very large files were checked in as part of a changeset then the default may not be long enough. The default is 60.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.cvsps.mergeto:</th></tr> -<tr class="field"><td> </td><td class="field-body">Specify a regular expression to which +<tr><td> </td><td class="field-body">Specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will insert a dummy revision merging the branch on which this log message occurs to the branch @@ -5830,7 +4951,7 @@ indicated in the regex. Default is <tt class="docutils literal">{{mergetobranch <span class="pre">([-\w]+)}}</span></tt></td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.cvsps.mergefrom:</th></tr> -<tr class="field"><td> </td><td class="field-body">Specify a regular expression to which +<tr><td> </td><td class="field-body">Specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will add the most recent revision on the branch indicated in the regex as the second parent of the @@ -5842,8 +4963,8 @@ log entries, and can modify the entries in-place, or add or delete them.</td> </tr> <tr class="field"><th class="field-name" colspan="2">hook.cvschangesets:</th></tr> -<tr class="field"><td> </td><td class="field-body">Specify a Python function to be called after -the changesets are calculated from the CVS log. The +<tr><td> </td><td class="field-body">Specify a Python function to be called after +the changesets are calculated from the the CVS log. The function is passed a list with the changeset entries, and can modify the changesets in-place, or add or delete them.</td> </tr> @@ -5872,15 +4993,15 @@ detection.</p> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.svn.branches:</th></tr> -<tr class="field"><td> </td><td class="field-body">specify the directory containing branches. +<tr><td> </td><td class="field-body">specify the directory containing branches. The default is <tt class="docutils literal">branches</tt>.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.svn.tags:</th></tr> -<tr class="field"><td> </td><td class="field-body">specify the directory containing tags. The +<tr><td> </td><td class="field-body">specify the directory containing tags. The default is <tt class="docutils literal">tags</tt>.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.svn.trunk:</th></tr> -<tr class="field"><td> </td><td class="field-body">specify the name of the trunk branch. The +<tr><td> </td><td class="field-body">specify the name of the trunk branch. The default is <tt class="docutils literal">trunk</tt>.</td> </tr> </tbody> @@ -5893,7 +5014,7 @@ conversions are supported.</p> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.svn.startrev:</th></tr> -<tr class="field"><td> </td><td class="field-body">specify start Subversion revision number. +<tr><td> </td><td class="field-body">specify start Subversion revision number. The default is 0.</td> </tr> </tbody> @@ -5914,7 +5035,7 @@ converted by specifying an initial Perforce revision:</p> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.p4.startrev:</th></tr> -<tr class="field"><td> </td><td class="field-body">specify initial Perforce revision (a +<tr><td> </td><td class="field-body">specify initial Perforce revision (a Perforce changelist number).</td> </tr> </tbody> @@ -5928,15 +5049,15 @@ Perforce changelist number).</td> <col class="field-body" /> <tbody valign="top"> <tr class="field"><th class="field-name" colspan="2">convert.hg.clonebranches:</th></tr> -<tr class="field"><td> </td><td class="field-body">dispatch source branches in separate +<tr><td> </td><td class="field-body">dispatch source branches in separate clones. The default is False.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.hg.tagsbranch:</th></tr> -<tr class="field"><td> </td><td class="field-body">branch name for tag revisions, defaults to +<tr><td> </td><td class="field-body">branch name for tag revisions, defaults to <tt class="docutils literal">default</tt>.</td> </tr> <tr class="field"><th class="field-name" colspan="2">convert.hg.usebranchnames:</th></tr> -<tr class="field"><td> </td><td class="field-body">preserve branch names. The default is +<tr><td> </td><td class="field-body">preserve branch names. The default is True.</td> </tr> </tbody> @@ -5989,7 +5110,7 @@ True.</td> </div> </div> <div class="section" id="eol"> -<h2><a class="toc-backref" href="#id74">eol</a></h2> +<h2><a class="toc-backref" href="#id79">eol</a></h2> <p>automatically manage newlines in repository files</p> <p>This extension allows you to manage the type of line endings (CRLF or LF) that are used in the repository and in the local working @@ -6039,10 +5160,9 @@ native = LF <p class="last">The rules will first apply when files are touched in the working copy, e.g. by updating to null and back to tip to touch all files.</p> </div> -<p>The extension uses an optional <tt class="docutils literal">[eol]</tt> section read from both the -normal Mercurial configuration files and the <tt class="docutils literal">.hgeol</tt> file, with the -latter overriding the former. You can use that section to control the -overall behavior. There are three settings:</p> +<p>The extension uses an optional <tt class="docutils literal">[eol]</tt> section in your hgrc file +(not the <tt class="docutils literal">.hgeol</tt> file) for settings that control the overall +behavior. There are two settings:</p> <ul class="simple"> <li><tt class="docutils literal">eol.native</tt> (default <tt class="docutils literal">os.linesep</tt>) can be set to <tt class="docutils literal">LF</tt> or <tt class="docutils literal">CRLF</tt> to override the default interpretation of <tt class="docutils literal">native</tt> for @@ -6053,9 +5173,6 @@ the extension convert files with inconsistent EOLs. Inconsistent means that there is both <tt class="docutils literal">CRLF</tt> and <tt class="docutils literal">LF</tt> present in the file. Such files are normally not touched under the assumption that they have mixed EOLs on purpose.</li> -<li><tt class="docutils literal"><span class="pre">eol.fix-trailing-newline</span></tt> (default False) can be set to True to -ensure that converted files end with a EOL character (either <tt class="docutils literal">\n</tt> -or <tt class="docutils literal">\r\n</tt> as per the configured patterns).</li> </ul> <p>The extension provides <tt class="docutils literal">cleverencode:</tt> and <tt class="docutils literal">cleverdecode:</tt> filters like the deprecated win32text extension does. This means that you can @@ -6073,7 +5190,7 @@ invalid revisions will be pushed. To forbid them completely, use the used.</p> </div> <div class="section" id="extdiff"> -<h2><a class="toc-backref" href="#id75">extdiff</a></h2> +<h2><a class="toc-backref" href="#id80">extdiff</a></h2> <p>command to allow external programs to compare revisions</p> <p>The extdiff Mercurial extension allows you to use external programs to compare revisions, or revision with working directory. The external @@ -6100,8 +5217,7 @@ meld = # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc -vimdiff = gvim -f "+next" \ - "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" +vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' </pre> <p>Tool arguments can include variables that are expanded at runtime:</p> <pre class="literal-block"> @@ -6171,35 +5287,9 @@ to its parent.</p> </div> </div> </div> -<div class="section" id="factotum"> -<h2><a class="toc-backref" href="#id76">factotum</a></h2> -<p>http authentication with factotum</p> -<p>This extension allows the factotum(4) facility on Plan 9 from Bell Labs -platforms to provide authentication information for HTTP access. Configuration -entries specified in the auth section as well as authentication information -provided in the repository URL are fully supported. If no prefix is specified, -a value of "*" will be assumed.</p> -<p>By default, keys are specified as:</p> -<pre class="literal-block"> -proto=pass service=hg prefix=<prefix> user=<username> !password=<password> -</pre> -<p>If the factotum extension is unable to read the required key, one will be -requested interactively.</p> -<p>A configuration section is available to customize runtime behavior. By -default, these entries are:</p> -<pre class="literal-block"> -[factotum] -executable = /bin/auth/factotum -mountpoint = /mnt/factotum -service = hg -</pre> -<p>The executable entry defines the full path to the factotum binary. The -mountpoint entry defines the path to the factotum file service. Lastly, the -service entry controls the service name used when reading keys.</p> -</div> <div class="section" id="fetch"> -<h2><a class="toc-backref" href="#id77">fetch</a></h2> -<p>pull, update and merge in one command (DEPRECATED)</p> +<h2><a class="toc-backref" href="#id81">fetch</a></h2> +<p>pull, update and merge in one command</p> <div class="section" id="id15"> <h3>Commands</h3> <div class="section" id="id16"> @@ -6213,9 +5303,10 @@ or URL and adds them to the local repository.</p> automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.</p> -<p>When a merge is needed, the working directory is first updated to -the newly pulled changes. Local changes are then merged into the -pulled changes. To switch the merge order, use --switch-parent.</p> +<p>When a merge occurs, the newly pulled changes are assumed to be +"authoritative". The head of the new changes is used as the first +parent, with local changes as the second. To switch the merge +order, use --switch-parent.</p> <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> <p>Returns 0 on success.</p> <p>Options:</p> @@ -6263,21 +5354,21 @@ pulled changes. To switch the merge order, use --switch-parent.</p> </div> </div> <div class="section" id="gpg"> -<h2><a class="toc-backref" href="#id78">gpg</a></h2> +<h2><a class="toc-backref" href="#id82">gpg</a></h2> <p>commands to sign and verify changesets</p> <div class="section" id="id17"> <h3>Commands</h3> <div class="section" id="sigcheck"> <h4>sigcheck</h4> <pre class="literal-block"> -hg sigcheck REV +hg sigcheck REVISION </pre> <p>verify all the signatures there may be for a particular revision</p> </div> <div class="section" id="sign"> <h4>sign</h4> <pre class="literal-block"> -hg sign [OPTION]... [REV]... +hg sign [OPTION]... [REVISION]... </pre> <p>If no revision is given, the parent of the working directory is used, or tip if no revision is checked out.</p> @@ -6321,7 +5412,7 @@ hg sigs </div> </div> <div class="section" id="graphlog"> -<h2><a class="toc-backref" href="#id79">graphlog</a></h2> +<h2><a class="toc-backref" href="#id83">graphlog</a></h2> <p>command to view revision graphs from a shell</p> <p>This extension adds a --graph option to the incoming, outgoing and log commands. When this options is given, an ASCII representation of the @@ -6343,83 +5434,27 @@ directory.</p> <col class="description" /> <tbody valign="top"> <tr><td class="option-group"> -<kbd><span class="option">-f</span>, <span class="option">--follow</span></kbd></td> -<td>follow changeset history, or file history across copies and renames</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--follow-first</span></kbd></td> -<td>only follow the first parent of merge changesets (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-d</span>, <span class="option">--date</span></kbd></td> -<td>show revisions matching date spec</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-C</span>, <span class="option">--copies</span></kbd></td> -<td>show copied files</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-k</span>, <span class="option">--keyword</span></kbd></td> -<td>do case-insensitive search for a given text</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>show the specified revision or range</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--removed</span></kbd></td> -<td>include revisions where files were removed</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-m</span>, <span class="option">--only-merges</span></kbd></td> -</tr> -<tr><td> </td><td>show only merges (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> -<td>revisions committed by user</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--only-branch</span></kbd></td> -<td>show only changesets within the given named branch (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-b</span>, <span class="option">--branch</span></kbd></td> -<td>show changesets within the given named branch</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-P</span>, <span class="option">--prune</span></kbd></td> -<td>do not display revision or any of its ancestors</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--hidden</span></kbd></td> -<td>show hidden changesets (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td> -<td>show patch</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-g</span>, <span class="option">--git</span></kbd></td> -<td>use git extended diff format</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-l</span>, <span class="option">--limit</span></kbd></td> <td>limit number of changes displayed</td></tr> -<tr><td class="option-group" colspan="2"> -<kbd><span class="option">-M</span>, <span class="option">--no-merges</span></kbd></td> -</tr> -<tr><td> </td><td>do not show merges</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--stat</span></kbd></td> -<td>output diffstat-style summary of changes</td></tr> +<kbd><span class="option">-p</span>, <span class="option">--patch</span></kbd></td> +<td>show patch</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-G</span>, <span class="option">--graph</span></kbd></td> -<td>show the revision DAG</td></tr> +<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> +<td>show the specified revision or range</td></tr> <tr><td class="option-group"> <kbd><span class="option">--style</span></kbd></td> <td>display using template map file</td></tr> <tr><td class="option-group"> <kbd><span class="option">--template</span></kbd></td> <td>display with template</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> -<td>include names matching the given patterns</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-X</span>, <span class="option">--exclude</span></kbd></td> -<td>exclude names matching the given patterns</td></tr> </tbody> </table> </div> </div> </div> <div class="section" id="hgcia"> -<h2><a class="toc-backref" href="#id80">hgcia</a></h2> +<h2><a class="toc-backref" href="#id84">hgcia</a></h2> <p>hooks for integrating with the CIA.vc notification service</p> <p>This is meant to be run as a changegroup or incoming hook. To configure it, set the following options in your hgrc:</p> @@ -6458,7 +5493,7 @@ baseurl = http://server/path/to/repo </pre> </div> <div class="section" id="hgk"> -<h2><a class="toc-backref" href="#id81">hgk</a></h2> +<h2><a class="toc-backref" href="#id85">hgk</a></h2> <p>browse the repository in a graphical way</p> <p>The hgk extension allows browsing the history of a repository in a graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not @@ -6505,7 +5540,7 @@ hg view [-l LIMIT] [REVRANGE] </div> </div> <div class="section" id="highlight"> -<h2><a class="toc-backref" href="#id82">highlight</a></h2> +<h2><a class="toc-backref" href="#id86">highlight</a></h2> <p>syntax highlighting for hgweb (requires Pygments)</p> <p>It depends on the Pygments syntax highlighting library: <a class="reference external" href="http://pygments.org/">http://pygments.org/</a></p> @@ -6516,178 +5551,10 @@ pygments_style = <style> </pre> <p>The default is 'colorful'.</p> </div> -<div class="section" id="histedit"> -<h2><a class="toc-backref" href="#id83">histedit</a></h2> -<p>interactive history editing</p> -<p>With this extension installed, Mercurial gains one new command: histedit. Usage -is as follows, assuming the following history:</p> -<pre class="literal-block"> -@ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42 -| Add delta -| -o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42 -| Add gamma -| -o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42 -| Add beta -| -o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 - Add alpha -</pre> -<p>If you were to run <tt class="docutils literal">hg histedit c561b4e977df</tt>, you would see the following -file open in your editor:</p> -<pre class="literal-block"> -pick c561b4e977df Add beta -pick 030b686bedc4 Add gamma -pick 7c2fd3b9020c Add delta - -# Edit history between 633536316234 and 7c2fd3b9020c -# -# Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# f, fold = use commit, but fold into previous commit -# d, drop = remove commit from history -# m, mess = edit message without changing commit content -# -</pre> -<p>In this file, lines beginning with <tt class="docutils literal">#</tt> are ignored. You must specify a rule -for each revision in your history. For example, if you had meant to add gamma -before beta, and then wanted to add delta in the same revision as beta, you -would reorganize the file to look like this:</p> -<pre class="literal-block"> -pick 030b686bedc4 Add gamma -pick c561b4e977df Add beta -fold 7c2fd3b9020c Add delta - -# Edit history between 633536316234 and 7c2fd3b9020c -# -# Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# f, fold = use commit, but fold into previous commit -# d, drop = remove commit from history -# m, mess = edit message without changing commit content -# -</pre> -<p>At which point you close the editor and <tt class="docutils literal">histedit</tt> starts working. When you -specify a <tt class="docutils literal">fold</tt> operation, <tt class="docutils literal">histedit</tt> will open an editor when it folds -those revisions together, offering you a chance to clean up the commit message:</p> -<pre class="literal-block"> -Add beta -*** -Add delta -</pre> -<p>Edit the commit message to your liking, then close the editor. For -this example, let's assume that the commit message was changed to -<tt class="docutils literal">Add beta and delta.</tt> After histedit has run and had a chance to -remove any old or temporary revisions it needed, the history looks -like this:</p> -<pre class="literal-block"> -@ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42 -| Add beta and delta. -| -o 1 081603921c3f 2009-04-27 18:04 -0500 durin42 -| Add gamma -| -o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 - Add alpha -</pre> -<p>Note that <tt class="docutils literal">histedit</tt> does <em>not</em> remove any revisions (even its own temporary -ones) until after it has completed all the editing operations, so it will -probably perform several strip operations when it's done. For the above example, -it had to run strip twice. Strip can be slow depending on a variety of factors, -so you might need to be a little patient. You can choose to keep the original -revisions by passing the <tt class="docutils literal"><span class="pre">--keep</span></tt> flag.</p> -<p>The <tt class="docutils literal">edit</tt> operation will drop you back to a command prompt, -allowing you to edit files freely, or even use <tt class="docutils literal">hg record</tt> to commit -some changes as a separate commit. When you're done, any remaining -uncommitted changes will be committed as well. When done, run <tt class="docutils literal">hg -histedit <span class="pre">--continue</span></tt> to finish this step. You'll be prompted for a -new commit message, but the default commit message will be the -original message for the <tt class="docutils literal">edit</tt> ed revision.</p> -<p>The <tt class="docutils literal">message</tt> operation will give you a chance to revise a commit -message without changing the contents. It's a shortcut for doing -<tt class="docutils literal">edit</tt> immediately followed by <cite>hg histedit --continue`</cite>.</p> -<p>If <tt class="docutils literal">histedit</tt> encounters a conflict when moving a revision (while -handling <tt class="docutils literal">pick</tt> or <tt class="docutils literal">fold</tt>), it'll stop in a similar manner to -<tt class="docutils literal">edit</tt> with the difference that it won't prompt you for a commit -message when done. If you decide at this point that you don't like how -much work it will be to rearrange history, or that you made a mistake, -you can use <tt class="docutils literal">hg histedit <span class="pre">--abort</span></tt> to abandon the new changes you -have made and return to the state before you attempted to edit your -history.</p> -<p>If we clone the example repository above and add three more changes, such that -we have the following history:</p> -<pre class="literal-block"> -@ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan -| Add theta -| -o 5 140988835471 2009-04-27 18:04 -0500 stefan -| Add eta -| -o 4 122930637314 2009-04-27 18:04 -0500 stefan -| Add zeta -| -o 3 836302820282 2009-04-27 18:04 -0500 stefan -| Add epsilon -| -o 2 989b4d060121 2009-04-27 18:04 -0500 durin42 -| Add beta and delta. -| -o 1 081603921c3f 2009-04-27 18:04 -0500 durin42 -| Add gamma -| -o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 - Add alpha -</pre> -<p>If you run <tt class="docutils literal">hg histedit <span class="pre">--outgoing</span></tt> on the clone then it is the same -as running <tt class="docutils literal">hg histedit 836302820282</tt>. If you need plan to push to a -repository that Mercurial does not detect to be related to the source -repo, you can add a <tt class="docutils literal"><span class="pre">--force</span></tt> option.</p> -<div class="section" id="id20"> -<h3>Commands</h3> -<div class="section" id="id21"> -<h4>histedit</h4> -<pre class="literal-block"> -hg histedit [PARENT] -</pre> -<p>interactively edit changeset history</p> -<p>Options:</p> -<table class="docutils option-list" frame="void" rules="none"> -<col class="option" /> -<col class="description" /> -<tbody valign="top"> -<tr><td class="option-group"> -<kbd><span class="option">--commands</span></kbd></td> -<td>Read history edits from the specified file.</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-c</span>, <span class="option">--continue</span></kbd></td> -<td>continue an edit already in progress</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-k</span>, <span class="option">--keep</span></kbd></td> -<td>don't strip old nodes after edit is complete</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--abort</span></kbd></td> -<td>abort an edit in progress</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-o</span>, <span class="option">--outgoing</span></kbd></td> -<td>changesets not found in destination</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> -<td>force outgoing even for unrelated repositories</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>first revision to be edited</td></tr> -</tbody> -</table> -</div> -</div> -</div> <div class="section" id="inotify"> -<h2><a class="toc-backref" href="#id84">inotify</a></h2> +<h2><a class="toc-backref" href="#id87">inotify</a></h2> <p>accelerate status report using Linux's inotify service</p> -<div class="section" id="id22"> +<div class="section" id="id20"> <h3>Commands</h3> <div class="section" id="inserve"> <h4>inserve</h4> @@ -6720,7 +5587,7 @@ hg inserve [OPTION]... </div> </div> <div class="section" id="interhg"> -<h2><a class="toc-backref" href="#id85">interhg</a></h2> +<h2><a class="toc-backref" href="#id88">interhg</a></h2> <p>expand expressions into changelog and summaries</p> <p>This extension allows the use of a special syntax in summaries, which will be automatically expanded into links or any other arbitrary @@ -6735,7 +5602,7 @@ boldify = s!(^|\s)#(\d+)\b! <b>#\2</b>! </pre> </div> <div class="section" id="keyword"> -<h2><a class="toc-backref" href="#id86">keyword</a></h2> +<h2><a class="toc-backref" href="#id89">keyword</a></h2> <p>expand keywords in tracked files</p> <p>This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked text files selected by your configuration.</p> @@ -6788,7 +5655,7 @@ to avoid storing expanded keywords in the change history.</p> <p>Expansions spanning more than one line and incremental expansions, like CVS' $Log$, are not supported. A keyword template map "Log = {desc}" expands to the first line of the changeset description.</p> -<div class="section" id="id23"> +<div class="section" id="id21"> <h3>Commands</h3> <div class="section" id="kwdemo"> <h4>kwdemo</h4> @@ -6902,118 +5769,8 @@ hg kwshrink [OPTION]... [FILE]... </div> </div> </div> -<div class="section" id="largefiles"> -<h2><a class="toc-backref" href="#id87">largefiles</a></h2> -<p>track large binary files</p> -<p>Large binary files tend to be not very compressible, not very -diffable, and not at all mergeable. Such files are not handled -efficiently by Mercurial's storage format (revlog), which is based on -compressed binary deltas; storing large binary files as regular -Mercurial files wastes bandwidth and disk space and increases -Mercurial's memory usage. The largefiles extension addresses these -problems by adding a centralized client-server layer on top of -Mercurial: largefiles live in a <em>central store</em> out on the network -somewhere, and you only fetch the revisions that you need when you -need them.</p> -<p>largefiles works by maintaining a "standin file" in .hglf/ for each -largefile. The standins are small (41 bytes: an SHA-1 hash plus -newline) and are tracked by Mercurial. Largefile revisions are -identified by the SHA-1 hash of their contents, which is written to -the standin. largefiles uses that revision ID to get/put largefile -revisions from/to the central store. This saves both disk space and -bandwidth, since you don't need to retrieve all historical revisions -of large files when you clone or pull.</p> -<p>To start a new repository or add new large binary files, just add ---large to your <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a> command. For example:</p> -<pre class="literal-block"> -$ dd if=/dev/urandom of=randomdata count=2000 -$ hg add --large randomdata -$ hg commit -m 'add randomdata as a largefile' -</pre> -<p>When you push a changeset that adds/modifies largefiles to a remote -repository, its largefile revisions will be uploaded along with it. -Note that the remote Mercurial must also have the largefiles extension -enabled for this to work.</p> -<p>When you pull a changeset that affects largefiles from a remote -repository, Mercurial behaves as normal. However, when you update to -such a revision, any largefiles needed by that revision are downloaded -and cached (if they have never been downloaded before). This means -that network access may be required to update to changesets you have -not previously updated to.</p> -<p>If you already have large files tracked by Mercurial without the -largefiles extension, you will need to convert your repository in -order to benefit from largefiles. This is done with the -<a class="reference external" href="hg.1.html#lfconvert"><tt class="docutils literal">hg lfconvert</tt></a> command:</p> -<pre class="literal-block"> -$ hg lfconvert --size 10 oldrepo newrepo -</pre> -<p>In repositories that already have largefiles in them, any new file -over 10MB will automatically be added as a largefile. To change this -threshold, set <tt class="docutils literal">largefiles.minsize</tt> in your Mercurial config file -to the minimum size in megabytes to track as a largefile, or use the ---lfsize option to the add command (also in megabytes):</p> -<pre class="literal-block"> -[largefiles] -minsize = 2 - -$ hg add --lfsize 2 -</pre> -<p>The <tt class="docutils literal">largefiles.patterns</tt> config option allows you to specify a list -of filename patterns (see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a>) that should always be -tracked as largefiles:</p> -<pre class="literal-block"> -[largefiles] -patterns = - *.jpg - re:.*\.(png|bmp)$ - library.zip - content/audio/* -</pre> -<p>Files that match one of these patterns will be added as largefiles -regardless of their size.</p> -<p>The <tt class="docutils literal">largefiles.minsize</tt> and <tt class="docutils literal">largefiles.patterns</tt> config options -will be ignored for any repositories not already containing a -largefile. To add the first largefile to a repository, you must -explicitly do so with the --large flag passed to the <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a> -command.</p> -<div class="section" id="id24"> -<h3>Commands</h3> -<div class="section" id="lfconvert"> -<h4>lfconvert</h4> -<pre class="literal-block"> -hg lfconvert SOURCE DEST [FILE ...] -</pre> -<p>Convert repository SOURCE to a new repository DEST, identical to -SOURCE except that certain files will be converted as largefiles: -specifically, any file that matches any PATTERN <em>or</em> whose size is -above the minimum size threshold is converted as a largefile. The -size used to determine whether or not to track a file as a -largefile is the size of the first version of the file. The -minimum size can be specified either with --size or in -configuration as <tt class="docutils literal">largefiles.size</tt>.</p> -<p>After running this command you will need to make sure that -largefiles is enabled anywhere you intend to push the new -repository.</p> -<p>Use --to-normal to convert largefiles back to normal files; after -this, the DEST repository can be used without largefiles at all.</p> -<p>Options:</p> -<table class="docutils option-list" frame="void" rules="none"> -<col class="option" /> -<col class="description" /> -<tbody valign="top"> -<tr><td class="option-group"> -<kbd><span class="option">-s</span>, <span class="option">--size</span></kbd></td> -<td>minimum size (MB) for files to be converted as largefiles</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--to-normal</span></kbd></td> -<td>convert from a largefiles repo to a normal repo</td></tr> -</tbody> -</table> -</div> -</div> -</div> <div class="section" id="mq"> -<h2><a class="toc-backref" href="#id88">mq</a></h2> +<h2><a class="toc-backref" href="#id90">mq</a></h2> <p>manage a stack of patches</p> <p>This extension lets you work with a stack of patches in a Mercurial repository. It manages two stacks of patches - all known patches, and @@ -7043,25 +5800,9 @@ git = auto/keep/yes/no preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq will override the [diff] section and always generate git or regular patches, possibly losing data in the second case.</p> -<p>It may be desirable for mq changesets to be kept in the secret phase (see -<a class="reference external" href="hg.1.html#phases"><tt class="docutils literal">hg help phases</tt></a>), which can be enabled with the following setting:</p> -<pre class="literal-block"> -[mq] -secret = True -</pre> <p>You will by default be managing a patch queue named "patches". You can create other, independent patch queues with the <a class="reference external" href="hg.1.html#qqueue"><tt class="docutils literal">hg qqueue</tt></a> command.</p> -<p>If the working directory contains uncommitted files, qpush, qpop and -qgoto abort immediately. If -f/--force is used, the changes are -discarded. Setting:</p> -<pre class="literal-block"> -[mq] -keepchanges = True -</pre> -<p>make them behave as if --keep-changes were passed, and non-conflicting -local changes will be tolerated and preserved. If incompatible options -such as -f/--force or --exact are passed, this setting is ignored.</p> -<div class="section" id="id25"> +<div class="section" id="id22"> <h3>Commands</h3> <div class="section" id="qapplied"> <h4>qapplied</h4> @@ -7076,7 +5817,7 @@ hg qapplied [-1] [-s] [PATCH] <tbody valign="top"> <tr><td class="option-group"> <kbd><span class="option">-1</span>, <span class="option">--last</span></kbd></td> -<td>show only the preceding applied patch</td></tr> +<td>show only the last patch</td></tr> <tr><td class="option-group"> <kbd><span class="option">-s</span>, <span class="option">--summary</span></kbd></td> <td>print first line of patch header</td></tr> @@ -7146,9 +5887,6 @@ hg qcommit [OPTION]... [FILE]... <kbd><span class="option">--close-branch</span></kbd></td> <td>mark a branch as closed, hiding it from the branch list</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--amend</span></kbd></td> -<td>amend the parent of the working dir</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> <tr><td class="option-group"> @@ -7165,10 +5903,7 @@ hg qcommit [OPTION]... [FILE]... <td>record the specified date as commit date</td></tr> <tr><td class="option-group"> <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> -<td>record the specified user as committer</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td> -<td><p class="first">recurse into subrepositories</p> +<td><p class="first">record the specified user as committer</p> <p class="last">aliases: qci</p> </td></tr> </tbody> @@ -7179,9 +5914,8 @@ hg qcommit [OPTION]... [FILE]... <pre class="literal-block"> hg qdelete [-k] [PATCH]... </pre> -<p>The patches must not be applied, and at least one patch is required. Exact -patch identifiers must be given. With -k/--keep, the patch files are -preserved in the patch directory.</p> +<p>The patches must not be applied, and at least one patch is required. With +-k/--keep, the patch files are preserved in the patch directory.</p> <p>To stop managing a patch and move it into permanent history, use the <a class="reference external" href="hg.1.html#qfinish"><tt class="docutils literal">hg qfinish</tt></a> command.</p> <p>Options:</p> @@ -7335,14 +6069,8 @@ hg qgoto [OPTION]... PATCH <col class="description" /> <tbody valign="top"> <tr><td class="option-group"> -<kbd><span class="option">--keep-changes</span></kbd></td> -<td>tolerate non-conflicting local changes</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>overwrite any local changes</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--no-backup</span></kbd></td> -<td>do not save backup copies of files</td></tr> </tbody> </table> </div> @@ -7391,7 +6119,7 @@ hg qheader [PATCH] <div class="section" id="qimport"> <h4>qimport</h4> <pre class="literal-block"> -hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]... +hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE... </pre> <p>The patch is inserted into the series after the last applied patch. If no patches have been applied, qimport prepends the patch @@ -7553,13 +6281,9 @@ hg qnext [-s] <pre class="literal-block"> hg qpop [-a] [-f] [PATCH | INDEX] </pre> -<p>Without argument, pops off the top of the patch stack. If given a -patch name, keeps popping off patches until the named patch is at -the top of the stack.</p> -<p>By default, abort if the working directory contains uncommitted -changes. With --keep-changes, abort only if the uncommitted files -overlap with patched files. With -f/--force, backup and discard -changes made to such files.</p> +<p>By default, pops off the top of the patch stack. If given a patch +name, keeps popping off patches until the named patch is at the +top of the stack.</p> <p>Return 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -7573,14 +6297,8 @@ changes made to such files.</p> <kbd><span class="option">-n</span>, <span class="option">--name</span></kbd></td> <td>queue name to pop (DEPRECATED)</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--keep-changes</span></kbd></td> -<td>tolerate non-conflicting local changes</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>forget any local changes to patched files</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--no-backup</span></kbd></td> -<td>do not save backup copies of files</td></tr> </tbody> </table> </div> @@ -7606,10 +6324,8 @@ hg qprev [-s] <pre class="literal-block"> hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX] </pre> -<p>By default, abort if the working directory contains uncommitted -changes. With --keep-changes, abort only if the uncommitted files -overlap with patched files. With -f/--force, backup and patch over -uncommitted changes.</p> +<p>When -f/--force is applied, all local changes in patched files +will be lost.</p> <p>Return 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -7617,9 +6333,6 @@ uncommitted changes.</p> <col class="description" /> <tbody valign="top"> <tr><td class="option-group"> -<kbd><span class="option">--keep-changes</span></kbd></td> -<td>tolerate non-conflicting local changes</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>apply on top of local changes</td></tr> <tr><td class="option-group"> @@ -7640,9 +6353,6 @@ uncommitted changes.</p> <tr><td class="option-group"> <kbd><span class="option">--move</span></kbd></td> <td>reorder patch series and apply only the patch</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--no-backup</span></kbd></td> -<td>do not save backup copies of files</td></tr> </tbody> </table> </div> @@ -7655,8 +6365,7 @@ hg qqueue [OPTION] [QUEUE] new patch queues and deleting existing ones.</p> <p>Omitting a queue name or specifying -l/--list will show you the registered queues - by default the "normal" patches queue is registered. The currently -active queue will be marked with "(active)". Specifying --active will print -only the name of the active queue.</p> +active queue will be marked with "(active)".</p> <p>To create a new queue, use -c/--create. The queue is automatically made active, except in the case where there are applied patches from the currently active queue in the repository. Then the queue will only be @@ -7673,9 +6382,6 @@ active queue.</p> <kbd><span class="option">-l</span>, <span class="option">--list</span></kbd></td> <td>list all available queues</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--active</span></kbd></td> -<td>print name of active queue</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-c</span>, <span class="option">--create</span></kbd></td> <td>create new queue</td></tr> <tr><td class="option-group"> @@ -7925,7 +6631,7 @@ hg qunapplied [-1] [-s] [PATCH] <div class="section" id="strip"> <h4>strip</h4> <pre class="literal-block"> -hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV... +hg strip [-k] [-f] [-n] REV... </pre> <p>The strip command removes the specified changesets and all their descendants. If the working directory has uncommitted changes, the @@ -7943,9 +6649,6 @@ the local revision numbers will in general be different after the restore.</p> <p>Use the --no-backup option to discard the backup bundle once the operation completes.</p> -<p>Strip is not a history-rewriting operation and can be used on -changesets in the public phase. But if the stripped changesets have -been pushed to a remote repository you will likely pull them again.</p> <p>Return 0 on success.</p> <p>Options:</p> <table class="docutils option-list" frame="void" rules="none"> @@ -7953,159 +6656,105 @@ been pushed to a remote repository you will likely pull them again.</p> <col class="description" /> <tbody valign="top"> <tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>strip specified revision (optional, can specify revisions without this option)</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-f</span>, <span class="option">--force</span></kbd></td> <td>force removal of changesets, discard uncommitted changes (no backup)</td></tr> <tr><td class="option-group"> <kbd><span class="option">-b</span>, <span class="option">--backup</span></kbd></td> <td>bundle only changesets with local revision number greater than REV which are not descendants of REV (DEPRECATED)</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">--no-backup</span></kbd></td> -<td>no backups</td></tr> +<tr><td class="option-group" colspan="2"> +<kbd><span class="option">-n</span>, <span class="option">--no-backup</span></kbd></td> +</tr> +<tr><td> </td><td>no backups</td></tr> <tr><td class="option-group"> <kbd><span class="option">--nobackup</span></kbd></td> <td>no backups (DEPRECATED)</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-n</span></kbd></td> -<td>ignored (DEPRECATED)</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-k</span>, <span class="option">--keep</span></kbd></td> <td>do not modify working copy during strip</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-B</span>, <span class="option">--bookmark</span></kbd></td> -<td>remove revs only reachable from given bookmark</td></tr> </tbody> </table> </div> </div> </div> <div class="section" id="notify"> -<h2><a class="toc-backref" href="#id89">notify</a></h2> -<p>hooks for sending email push notifications</p> -<p>This extension implements hooks to send email notifications when -changesets are sent from or received by the local repository.</p> -<p>First, enable the extension as explained in <a class="reference external" href="hg.1.html#extensions"><tt class="docutils literal">hg help extensions</tt></a>, and -register the hook you want to run. <tt class="docutils literal">incoming</tt> and <tt class="docutils literal">changegroup</tt> hooks -are run when changesets are received, while <tt class="docutils literal">outgoing</tt> hooks are for -changesets sent to another repository:</p> +<h2><a class="toc-backref" href="#id91">notify</a></h2> +<p>hooks for sending email notifications at commit/push time</p> +<p>Subscriptions can be managed through a hgrc file. Default mode is to +print messages to stdout, for testing and configuring.</p> +<p>To use, configure the notify extension and enable it in hgrc like +this:</p> <pre class="literal-block"> +[extensions] +notify = + [hooks] # one email for each incoming changeset incoming.notify = python:hgext.notify.hook -# one email for all incoming changesets +# batch emails when many changesets incoming at one time changegroup.notify = python:hgext.notify.hook - -# one email for all outgoing changesets +# batch emails when many changesets outgoing at one time (client side) outgoing.notify = python:hgext.notify.hook + +[notify] +# config items go here +</pre> +<p>Required configuration items:</p> +<pre class="literal-block"> +config = /path/to/file # file containing subscriptions +</pre> +<p>Optional configuration items:</p> +<pre class="literal-block"> +test = True # print messages to stdout for testing +strip = 3 # number of slashes to strip for url paths +domain = example.com # domain to use if committer missing domain +style = ... # style file to use when formatting email +template = ... # template to use when formatting email +incoming = ... # template to use when run as incoming hook +outgoing = ... # template to use when run as outgoing hook +changegroup = ... # template to use when run as changegroup hook +maxdiff = 300 # max lines of diffs to include (0=none, -1=all) +maxsubject = 67 # truncate subject line longer than this +diffstat = True # add a diffstat before the diff content +sources = serve # notify if source of incoming changes in this list + # (serve == ssh or http, push, pull, bundle) +merge = False # send notification for merges (default True) +[email] +from = user@host.com # email address to send as if none given +[web] +baseurl = http://hgserver/... # root of hg web site for browsing commits </pre> -<p>This registers the hooks. To enable notification, subscribers must -be assigned to repositories. The <tt class="docutils literal">[usersubs]</tt> section maps multiple -repositories to a given recipient. The <tt class="docutils literal">[reposubs]</tt> section maps -multiple recipients to a single repository:</p> +<p>The notify config file has same format as a regular hgrc file. It has +two sections so you can express subscriptions in whatever way is +handier for you.</p> <pre class="literal-block"> [usersubs] -# key is subscriber email, value is a comma-separated list of repo glob -# patterns +# key is subscriber email, value is ","-separated list of glob patterns user@host = pattern [reposubs] -# key is glob pattern, value is a comma-separated list of subscriber -# emails +# key is glob pattern, value is ","-separated list of subscriber emails pattern = user@host </pre> -<p>Glob patterns are matched against absolute path to repository -root.</p> -<p>In order to place them under direct user management, <tt class="docutils literal">[usersubs]</tt> and -<tt class="docutils literal">[reposubs]</tt> sections may be placed in a separate <tt class="docutils literal">hgrc</tt> file and -incorporated by reference:</p> -<pre class="literal-block"> -[notify] -config = /path/to/subscriptionsfile -</pre> -<p>Notifications will not be sent until the <tt class="docutils literal">notify.test</tt> value is set -to <tt class="docutils literal">False</tt>; see below.</p> -<p>Notifications content can be tweaked with the following configuration entries:</p> -<dl class="docutils"> -<dt>notify.test</dt> -<dd>If <tt class="docutils literal">True</tt>, print messages to stdout instead of sending them. Default: True.</dd> -<dt>notify.sources</dt> -<dd><p class="first">Space-separated list of change sources. Notifications are activated only -when a changeset's source is in this list. Sources may be:</p> -<table class="docutils field-list" frame="void" rules="none"> -<col class="field-name" /> -<col class="field-body" /> -<tbody valign="top"> -<tr class="field"><th class="field-name"><tt class="docutils literal">serve</tt>:</th><td class="field-body">changesets received via http or ssh</td> -</tr> -<tr class="field"><th class="field-name"><tt class="docutils literal">pull</tt>:</th><td class="field-body">changesets received via <tt class="docutils literal">hg pull</tt></td> -</tr> -<tr class="field"><th class="field-name"><tt class="docutils literal">unbundle</tt>:</th><td class="field-body">changesets received via <tt class="docutils literal">hg unbundle</tt></td> -</tr> -<tr class="field"><th class="field-name"><tt class="docutils literal">push</tt>:</th><td class="field-body">changesets sent or received via <tt class="docutils literal">hg push</tt></td> -</tr> -<tr class="field"><th class="field-name"><tt class="docutils literal">bundle</tt>:</th><td class="field-body">changesets sent via <tt class="docutils literal">hg unbundle</tt></td> -</tr> -</tbody> -</table> -<p class="last">Default: serve.</p> -</dd> -<dt>notify.strip</dt> -<dd>Number of leading slashes to strip from url paths. By default, notifications -reference repositories with their absolute path. <tt class="docutils literal">notify.strip</tt> lets you -turn them into relative paths. For example, <tt class="docutils literal">notify.strip=3</tt> will change -<tt class="docutils literal">/long/path/repository</tt> into <tt class="docutils literal">repository</tt>. Default: 0.</dd> -<dt>notify.domain</dt> -<dd>Default email domain for sender or recipients with no explicit domain.</dd> -<dt>notify.style</dt> -<dd>Style file to use when formatting emails.</dd> -<dt>notify.template</dt> -<dd>Template to use when formatting emails.</dd> -<dt>notify.incoming</dt> -<dd>Template to use when run as an incoming hook, overriding <tt class="docutils literal">notify.template</tt>.</dd> -<dt>notify.outgoing</dt> -<dd>Template to use when run as an outgoing hook, overriding <tt class="docutils literal">notify.template</tt>.</dd> -<dt>notify.changegroup</dt> -<dd>Template to use when running as a changegroup hook, overriding -<tt class="docutils literal">notify.template</tt>.</dd> -<dt>notify.maxdiff</dt> -<dd>Maximum number of diff lines to include in notification email. Set to 0 -to disable the diff, or -1 to include all of it. Default: 300.</dd> -<dt>notify.maxsubject</dt> -<dd>Maximum number of characters in email's subject line. Default: 67.</dd> -<dt>notify.diffstat</dt> -<dd>Set to True to include a diffstat before diff content. Default: True.</dd> -<dt>notify.merge</dt> -<dd>If True, send notifications for merge changesets. Default: True.</dd> -<dt>notify.mbox</dt> -<dd>If set, append mails to this mbox file instead of sending. Default: None.</dd> -<dt>notify.fromauthor</dt> -<dd>If set, use the committer of the first changeset in a changegroup for -the "From" field of the notification mail. If not set, take the user -from the pushing repo. Default: False.</dd> -</dl> -<p>If set, the following entries will also be used to customize the -notifications:</p> -<dl class="docutils"> -<dt>email.from</dt> -<dd>Email <tt class="docutils literal">From</tt> address to use if none can be found in the generated -email content.</dd> -<dt>web.baseurl</dt> -<dd>Root repository URL to combine with repository paths when making -references. See also <tt class="docutils literal">notify.strip</tt>.</dd> -</dl> +<p>Glob patterns are matched against path to repository root.</p> +<p>If you like, you can put notify config file in repository that users +can push changes to, they can manage their own subscriptions.</p> </div> <div class="section" id="pager"> -<h2><a class="toc-backref" href="#id90">pager</a></h2> +<h2><a class="toc-backref" href="#id92">pager</a></h2> <p>browse command output with an external pager</p> <p>To set the pager that should be used, set the application variable:</p> <pre class="literal-block"> [pager] -pager = less -FRX +pager = less -FRSX </pre> <p>If no pager is set, the pager extensions uses the environment variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.</p> +<p>If you notice "BROKEN PIPE" error messages, you can disable them by +setting:</p> +<pre class="literal-block"> +[pager] +quiet = True +</pre> <p>You can disable the pager for certain commands by adding them to the pager.ignore list:</p> <pre class="literal-block"> @@ -8128,7 +6777,7 @@ used. Use a boolean value like yes, no, on, off, or use auto for normal behavior.</p> </div> <div class="section" id="patchbomb"> -<h2><a class="toc-backref" href="#id91">patchbomb</a></h2> +<h2><a class="toc-backref" href="#id93">patchbomb</a></h2> <p>command to send changesets as (a series of) patch emails</p> <p>The series is started off with a "[PATCH 0 of N]" introduction, which describes the series as a whole.</p> @@ -8162,7 +6811,7 @@ to be a sendmail compatible mailer or fill out the [smtp] section so that the patchbomb extension can automatically send patchbombs directly from the commandline. See the [email] and [smtp] sections in hgrc(5) for details.</p> -<div class="section" id="id26"> +<div class="section" id="id23"> <h3>Commands</h3> <div class="section" id="email"> <h4>email</h4> @@ -8185,9 +6834,7 @@ the messages are sent.</p> <p>By default the patch is included as text in the email body for easy reviewing. Using the -a/--attach option will instead create an attachment for the patch. With -i/--inline an inline attachment -will be created. You can include a patch both as text in the email -body and as a regular or an inline attachment by combining the --a/--attach or -i/--inline with the --body option.</p> +will be created.</p> <p>With -o/--outgoing, emails will be generated for patches not found in the destination repository (or only those which are ancestors of the specified revisions if any are provided)</p> @@ -8265,9 +6912,6 @@ hgrc. See the [email] section in hgrc(5) for details.</p> <kbd><span class="option">--intro</span></kbd></td> <td>send an introduction email for a single patch</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--body</span></kbd></td> -<td>send patches as inline message text (default)</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-a</span>, <span class="option">--attach</span></kbd></td> <td>send patches as attachments</td></tr> <tr><td class="option-group"> @@ -8330,7 +6974,7 @@ hgrc. See the [email] section in hgrc(5) for details.</p> </div> </div> <div class="section" id="progress"> -<h2><a class="toc-backref" href="#id92">progress</a></h2> +<h2><a class="toc-backref" href="#id94">progress</a></h2> <p>show progress bars for some actions</p> <p>This extension uses the progress information logged by hg commands to draw progress bars that are as informative as possible. Some progress @@ -8340,9 +6984,6 @@ end point.</p> <pre class="literal-block"> [progress] delay = 3 # number of seconds (float) before showing the progress bar -changedelay = 1 # changedelay: minimum delay before showing a new topic. - # If set to less than 3 * refresh, that value will - # be used instead. refresh = 0.1 # time in seconds between refreshes of the progress bar format = topic bar number estimate # format of the progress bar width = <none> # if set, the maximum width of the progress information @@ -8359,11 +7000,11 @@ would take the last num characters, or <tt class="docutils literal">+<num> characters.</p> </div> <div class="section" id="purge"> -<h2><a class="toc-backref" href="#id93">purge</a></h2> +<h2><a class="toc-backref" href="#id95">purge</a></h2> <p>command to delete untracked files from the working directory</p> -<div class="section" id="id27"> +<div class="section" id="id24"> <h3>Commands</h3> -<div class="section" id="id28"> +<div class="section" id="id25"> <h4>purge</h4> <pre class="literal-block"> hg purge [OPTION]... [DIR]... @@ -8420,18 +7061,19 @@ option.</p> </div> </div> <div class="section" id="rebase"> -<h2><a class="toc-backref" href="#id94">rebase</a></h2> +<h2><a class="toc-backref" href="#id96">rebase</a></h2> <p>command to move sets of revisions to a different ancestor</p> <p>This extension lets you rebase changesets in an existing Mercurial repository.</p> <p>For more information: <a class="reference external" href="http://mercurial.selenic.com/wiki/RebaseExtension">http://mercurial.selenic.com/wiki/RebaseExtension</a></p> -<div class="section" id="id29"> +<div class="section" id="id26"> <h3>Commands</h3> -<div class="section" id="id30"> +<div class="section" id="id27"> <h4>rebase</h4> <pre class="literal-block"> -hg rebase [-s REV | -b REV] [-d REV] [OPTION] +hg rebase [-s REV | -b REV] [-d REV] [options] +hg rebase {-a|-c} </pre> <p>Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be @@ -8482,9 +7124,6 @@ continued with --continue/-c or aborted with --abort/-a.</p> <kbd><span class="option">-b</span>, <span class="option">--base</span></kbd></td> <td>rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-r</span>, <span class="option">--rev</span></kbd></td> -<td>rebase these revisions</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-d</span>, <span class="option">--dest</span></kbd></td> <td>rebase onto the specified changeset</td></tr> <tr><td class="option-group"> @@ -8494,9 +7133,6 @@ continued with --continue/-c or aborted with --abort/-a.</p> <kbd><span class="option">-m</span>, <span class="option">--message</span></kbd></td> <td>use text as collapse commit message</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td> -<td>invoke editor on commit messages</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-l</span>, <span class="option">--logfile</span></kbd></td> <td>read collapse commit message from file</td></tr> <tr><td class="option-group"> @@ -8506,8 +7142,8 @@ continued with --continue/-c or aborted with --abort/-a.</p> <kbd><span class="option">--keepbranches</span></kbd></td> <td>keep original branch names</td></tr> <tr><td class="option-group"> -<kbd><span class="option">-D</span>, <span class="option">--detach</span></kbd></td> -<td>(DEPRECATED)</td></tr> +<kbd><span class="option">--detach</span></kbd></td> +<td>force detaching of source from its original branch</td></tr> <tr><td class="option-group"> <kbd><span class="option">-t</span>, <span class="option">--tool</span></kbd></td> <td>specify merge tool</td></tr> @@ -8529,9 +7165,9 @@ continued with --continue/-c or aborted with --abort/-a.</p> </div> </div> <div class="section" id="record"> -<h2><a class="toc-backref" href="#id95">record</a></h2> +<h2><a class="toc-backref" href="#id97">record</a></h2> <p>commands to interactively select changes for commit/qrefresh</p> -<div class="section" id="id31"> +<div class="section" id="id28"> <h3>Commands</h3> <div class="section" id="qrecord"> <h4>qrecord</h4> @@ -8541,7 +7177,7 @@ hg qrecord [OPTION]... PATCH [FILE]... <p>See <a class="reference external" href="hg.1.html#qnew"><tt class="docutils literal">hg help qnew</tt></a> & <a class="reference external" href="hg.1.html#record"><tt class="docutils literal">hg help record</tt></a> for more information and usage.</p> </div> -<div class="section" id="id32"> +<div class="section" id="id29"> <h4>record</h4> <pre class="literal-block"> hg record [OPTION]... [FILE]... @@ -8556,7 +7192,6 @@ possible:</p> <pre class="literal-block"> y - record this change n - skip this change -e - edit this change manually s - skip remaining changes to this file f - record remaining changes to this file @@ -8581,9 +7216,6 @@ q - quit, recording no changes <kbd><span class="option">--close-branch</span></kbd></td> <td>mark a branch as closed, hiding it from the branch list</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--amend</span></kbd></td> -<td>amend the parent of the working dir</td></tr> -<tr><td class="option-group"> <kbd><span class="option">-I</span>, <span class="option">--include</span></kbd></td> <td>include names matching the given patterns</td></tr> <tr><td class="option-group"> @@ -8601,9 +7233,6 @@ q - quit, recording no changes <tr><td class="option-group"> <kbd><span class="option">-u</span>, <span class="option">--user</span></kbd></td> <td>record the specified user as committer</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-S</span>, <span class="option">--subrepos</span></kbd></td> -<td>recurse into subrepositories</td></tr> <tr><td class="option-group" colspan="2"> <kbd><span class="option">-w</span>, <span class="option">--ignore-all-space</span></kbd></td> </tr> @@ -8622,11 +7251,11 @@ q - quit, recording no changes </div> </div> <div class="section" id="relink"> -<h2><a class="toc-backref" href="#id96">relink</a></h2> +<h2><a class="toc-backref" href="#id98">relink</a></h2> <p>recreates hardlinks between repository clones</p> -<div class="section" id="id33"> +<div class="section" id="id30"> <h3>Commands</h3> -<div class="section" id="id34"> +<div class="section" id="id31"> <h4>relink</h4> <pre class="literal-block"> hg relink [ORIGIN] @@ -8651,7 +7280,7 @@ writes.)</p> </div> </div> <div class="section" id="schemes"> -<h2><a class="toc-backref" href="#id97">schemes</a></h2> +<h2><a class="toc-backref" href="#id99">schemes</a></h2> <p>extend schemes with shortcuts to repository swarms</p> <p>This extension allows you to specify shortcuts for parent URLs with a lot of repositories to act like a scheme, for example:</p> @@ -8687,11 +7316,11 @@ kiln = https://{1}.kilnhg.com/Repo/ same name.</p> </div> <div class="section" id="share"> -<h2><a class="toc-backref" href="#id98">share</a></h2> +<h2><a class="toc-backref" href="#id100">share</a></h2> <p>share a common history between several working directories</p> -<div class="section" id="id35"> +<div class="section" id="id32"> <h3>Commands</h3> -<div class="section" id="id36"> +<div class="section" id="id33"> <h4>share</h4> <pre class="literal-block"> hg share [-U] SOURCE [DEST] @@ -8721,24 +7350,17 @@ the broken clone to reset it to a changeset that still exists </tbody> </table> </div> -<div class="section" id="unshare"> -<h4>unshare</h4> -<pre class="literal-block"> -hg unshare -</pre> -<p>Copy the store data to the repo and remove the sharedpath data.</p> -</div> </div> </div> <div class="section" id="transplant"> -<h2><a class="toc-backref" href="#id99">transplant</a></h2> +<h2><a class="toc-backref" href="#id101">transplant</a></h2> <p>command to transplant changesets from another branch</p> <p>This extension allows you to transplant patches from another branch.</p> <p>Transplanted patches are recorded in .hg/transplant/transplants, as a map from a changeset hash to its hash in the source repository.</p> -<div class="section" id="id37"> +<div class="section" id="id34"> <h3>Commands</h3> -<div class="section" id="id38"> +<div class="section" id="id35"> <h4>transplant</h4> <pre class="literal-block"> hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]... @@ -8762,15 +7384,13 @@ the branch holding the named revision, up to that revision. If --all/-a is specified, all changesets on the branch will be transplanted, otherwise you will be prompted to select the changesets you want.</p> -<p><a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--branch</span> REV <span class="pre">--all</span></tt></a> will transplant the +<p><a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--branch</span> REVISION <span class="pre">--all</span></tt></a> will transplant the selected branch (up to the named revision) onto your current working directory.</p> <p>You can optionally mark selected transplanted changesets as merge changesets. You will not be prompted to transplant any ancestors of a merged transplant, and you can merge descendants of them normally instead of transplanting them.</p> -<p>Merge changesets may be transplanted directly by specifying the -proper parent changeset by calling <a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant <span class="pre">--parent</span></tt></a>.</p> <p>If no merges or revisions are provided, <a class="reference external" href="hg.1.html#transplant"><tt class="docutils literal">hg transplant</tt></a> will start an interactive changeset browser.</p> <p>If a changeset application fails, you can fix the merge by hand @@ -8797,12 +7417,6 @@ and then resume where you left off by calling <a class="reference external" href <kbd><span class="option">-m</span>, <span class="option">--merge</span></kbd></td> <td>merge at REV</td></tr> <tr><td class="option-group"> -<kbd><span class="option">--parent</span></kbd></td> -<td>parent to choose when transplanting merge</td></tr> -<tr><td class="option-group"> -<kbd><span class="option">-e</span>, <span class="option">--edit</span></kbd></td> -<td>invoke editor on commit messages</td></tr> -<tr><td class="option-group"> <kbd><span class="option">--log</span></kbd></td> <td>append transplant info to log message</td></tr> <tr><td class="option-group"> @@ -8817,7 +7431,7 @@ and then resume where you left off by calling <a class="reference external" href </div> </div> <div class="section" id="win32mbcs"> -<h2><a class="toc-backref" href="#id100">win32mbcs</a></h2> +<h2><a class="toc-backref" href="#id102">win32mbcs</a></h2> <p>allow the use of MBCS paths with problematic encodings</p> <p>Some MBCS encodings are not good for some path operations (i.e. splitting path, case conversion, etc.) with its encoded bytes. We call @@ -8852,7 +7466,7 @@ encoding = sjis <p>It is useful for the users who want to commit with UTF-8 log message.</p> </div> <div class="section" id="win32text"> -<h2><a class="toc-backref" href="#id101">win32text</a></h2> +<h2><a class="toc-backref" href="#id103">win32text</a></h2> <p>perform automatic newline conversion</p> <blockquote> <p>Deprecation: The win32text extension requires each user to configure @@ -8889,7 +7503,7 @@ pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf </pre> </div> <div class="section" id="zeroconf"> -<h2><a class="toc-backref" href="#id102">zeroconf</a></h2> +<h2><a class="toc-backref" href="#id104">zeroconf</a></h2> <p>discover and advertise repositories on the local network</p> <p>Zeroconf-enabled repositories will be announced in a network without the need to configure a server or a service. They can be discovered @@ -8911,34 +7525,20 @@ zc-test = http://example.com:8000/test <div class="section" id="files"> <h1><a class="toc-backref" href="#contents">Files</a></h1> <dl class="docutils"> -<dt><tt class="docutils literal">/etc/mercurial/hgrc</tt>, <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, <tt class="docutils literal">.hg/hgrc</tt></dt> -<dd>This file contains defaults and configuration. Values in -<tt class="docutils literal">.hg/hgrc</tt> override those in <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, and these override -settings made in the global <tt class="docutils literal">/etc/mercurial/hgrc</tt> configuration. -See <a class="reference external" href="hgrc.5.html"><strong>hgrc</strong>(5)</a> for details of the contents and format of these -files.</dd> <dt><tt class="docutils literal">.hgignore</tt></dt> <dd>This file contains regular expressions (one per line) that describe file names that should be ignored by <strong>hg</strong>. For details, see <a class="reference external" href="hgignore.5.html"><strong>hgignore</strong>(5)</a>.</dd> -<dt><tt class="docutils literal">.hgsub</tt></dt> -<dd>This file defines the locations of all subrepositories, and -tells where the subrepository checkouts came from. For details, see -<a class="reference external" href="hg.1.html#subrepos"><tt class="docutils literal">hg help subrepos</tt></a>.</dd> -<dt><tt class="docutils literal">.hgsubstate</tt></dt> -<dd>This file is where Mercurial stores all nested repository states. <em>NB: This -file should not be edited manually.</em></dd> <dt><tt class="docutils literal">.hgtags</tt></dt> <dd>This file contains changeset hash values and text tag names (one of each separated by spaces) that correspond to tagged versions of -the repository contents. The file content is encoded using UTF-8.</dd> -<dt><tt class="docutils literal"><span class="pre">.hg/last-message.txt</span></tt></dt> -<dd>This file is used by <a class="reference external" href="hg.1.html#commit"><tt class="docutils literal">hg commit</tt></a> to store a backup of the commit message -in case the commit fails.</dd> -<dt><tt class="docutils literal">.hg/localtags</tt></dt> -<dd>This file can be used to define local tags which are not shared among -repositories. The file format is the same as for <tt class="docutils literal">.hgtags</tt>, but it is -encoded using the local system encoding.</dd> +the repository contents.</dd> +<dt><tt class="docutils literal">/etc/mercurial/hgrc</tt>, <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, <tt class="docutils literal">.hg/hgrc</tt></dt> +<dd>This file contains defaults and configuration. Values in +<tt class="docutils literal">.hg/hgrc</tt> override those in <tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt>, and these override +settings made in the global <tt class="docutils literal">/etc/mercurial/hgrc</tt> configuration. +See <a class="reference external" href="hgrc.5.html"><strong>hgrc</strong>(5)</a> for details of the contents and format of these +files.</dd> </dl> <p>Some commands (e.g. revert) produce backup files ending in <tt class="docutils literal">.orig</tt>, if the <tt class="docutils literal">.orig</tt> file already exists and is not tracked by Mercurial, @@ -8965,7 +7565,7 @@ below) when you find them.</p> </div> <div class="section" id="copying"> <h1><a class="toc-backref" href="#contents">Copying</a></h1> -<p>Copyright (C) 2005-2012 Matt Mackall. +<p>Copyright (C) 2005-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version.</p> <!-- Common link and substitution definitions. --> |