| Author: | Matt Mackall <mpm@selenic.com> |
|---|---|
| Organization: | Mercurial |
| Manual section: | 1 |
| Manual group: | Mercurial Manual |
Contents
hgcommand [option]... [argument]...
Thehg command provides a command line interface to the Mercurialsystem.
| -R,--repository<REPO> | |
| repository root directory or name of overlay bundle file | |
| --cwd<DIR> | change working directory |
| -y,--noninteractive | |
| do not prompt, automatically pick the first choice for all prompts | |
| -q,--quiet | suppress output |
| -v,--verbose | enable additional output |
| --config<CONFIG[+]> | |
| set/override config option (use 'section.name=value') | |
| --debug | enable debugging output |
| --debugger | start debugger |
| --encoding<ENCODE> | |
| set the charset encoding (default: UTF-8) | |
| --encodingmode<MODE> | |
| set the charset encoding mode (default: strict) | |
| --traceback | always print a traceback on exception |
| --time | time how long the command takes |
| --profile | print command execution profile |
| --version | output version information and exit |
| -h,--help | display help and exit |
| --hidden | consider hidden changesets |
[+] marked option can be specified multiple times
add the specified files on the next commit:
hg add [OPTION]... [FILE]...
Schedule files to be version controlled and added to therepository.
The files will be added to the repository at the next commit. Toundo an add before that, seehg forget.
If no names are given, add all files to the repository (exceptfiles matching.hgignore).
Examples:
New (unknown) files are addedautomatically byhg add:
$ lsfoo.c$ hg status? foo.c$ hg addadding foo.c$ hg statusA foo.cSpecific files to be added can be specified:
$ lsbar.c foo.c$ hg status? bar.c? foo.c$ hg add bar.c$ hg statusA bar.c? foo.c
Returns 0 if all files are successfully added.
Options:
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -S,--subrepos | recurse into subrepositories |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
add all new files, delete all missing files:
hg addremove [OPTION]... [FILE]...
Add all new files and remove all missing files from therepository.
Unless names are given, new files are ignored if they match any ofthe patterns in.hgignore. As with add, these changes takeeffect at the next commit.
Use the -s/--similarity option to detect renamed files. Thisoption takes a percentage between 0 (disabled) and 100 (files mustbe identical) as its parameter. With a parameter greater than 0,this compares every removed file with every added file and recordsthose similar enough as renames. Detecting renamed files this waycan be expensive. After using this option,hg status-C can beused to check which files were identified as moved or renamed. Ifnot specified, -s/--similarity defaults to 100 and only renames ofidentical files are detected.
Examples:
A number of files (bar.c and foo.c) are new,while foobar.c has been removed (without usinghg remove)from the repository:
$ lsbar.c foo.c$ hg status! foobar.c? bar.c? foo.c$ hg addremoveadding bar.cadding foo.cremoving foobar.c$ hg statusA bar.cA foo.cR foobar.cA file foobar.c was moved to foo.c without usinghg rename.Afterwards, it was edited slightly:
$ lsfoo.c$ hg status! foobar.c? foo.c$ hg addremove --similarity 90removing foobar.cadding foo.crecording removal of foobar.c as rename to foo.c (94% similar)$ hg status -CA foo.c foobar.cR foobar.c
Returns 0 if all files are successfully added.
Options:
| -s,--similarity<SIMILARITY> | |
| guess renamed files by similarity (0<=s<=100) | |
| -S,--subrepos | recurse into subrepositories |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
show changeset information by line for each file:
hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...
List changes in files, showing the revision id responsible foreach line.
This command is useful for discovering when a change was made andby whom.
If you include --file, --user, or --date, the revision number issuppressed unless you also include --number.
Without the -a/--text option, annotate will avoid processing filesit detects as binary. With -a, annotate will annotate the fileanyway, although the results will probably be neither usefulnor desirable.
Returns 0 on success.
Options:
| -r,--rev<REV> | |
| annotate the specified revision | |
| --follow | follow copies/renames and list the filename (DEPRECATED) |
| --no-follow | don't follow copies and renames |
| -a,--text | treat all files as text |
| -u,--user | list the author (long with -v) |
| -f,--file | list the filename |
| -d,--date | list the date (short with -q) |
| -n,--number | list the revision number (default) |
| -c,--changeset | |
| list the changeset | |
| -l,--line-number | |
| show line number at the first appearance | |
| -w,--ignore-all-space | |
| ignore white space when comparing lines | |
| -b,--ignore-space-change | |
| ignore changes in the amount of white space | |
| -B,--ignore-blank-lines | |
| ignore changes whose lines are all blank | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
[+] marked option can be specified multiple times
aliases: blame
create an unversioned archive of a repository revision:
hg archive [OPTION]... DEST
By default, the revision used is the parent of the workingdirectory; use -r/--rev to specify a different revision.
The archive type is automatically detected based on fileextension (to override, use -t/--type).
Examples:
create a zip file containing the 1.0 release:
hg archive -r 1.0 project-1.0.zip
create a tarball excluding .hg files:
hg archive project.tar.gz -X ".hg*"
Valid types are:
| files: | a directory full of files (default) |
|---|---|
| tar: | tar archive, uncompressed |
| tbz2: | tar archive, compressed using bzip2 |
| tgz: | tar archive, compressed using gzip |
| uzip: | zip archive, uncompressed |
| zip: | zip archive, compressed using deflate |
The exact name of the destination archive or directory is givenusing a format string; seehg help export for details.
Each member added to an archive file has a directory prefixprepended. Use -p/--prefix to specify a format string for theprefix. The default is the basename of the archive, with suffixesremoved.
Returns 0 on success.
Options:
| --no-decode | do not pass files through decoders |
| -p,--prefix<PREFIX> | |
| directory prefix for files in archive | |
| -r,--rev<REV> | |
| revision to distribute | |
| -t,--type<TYPE> | |
| type of distribution to create | |
| -S,--subrepos | recurse into subrepositories |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
reverse effect of earlier changeset:
hg backout [OPTION]... [-r] REV
Prepare a new changeset with the effect of REV undone in thecurrent working directory. If no conflicts were encountered,it will be committed immediately.
If REV is the parent of the working directory, then this new changesetis committed automatically (unless --no-commit is specified).
Note
hg backout cannot be used to fix either an unwanted orincorrect merge.
Examples:
Reverse the effect of the parent of the working directory.This backout will be committed immediately:
hg backout -r .
Reverse the effect of previous bad revision 23:
hg backout -r 23
Reverse the effect of previous bad revision 23 andleave changes uncommitted:
hg backout -r 23 --no-commithg commit -m "Backout revision 23"
By default, the pending changeset will have one parent,maintaining a linear history. With --merge, the pendingchangeset will instead have two parents: the old parent of theworking directory and a new child of REV that simply undoes REV.
Before version 1.7, the behavior without --merge was equivalentto specifying --merge followed byhg update--clean . tocancel the merge and leave the child of REV as a head to bemerged separately.
Seehg help dates for a list of formats valid for -d/--date.
Seehg help revert for a way to restore files to the stateof another revision.
Returns 0 on success, 1 if nothing to backout or there are unresolvedfiles.
Options:
| --merge | merge with old dirstate parent after backout |
| --commit | commit if no conflicts were encountered (DEPRECATED) |
| --no-commit | do not commit |
| --parent<REV> | parent to choose when backing out merge (DEPRECATED) |
| -r,--rev<REV> | |
| revision to backout | |
| -e,--edit | invoke editor on commit messages |
| -t,--tool<VALUE> | |
| specify merge tool | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
[+] marked option can be specified multiple times
subdivision search of changesets:
hg bisect [-gbsr] [-U] [-c CMD] [REV]
This command helps to find changesets which introduce problems. Touse, mark the earliest changeset you know exhibits the problem asbad, then mark the latest changeset which is free from the problemas good. Bisect will update your working directory to a revisionfor testing (unless the -U/--noupdate option is specified). Onceyou have performed tests, mark the working directory as good orbad, and bisect will either update to another candidate changesetor announce that it has found the bad revision.
As a shortcut, you can also use the revision argument to mark arevision as good or bad without checking it out first.
If you supply a command, it will be used for automatic bisection.The environment variable HG_NODE will contain the ID of thechangeset being tested. The exit status of the command will beused to mark revisions as good or bad: status 0 means good, 125means to skip the revision, 127 (command not found) will abort thebisection, and any other non-zero exit status means the revisionis bad.
Some examples:
start a bisection with known bad revision 34, and good revision 12:
hg bisect --bad 34hg bisect --good 12
advance the current bisection by marking current revision as good orbad:
hg bisect --goodhg bisect --bad
mark the current revision, or a known revision, to be skipped (e.g. ifthat revision is not usable because of another issue):
hg bisect --skiphg bisect --skip 23
skip all revisions that do not touch directoriesfoo orbar:
hg bisect --skip "!( file('path:foo') & file('path:bar') )"forget the current bisection:
hg bisect --reset
use 'make && make tests' to automatically find the first brokenrevision:
hg bisect --resethg bisect --bad 34hg bisect --good 12hg bisect --command "make && make tests"
see all changesets whose states are already known in the currentbisection:
hg log -r "bisect(pruned)"
see the changeset currently being bisected (especially usefulif running with -U/--noupdate):
hg log -r "bisect(current)"
see all changesets that took part in the current bisection:
hg log -r "bisect(range)"
you can even get a nice graph:
hg log --graph -r "bisect(range)"
Seehg help revsets for more about thebisect() keyword.
Returns 0 on success.
Options:
| -r,--reset | reset bisect state |
| -g,--good | mark changeset good |
| -b,--bad | mark changeset bad |
| -s,--skip | skip testing changeset |
| -e,--extend | extend the bisect range |
| -c,--command<CMD> | |
| use command to check changeset state | |
| -U,--noupdate | do not update to target |
create a new bookmark or list existing bookmarks:
hg bookmarks [OPTIONS]... [NAME]...
Bookmarks are labels on changesets to help track lines of development.Bookmarks are unversioned and can be moved, renamed and deleted.Deleting or moving a bookmark has no effect on the associated changesets.
Creating or updating to a bookmark causes it to be marked as 'active'.The active bookmark is indicated with a '*'.When a commit is made, the active bookmark will advance to the new commit.A plainhg update will also advance an active bookmark, if possible.Updating away from a bookmark will cause it to be deactivated.
Bookmarks can be pushed and pulled between repositories (seehg help push andhg help pull). If a shared bookmark hasdiverged, a new 'divergent bookmark' of the form'name@path' willbe created. Usinghg merge will resolve the divergence.
A bookmark named '@' has the special property thathg clone willcheck it out by default if it exists.
Examples:
create an active bookmark for a new line of development:
hg book new-feature
create an inactive bookmark as a place marker:
hg book -i reviewed
create an inactive bookmark on another changeset:
hg book -r .^ tested
rename bookmark turkey to dinner:
hg book -m turkey dinner
move the '@' bookmark from another branch:
hg book -f @
Options:
| -f,--force | force |
| -r,--rev<REV> | |
| revision for bookmark action | |
| -d,--delete | delete a given bookmark |
| -m,--rename<OLD> | |
| rename a given bookmark | |
| -i,--inactive | mark a bookmark inactive |
| -T,--template<TEMPLATE> | |
display with template (EXPERIMENTAL) aliases: bookmark | |
set or show the current branch name:
hg branch [-fC] [NAME]
Note
Branch names are permanent and global. Usehg bookmark to create alight-weight bookmark instead. Seehg help glossary for moreinformation about named branches and bookmarks.
With no argument, show the current branch name. With one argument,set the working directory branch name (the branch will not existin the repository until the next commit). Standard practicerecommends that primary development take place on the 'default'branch.
Unless -f/--force is specified, branch will not let you set abranch name that already exists.
Use -C/--clean to reset the working directory branch to that ofthe parent of the working directory, negating a previous branchchange.
Use the commandhg update to switch to an existing branch. Usehg commit--close-branch to mark this branch head as closed.When all heads of a branch are closed, the branch will beconsidered closed.
Returns 0 on success.
Options:
| -f,--force | set branch name even if it shadows an existing branch |
| -C,--clean | reset branch name to parent branch name |
list repository named branches:
hg branches [-c]
List the repository's named branches, indicating which ones areinactive. If -c/--closed is specified, also list branches which havebeen marked closed (seehg commit--close-branch).
Use the commandhg update to switch to an existing branch.
Returns 0.
Options:
| -a,--active | show only branches that have unmerged heads (DEPRECATED) |
| -c,--closed | show normal and closed branches |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
create a changegroup file:
hg bundle [-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]
Generate a changegroup file collecting changesets to be addedto a repository.
To create a bundle containing all changesets, use -a/--all(or --base null). Otherwise, hg assumes the destination will haveall the nodes you specify with --base parameters. Otherwise, hgwill assume the repository has all the nodes in destination, ordefault-push/default if no destination is specified.
You can change bundle format with the -t/--type option. You canspecify a compression, a bundle version or both using a dash(comp-version). The available compression methods are: none, bzip2,and gzip (by default, bundles are compressed using bzip2). Theavailable formats are: v1, v2 (default to most suitable).
The bundle file can then be transferred using conventional meansand applied to another repository with the unbundle or pullcommand. This is useful when direct push and pull are notavailable or when exporting an entire repository is undesirable.
Applying bundles preserves all changeset contents includingpermissions, copy/rename information, and revision history.
Returns 0 on success, 1 if no changes found.
Options:
| -f,--force | run even when the destination is unrelated |
| -r,--rev<REV[+]> | |
| a changeset intended to be added to the destination | |
| -b,--branch<BRANCH[+]> | |
| a specific branch you would like to bundle | |
| --base<REV[+]> | |
| a base changeset assumed to be available at the destination | |
| -a,--all | bundle all changesets in the repository |
| -t,--type<TYPE> | |
| bundle compression type to use (default: bzip2) | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
output the current or given revision of files:
hg cat [OPTION]... FILE...
Print the specified files as they were at the given revision. Ifno revision is given, the parent of the working directory is used.
Output may be to a file, in which case the name of the file isgiven using a format string. The formatting rules as follows:
| %%: | literal "%" character |
|---|---|
| %s: | basename of file being printed |
| %d: | dirname of file being printed, or '.' if in repository root |
| %p: | root-relative path name of file being printed |
| %H: | changeset hash (40 hexadecimal digits) |
| %R: | changeset revision number |
| %h: | short-form changeset hash (12 hexadecimal digits) |
| %r: | zero-padded changeset revision number |
| %b: | basename of the exporting repository |
Returns 0 on success.
Options:
| -o,--output<FORMAT> | |
| print output to file with formatted name | |
| -r,--rev<REV> | |
| print the given revision | |
| --decode | apply any matching decode filter |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
make a copy of an existing repository:
hg clone [OPTION]... SOURCE [DEST]
Create a copy of an existing repository in a new directory.
If no destination directory name is specified, it defaults to thebasename of the source.
The location of the source is added to the new repository's.hg/hgrc file, as the default to be used for future pulls.
Only local paths andssh:// URLs are supported asdestinations. Forssh:// destinations, no working directory or.hg/hgrc will be created on the remote side.
If the source repository has a bookmark called '@' set, thatrevision will be checked out in the new repository by default.
To check out a particular version, use -u/--update, or-U/--noupdate to create a clone with no working directory.
To pull only a subset of changesets, specify one or more revisionsidentifiers with -r/--rev or branches with -b/--branch. Theresulting clone will contain only the specified changesets andtheir ancestors. These options (or 'clone src#rev dest') imply--pull, even for local source repositories.
Note
Specifying a tag will include the tagged changeset but not thechangeset containing the tag.
For efficiency, hardlinks are used for cloning whenever thesource and destination are on the same filesystem (note thisapplies only to the repository data, not to the workingdirectory). Some filesystems, such as AFS, implement hardlinkingincorrectly, but do not report errors. In these cases, use the--pull option to avoid hardlinking.
In some cases, you can clone repositories and the workingdirectory using full hardlinks with
$ cp -al REPO REPOCLONE
This is the fastest way to clone, but it is not always safe. Theoperation is not atomic (making sure REPO is not modified duringthe operation is up to you) and you have to make sure youreditor breaks hardlinks (Emacs and most Linux Kernel tools doso). Also, this is not compatible with certain extensions thatplace their metadata under the .hg directory, such as mq.
Mercurial will update the working directory to the first applicablerevision from this list:
When cloning from servers that support it, Mercurial may fetchpre-generated data from a server-advertised URL. When this is done,hooks operating on incoming changesets and changegroups may fire twice,once for the bundle fetched from the URL and another for any additionaldata not fetched from this URL. In addition, if an error occurs, therepository may be rolled back to a partial clone. This behavior maychange in future releases. Seehg help-e clonebundles for more.
Examples:
clone a remote repository to a new directory named hg/:
hg clone http://selenic.com/hg
create a lightweight local clone:
hg clone project/ project-feature/
clone from an absolute path on an ssh server (note double-slash):
hg clone ssh://user@server//home/projects/alpha/
do a high-speed clone over a LAN while checking out aspecified version:
hg clone --uncompressed http://server/repo -u 1.5
create a repository without changesets after a particular revision:
hg clone -r 04e544 experimental/ good/
clone (and track) a particular named branch:
hg clone http://selenic.com/hg#stable
Seehg help urls for details on specifying URLs.
Returns 0 on success.
Options:
| -U,--noupdate | the clone will include an empty working directory (only a repository) |
| -u,--updaterev<REV> | |
| revision, tag, or branch to check out | |
| -r,--rev<REV[+]> | |
| include the specified changeset | |
| -b,--branch<BRANCH[+]> | |
| clone only the specified branch | |
| --pull | use pull protocol to copy metadata |
| --uncompressed | use uncompressed transfer (fast over LAN) |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
commit the specified files or all outstanding changes:
hg commit [OPTION]... [FILE]...
Commit changes to the given files into the repository. Unlike acentralized SCM, this operation is a local operation. Seehg push for a way to actively distribute your changes.
If a list of files is omitted, all changes reported byhg statuswill be committed.
If you are committing the result of a merge, do not provide anyfilenames or -I/-X filters.
If no commit message is specified, Mercurial starts yourconfigured editor where you can enter a message. In case yourcommit fails, you will find a backup of your message in.hg/last-message.txt.
The --close-branch flag can be used to mark the current branchhead closed. When all heads of a branch are closed, the branchwill be considered closed and no longer listed.
The --amend flag can be used to amend the parent of theworking directory with a new commit that contains the changesin the parent in addition to those currently reported byhg status,if there are any. The old commit is stored in a backup bundle in.hg/strip-backup (seehg help bundle andhg help unbundleon how to restore it).
Message, user and date are taken from the amended commit unlessspecified. When a message isn't specified on the command line,the editor will open with the message of the amended commit.
It is not possible to amend public changesets (seehg help phases)or changesets that have children.
Seehg help dates for a list of formats valid for -d/--date.
Returns 0 on success, 1 if nothing changed.
Examples:
commit all files ending in .py:
hg commit --include "set:**.py"
commit all non-binary files:
hg commit --exclude "set:binary()"
amend the current commit and set the date to now:
hg commit --amend --date now
Options:
| -A,--addremove | |
| mark new/missing files as added/removed before committing | |
| --close-branch | mark a branch head as closed |
| --amend | amend the parent of the working directory |
| -s,--secret | use the secret phase for committing |
| -e,--edit | invoke editor on commit messages |
| -i,--interactive | |
| use interactive mode | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
aliases: ci
show combined config settings from all hgrc files:
hg config [-u] [NAME]...
With no arguments, print names and values of all config items.
With one argument of the form section.name, print just the valueof that config item.
With multiple arguments, print names and values of all configitems with matching section names.
With --edit, start an editor on the user-level config file. With--global, edit the system-wide config file. With --local, edit therepository-level config file.
With --debug, the source (filename and line number) is printedfor each config item.
Seehg help config for more information about config files.
Returns 0 on success, 1 if NAME does not exist.
Options:
| -u,--untrusted | |
| show untrusted configuration options | |
| -e,--edit | edit user config |
| -l,--local | edit repository config |
| -g,--global | edit global config |
| -T,--template<TEMPLATE> | |
display with template (EXPERIMENTAL) aliases: showconfig debugconfig | |
mark files as copied for the next commit:
hg copy [OPTION]... [SOURCE]... DEST
Mark dest as having copies of source files. If dest is adirectory, copies are put in that directory. If dest is a file,the source must be a single file.
By default, this command copies the contents of files as theyexist in the working directory. If invoked with -A/--after, theoperation is recorded, but no copying is performed.
This command takes effect with the next commit. To undo a copybefore that, seehg revert.
Returns 0 on success, 1 if errors are encountered.
Options:
| -A,--after | record a copy that has already occurred |
| -f,--force | forcibly copy over an existing managed file |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
aliases: cp
diff repository (or selected files):
hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format.
Note
hg diff may generate unexpected results for merges, as it willdefault to comparing against the working directory's firstparent changeset if no revisions are specified.
When two revision arguments are given, then changes are shownbetween those revisions. If only one revision is specified thenthat revision is compared to the working directory, and, when norevisions are specified, the working directory files are comparedto its first parent.
Alternatively you can specify -c/--change with a revision to seethe changes in that changeset relative to its first parent.
Without the -a/--text option, diff will avoid generating diffs offiles it detects as binary. With -a, diff will generate a diffanyway, probably with undesirable results.
Use the -g/--git option to generate diffs in the git extended diffformat. For more information, readhg help diffs.
Examples:
compare a file in the current working directory to its parent:
hg diff foo.c
compare two historical versions of a directory, with rename info:
hg diff --git -r 1.0:1.2 lib/
get change stats relative to the last change on some date:
hg diff --stat -r "date('may 2')"diff all newly-added files that contain a keyword:
hg diff "set:added() and grep(GNU)"
compare a revision and its parents:
hg diff -c 9353 # compare against first parenthg diff -r 9353^:9353 # same using revset syntaxhg diff -r 9353^2:9353 # compare against the second parent
Returns 0 on success.
Options:
| -r,--rev<REV[+]> | |
| revision | |
| -c,--change<REV> | |
| change made by revision | |
| -a,--text | treat all files as text |
| -g,--git | use git extended diff format |
| --nodates | omit dates from diff headers |
| --noprefix | omit a/ and b/ prefixes from filenames |
| -p,--show-function | |
| show which function each change is in | |
| --reverse | produce a diff that undoes the changes |
| -w,--ignore-all-space | |
| ignore white space when comparing lines | |
| -b,--ignore-space-change | |
| ignore changes in the amount of white space | |
| -B,--ignore-blank-lines | |
| ignore changes whose lines are all blank | |
| -U,--unified<NUM> | |
| number of lines of context to show | |
| --stat | output diffstat-style summary of changes |
| --root<DIR> | produce diffs relative to subdirectory |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
dump the header and diffs for one or more changesets:
hg export [OPTION]... [-o OUTFILESPEC] [-r] [REV]...
Print the changeset header and diffs for one or more revisions.If no revision is given, the parent of the working directory is used.
The information shown in the changeset header is: author, date,branch name (if non-default), changeset hash, parent(s) and commitcomment.
Note
hg export may generate unexpected diff output for mergechangesets, as it will compare the merge changeset against itsfirst parent only.
Output may be to a file, in which case the name of the file isgiven using a format string. The formatting rules are as follows:
| %%: | literal "%" character |
|---|---|
| %H: | changeset hash (40 hexadecimal digits) |
| %N: | number of patches being generated |
| %R: | changeset revision number |
| %b: | basename of the exporting repository |
| %h: | short-form changeset hash (12 hexadecimal digits) |
| %m: | first line of the commit message (only alphanumeric characters) |
| %n: | zero-padded sequence number, starting at 1 |
| %r: | zero-padded changeset revision number |
Without the -a/--text option, export will avoid generating diffsof files it detects as binary. With -a, export will generate adiff anyway, probably with undesirable results.
Use the -g/--git option to generate diffs in the git extended diffformat. Seehg help diffs for more information.
With the --switch-parent option, the diff will be against thesecond parent. It can be useful to review a merge.
Examples:
use export and import to transplant a bugfix to the currentbranch:
hg export -r 9353 | hg import -
export all the changesets between two revisions to a file withrename information:
hg export --git -r 123:150 > changes.txt
split outgoing changes into a series of patches withdescriptive names:
hg export -r "outgoing()" -o "%n-%m.patch"
Returns 0 on success.
Options:
| -o,--output<FORMAT> | |
| print output to file with formatted name | |
| --switch-parent | |
| diff against the second parent | |
| -r,--rev<REV[+]> | |
| revisions to export | |
| -a,--text | treat all files as text |
| -g,--git | use git extended diff format |
| --nodates | omit dates from diff headers |
[+] marked option can be specified multiple times
list tracked files:
hg files [OPTION]... [FILE]...
Print files under Mercurial control in the working directory orspecified revision for given files (excluding removed files).Files can be specified as filenames or filesets.
If no files are given to match, this command prints the namesof all files under Mercurial control.
Examples:
list all files under the current directory:
hg files .
shows sizes and flags for current revision:
hg files -vr .
list all files named README:
hg files -I "**/README"
list all binary files:
hg files "set:binary()"
find files containing a regular expression:
hg files "set:grep('bob')"search tracked file contents with xargs and grep:
hg files -0 | xargs -0 grep foo
Seehg help patterns andhg help filesets for more informationon specifying file patterns.
Returns 0 if a match is found, 1 otherwise.
Options:
| -r,--rev<REV> | |
| search the repository as it is in REV | |
| -0,--print0 | end filenames with NUL, for use with xargs |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
forget the specified files on the next commit:
hg forget [OPTION]... FILE...
Mark the specified files so they will no longer be trackedafter the next commit.
This only removes files from the current branch, not from theentire project history, and it does not delete them from theworking directory.
To delete the file from the working directory, seehg remove.
To undo a forget before the next commit, seehg add.
Examples:
forget newly-added binary files:
hg forget "set:added() and binary()"
forget files that would be excluded by .hgignore:
hg forget "set:hgignore()"
Returns 0 on success.
Options:
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
copy changes from other branches onto the current branch:
hg graft [OPTION]... [-r REV]... REV...
This command uses Mercurial's merge logic to copy individualchanges from other branches without merging branches in thehistory graph. This is sometimes known as 'backporting' or'cherry-picking'. By default, graft will copy user, date, anddescription from the source changesets.
Changesets that are ancestors of the current revision, that havealready been grafted, or that are merges will be skipped.
If --log is specified, log messages will have a comment appendedof the form:
(grafted from CHANGESETHASH)
If --force is specified, revisions will be grafted even if theyare already ancestors of or have been grafted to the destination.This is useful when the revisions have since been backed out.
If a graft merge results in conflicts, the graft process isinterrupted so that the current merge can be manually resolved.Once all conflicts are addressed, the graft process can becontinued with the -c/--continue option.
Note
The -c/--continue option does not reapply earlier options, exceptfor --force.
Examples:
copy a single change to the stable branch and edit its description:
hg update stablehg graft --edit 9393
graft a range of changesets with one exception, updating dates:
hg graft -D "2085::2093 and not 2091"
continue a graft after resolving conflicts:
hg graft -c
show the source of a grafted changeset:
hg log --debug -r .
show revisions sorted by date:
hg log -r "sort(all(), date)"
Seehg help revisions andhg help revsets for more aboutspecifying revisions.
Returns 0 on successful completion.
Options:
| -r,--rev<REV[+]> | |
| revisions to graft | |
| -c,--continue | resume interrupted graft |
| -e,--edit | invoke editor on commit messages |
| --log | append graft info to log message |
| -f,--force | force graft |
| -D,--currentdate | |
| record the current date as commit date | |
| -U,--currentuser | |
| record the current user as committer | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -t,--tool<VALUE> | |
| specify merge tool | |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
search revision history for a pattern in specified files:
hg grep [OPTION]... PATTERN [FILE]...
Search revision history for a regular expression in the specifiedfiles or the entire project.
By default, grep prints the most recent revision number for eachfile in which it finds a match. To get it to print every revisionthat contains a change in match status ("-" for a match that becomesa non-match, or "+" for a non-match that becomes a match), use the--all flag.
PATTERN can be any Python (roughly Perl-compatible) regularexpression.
If no FILEs are specified (and -f/--follow isn't set), all files inthe repository are searched, including those that don't exist in thecurrent branch or have been deleted in a prior changeset.
Returns 0 if a match is found, 1 otherwise.
Options:
| -0,--print0 | end fields with NUL |
| --all | print all revisions that match |
| -a,--text | treat all files as text |
| -f,--follow | follow changeset history, or file history across copies and renames |
| -i,--ignore-case | |
| ignore case when matching | |
| -l,--files-with-matches | |
| print only filenames and revisions that match | |
| -n,--line-number | |
| print matching line numbers | |
| -r,--rev<REV[+]> | |
| only search files changed within revision range | |
| -u,--user | list the author (long with -v) |
| -d,--date | list the date (short with -q) |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
show branch heads:
hg heads [-ct] [-r STARTREV] [REV]...
With no arguments, show all open branch heads in the repository.Branch heads are changesets that have no descendants on thesame branch. They are where development generally takes place andare the usual targets for update and merge operations.
If one or more REVs are given, only open branch heads on thebranches associated with the specified changesets are shown. Thismeans that you can usehg heads . to see the heads on thecurrently checked-out branch.
If -c/--closed is specified, also show branch heads marked closed(seehg commit--close-branch).
If STARTREV is specified, only those heads that are descendants ofSTARTREV will be displayed.
If -t/--topo is specified, named branch mechanics will be ignored and onlytopological heads (changesets with no children) will be shown.
Returns 0 if matching heads are found, 1 if not.
Options:
| -r,--rev<STARTREV> | |
| show only heads which are descendants of STARTREV | |
| -t,--topo | show topological heads only |
| -a,--active | show active branchheads only (DEPRECATED) |
| -c,--closed | show normal and closed branch heads |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
show help for a given topic or a help overview:
hg help [-ecks] [TOPIC]
With no arguments, print a list of commands with short help messages.
Given a topic, extension, or command name, print help for thattopic.
Returns 0 if successful.
Options:
| -e,--extension | |
| show only help for extensions | |
| -c,--command | show only help for commands |
| -k,--keyword | show topics matching keyword |
| -s,--system<VALUE[+]> | |
| show help for specific platform(s) | |
[+] marked option can be specified multiple times
identify the working directory or specified revision:
hg identify [-nibtB] [-r REV] [SOURCE]
Print a summary identifying the repository state at REV using one ortwo parent hash identifiers, followed by a "+" if the workingdirectory has uncommitted changes, the branch name (if not default),a list of tags, and a list of bookmarks.
When REV is not given, print a summary of the current state of therepository.
Specifying a path to a repository root or Mercurial bundle willcause lookup to operate on that repository/bundle.
Examples:
generate a build identifier for the working directory:
hg id --id > build-id.dat
find the revision corresponding to a tag:
hg id -n -r 1.3
check the most recent revision of a remote repository:
hg id -r tip http://selenic.com/hg/
Seehg log for generating more information about specific revisions,including full hash identifiers.
Returns 0 if successful.
Options:
| -r,--rev<REV> | |
| identify the specified revision | |
| -n,--num | show local revision number |
| -i,--id | show global revision id |
| -b,--branch | show branch |
| -t,--tags | show tags |
| -B,--bookmarks | |
| show bookmarks | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) aliases: id |
import an ordered set of patches:
hg import [OPTION]... PATCH...
Import a list of patches and commit them individually (unless--no-commit is specified).
To read a patch from standard input, use "-" as the patch name. Ifa URL is specified, the patch will be downloaded from there.
Import first applies changes to the working directory (unless--bypass is specified), import will abort if there are outstandingchanges.
Use --bypass to apply and commit patches directly to therepository, without affecting the working directory. Without--exact, patches will be applied on top of the working directoryparent revision.
You can import a patch straight from a mail message. Even patchesas attachments work (to use the body part, it must have typetext/plain or text/x-patch). From and Subject headers of emailmessage are used as default committer and commit message. Alltext/plain body parts before first diff are added to the commitmessage.
If the imported patch was generated byhg export, user anddescription from patch override values from message headers andbody. Values given on command line with -m/--message and -u/--useroverride these.
If --exact is specified, import will set the working directory tothe parent of each patch before applying it, and will abort if theresulting changeset has a different ID than the one recorded inthe patch. This will guard against various ways that portablepatch formats and mail systems might fail to transfer Mercurialdata or metadata. Seehg bundle for lossless transmission.
Use --partial to ensure a changeset will be created from the patcheven if some hunks fail to apply. Hunks that fail to apply will bewritten to a <target-file>.rej file. Conflicts can then be resolvedby hand beforehg commit--amend is run to update the createdchangeset. This flag exists to let people import patches thatpartially apply without losing the associated metadata (author,date, description, ...).
Note
When no hunks apply cleanly,hg import--partial will createan empty changeset, importing only the patch metadata.
With -s/--similarity, hg will attempt to discover renames andcopies in the patch in the same way ashg addremove.
It is possible to use external patch programs to perform the patchby setting theui.patch configuration option. For the defaultinternal tool, the fuzz can also be configured viapatch.fuzz.Seehg help config for more information about configurationfiles and how to use these options.
Seehg help dates for a list of formats valid for -d/--date.
Examples:
import a traditional patch from a website and detect renames:
hg import -s 80 http://example.com/bugfix.patch
import a changeset from an hgweb server:
hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
import all the patches in an Unix-style mbox:
hg import incoming-patches.mbox
attempt to exactly restore an exported changeset (not alwayspossible):
hg import --exact proposed-fix.patch
use an external tool to apply a patch which is too fuzzy forthe default internal tool.
hg import --config ui.patch="patch --merge" fuzzy.patch
change the default fuzzing from 2 to a less strict 7
hg import --config ui.fuzz=7 fuzz.patch
Returns 0 on success, 1 on partial success (see --partial).
Options:
| -p,--strip<NUM> | |
| directory strip option for patch. This has the same meaning as the corresponding patch option (default: 1) | |
| -b,--base<PATH> | |
| base path (DEPRECATED) | |
| -e,--edit | invoke editor on commit messages |
| -f,--force | skip check for outstanding uncommitted changes (DEPRECATED) |
| --no-commit | don't commit, just update the working directory |
| --bypass | apply patch without touching the working directory |
| --partial | commit even if some hunks fail |
| --exact | abort if patch would apply lossily |
| --prefix<DIR> | apply patch to subdirectory |
| --import-branch | |
| use any branch information in patch (implied by --exact) | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -s,--similarity<SIMILARITY> | |
guess renamed files by similarity (0<=s<=100) aliases: patch | |
show new changesets found in source:
hg incoming [-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]
Show new changesets found in the specified path/URL or the defaultpull location. These are the changesets that would have been pulledif a pull at the time you issued this command.
See pull for valid source format details.
With -B/--bookmarks, the result of bookmark comparison betweenlocal and remote repositories is displayed. With -v/--verbose,status is also displayed for each bookmark like below:
BM1 01234567890a addedBM2 1234567890ab advancedBM3 234567890abc divergedBM4 34567890abcd changed
The action taken locally when pulling depends on thestatus of each bookmark:
| added: | pull will create it |
|---|---|
| advanced: | pull will update it |
| diverged: | pull will create a divergent bookmark |
| changed: | result depends on remote changesets |
From the point of view of pulling behavior, bookmarkexisting only in the remote repository are treated asadded,even if it is in fact locally deleted.
For remote repository, using --bundle avoids downloading thechangesets twice if the incoming is followed by a pull.
Examples:
show incoming changes with patches and full description:
hg incoming -vp
show incoming changes excluding merges, store a bundle:
hg in -vpM --bundle incoming.hghg pull incoming.hg
briefly list changes inside a bundle:
hg in changes.hg -T "{desc|firstline}\n"Returns 0 if there are incoming changes, 1 otherwise.
Options:
| -f,--force | run even if remote repository is unrelated |
| -n,--newest-first | |
| show newest record first | |
| --bundle<FILE> | |
| file to store the bundles into | |
| -r,--rev<REV[+]> | |
| a remote changeset intended to be added | |
| -B,--bookmarks | |
| compare bookmarks | |
| -b,--branch<BRANCH[+]> | |
| a specific branch you would like to pull | |
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| -l,--limit<NUM> | |
| limit number of changes displayed | |
| -M,--no-merges | |
| do not show merges | |
| --stat | output diffstat-style summary of changes |
| -G,--graph | show the revision DAG |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
aliases: in
create a new repository in the given directory:
hg init [-e CMD] [--remotecmd CMD] [DEST]
Initialize a new repository in the given directory. If the givendirectory does not exist, it will be created.
If no directory is given, the current directory is used.
It is possible to specify anssh:// URL as the destination.Seehg help urls for more information.
Returns 0 on success.
Options:
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
locate files matching specific patterns (DEPRECATED):
hg locate [OPTION]... [PATTERN]...
Print files under Mercurial control in the working directory whosenames match the given patterns.
By default, this command searches all directories in the workingdirectory. To search just the current directory and itssubdirectories, use "--include .".
If no patterns are given to match, this command prints the namesof all files under Mercurial control in the working directory.
If you want to feed the output of this command into the "xargs"command, use the -0 option to both this command and "xargs". Thiswill avoid the problem of "xargs" treating single filenames thatcontain whitespace as multiple filenames.
Seehg help files for a more versatile command.
Returns 0 if a match is found, 1 otherwise.
Options:
| -r,--rev<REV> | |
| search the repository as it is in REV | |
| -0,--print0 | end filenames with NUL, for use with xargs |
| -f,--fullpath | print complete paths from the filesystem root |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
show revision history of entire repository or files:
hg log [OPTION]... [FILE]
Print the revision history of the specified files or the entireproject.
If no revision range is specified, the default istip:0 unless--follow is set, in which case the working directory parent isused as the starting revision.
File history is shown without following rename or copy history offiles. Use -f/--follow with a filename to follow history acrossrenames and copies. --follow without a filename will only showancestors or descendants of the starting revision.
By default this command prints revision number and changeset id,tags, non-trivial parents, user, date and time, and a summary foreach commit. When the -v/--verbose switch is used, the list ofchanged files and full commit message are shown.
With --graph the revisions are shown as an ASCII art DAG with the mostrecent changeset at the top.'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,and '+' represents a fork where the changeset from the lines below is aparent of the 'o' merge on the same line.
Note
hg log--patch may generate unexpected diff output for mergechangesets, as it will only compare the merge changeset againstits first parent. Also, only files different from BOTH parentswill appear in files:.
Note
For performance reasons,hg log FILE may omit duplicate changesmade on branches and will not show removals or mode changes. Tosee all such changes, use the --removed switch.
Some examples:
changesets with full descriptions and file lists:
hg log -v
changesets ancestral to the working directory:
hg log -f
last 10 commits on the current branch:
hg log -l 10 -b .
changesets showing all modifications of a file, including removals:
hg log --removed file.c
all changesets that touch a directory, with diffs, excluding merges:
hg log -Mp lib/
all revision numbers that match a keyword:
hg log -k bug --template "{rev}\n"the full hash identifier of the working directory parent:
hg log -r . --template "{node}\n"list available log templates:
hg log -T list
check if a given changeset is included in a tagged release:
hg log -r "a21ccf and ancestor(1.9)"
find all changesets by some user in a date range:
hg log -k alice -d "may 2008 to jul 2008"
summary of all changesets after the last tag:
hg log -r "last(tagged())::" --template "{desc|firstline}\n"Seehg help dates for a list of formats valid for -d/--date.
Seehg help revisions andhg help revsets for more aboutspecifying and ordering revisions.
Seehg help templates for more about pre-packaged styles andspecifying custom templates.
Returns 0 on success.
Options:
| -f,--follow | follow changeset history, or file history across copies and renames |
| --follow-first | only follow the first parent of merge changesets (DEPRECATED) |
| -d,--date<DATE> | |
| show revisions matching date spec | |
| -C,--copies | show copied files |
| -k,--keyword<TEXT[+]> | |
| do case-insensitive search for a given text | |
| -r,--rev<REV[+]> | |
| show the specified revision or revset | |
| --removed | include revisions where files were removed |
| -m,--only-merges | |
| show only merges (DEPRECATED) | |
| -u,--user<USER[+]> | |
| revisions committed by user | |
| --only-branch<BRANCH[+]> | |
| show only changesets within the given named branch (DEPRECATED) | |
| -b,--branch<BRANCH[+]> | |
| show changesets within the given named branch | |
| -P,--prune<REV[+]> | |
| do not display revision or any of its ancestors | |
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| -l,--limit<NUM> | |
| limit number of changes displayed | |
| -M,--no-merges | |
| do not show merges | |
| --stat | output diffstat-style summary of changes |
| -G,--graph | show the revision DAG |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
aliases: history
output the current or given revision of the project manifest:
hg manifest [-r REV]
Print a list of version controlled files for the given revision.If no revision is given, the first parent of the working directoryis used, or the null revision if no revision is checked out.
With -v, print file permissions, symlink and executable bits.With --debug, print file revision hashes.
If option --all is specified, the list of all files from all revisionsis printed. This includes deleted and renamed files.
Returns 0 on success.
Options:
| -r,--rev<REV> | |
| revision to display | |
| --all | list files from all revisions |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
merge another revision into working directory:
hg merge [-P] [[-r] REV]
The current working directory is updated with all changes made inthe requested revision since the last common predecessor revision.
Files that changed between either parent are marked as changed forthe next commit and a commit must be performed before any furtherupdates to the repository are allowed. The next commit will havetwo parents.
--tool can be used to specify the merge tool used for filemerges. It overrides the HGMERGE environment variable and yourconfiguration files. Seehg helpmerge-tools for options.
If no revision is specified, the working directory's parent is ahead revision, and the current branch contains exactly one otherhead, the other head is merged with by default. Otherwise, anexplicit revision with which to merge with must be provided.
Seehg help resolve for information on handling file conflicts.
To undo an uncommitted merge, usehg update--clean . whichwill check out a clean copy of the original merge parent, losingall changes.
Returns 0 on success, 1 if there are unresolved files.
Options:
| -f,--force | force a merge including outstanding changes (DEPRECATED) |
| -r,--rev<REV> | |
| revision to merge | |
| -P,--preview | review revisions to merge (no merge is performed) |
| -t,--tool<VALUE> | |
| specify merge tool | |
show changesets not found in the destination:
hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]
Show changesets not found in the specified destination repositoryor the default push location. These are the changesets that wouldbe pushed if a push was requested.
See pull for details of valid destination formats.
With -B/--bookmarks, the result of bookmark comparison betweenlocal and remote repositories is displayed. With -v/--verbose,status is also displayed for each bookmark like below:
BM1 01234567890a addedBM2 deletedBM3 234567890abc advancedBM4 34567890abcd divergedBM5 4567890abcde changed
The action taken when pushing depends on thestatus of each bookmark:
| added: | push with-B will create it |
|---|---|
| deleted: | push with-B will delete it |
| advanced: | push will update it |
| diverged: | push with-B will update it |
| changed: | push with-B will update it |
From the point of view of pushing behavior, bookmarksexisting only in the remote repository are treated asdeleted, even if it is in fact added remotely.
Returns 0 if there are outgoing changes, 1 otherwise.
Options:
| -f,--force | run even when the destination is unrelated |
| -r,--rev<REV[+]> | |
| a changeset intended to be included in the destination | |
| -n,--newest-first | |
| show newest record first | |
| -B,--bookmarks | |
| compare bookmarks | |
| -b,--branch<BRANCH[+]> | |
| a specific branch you would like to push | |
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| -l,--limit<NUM> | |
| limit number of changes displayed | |
| -M,--no-merges | |
| do not show merges | |
| --stat | output diffstat-style summary of changes |
| -G,--graph | show the revision DAG |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
aliases: out
show the parents of the working directory or revision (DEPRECATED):
hg parents [-r REV] [FILE]
Print the working directory's parent revisions. If a revision isgiven via -r/--rev, the parent of that revision will be printed.If a file argument is given, the revision in which the file waslast changed (before the working directory revision or theargument to --rev if given) is printed.
This command is equivalent to:
hg log -r "p1()+p2()" orhg log -r "p1(REV)+p2(REV)" orhg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" orhg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
Seehg summary andhg help revsets for related information.
Returns 0 on success.
Options:
| -r,--rev<REV> | |
| show parents of the specified revision | |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
show aliases for remote repositories:
hg paths [NAME]
Show definition of symbolic path name NAME. If no name is given,show definition of all available names.
Option -q/--quiet suppresses all output when searching for NAMEand shows only the path names when listing all definitions.
Path names are defined in the [paths] section of yourconfiguration file and in/etc/mercurial/hgrc. If run inside arepository,.hg/hgrc is used, too.
The path namesdefault anddefault-push have a specialmeaning. When performing a push or pull operation, they are usedas fallbacks if no location is specified on the command-line.Whendefault-push is set, it will be used for push anddefault will be used for pull; otherwisedefault is usedas the fallback for both. When cloning a repository, the clonesource is written asdefault in.hg/hgrc.
Note
default anddefault-push apply to all inbound (e.g.hg incoming) and outbound (e.g.hg outgoing,hg emailandhg bundle) operations.
Seehg help urls for more information.
Returns 0 on success.
Options:
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
set or show the current phase name:
hg phase [-p|-d|-s] [-f] [-r] [REV...]
With no argument, show the phase name of the current revision(s).
With one of -p/--public, -d/--draft or -s/--secret, change thephase value of the specified revisions.
Unless -f/--force is specified,hg phase won't move changeset from alower phase to an higher phase. Phases are ordered as follows:
public < draft < secret
Returns 0 on success, 1 if some phases could not be changed.
(For more information about the phases concept, seehg help phases.)
Options:
| -p,--public | set changeset phase to public |
| -d,--draft | set changeset phase to draft |
| -s,--secret | set changeset phase to secret |
| -f,--force | allow to move boundary backward |
| -r,--rev<REV[+]> | |
| target revision | |
[+] marked option can be specified multiple times
pull changes from the specified source:
hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]
Pull changes from a remote repository to a local one.
This finds all changes from the repository at the specified pathor URL and adds them to a local repository (the current one unless-R is specified). By default, this does not update the copy of theproject in the working directory.
Usehg incoming if you want to see what would have been addedby a pull at the time you issued this command. If you then decideto add those changes to the repository, you should usehg pull-r X whereX is the last changeset listed byhg incoming.
If SOURCE is omitted, the 'default' path will be used.Seehg help urls for more information.
Specifying bookmark as. is equivalent to specifying the activebookmark's name.
Returns 0 on success, 1 if an update had unresolved files.
Options:
| -u,--update | update to new branch head if changesets were pulled |
| -f,--force | run even when remote repository is unrelated |
| -r,--rev<REV[+]> | |
| a remote changeset intended to be added | |
| -B,--bookmark<BOOKMARK[+]> | |
| bookmark to pull | |
| -b,--branch<BRANCH[+]> | |
| a specific branch you would like to pull | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
push changes to the specified destination:
hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]
Push changesets from the local repository to the specifieddestination.
This operation is symmetrical to pull: it is identical to a pullin the destination repository from the current one.
By default, push will not allow creation of new heads at thedestination, since multiple heads would make it unclear which headto use. In this situation, it is recommended to pull and mergebefore pushing.
Use --new-branch if you want to allow push to create a new namedbranch that is not present at the destination. This allows you toonly create a new branch without forcing other changes.
Note
Extra care should be taken with the -f/--force option,which will push all new heads on all branches, an action which willalmost always cause confusion for collaborators.
If -r/--rev is used, the specified revision and all its ancestorswill be pushed to the remote repository.
If -B/--bookmark is used, the specified bookmarked revision, itsancestors, and the bookmark will be pushed to the remoterepository. Specifying. is equivalent to specifying the activebookmark's name.
Please seehg help urls for important details aboutssh://URLs. If DESTINATION is omitted, a default path will be used.
Returns 0 if push was successful, 1 if nothing to push.
Options:
| -f,--force | force push |
| -r,--rev<REV[+]> | |
| a changeset intended to be included in the destination | |
| -B,--bookmark<BOOKMARK[+]> | |
| bookmark to push | |
| -b,--branch<BRANCH[+]> | |
| a specific branch you would like to push | |
| --new-branch | allow pushing a new branch |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
roll back an interrupted transaction:
hg recover
Recover from an interrupted commit or pull.
This command tries to fix the repository status after aninterrupted operation. It should only be necessary when Mercurialsuggests it.
Returns 0 if successful, 1 if nothing to recover or verify fails.
remove the specified files on the next commit:
hg remove [OPTION]... FILE...
Schedule the indicated files for removal from the current branch.
This command schedules the files to be removed at the next commit.To undo a remove before that, seehg revert. To undo addedfiles, seehg forget.
-A/--after can be used to remove only files that have alreadybeen deleted, -f/--force can be used to force deletion, and -Afcan be used to remove files from the next revision withoutdeleting them from the working directory.
The following table details the behavior of remove for differentfile states (columns) and option combinations (rows). The filestates are Added [A], Clean [C], Modified [M] and Missing [!](as reported byhg status). The actions are Warn, Remove(from branch) and Delete (from disk):
| opt/state | A | C | M | ! |
|---|---|---|---|---|
| none | W | RD | W | R |
| -f | R | RD | RD | R |
| -A | W | W | W | R |
| -Af | R | R | R | R |
Note
hg remove never deletes files in Added [A] state from theworking directory, not even if--force is specified.
Returns 0 on success, 1 if any warnings encountered.
Options:
| -A,--after | record delete for missing files |
| -f,--force | forget added files, delete modified files |
| -S,--subrepos | recurse into subrepositories |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
aliases: rm
rename files; equivalent of copy + remove:
hg rename [OPTION]... SOURCE... DEST
Mark dest as copies of sources; mark sources for deletion. If destis a directory, copies are put in that directory. If dest is afile, there can only be one source.
By default, this command copies the contents of files as theyexist in the working directory. If invoked with -A/--after, theoperation is recorded, but no copying is performed.
This command takes effect at the next commit. To undo a renamebefore that, seehg revert.
Returns 0 on success, 1 if errors are encountered.
Options:
| -A,--after | record a rename that has already occurred |
| -f,--force | forcibly copy over an existing managed file |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
aliases: move mv
redo merges or set/view the merge status of files:
hg resolve [OPTION]... [FILE]...
Merges with unresolved conflicts are often the result ofnon-interactive merging using theinternal:merge configurationsetting, or a command-line merge tool likediff3. The resolvecommand is used to manage the files involved in a merge, afterhg merge has been run, and beforehg commit is run (i.e. theworking directory must have two parents). Seehg helpmerge-tools for information on configuring merge tools.
The resolve command can be used in the following ways:
Note
Mercurial will not let you commit files with unresolved mergeconflicts. You must usehg resolve-m ... before you cancommit after a conflicting merge.
Returns 0 on success, 1 if any files fail a resolve attempt.
Options:
| -a,--all | select all unresolved files |
| -l,--list | list state of files needing merge |
| -m,--mark | mark files as resolved |
| -u,--unmark | mark files as unresolved |
| -n,--no-status | |
| hide status prefix | |
| -t,--tool<VALUE> | |
| specify merge tool | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
[+] marked option can be specified multiple times
restore files to their checkout state:
hg revert [OPTION]... [-r REV] [NAME]...
Note
To check out earlier revisions, you should usehg update REV.To cancel an uncommitted merge (and lose your changes),usehg update--clean ..
With no revision specified, revert the specified files or directoriesto the contents they had in the parent of the working directory.This restores the contents of files to an unmodifiedstate and unschedules adds, removes, copies, and renames. If theworking directory has two parents, you must explicitly specify arevision.
Using the -r/--rev or -d/--date options, revert the given files ordirectories to their states as of a specific revision. Becauserevert does not change the working directory parents, this willcause these files to appear modified. This can be helpful to "backout" some or all of an earlier change. Seehg backout for arelated method.
Modified files are saved with a .orig suffix before reverting.To disable these backups, use --no-backup. It is possible to storethe backup files in a custom directory relative to the root of therepository by setting theui.origbackuppath configurationoption.
Seehg help dates for a list of formats valid for -d/--date.
Seehg help backout for a way to reverse the effect of anearlier changeset.
Returns 0 on success.
Options:
| -a,--all | revert all changes when no arguments given |
| -d,--date<DATE> | |
| tipmost revision matching date | |
| -r,--rev<REV> | |
| revert to the specified revision | |
| -C,--no-backup | |
| do not save backup copies of files | |
| -i,--interactive | |
| interactively select the changes (EXPERIMENTAL) | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -n,--dry-run | do not perform actions, just print output |
[+] marked option can be specified multiple times
roll back the last transaction (DANGEROUS) (DEPRECATED):
hg rollback
Please usehg commit--amend instead of rollback to correctmistakes in the last commit.
This command should be used with care. There is only one level ofrollback, and there is no way to undo a rollback. It will alsorestore the dirstate at the time of the last transaction, losingany dirstate changes since that time. This command does not alterthe working directory.
Transactions are used to encapsulate the effects of all commandsthat create new changesets or propagate existing changesets into arepository.
For example, the following commands are transactional, and theireffects can be rolled back:
To avoid permanent data loss, rollback will refuse to rollback acommit transaction if it isn't checked out. Use --force tooverride this protection.
The rollback command can be entirely disabled by setting theui.rollback configuration setting to false. If you're herebecause you want to use rollback and it's disabled, you canre-enable the command by settingui.rollback to true.
This command is not intended for use on public repositories. Oncechanges are visible for pull by other users, rolling a transactionback locally is ineffective (someone else may already have pulledthe changes). Furthermore, a race is possible with readers of therepository; for example an in-progress pull from the repositorymay fail if a rollback is performed.
Returns 0 on success, 1 if no rollback data is available.
Options:
| -n,--dry-run | do not perform actions, just print output |
| -f,--force | ignore safety measures |
print the root (top) of the current working directory:
hg root
Print the root directory of the current repository.
Returns 0 on success.
start stand-alone webserver:
hg serve [OPTION]...
Start a local HTTP repository browser and pull server. You can usethis for ad-hoc sharing and browsing of repositories. It isrecommended to use a real web server to serve a repository forlonger periods of time.
Please note that the server does not implement access control.This means that, by default, anybody can read from the server andnobody can write to it by default. Set theweb.allow_pushoption to* to allow everybody to push to the server. Youshould use a real web server if you need to authenticate users.
By default, the server logs accesses to stdout and errors tostderr. Use the -A/--accesslog and -E/--errorlog options to log tofiles.
To have the server choose a free port number to listen on, specifya port number of 0; in this case, the server will print the portnumber it uses.
Returns 0 on success.
Options:
| -A,--accesslog<FILE> | |
| name of access log file to write to | |
| -d,--daemon | run server in background |
| --daemon-postexec<VALUE[+]> | |
| used internally by daemon mode | |
| -E,--errorlog<FILE> | |
| name of error log file to write to | |
| -p,--port<PORT> | |
| port to listen on (default: 8000) | |
| -a,--address<ADDR> | |
| address to listen on (default: all interfaces) | |
| --prefix<PREFIX> | |
| prefix path to serve from (default: server root) | |
| -n,--name<NAME> | |
| name to show in web pages (default: working directory) | |
| --web-conf<FILE> | |
| name of the hgweb config file (see 'hg help hgweb') | |
| --webdir-conf<FILE> | |
| name of the hgweb config file (DEPRECATED) | |
| --pid-file<FILE> | |
| name of file to write process ID to | |
| --stdio | for remote clients |
| --cmdserver<MODE> | |
| for remote clients | |
| -t,--templates<TEMPLATE> | |
| web templates to use | |
| --style<STYLE> | |
| template style to use | |
| -6,--ipv6 | use IPv6 in addition to IPv4 |
| --certificate<FILE> | |
| SSL certificate file | |
[+] marked option can be specified multiple times
show changed files in the working directory:
hg status [OPTION]... [FILE]...
Show status of files in the repository. If names are given, onlyfiles that match are shown. Files that are clean or ignored orthe source of a copy/move operation, are not listed unless-c/--clean, -i/--ignored, -C/--copies or -A/--all are given.Unless options described with "show only ..." are given, theoptions -mardu are used.
Option -q/--quiet hides untracked (unknown and ignored) filesunless explicitly requested with -u/--unknown or -i/--ignored.
Note
hg status may appear to disagree with diff if permissions havechanged or a merge has occurred. The standard diff format doesnot report permission changes and diff only reports changesrelative to one merge parent.
If one revision is given, it is used as the base revision.If two revisions are given, the differences between them areshown. The --change option can also be used as a shortcut to listthe changed files of a revision from its first parent.
The codes used to show the status of files are:
M = modifiedA = addedR = removedC = clean! = missing (deleted by non-hg command, but still tracked)? = not trackedI = ignored = origin of the previous file (with --copies)
Examples:
show changes in the working directory relative to achangeset:
hg status --rev 9353
show changes in the working directory relative to thecurrent directory (seehg help patterns for more information):
hg status re:
show all changes including copies in an existing changeset:
hg status --copies --change 9353
get a NUL separated list of added files, suitable for xargs:
hg status -an0
Returns 0 on success.
Options:
| -A,--all | show status of all files |
| -m,--modified | show only modified files |
| -a,--added | show only added files |
| -r,--removed | show only removed files |
| -d,--deleted | show only deleted (but tracked) files |
| -c,--clean | show only files without changes |
| -u,--unknown | show only unknown (not tracked) files |
| -i,--ignored | show only ignored files |
| -n,--no-status | |
| hide status prefix | |
| -C,--copies | show source of copied files |
| -0,--print0 | end filenames with NUL, for use with xargs |
| --rev<REV[+]> | show difference from revision |
| --change<REV> | list the changed files of a revision |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -S,--subrepos | recurse into subrepositories |
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
[+] marked option can be specified multiple times
aliases: st
summarize working directory state:
hg summary [--remote]
This generates a brief summary of the working directory state,including parents, branch, commit status, phase and available updates.
With the --remote option, this will check the default paths forincoming and outgoing changes. This can be time-consuming.
Returns 0 on success.
Options:
| --remote | check for push and pull aliases: sum |
add one or more tags for the current or given revision:
hg tag [-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...
Name a particular revision using <name>.
Tags are used to name particular revisions of the repository and arevery useful to compare different revisions, to go back to significantearlier versions or to mark branch points as releases, etc. Changingan existing tag is normally disallowed; use -f/--force to override.
If no revision is given, the parent of the working directory isused.
To facilitate version control, distribution, and merging of tags,they are stored as a file named ".hgtags" which is managed similarlyto other project files and can be hand-edited if necessary. Thisalso means that tagging creates a new commit. The file".hg/localtags" is used for local tags (not shared amongrepositories).
Tag commits are usually made at the head of a branch. If the parentof the working directory is not a branch head,hg tag aborts; use-f/--force to force the tag commit to be based on a non-headchangeset.
Seehg help dates for a list of formats valid for -d/--date.
Since tag names have priority over branch names during revisionlookup, using an existing branch name as a tag name is discouraged.
Returns 0 on success.
Options:
| -f,--force | force tag |
| -l,--local | make the tag local |
| -r,--rev<REV> | |
| revision to tag | |
| --remove | remove a tag |
| -e,--edit | invoke editor on commit messages |
| -m,--message<TEXT> | |
| use text as commit message | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
list repository tags:
hg tags
This lists both regular and local tags. When the -v/--verboseswitch is used, a third column "local" is printed for local tags.When the -q/--quiet switch is used, only the tag name is printed.
Returns 0 on success.
Options:
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
show the tip revision (DEPRECATED):
hg tip [-p] [-g]
The tip revision (usually just called the tip) is the changesetmost recently added to the repository (and therefore the mostrecently changed head).
If you have just made a commit, that commit will be the tip. Ifyou have just pulled changes from another repository, the tip ofthat repository becomes the current tip. The "tip" tag is specialand cannot be renamed or assigned to a different changeset.
This command is deprecated, please usehg heads instead.
Returns 0 on success.
Options:
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
apply one or more changegroup files:
hg unbundle [-u] FILE...
Apply one or more compressed changegroup files generated by thebundle command.
Returns 0 on success, 1 if an update has unresolved files.
Options:
| -u,--update | update to new branch head if changesets were unbundled |
update working directory (or switch revisions):
hg update [-c] [-C] [-d DATE] [[-r] REV]
Update the repository's working directory to the specifiedchangeset. If no changeset is specified, update to the tip of thecurrent named branch and move the active bookmark (seehg helpbookmarks).
Update sets the working directory's parent revision to the specifiedchangeset (seehg help parents).
If the changeset is not a descendant or ancestor of the workingdirectory's parent, the update is aborted. With the -c/--checkoption, the working directory is checked for uncommitted changes; ifnone are found, the working directory is updated to the specifiedchangeset.
The following rules apply when the working directory containsuncommitted changes:
To cancel an uncommitted merge (and lose your changes), usehg update--clean ..
Use null as the changeset to remove the working directory (likehg clone-U).
If you want to revert just one file to an older revision, usehg revert[-r REV] NAME.
Seehg help dates for a list of formats valid for -d/--date.
Returns 0 on success, 1 if there are unresolved files.
Options:
| -C,--clean | discard uncommitted changes (no backup) |
| -c,--check | require clean working directory |
| -d,--date<DATE> | |
| tipmost revision matching date | |
| -r,--rev<REV> | |
| revision | |
| -t,--tool<VALUE> | |
specify merge tool aliases: up checkout co | |
verify the integrity of the repository:
hg verify
Verify the integrity of the current repository.
This will perform an extensive check of the repository'sintegrity, validating the hashes and checksums of each entry inthe changelog, manifest, and tracked files, as well as theintegrity of their crosslinks and indices.
Please seehttps://mercurial-scm.org/wiki/RepositoryCorruptionfor more information about recovery from corruption of therepository.
Returns 0 on success, 1 if errors are encountered.
output version and copyright information:
hg version
output version and copyright information
Options:
| -T,--template<TEMPLATE> | |
| display with template (EXPERIMENTAL) | |
Some commands allow the user to specify a date, e.g.:
Many date formats are valid. Here are some examples:
Lastly, there is Mercurial's internal format:
This is the internal representation format for dates. The first numberis the number of seconds since the epoch (1970-01-01 00:00 UTC). Thesecond is the offset of the local timezone, in seconds west of UTC(negative if the timezone is east of UTC).
The log command also accepts date ranges:
Mercurial's default format for showing changes between two versions ofa file is compatible with the unified format of GNU diff, which can beused by GNU patch and many other standard tools.
While this standard format is often enough, it does not encode thefollowing information:
Mercurial also supports the extended diff format from the git VCSwhich addresses these limitations. The git diff format is not producedby default because a few widespread tools still do not understand thisformat.
This means that when generating diffs from a Mercurial repository(e.g. withhg export), you should be careful about things like filecopies and renames or other things mentioned above, because whenapplying a standard diff to a different repository, this extrainformation is lost. Mercurial's internal operations (like push andpull) are not affected by this, because they use an internal binaryformat for communicating changes.
To make Mercurial produce the git extended diff format, use the --gitoption available for many commands, or set 'git = True' in the [diff]section of your configuration file. You do not need to set this optionwhen importing diffs in this format or using them in the mq extension.
This is the name of the editor to run when committing. See EDITOR.
(deprecated, use configuration file)
An executable to use for resolving merge conflicts. The programwill be executed with three arguments: local file, remote file,ancestor file.
(deprecated, use configuration file)
A list of files or directories to search for configurationfiles. Item separator is ":" on Unix, ";" on Windows. If HGRCPATHis not set, platform default search path is used. If empty, onlythe .hg/hgrc from the current repository is read.
For each element in HGRCPATH:
When set, this disables any configuration settings that mightchange Mercurial's default output. This includes encoding,defaults, verbose mode, debug mode, quiet mode, tracebacks, andlocalization. This can be useful when scripting against Mercurialin the face of existing user configuration.
Equivalent options set via command line flags or environmentvariables are not overridden.
This is a comma-separated list of features to preserve whenHGPLAIN is enabled. Currently the following values are supported:
Setting HGPLAINEXCEPT to anything (even an empty string) willenable plain mode.
This is the string used as the author of a commit. If not set,available values will be considered in this order:
(deprecated, use configuration file)
Mercurial has the ability to add new features through the use ofextensions. Extensions may add new commands, add options toexisting commands, change the default behavior of commands, orimplement hooks.
To enable the "foo" extension, either shipped with Mercurial or in thePython search path, create an entry for it in your configuration file,like this:
[extensions]foo =
You may also specify the full path to an extension:
[extensions]myfeature = ~/.hgext/myfeature.py
Seehg help config for more information on configuration files.
Extensions are not loaded by default for a variety of reasons:they can increase startup overhead; they may be meant for advancedusage only; they may provide potentially dangerous abilities (suchas letting you destroy or modify history); they might not be readyfor prime time; or they may alter some usual behaviors of stockMercurial. It is thus up to the user to activate extensions asneeded.
To explicitly disable an extension enabled in a configuration file ofbroader scope, prepend its path with !:
[extensions]# disabling extension bar residing in /path/to/extension/bar.pybar = !/path/to/extension/bar.py# ditto, but no path was supplied for extension bazbaz = !
disabled extensions:
acl: hooks for controlling repository access blackbox: log repository events to a blackbox for debugging bugzilla: hooks for integrating with the Bugzilla bug tracker censor: erase file content at a given revision churn: command to display statistics about repository history clonebundles: advertise pre-generated bundles to seed clones color: colorize output from some commands convert: import revisions from foreign VCS repositories into Mercurial eol: automatically manage newlines in repository files extdiff: command to allow external programs to compare revisions factotum: http authentication with factotum gpg: commands to sign and verify changesets hgk: browse the repository in a graphical way highlight: syntax highlighting for hgweb (requires Pygments) histedit: interactive history editing keyword: expand keywords in tracked files largefiles: track large binary files mq: manage a stack of patches notify: hooks for sending email push notifications pager: browse command output with an external pager patchbomb: command to send changesets as (a series of) patch emails purge: command to delete untracked files from the working directory rebase: command to move sets of revisions to a different ancestor relink: recreates hardlinks between repository clones schemes: extend schemes with shortcuts to repository swarms share: share a common history between several working directories shelve: save and restore changes to the working directory strip: strip changesets and their descendants from history transplant: command to transplant changesets from another branch win32mbcs: allow the use of MBCS paths with problematic encodings zeroconf: discover and advertise repositories on the local network
Mercurial supports a functional language for selecting a set offiles.
Like other file patterns, this pattern type is indicated by a prefix,'set:'. The language supports a number of predicates which are joinedby infix operators. Parenthesis can be used for grouping.
Identifiers such as filenames or patterns must be quoted with singleor double quotes if they contain characters outside of[.*{}[]?/\_a-zA-Z0-9\x80-\xff] or if they match one of thepredefined predicates. This generally applies to file patterns otherthan globs and arguments for predicates.
Special characters can be used in quoted identifiers by escaping them,e.g.,\n is interpreted as a newline. To prevent them from beinginterpreted, strings can be prefixed withr, e.g.r'...'.
There is a single prefix operator:
These are the supported infix operators:
The following predicates are supported:
File size matches the given expression. Examples:
Some sample queries:
Show status of files that appear to be binary in the working directory:
hg status -A "set:binary()"
Forget files that are in .hgignore but are already tracked:
hg forget "set:hgignore() and not ignored()"
Find text files that contain a string:
hg files "set:grep(magic) and not binary()"
Find C files in a non-standard encoding:
hg files "set:**.c and not encoding('UTF-8')"Revert copies of large binary files:
hg revert "set:copied() and binary() and size('>1M')"Remove files listed in foo.lst that contain the letter a or b:
hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
See alsohg help patterns.
Bookmarks are pointers to certain commits that move whencommitting. They are similar to tags in that it is possible to usebookmark names in all places where Mercurial expects a changesetID, e.g., withhg update. Unlike tags, bookmarks move alongwhen you make a commit.
Bookmarks can be renamed, copied and deleted. Bookmarks are local,unless they are explicitly pushed or pulled between repositories.Pushing and pulling bookmarks allow you to collaborate with otherson a branch without creating a named branch.
(Noun) A child changeset that has been created from a parent thatis not a head. These are known as topological branches, see'Branch, topological'. If a topological branch is named, it becomesa named branch. If a topological branch is not named, it becomesan anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
Branches may be created when changes are pulled from or pushed toa remote repository, since new heads may be created by theseoperations. Note that the term branch can also be used informallyto describe a development process in which certain development isdone independently of other development. This is sometimes doneexplicitly with a named branch, but it can also be done locally,using bookmarks or clones and anonymous branches.
Example: "The experimental branch."
(Verb) The action of creating a child changeset which results inits parent having more than one child.
Example: "I'm going to branch at X."
If a named branch has no topological heads, it is considered to beinactive. As an example, a feature branch becomes inactive when itis merged into the default branch. Thehg branches commandshows inactive branches by default, though they can be hidden withhg branches--active.
NOTE: this concept is deprecated because it is too implicit.Branches should now be explicitly closed usinghg commit--close-branch when they are no longer needed.
A collection of changesets which have the same branch name. Bydefault, children of a changeset in a named branch belong to thesame named branch. A child can be explicitly assigned to adifferent branch. Seehg help branch,hg help branches andhg commit--close-branch for more information on managingbranches.
Named branches can be thought of as a kind of namespace, dividingthe collection of changesets that comprise the repository into acollection of disjoint subsets. A named branch is not necessarilya topological branch. If a new named branch is created from thehead of another named branch, or the default branch, but nofurther changesets are added to that previous branch, then thatprevious branch will be a branch in name only.
(Noun) The working directory being updated to a specificrevision. This use should probably be avoided where possible, aschangeset is much more appropriate than checkout in this context.
Example: "I'm using checkout X."
(Verb) Updating the working directory to a specific changeset. Seehg help update.
Example: "I'm going to check out changeset X."
(Noun) An entire or partial copy of a repository. The partialclone must be in the form of a revision and its ancestors.
Example: "Is your clone up to date?"
(Verb) The process of creating a clone, usinghg clone.
Example: "I'm going to clone the repository."
(Noun) A synonym for changeset.
Example: "Is the bug fixed in your recent commit?"
(Verb) The act of recording changes to a repository. When filesare committed in a working directory, Mercurial finds thedifferences between the committed files and their parentchangeset, creating a new changeset in the repository.
Example: "You should commit those changes now."
(Noun) The difference between the contents and attributes of filesin two changesets or a changeset and the current workingdirectory. The difference is usually represented in a standardform called a "diff" or "patch". The "git diff" format is usedwhen the changes include copies, renames, or changes to fileattributes, none of which can be represented/handled by classic"diff" and "patch".
Example: "Did you see my correction in the diff?"
(Verb) Diffing two changesets is the action of creating a diff orpatch.
Example: "If you diff with changeset X, you will see what I mean."
The term 'head' may be used to refer to both a branch head or arepository head, depending on the context. See 'Head, branch' and'Head, repository' for specific definitions.
Heads are where development generally takes place and are theusual targets for update and merge operations.
A changeset that marks a head as no longer interesting. The closedhead is no longer listed byhg heads. A branch is consideredclosed when all its heads are closed and consequently is notlisted byhg branches.
Closed heads can be re-opened by committing new changeset as thechild of the changeset that marks a head as closed.
(Noun) The product of a diff operation.
Example: "I've sent you my patch."
(Verb) The process of using a patch file to transform onechangeset into another.
Example: "You will need to patch that revision."
(Noun) Another synonym of changeset.
Example: "I've pushed an update."
(Verb) This term is usually used to describe updating the state ofthe working directory to that of a specific changeset. Seehg help update.
Example: "You should update."
The Mercurial system uses a file called.hgignore in the rootdirectory of a repository to control its behavior when it searchesfor files that it is not currently tracking.
The working directory of a Mercurial repository will often containfiles that should not be tracked by Mercurial. These include backupfiles created by editors and build products created by compilers.These files can be ignored by listing them in a.hgignore file inthe root of the working directory. The.hgignore file must becreated manually. It is typically put under version control, so thatthe settings will propagate to other repositories with push and pull.
An untracked file is ignored if its path relative to the repositoryroot directory, or any prefix path of that path, is matched againstany pattern in.hgignore.
For example, say we have an untracked file,file.c, ata/b/file.c inside our repository. Mercurial will ignorefile.cif any pattern in.hgignore matchesa/b/file.c,a/b ora.
In addition, a Mercurial configuration file can reference a set ofper-user or global ignore files. See theignore configurationkey on the[ui] section ofhg help config for details of how toconfigure these files.
To control Mercurial's handling of files that it manages, manycommands support the-I and-X options; seehg help <command> andhg help patterns for details.
Files that are already tracked are not affected by .hgignore, evenif they appear in .hgignore. An untracked file X can be explicitlyadded withhg add X, even if X would be excluded by a patternin .hgignore.
An ignore file is a plain text file consisting of a list of patterns,with one pattern per line. Empty lines are skipped. The#character is treated as a comment character, and the\ characteris treated as an escape character.
Mercurial supports several pattern syntaxes. The default syntax usedis Python/Perl-style regular expressions.
To change the syntax used, use a line of the following form:
syntax: NAME
whereNAME is one of the following:
The chosen syntax stays in effect when parsing all patterns thatfollow, until another syntax is selected.
Neither glob nor regexp patterns are rooted. A glob-syntax pattern ofthe form*.c will match a file ending in.c in any directory,and a regexp pattern of the form\.c$ will do the same. To root aregexp pattern, start it with^.
Subdirectories can have their own .hgignore settings by addingsubinclude:path/to/subdir/.hgignore to the root.hgignore. Seehg help patterns for details onsubinclude: andinclude:.
Note
Patterns specified in other than.hgignore are always rooted.Please seehg help patterns for details.
Here is an example ignore file.
# use glob syntax.syntax: glob*.elc*.pyc*~# switch to regexp syntax.syntax: regexp^\.pc/
Mercurial's internal web server, hgweb, can serve either a singlerepository, or a tree of repositories. In the second case, repositorypaths and global options can be defined using a dedicatedconfiguration file common tohg serve,hgweb.wsgi,hgweb.cgi andhgweb.fcgi.
This file uses the same syntax as other Mercurial configuration filesbut recognizes only the following sections:
- web
- paths
- collections
Theweb options are thoroughly described inhg help config.
Thepaths section maps URL paths to paths of repositories in thefilesystem. hgweb will not expose the filesystem directly - onlyMercurial repositories can be published and only according to theconfiguration.
The left hand side is the path in the URL. Note that hgweb reservessubpaths likerev orfile, try using different names fornested repositories to avoid confusing effects.
The right hand side is the path in the filesystem. If the specifiedpath ends with* or** the filesystem will be searchedrecursively for repositories below that point.With* it will not recurse into the repositories it finds (except for.hg/patches).With** it will also search inside repository working directoriesand possibly find subrepositories.
In this example:
[paths]/projects/a = /srv/tmprepos/a/projects/b = c:/repos/b/ = /srv/repos/*/user/bob = /home/bob/repos/**
Thecollections section is deprecated and has been superseded bypaths.
URLs under each repository have the form/{command}[/{arguments}]where{command} represents the name of a command or handler and{arguments} represents any number of additional URL parametersto that command.
The web server has a default style associated with it. Styles map toa collection of named templates. Each template is used to render aspecific piece of data, such as a changeset or diff.
The style for the current request can be overwritten two ways. First,if{command} contains a hyphen (-), the text before the hyphendefines the style. For example,/atom-log will render thelogcommand handler with theatom style. The second way to set thestyle is with thestyle query string argument. For example,/log?style=atom. The hyphenated URL parameter is preferred.
Not all templates are available for all styles. Attempting to usea style that doesn't have all templates defined may result in an errorrendering the page.
Many commands take a{revision} URL parameter. This defines thechangeset to operate on. This is commonly specified as the short,12 digit hexadecimal abbreviation for the full 40 character uniquerevision identifier. However, any value described byhg help revisions typically works.
The following web commands and their URLs are available:
Show changeset information for each line in a file.
Thefileannotate template is rendered.
Obtain an archive of repository content.
The content and type of the archive is defined by a URL path parameter.format is the file extension of the archive type to be generated. e.g.zip ortar.bz2. Not all archive types may be allowed by yourserver configuration.
The optionalpath URL parameter controls content to include in thearchive. If omitted, every file in the specified revision is present in thearchive. If included, only the specified file or contents of the specifieddirectory will be included in the archive.
No template is used for this handler. Raw, binary content is generated.
Show information about bookmarks.
No arguments are accepted.
Thebookmarks template is rendered.
Show information about branches.
All known branches are contained in the output, even closed branches.
No arguments are accepted.
Thebranches template is rendered.
Show information about multiple changesets.
If the optionalrevision URL argument is absent, information aboutall changesets starting attip will be rendered. If therevisionargument is present, changesets will be shown starting from the specifiedrevision.
Ifrevision is absent, therev query string argument may bedefined. This will perform a search for changesets.
The argument forrev can be a single revision, a revision set,or a literal keyword to search for in changeset data (equivalent tohg log-k).
Therevcount query string argument defines the maximum numbers ofchangesets to render.
For non-searches, thechangelog template will be rendered.
Show information about a single changeset.
A URL path argument is the changeset identifier to show. Seehg helprevisions for possible values. If not defined, thetip changesetwill be shown.
Thechangeset template is rendered. Contents of thechangesettag,changesetbookmark,filenodelink,filenolink, and the manytemplates related to diffs may all be used to produce the output.
Show a comparison between the old and new versions of a file from changesmade on a particular revision.
This is similar to thediff handler. However, this form featuresa split or side-by-side diff rather than a unified diff.
Thecontext query string argument can be used to control the lines ofcontext in the diff.
Thefilecomparison template is rendered.
Show how a file changed in a particular commit.
Thefilediff template is rendered.
This handler is registered under both the/diff and/filediffpaths./diff is used in modern code.
Show information about a directory or file in the repository.
Info about thepath given as a URL parameter will be rendered.
Ifpath is a directory, information about the entries in thatdirectory will be rendered. This form is equivalent to themanifesthandler.
Ifpath is a file, information about that file will be shown viathefilerevision template.
Ifpath is not defined, information about the root directory willbe rendered.
Show how a file changed in a particular commit.
Thefilediff template is rendered.
This handler is registered under both the/diff and/filediffpaths./diff is used in modern code.
Show information about the history of a file in the repository.
Therevcount query string argument can be defined to control themaximum number of entries to show.
Thefilelog template will be rendered.
Show information about the graphical topology of the repository.
Information rendered by this handler can be used to create visualrepresentations of repository topology.
Therevision URL parameter controls the starting changeset.
Therevcount query string argument can define the number of changesetsto show information for.
This handler will render thegraph template.
Render help documentation.
This web command is roughly equivalent tohg help. If atopicis defined, that help topic will be rendered. If not, an index ofavailable help topics will be rendered.
Thehelp template will be rendered when requesting help for a topic.helptopics will be rendered for the index of help topics.
Show repository or file history.
For URLs of the form/log/{revision}, a list of changesets starting atthe specified changeset identifier is shown. If{revision} is notdefined, the default istip. This form is equivalent to thechangelog handler.
For URLs of the form/log/{revision}/{file}, the history for a specificfile will be shown. This form is equivalent to thefilelog handler.
Show information about a directory.
If the URL path arguments are omitted, information about the rootdirectory for thetip changeset will be shown.
Because this handler can only show information for directories, itis recommended to use thefile handler instead, as it can handle bothdirectories and files.
Themanifest template will be rendered for this handler.
Show information about a single changeset.
A URL path argument is the changeset identifier to show. Seehg helprevisions for possible values. If not defined, thetip changesetwill be shown.
Thechangeset template is rendered. Contents of thechangesettag,changesetbookmark,filenodelink,filenolink, and the manytemplates related to diffs may all be used to produce the output.
Show basic information about a set of changesets.
This accepts the same parameters as thechangelog handler. The onlydifference is theshortlog template will be rendered instead of thechangelog template.
Show a summary of repository state.
Information about the latest changesets, bookmarks, tags, and branchesis captured by this handler.
Thesummary template is rendered.
Show information about tags.
No arguments are accepted.
Thetags template is rendered.
bundles: Bundles changegroups: Changegroups requirements: Repository Requirements revlogs: Revision Logs wireprotocol: Wire Protocol
To merge files Mercurial uses merge tools.
A merge tool combines two different versions of a file into a mergedfile. Merge tools are given the two files and the greatest commonancestor of the two file versions, so they can determine the changesmade on both branches.
Merge tools are used both forhg resolve,hg merge,hg update,hg backout and in several extensions.
Usually, the merge tool tries to automatically reconcile the files bycombining all non-overlapping changes that occurred separately inthe two different evolutions of the same initial base file. Furthermore, someinteractive merge programs make it easier to manually resolveconflicting merges, either in a graphical way, or by inserting someconflict markers. Mercurial does not include any interactive mergeprograms but relies on external tools for that.
External merge tools and their properties are configured in themerge-tools configuration section - see hgrc(5) - but they can often justbe named by their executable.
A merge tool is generally usable if its executable can be found on thesystem and if it can handle the merge. The executable is found if itis an absolute or relative executable path or the name of anapplication in the executable search path. The tool is assumed to beable to handle the merge if it can handle symlinks if the file is asymlink, if it can handle binary files if the file is binary, and if aGUI is available if the tool requires a GUI.
There are some internal merge tools which can be used. The internalmerge tools are:
Internal tools are always available and do not require a GUI but will by defaultnot handle symlinks or binary files.
Mercurial uses these rules when deciding which merge tool to use:
Note
After selecting a merge program, Mercurial will by default attemptto merge the files using a simple merge algorithm first. Only if it doesn'tsucceed because of conflicting changes Mercurial will actually execute themerge program. Whether to use the simple merge algorithm first can becontrolled by the premerge setting of the merge tool. Premerge is enabled bydefault unless the file is binary or a symlink.
See the merge-tools and ui sections of hgrc(5) for details on theconfiguration of merge tools.
When Mercurial accepts more than one revision, they may be specifiedindividually, or provided as a topologically continuous range,separated by the ":" character.
The syntax of range notation is [BEGIN]:[END], where BEGIN and END arerevision identifiers. Both BEGIN and END are optional. If BEGIN is notspecified, it defaults to revision number 0. If END is not specified,it defaults to the tip. The range ":" thus means "all revisions".
If BEGIN is greater than END, revisions are treated in reverse order.
A range acts as a closed interval. This means that a range of 3:5gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
Mercurial accepts several notations for identifying one or more filesat a time.
By default, Mercurial treats filenames as shell-style extended globpatterns.
Alternate pattern notations must be specified explicitly.
Note
Patterns specified in.hgignore are not rooted.Please seehg help hgignore for details.
To use a plain path name without any pattern matching, start it withpath:. These path names must completely match starting at thecurrent repository root.
To use an extended glob, start a name withglob:. Globs are rootedat the current directory; a glob such as*.c will only match filesin the current directory ending with.c.
The supported glob syntax extensions are** to match any stringacross path separators and{a,b} to mean "a or b".
To use a Perl/Python regular expression, start a name withre:.Regexp pattern matching is anchored at the root of the repository.
To read name patterns from a file, uselistfile: orlistfile0:.The latter expects null delimited patterns while the former expects linefeeds. Each string read from the file is itself treated as a filepattern.
To read a set of patterns from a file, useinclude: orsubinclude:.include: will use all the patterns from the given file and treat them as ifthey had been passed in manually.subinclude: will only apply the patternsagainst files that are under the subinclude file's directory. Seehg helphgignore for details on the format of these files.
All patterns, except forglob: specified in command line (not for-I or-X options), can match also against directories: filesunder matched directories are treated as matched.
Plain examples:
path:foo/bar a name bar in a directory named foo in the root of the repositorypath:path:name a file or directory named "path:name"
Glob examples:
glob:*.c any name ending in ".c" in the current directory*.c any name ending in ".c" in the current directory**.c any name ending in ".c" in any subdirectory of the current directory including itself.foo/*.c any name ending in ".c" in the directory foofoo/**.c any name ending in ".c" in any subdirectory of foo including itself.
Regexp examples:
re:.*\.c$ any name ending in ".c", anywhere in the repository
File examples:
listfile:list.txt read list from list.txt with one file pattern per linelistfile0:list.txt read list from list.txt with null byte delimiters
See alsohg help filesets.
Include examples:
include:path/to/mypatternfile reads patterns to be applied to all pathssubinclude:path/to/subignorefile reads patterns specifically for paths in the subdirectory
Phases are a system for tracking which changesets have been or shouldbe shared. This helps prevent common mistakes when modifying history(for instance, with the mq or rebase extensions).
Each changeset in a repository is in one of the following phases:
- public : changeset is visible on a public server
- draft : changeset is not yet published
- secret : changeset should not be pushed, pulled, or cloned
These phases are ordered (public < draft < secret) and no changesetcan be in a lower phase than its ancestors. For instance, if achangeset is public, all its ancestors are also public. Lastly,changeset phases should only be changed towards the public phase.
For the most part, phases should work transparently. By default, achangeset is created in the draft phase and is moved into the publicphase when it is pushed to another repository.
Once changesets become public, extensions like mq and rebase willrefuse to operate on them to prevent creating duplicate changesets.Phases can also be manually manipulated with thehg phase commandif needed. Seehg help-v phase for examples.
To make yours commits secret by default, put this in yourconfiguration file:
[phases]new-commit = secret
Normally, all servers arepublishing by default. This means:
- all draft changesets that are pulled or cloned appear in phasepublic on the client- all draft changesets that are pushed appear as public on bothclient and server- secret changesets are neither pushed, pulled, or cloned
Note
Pulling a draft changeset from a publishing server does not mark itas public on the server side due to the read-only nature of pull.
Sometimes it may be desirable to push and pull changesets in the draftphase to share unfinished work. This can be done by setting arepository to disable publishing in its configuration file:
[phases]publish = False
Seehg help config for more information on configuration files.
Note
Servers running older versions of Mercurial are treated aspublishing.
Note
Changesets in secret phase are not exchanged with the server. Thisapplies to their content: file names, file contents, and changesetmetadata. For technical reasons, the identifier (e.g. d825e4025e39)of the secret changeset may be communicated to the server.
list changesets in draft or secret phase:
hg log -r "not public()"change all secret changesets to draft:
hg phase --draft "secret()"forcibly move the current changeset and descendants from public to draft:
hg phase --force --draft .show a list of changeset revision and phase:
hg log --template "{rev} {phase}\n"resynchronize draft changesets relative to a remote repository:
hg phase -fd "outgoing(URL)"
Seehg help phase for more information on manually manipulating phases.
Mercurial supports several ways to specify individual revisions.
A plain integer is treated as a revision number. Negative integers aretreated as sequential offsets from the tip, with -1 denoting the tip,-2 denoting the revision prior to the tip, and so forth.
A 40-digit hexadecimal string is treated as a unique revisionidentifier.
A hexadecimal string less than 40 characters long is treated as aunique revision identifier and is referred to as a short-formidentifier. A short-form identifier is only valid if it is the prefixof exactly one full-length identifier.
Any other string is treated as a bookmark, tag, or branch name. Abookmark is a movable pointer to a revision. A tag is a permanent nameassociated with a revision. A branch name denotes the tipmost open branch headof that branch - or if they are all closed, the tipmost closed head of thebranch. Bookmark, tag, and branch names must not contain the ":" character.
The reserved name "tip" always identifies the most recent revision.
The reserved name "null" indicates the null revision. This is therevision of an empty repository, and the parent of revision 0.
The reserved name "." indicates the working directory parent. If noworking directory is checked out, it is equivalent to null. If anuncommitted merge is in progress, "." is the revision of the firstparent.
Mercurial supports a functional language for selecting a set ofrevisions.
The language supports a number of predicates which are joined by infixoperators. Parenthesis can be used for grouping.
Identifiers such as branch names may need quoting with single ordouble quotes if they contain characters like- or if they matchone of the predefined predicates.
Special characters can be used in quoted identifiers by escaping them,e.g.,\n is interpreted as a newline. To prevent them from beinginterpreted, strings can be prefixed withr, e.g.r'...'.
There is a single prefix operator:
These are the supported infix operators:
A DAG range, meaning all changesets that are descendants of x andancestors of y, including x and y themselves. If the first endpointis left out, this is equivalent toancestors(y), if the secondis left out it is equivalent todescendants(x).
An alternative syntax isx..y.
Concatenate strings and identifiers into one string.
All other prefix, infix and postfix operators have lower priority than##. For example,a1 ## a2~2 is equivalent to(a1 ##a2)~2.
For example:
[revsetalias]issue(a1) = grep(r'\bissue[ :]?' ## a1 ## r'\b|\bbug\(' ## a1 ## r'\)')``issue(1234)`` is equivalent to``grep(r'\bissue[ :]?1234\b|\bbug\(1234\)')``in this case. This matches against all of "issue 1234", "issue:1234","issue1234" and "bug(1234)".There is a single postfix operator:
The following predicates are supported:
Changesets that add a file matching pattern.
The pattern without explicit kind likeglob: is expected to berelative to the current directory and match against a file or adirectory.
A greatest common ancestor of the changesets.
Accepts 0 or more changesets.Will return empty list when passed no args.Greatest common ancestor of a single changeset is that changeset.
Changesets marked in the specified bisect status:
The named bookmark or all bookmarks.
Ifname starts withre:, the remainder of the name is treated asa regular expression. To match a bookmark that actually starts withre:,use the prefixliteral:.
All changesets belonging to the given branch or the branches of the givenchangesets.
Ifstring starts withre:, the remainder of the name is treated asa regular expression. To match a branch that actually starts withre:,use the prefixliteral:.
Mutable changesets marked as successors of public changesets.
Only non-public and non-obsolete changesets can bebumped.
Changesets in the bundle.
Bundle must be specified by the -R option.
The revision's manifest contains a file matching pattern (but might notmodify it). Seehg help patterns for information about file patterns.
The pattern without explicit kind likeglob: is expected to berelative to the current directory and match against a file exactlyfor efficiency.
Changesets with the given label in the extra metadata, with the givenoptional value.
Ifvalue starts withre:, the remainder of the value is treated asa regular expression. To match a value that actually starts withre:,use the prefixliteral:.
Changesets affecting files matched by pattern.
For a faster but less accurate result, consider usingfilelog()instead.
This predicate usesglob: as the default kind of pattern.
Changesets connected to the specified filelog.
For performance reasons, visits only revisions mentioned in the file-levelfilelog, rather than filtering through all changesets (much faster, butdoesn't include deletes or duplicate changes). For a slower, more accurateresult, usefile().
The pattern without explicit kind likeglob: is expected to berelative to the current directory and match against a file exactlyfor efficiency.
If some linkrev points to revisions filtered by the current repoview, we'llwork around it to return a non-filtered value.
Changesets in which a given set of fields match the set of fields in theselected revision or set.
To match more than one field pass the list of fields to match separatedby spaces (e.g.author description).
Valid fields are most regular revision fields and some special fields.
Regular revision fields aredescription,author,branch,date,files,phase,parents,substate,useranddiff.Note thatauthor anduser are synonyms.diff refers to thecontents of the revision. Two revisions matching theirdiff willalso match theirfiles.
Special fields aresummary andmetadata:summary matches the first line of the description.metadata is equivalent to matchingdescription user date(i.e. it matches the main metadata fields).
metadata is the default field which is used when no fields arespecified. You can match more than one field at a time.
Changesets modifying files matched by pattern.
The pattern without explicit kind likeglob: is expected to berelative to the current directory and match against a file or adirectory.
The changesets in a given namespace.
Ifnamespace starts withre:, the remainder of the string is treated asa regular expression. To match a namespace that actually starts withre:,use the prefixliteral:.
An empty set, if any revision in set isn't found; otherwise,all revisions in set.
If any of specified revisions is not present in the local repository,the query is normally aborted. But this predicate allows the queryto continue even in such cases.
Changesets which remove files matching pattern.
The pattern without explicit kind likeglob: is expected to berelative to the current directory and match against a file or adirectory.
Sort set by keys. The default sort order is ascending, specify a keyas-key to sort in descending order.
The keys can be:
Thetopo sort order cannot be combined with other sort keys. This sorttakes one optional argument,topo.firstbranch, which takes a revset thatspecifies what topographical branches to prioritize in the sort.
The specified tag by name, or all tagged revisions if no name is given.
Ifname starts withre:, the remainder of the name is treated asa regular expression. To match a tag that actually starts withre:,use the prefixliteral:.
User name contains string. The match is case-insensitive.
Ifstring starts withre:, the remainder of the string is treated asa regular expression. To match a user that actually containsre:, usethe prefixliteral:.
New predicates (known as "aliases") can be defined, using any combination ofexisting predicates or other aliases. An alias definition looks like:
<alias> = <definition>
in therevsetalias section of a Mercurial configuration file. Argumentsof the forma1,a2, etc. are substituted from the alias into thedefinition.
For example,
[revsetalias]h = heads()d(s) = sort(s, date)rs(s, k) = reverse(sort(s, k))
defines three aliases,h,d, andrs.rs(0:tip, author) isexactly equivalent toreverse(sort(0:tip, author)).
Command line equivalents forhg log:
-f -> ::.-d x -> date(x)-k x -> keyword(x)-m -> merge()-u x -> user(x)-b x -> branch(x)-P x -> !::x-l x -> limit(expr, x)
Some sample queries:
Changesets on the default branch:
hg log -r "branch(default)"
Changesets on the default branch since tag 1.5 (excluding merges):
hg log -r "branch(default) and 1.5:: and not merge()"
Open branch heads:
hg log -r "head() and not closed()"
Changesets between tags 1.3 and 1.5 mentioning "bug" that affecthgext/*:
hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')"Changesets committed in May 2008, sorted by user:
hg log -r "sort(date('May 2008'), user)"Changesets mentioning "bug" or "issue" that are not in a taggedrelease:
hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
It is common for machines (as opposed to humans) to consume Mercurial.This help topic describes some of the considerations for interfacingmachines with Mercurial.
Machines have a choice of several methods to interface with Mercurial.These include:
Executinghg processes is very similar to how humans interact withMercurial in the shell. It should already be familiar to you.
hg serve can be used to start a server. By default, this will starta "hgweb" HTTP server. This HTTP server has support for machine-readableoutput, such as JSON. For more, seehg help hgweb.
hg serve can also start a "command server." Clients can connectto this server and issue Mercurial commands over a special protocol.For more details on the command server, including links to clientlibraries, seehttps://www.mercurial-scm.org/wiki/CommandServer.
hg serve based interfaces (the hgweb and command servers) have theadvantage over simplehg process invocations in that they arelikely more efficient. This is because there is significant overheadto spawn new Python processes.
Tip
If you need to invoke severalhg processes in short order and/orperformance is important to you, use of a server-based interfaceis highly recommended.
As documented inhg help environment, various environment variablesinfluence the operation of Mercurial. The following are particularlyrelevant for machines consuming Mercurial:
If not set, Mercurial's output could be influenced by configurationsettings that impact its encoding, verbose mode, localization, etc.
It is highly recommended for machines to set this variable wheninvokinghg processes.
If not set, the locale used by Mercurial will be detected from theenvironment. If the determined locale does not support display ofcertain characters, Mercurial may render these character sequencesincorrectly (often by using "?" as a placeholder for invalidcharacters in the current locale).
Explicitly setting this environment variable is a good practice toguarantee consistent results. "utf-8" is a good choice on UNIX-likeenvironments.
If not set, Mercurial will inherit config options from config filesusing the process described inhg help config. This includesinheriting user or system-wide config files.
When utmost control over the Mercurial configuration is desired, thevalue ofHGRCPATH can be set to an explicit file with known goodconfigs. In rare cases, the value can be set to an empty file or thenull device (often/dev/null) to bypass loading of any user orsystem config files. Note that these approaches can have unintendedconsequences, as the user and system config files often define thingslike the username and extensions that may be required to interfacewith a repository.
It is common for machines to need to parse the output of Mercurialcommands for relevant data. This section describes the varioustechniques for doing so.
Likely the simplest and most effective solution for consuming commandoutput is to simply invokehg commands as you would as a user andparse their output.
The output of many commands can easily be parsed with tools likegrep,sed, andawk.
A potential downside with parsing command output is that the outputof commands can change when Mercurial is upgraded. While Mercurialdoes generally strive for strong backwards compatibility, commandoutput does occasionally change. Having tests for your automatedinteractions withhg commands is generally recommended, but iseven more important when raw command output parsing is involved.
Manyhg commands support templatized output via the-T/--template argument. For more, seehg help templates.
Templates are useful for explicitly controlling output so thatyou get exactly the data you want formatted how you want it. Forexample,log-T{node}\n can be used to print a newlinedelimited list of changeset nodes instead of a human-tailoredoutput containing authors, dates, descriptions, etc.
Tip
If parsing raw command output is too complicated, considerusing templates to make your life easier.
The-T/--template argument allows specifying pre-defined styles.Mercurial ships with the machine-readable stylesjson andxml,which provide JSON and XML output, respectively. These are useful forproducing output that is machine readable as-is.
Important
Thejson andxml styles are considered experimental. Whilethey may be attractive to use for easily obtaining machine-readableoutput, their behavior may change in subsequent versions.
These styles may also exhibit unexpected results when dealing withcertain encodings. Mercurial treats things like filenames as aseries of bytes and normalizing certain byte sequences to JSONor XML with certain encoding settings can lead to surprises.
If using the command server to interact with Mercurial, you are likelyusing an existing library/API that abstracts implementation details ofthe command server. If so, this interface layer may perform parsing foryou, saving you the work of implementing it yourself.
Commands often have varying output verbosity, even when machinereadable styles are being used (e.g.-T json). Adding-v/--verbose and--debug to the command's arguments canincrease the amount of data exposed by Mercurial.
An alternate way to get the data you need is by explicitly specifyinga template.
Revisions sets is a functional query language for selecting a setof revisions. Think of it as SQL for Mercurial repositories. Revsetsare useful for querying repositories for specific data.
Seehg help revsets for more.
Theshare extension provides functionality for sharingrepository data across several working copies. It can evenautomatically "pool" storage for logically related repositories whencloning.
Configuring theshare extension can lead to significant resourceutilization reduction, particularly around disk space and thenetwork. This is especially true for continuous integration (CI)environments.
Seehg help-e share for more.
Subrepositories let you nest external repositories or projects into aparent Mercurial repository, and make commands operate on them as agroup.
Mercurial currently supports Mercurial, Git, and Subversionsubrepositories.
Subrepositories are made of three components:
Nested repository checkouts. They can appear anywhere in theparent working directory.
Nested repository references. They are defined in.hgsub, whichshould be placed in the root of working directory, andtell where the subrepository checkouts come from. Mercurialsubrepositories are referenced like:
path/to/nested = https://example.com/nested/repo/path
Git and Subversion subrepos are also supported:
path/to/nested = [git]git://example.com/nested/repo/pathpath/to/nested = [svn]https://example.com/nested/trunk/path
wherepath/to/nested is the checkout location relatively to theparent Mercurial root, andhttps://example.com/nested/repo/pathis the source repository path. The source can also reference afilesystem path.
Note that.hgsub does not exist by default in Mercurialrepositories, you have to create and add it to the parentrepository before using subrepositories.
Nested repository states. They are defined in.hgsubstate, whichis placed in the root of working directory, andcapture whatever information is required to restore thesubrepositories to the state they were committed in a parentrepository changeset. Mercurial automatically record the nestedrepositories states when committing in the parent repository.
Note
The.hgsubstate file should not be edited manually.
If.hgsub does not exist, create it and add it to the parentrepository. Clone or checkout the external projects where you want itto live in the parent repository. Edit.hgsub and add thesubrepository entry as described above. At this point, thesubrepository is tracked and the next commit will record its state in.hgsubstate and bind it to the committed changeset.
Subrepos do not automatically track the latest changeset of theirsources. Instead, they are updated to the changeset that correspondswith the changeset checked out in the top-level changeset. This is sodevelopers always get a consistent set of compatible code andlibraries when they update.
Thus, updating subrepos is a manual process. Simply check out targetsubrepo at the desired revision, test in the top-level repo, thencommit in the parent repository to record the new combination.
To remove a subrepository from the parent repository, delete itsreference from.hgsub, then remove its files.
| add: | add does not recurse in subrepos unless -S/--subrepos isspecified. However, if you specify the full path of a file in asubrepo, it will be added even without -S/--subrepos specified.Subversion subrepositories are currently silentlyignored. |
|---|---|
| addremove: | addremove does not recurse into subrepos unless-S/--subrepos is specified. However, if you specify the fullpath of a directory in a subrepo, addremove will be performed onit even without -S/--subrepos being specified. Git andSubversion subrepositories will print a warning and continue. |
| archive: | archive does not recurse in subrepositories unless-S/--subrepos is specified. |
| cat: | cat currently only handles exact file matches in subrepos.Subversion subrepositories are currently ignored. |
| commit: | commit creates a consistent snapshot of the state of theentire project and its subrepositories. If any subrepositorieshave been modified, Mercurial will abort. Mercurial can be madeto instead commit all modified subrepositories by specifying-S/--subrepos, or setting "ui.commitsubrepos=True" in aconfiguration file (seehg help config). After there are nolonger any modified subrepositories, it records their state andfinally commits it in the parent repository. The --addremoveoption also honors the -S/--subrepos option. However, Git andSubversion subrepositories will print a warning and abort. |
| diff: | diff does not recurse in subrepos unless -S/--subrepos isspecified. Changes are displayed as usual, on the subrepositorieselements. Subversion subrepositories are currently silently ignored. |
| files: | files does not recurse into subrepos unless -S/--subrepos isspecified. However, if you specify the full path of a file ordirectory in a subrepo, it will be displayed even without-S/--subrepos being specified. Git and Subversion subrepositoriesare currently silently ignored. |
| forget: | forget currently only handles exact file matches in subrepos.Git and Subversion subrepositories are currently silently ignored. |
| incoming: | incoming does not recurse in subrepos unless -S/--subreposis specified. Git and Subversion subrepositories are currentlysilently ignored. |
| outgoing: | outgoing does not recurse in subrepos unless -S/--subreposis specified. Git and Subversion subrepositories are currentlysilently ignored. |
| pull: | pull is not recursive since it is not clear what to pull priorto runninghg update. Listing and retrieving allsubrepositories changes referenced by the parent repository pulledchangesets is expensive at best, impossible in the Subversioncase. |
| push: | Mercurial will automatically push all subrepositories firstwhen the parent repository is being pushed. This ensures newsubrepository changes are available when referenced by top-levelrepositories. Push is a no-op for Subversion subrepositories. |
| status: | status does not recurse into subrepositories unless-S/--subrepos is specified. Subrepository changes are displayed asregular Mercurial changes on the subrepositoryelements. Subversion subrepositories are currently silentlyignored. |
| remove: | remove does not recurse into subrepositories unless-S/--subrepos is specified. However, if you specify a file ordirectory path in a subrepo, it will be removed even without-S/--subrepos. Git and Subversion subrepositories are currentlysilently ignored. |
| update: | update restores the subrepos in the state they wereoriginally committed in target changeset. If the recordedchangeset is not available in the current subrepository, Mercurialwill pull it in first before updating. This means that updatingcan require network access when using subrepositories. |
A subrepository source location may change during a project life,invalidating references stored in the parent repository history. Tofix this, rewriting rules can be defined in parent repositoryhgrcfile or in Mercurial configuration. See the[subpaths] section inhgrc(5) for more details.
Mercurial allows you to customize output of commands throughtemplates. You can either pass in a template or select an existingtemplate-style from the command line, via the --template option.
You can customize output for any "log-like" command: log,outgoing, incoming, tip, parents, and heads.
Some built-in styles are packaged with Mercurial. These can be listedwithhg log--template list. Example usage:
$ hg log -r1.0::1.1 --template changelog
A template is a piece of text, with markup to invoke variableexpansion:
$ hg log -r1 --template "{node}\n"b56ce7b07c52de7d5fd79fb89701ea538af65746Strings in curly braces are called keywords. The availability ofkeywords depends on the exact context of the templater. Thesekeywords are usually available for templating a log-like command:
| activebookmark: | String. The active bookmark, if it isassociated with the changeset |
|---|---|
| author: | String. The unmodified author of the changeset. |
| bisect: | String. The changeset bisection status. |
| bookmarks: | List of strings. Any bookmarks associated with thechangeset. Also sets 'active', the name of the active bookmark. |
| branch: | String. The name of the branch on which the changeset wascommitted. |
| changessincelatesttag: | |
| Integer. All ancestors not in the latest tag. | |
| children: | List of strings. The children of the changeset. |
| date: | Date information. The date when the changeset was committed. |
| desc: | String. The text of the changeset description. |
| diffstat: | String. Statistics of changes with the following format:"modified files: +added/-removed lines" |
| extras: | List of dicts with key, value entries of the 'extras'field of this changeset. |
| file_adds: | List of strings. Files added by this changeset. |
| file_copies: | List of strings. Files copied in this changeset withtheir sources. |
| file_copies_switch: | |
| List of strings. Like "file_copies" but displayedonly if the --copied switch is set. | |
| file_dels: | List of strings. Files removed by this changeset. |
| file_mods: | List of strings. Files modified by this changeset. |
| files: | List of strings. All files modified, added, or removed by thischangeset. |
| graphnode: | String. The character representing the changeset node inan ASCII revision graph |
| latesttag: | List of strings. The global tags on the most recent globallytagged ancestor of this changeset. |
| latesttagdistance: | |
| Integer. Longest path to the latest tag. | |
| namespaces: | Dict of lists. Names attached to this changeset pernamespace. |
| node: | String. The changeset identification hash, as a 40 hexadecimaldigit string. |
| p1node: | String. The identification hash of the changeset's first parent,as a 40 digit hexadecimal string. If the changeset has no parents, alldigits are 0. |
| p1rev: | Integer. The repository-local revision number of the changeset'sfirst parent, or -1 if the changeset has no parents. |
| p2node: | String. The identification hash of the changeset's secondparent, as a 40 digit hexadecimal string. If the changeset has no secondparent, all digits are 0. |
| p2rev: | Integer. The repository-local revision number of the changeset'ssecond parent, or -1 if the changeset has no second parent. |
| parents: | List of strings. The parents of the changeset in "rev:node"format. If the changeset has only one "natural" parent (the predecessorrevision) nothing is shown. |
| phase: | String. The changeset phase name. |
| phaseidx: | Integer. The changeset phase index. |
| rev: | Integer. The repository-local changeset revision number. |
| subrepos: | List of strings. Updated subrepositories in the changeset. |
| tags: | List of strings. Any tags associated with the changeset. |
| termwidth: | Integer. The width of the current terminal. |
The "date" keyword does not produce human-readable output. If youwant to use a date in your output, you can use a filter to processit. Filters are functions which return a string based on the inputvariable. Be sure to use the stringify filter first when you'reapplying a string-input filter to a list-like input variable.You can also use a chain of filters to get the desired output:
$ hg tip --template "{date|isodate}\n"2008-08-21 18:22 +0000List of filters:
| addbreaks: | Any text. Add an XHTML "<br />" tag before the end ofevery line except the last. |
|---|---|
| age: | Date. Returns a human-readable date/time difference between thegiven date/time and the current date/time. |
| basename: | Any text. Treats the text as a path, and returns the lastcomponent of the path after splitting by the path separator(ignoring trailing separators). For example, "foo/bar/baz" becomes"baz" and "foo/bar//" becomes "bar". |
| count: | List or text. Returns the length as an integer. |
| domain: | Any text. Finds the first string that looks like an emailaddress, and extracts just the domain component. Example:User<user@example.com> becomesexample.com. |
| email: | Any text. Extracts the first string that looks like an emailaddress. Example:User <user@example.com> becomesuser@example.com. |
| emailuser: | Any text. Returns the user portion of an email address. |
| escape: | Any text. Replaces the special XML/XHTML characters "&", "<"and ">" with XML entities, and filters out NUL characters. |
| fill68: | Any text. Wraps the text to fit in 68 columns. |
| fill76: | Any text. Wraps the text to fit in 76 columns. |
| firstline: | Any text. Returns the first line of text. |
| hex: | Any text. Convert a binary Mercurial node identifier intoits long hexadecimal representation. |
| hgdate: | Date. Returns the date as a pair of numbers: "115740799325200" (Unix timestamp, timezone offset). |
| isodate: | Date. Returns the date in ISO 8601 format: "2009-08-18 13:00+0200". |
| isodatesec: | Date. Returns the date in ISO 8601 format, includingseconds: "2009-08-18 13:00:13 +0200". See also the rfc3339datefilter. |
| lower: | Any text. Converts the text to lowercase. |
| nonempty: | Any text. Returns '(none)' if the string is empty. |
| obfuscate: | Any text. Returns the input text rendered as a sequence ofXML entities. |
| person: | Any text. Returns the name before an email address,interpreting it as per RFC 5322. |
| revescape: | Any text. Escapes all "special" characters, except @.Forward slashes are escaped twice to prevent web servers from prematurelyunescaping them. For example, "@foo bar/baz" becomes "@foo%20bar%252Fbaz". |
| rfc3339date: | Date. Returns a date using the Internet date formatspecified in RFC 3339: "2009-08-18T13:00:13+02:00". |
| rfc822date: | Date. Returns a date using the same format used in emailheaders: "Tue, 18 Aug 2009 13:00:13 +0200". |
| short: | Changeset hash. Returns the short form of a changeset hash,i.e. a 12 hexadecimal digit string. |
| shortbisect: | Any text. Treatstext as a bisection status, andreturns a single-character representing the status (G: good, B: bad,S: skipped, U: untested, I: ignored). Returns single space iftextis not a valid bisection status. |
| shortdate: | Date. Returns a date like "2006-09-18". |
| splitlines: | Any text. Split text into a list of lines. |
| stringify: | Any type. Turns the value into text by converting values intotext and concatenating them. |
| stripdir: | Treat the text as path and strip a directory level, ifpossible. For example, "foo" and "foo/bar" becomes "foo". |
| tabindent: | Any text. Returns the text, with every non-empty lineexcept the first starting with a tab character. |
| upper: | Any text. Converts the text to uppercase. |
| urlescape: | Any text. Escapes all "special" characters. For example,"foo bar" becomes "foo%20bar". |
| user: | Any text. Returns a short representation of a user name or emailaddress. |
| utf8: | Any text. Converts from the local character encoding to UTF-8. |
Note that a filter is nothing more than a function call, i.e.expr|filter is equivalent tofilter(expr).
In addition to filters, there are some basic built-in functions:
| date(date[, fmt]): | |
|---|---|
| Format a date. Seehg help dates for formattingstrings. The default is a Unix date format, including the timezone:"Mon Sep 04 15:13:13 2006 0700". | |
| diff([includepattern [, excludepattern]]): | |
| Show a diff, optionallyspecifying files to include or exclude. | |
| files(pattern): | All files of the current changeset matching the pattern. Seehg help patterns. |
| fill(text[, width[, initialident[, hangindent]]]): | |
| Fill manyparagraphs with optional indentation. See the "fill" filter. | |
| get(dict, key): | Get an attribute/key from an object. Some keywordsare complex types. This function allows you to obtain the value of anattribute on these types. |
| if(expr, then[, else]): | |
| Conditionally execute based on the result ofan expression. | |
| ifcontains(needle, haystack, then[, else]): | |
| Conditionally execute basedon whether the item "needle" is in "haystack". | |
| ifeq(expr1, expr2, then[, else]): | |
| Conditionally execute based onwhether 2 items are equivalent. | |
| indent(text, indentchars[, firstline]): | |
| Indents all non-empty lineswith the characters given in the indentchars string. An optionalthird parameter will override the indent for the first line onlyif present. | |
| join(list, sep): | |
| Join items in a list with a delimiter. | |
| label(label, expr): | |
| Apply a label to generated content. Content witha label applied can result in additional post-processing, such asautomatic colorization. | |
| latesttag([pattern]): | |
| The global tags matching the given pattern on themost recent globally tagged ancestor of this changeset. | |
| localdate(date[, tz]): | |
| Converts a date to the specified timezone.The default is local date. | |
| mod(a, b): | Calculate a mod b such that a / b + a mod b == a |
| pad(text, width[, fillchar=' '[, left=False]]): | |
| Pad text with afill character. | |
| relpath(path): | Convert a repository-absolute path into a filesystem path relative tothe current working directory. |
| revset(query[, formatargs...]): | |
| Execute a revision set query. Seehg help revset. | |
| rstdoc(text, style): | |
| Format ReStructuredText. | |
| separate(sep, args): | |
| Add a separator between non-empty arguments. | |
| shortest(node, minlength=4): | |
| Obtain the shortest representation ofa node. | |
| startswith(pattern, text): | |
| Returns the value from the "text" argumentif it begins with the content from the "pattern" argument. | |
| strip(text[, chars]): | |
| Strip characters from a string. By default,strips all leading and trailing whitespace. | |
| sub(pattern, replacement, expression): | |
| Perform text substitutionusing regular expressions. | |
| word(number, text[, separator]): | |
| Return the nth word from a string. | |
We provide a limited set of infix arithmetic operations on integers:
+ for addition- for subtraction* for multiplication/ for floor division (division rounded to integer nearest -infinity)
Division fulfils the law x = x / y + mod(x, y).
Also, for any expression that returns a list, there is a list operator:
expr % "{template}"As seen in the above example,{template} is interpreted as a template.To prevent it from being interpreted, you can use an escape character\{or a raw string prefix,r'...'.
New keywords and functions can be defined in thetemplatealias section ofa Mercurial configuration file:
<alias> = <definition>
Arguments of the forma1,a2, etc. are substituted from the alias intothe definition.
For example,
[templatealias]r = revrn = "{r}:{node|short}"leftpad(s, w) = pad(s, w, ' ', True)defines two symbol aliases,r andrn, and a function aliasleftpad().
It's also possible to specify complete template strings, using thetemplates section. The syntax used is the general template string syntax.
For example,
[templates]nodedate = "{node|short}: {date(date, "%Y-%m-%d")}\n"defines a template,nodedate, which can be called like:
$ hg log -r . -Tnodedate
Some sample command line templates:
Format lists, e.g. files:
$ hg log -r 0 --template "files:\n{files % ' {file}\n'}"Join the list of files with a ", ":
$ hg log -r 0 --template "files: {join(files, ', ')}\n"Join the list of files ending with ".py" with a ", ":
$ hg log -r 0 --template "pythonfiles: {join(files('**.py'), ', ')}\n"Separate non-empty arguments by a " ":
$ hg log -r 0 --template "{separate(' ', node, bookmarks, tags}\n"Modify each line of a commit description:
$ hg log --template "{splitlines(desc) % '**** {line}\n'}"Format date:
$ hg log -r 0 --template "{date(date, '%Y')}\n"Display date in UTC:
$ hg log -r 0 --template "{localdate(date, 'UTC')|date}\n"Output the description set to a fill-width of 30:
$ hg log -r 0 --template "{fill(desc, 30)}"Use a conditional to test for the default branch:
$ hg log -r 0 --template "{ifeq(branch, 'default', 'on the main branch','on branch {branch}')}\n"Append a newline if not empty:
$ hg tip --template "{if(author, '{author}\n')}"Label the output for use with the color extension:
$ hg log -r 0 --template "{label('changeset.{phase}', node|short)}\n"Invert the firstline filter, i.e. everything but the first line:
$ hg log -r 0 --template "{sub(r'^.*\n?\n?', '', desc)}\n"Display the contents of the 'extra' field, one per line:
$ hg log -r 0 --template "{join(extras, '\n')}\n"Mark the active bookmark with '*':
$ hg log --template "{bookmarks % '{bookmark}{ifeq(bookmark, active, '*')} '}\n"Find the previous release candidate tag, the distance and changes since the tag:
$ hg log -r . --template "{latesttag('re:^.*-rc$') % '{tag}, {changes}, {distance}'}\n"Mark the working copy parent with '@':
$ hg log --template "{ifcontains(rev, revset('.'), '@')}\n"Show details of parent revisions:
$ hg log --template "{revset('parents(%d)', rev) % '{desc|firstline}\n'}"Show only commit descriptions that start with "template":
$ hg log --template "{startswith('template', firstline(desc))}\n"Print the first word of each line of a commit message:
$ hg log --template "{word(0, desc)}\n"Valid URLs are of the form:
local/filesystem/path[#revision]file://local/filesystem/path[#revision]http://[user[:pass]@]host[:port]/[path][#revision]https://[user[:pass]@]host[:port]/[path][#revision]ssh://[user@]host[:port]/[path][#revision]
Paths in the local filesystem can either point to Mercurialrepositories or to bundle files (as created byhg bundle orhg incoming--bundle). See alsohg help paths.
An optional identifier after # indicates a particular branch, tag, orchangeset to use from the remote repository. See alsohg helprevisions.
Some features, such as pushing tohttp:// andhttps:// URLs are onlypossible if the feature is explicitly enabled on the remote Mercurialserver.
Note that the security of HTTPS URLs depends on proper configuration ofweb.cacerts.
Some notes about using SSH with Mercurial:
SSH requires an accessible shell account on the destination machineand a copy of hg in the remote path or specified with as remotecmd.
path is relative to the remote user's home directory by default. Usean extra slash at the start of a path to specify an absolute path:
ssh://example.com//tmp/repository
Mercurial doesn't use its own compression via SSH; the right thingto do is to configure it in your ~/.ssh/config, e.g.:
Host *.mylocalnetwork.example.com Compression noHost * Compression yes
Alternatively specify "ssh -C" as your ssh command in yourconfiguration file or with the --ssh command line option.
These URLs can all be stored in your configuration file with pathaliases under the [paths] section like so:
[paths]alias1 = URL1alias2 = URL2...
You can then use the alias for any command that uses a URL (forexamplehg pull alias1 will be treated ashg pull URL1).
Two path aliases are special because they are used as defaults whenyou do not provide the URL to a command:
This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
hooks for controlling repository access
This hook makes it possible to allow or deny write access to givenbranches and paths of a repository when receiving incoming changesetsvia pretxnchangegroup and pretxncommit.
The authorization is matched based on the local user name on thesystem where the hook runs, and not the committer of the originalchangeset (since the latter is merely informative).
The acl hook is best used along with a restricted shell like hgsh,preventing authenticating users from doing anything other than pushingor pulling. The hook is not safe to use if users have interactiveshell access, as they can then disable the hook. Nor is it safe ifremote users share an account, because then there is no way todistinguish them.
The order in which access checks are performed is:
The allow and deny sections take key-value pairs.
Use theacl.deny.branches andacl.allow.branches sections tohave branch-based access control. Keys in these sections can beeither:
The corresponding values can be either:
You can add the "!" prefix to a user or group name to invert the senseof the match.
Use theacl.deny andacl.allow sections to have path-basedaccess control. Keys in these sections accept a subtree pattern (witha glob syntax by default). The corresponding values follow the samesyntax as the other sections above.
Group names must be prefixed with an@ symbol. Specifying a groupname has the same effect as specifying all the users in that group.
You can define group members in theacl.groups section.If a group name is not defined there, and Mercurial is running undera Unix-like system, the list of users will be taken from the OS.Otherwise, an exception will be raised.
[hooks]# Use this if you want to check access restrictions at commit timepretxncommit.acl = python:hgext.acl.hook# Use this if you want to check access restrictions for pull, push,# bundle and serve.pretxnchangegroup.acl = python:hgext.acl.hook[acl]# Allow or deny access for incoming changes only if their source is# listed here, let them pass otherwise. Source is "serve" for all# remote access (http or ssh), "push", "pull" or "bundle" when the# related commands are run locally.# Default: servesources = serve[acl.deny.branches]# Everyone is denied to the frozen branch:frozen-branch = *# A bad user is denied on all branches:* = bad-user[acl.allow.branches]# A few users are allowed on branch-a:branch-a = user-1, user-2, user-3# Only one user is allowed on branch-b:branch-b = user-1# The super user is allowed on any branch:* = super-user# Everyone is allowed on branch-for-tests:branch-for-tests = *[acl.deny]# This list is checked first. If a match is found, acl.allow is not# checked. All users are granted access if acl.deny is not present.# Format for both lists: glob pattern = user, ..., @group, ...# To match everyone, use an asterisk for the user:# my/glob/pattern = *# user6 will not have write access to any file:** = user6# Group "hg-denied" will not have write access to any file:** = @hg-denied# Nobody will be able to change "DONT-TOUCH-THIS.txt", despite# everyone being able to change all other files. See below.src/main/resources/DONT-TOUCH-THIS.txt = *[acl.allow]# if acl.allow is not present, all users are allowed by default# empty acl.allow = no users allowed# User "doc_writer" has write access to any file under the "docs"# folder:docs/** = doc_writer# User "jack" and group "designers" have write access to any file# 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):src/main/resources/** = *.hgtags = release_engineer
Suppose there's a branch that only a given user (or group) should be able topush to, and you don't want to restrict access to any other branch that maybe created.
The "!" prefix allows you to prevent anyone except a given user or group topush changesets in a given branch or path.
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"
[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
Check for unrecorded moves at commit time (EXPERIMENTAL)
This extension checks at commit/amend time if any of the committed filescomes from an unrecorded mv.
The threshold at which a file is considered a move can be set with theautomv.similarity config option. This option takes a percentage between 0(disabled) and 100 (files must be identical), the default is 95.
log repository events to a blackbox for debugging
Logs event information to .hg/blackbox.log to help debug and diagnose problems.The events that get logged can be configured via the blackbox.track config key.
Examples:
[blackbox]track = *# dirty is *EXPENSIVE* (slow);# each log entry indicates `+` if the repository is dirty, like :hg:`id`.dirty = True# record the source of log messageslogsource = True[blackbox]track = command, commandfinish, commandexception, exthook, pythonhook[blackbox]track = incoming[blackbox]# limit the size of a log filemaxsize = 1.5 MB# rotate up to N log files when the current one gets too bigmaxfiles = 3
view the recent repository events:
hg blackbox [OPTION]...
view the recent repository events
Options:
| -l,--limit<VALUE> | |
| the number of events to show (default: 10) | |
hooks for integrating with the Bugzilla bug tracker
This hook extension adds comments on bugs in Bugzilla when changesetsthat refer to bugs by Bugzilla ID are seen. The comment is formatted usingthe Mercurial template mechanism.
The bug references can optionally include an update for Bugzilla of thehours spent working on the bug. Bugs can also be marked fixed.
Three basic modes of access to Bugzilla are provided:
Writing directly to the database is susceptible to schema changes, andrelies on a Bugzilla contrib script to send out bug changenotification emails. This script runs as the user running Mercurial,must be run on the host with the Bugzilla install, and requirespermission to read Bugzilla configuration details and the necessaryMySQL user and password to have full access rights to the Bugzilladatabase. For these reasons this access mode is now considereddeprecated, and will not be updated for new Bugzilla versions goingforward. Only adding comments is supported in this access mode.
Access via XMLRPC needs a Bugzilla username and password to be specifiedin the configuration. Comments are added under that username. Since theconfiguration must be readable by all Mercurial users, it is recommendedthat the rights of that user are restricted in Bugzilla to the minimumnecessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.
Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sendsemail to the Bugzilla email interface to submit comments to bugs.The From: address in the email is set to the email address of the Mercurialuser, so the comment appears to come from the Mercurial user. In the eventthat the Mercurial user email is not recognized by Bugzilla as a Bugzillauser, the email associated with the Bugzilla username used to log intoBugzilla is used instead as the source of the comment. Marking bugs fixedworks on all supported Bugzilla versions.
Configuration items common to all access modes:
The access type to use. Values recognized are:
| xmlrpc: | Bugzilla XMLRPC interface. |
|---|---|
| xmlrpc+email: | Bugzilla XMLRPC and email interfaces. |
| 3.0: | MySQL access, Bugzilla 3.0 and later. |
| 2.18: | MySQL access, Bugzilla 2.18 and up to but notincluding 3.0. |
| 2.16: | MySQL access, Bugzilla 2.16 and up to but notincluding 2.18. |
Template to use when formatting comments. Overrides style ifspecified. In addition to the usual Mercurial keywords, theextension specifies:
| {bug}: | The Bugzilla bug ID. |
|---|---|
| {root}: | The full pathname of the Mercurial repository. |
| {webroot}: | Stripped pathname of the Mercurial repository. |
| {hgweb}: | Base URL for browsing Mercurial repositories. |
Defaultchangeset {node|short} in repo {root} refers to bug{bug}.\ndetails:\n\t{desc|tabindent}
Configuration items common to XMLRPC+email and MySQL access modes:
Path of file containing Mercurial committer email to Bugzilla user emailmappings. If specified, the file should contain one mapping perline:
committer = Bugzilla user
See also the[usermap] section.
The[usermap] section is used to specify mappings of Mercurialcommitter email to Bugzilla user email. See alsobugzilla.usermap.Contains entries of the formcommitter = Bugzilla user.
XMLRPC access mode configuration:
XMLRPC+email access mode uses the XMLRPC access mode configuration items,and also:
In addition, the Mercurial email settings must be configured. See thedocumentation in hgrc(5), sections[email] and[smtp].
MySQL access mode configuration:
Activating the extension:
[extensions]bugzilla =[hooks]# run bugzilla hook on every change pulled or pushed in hereincoming.bugzilla = python:hgext.bugzilla.hook
Example configurations:
XMLRPC example configuration. This uses the Bugzilla athttp://my-project.org/bugzilla, logging in as userbugmail@my-project.org with passwordplugh. It is used with acollection of Mercurial repositories in/var/local/hg/repos/,with a web interface athttp://my-project.org/hg.
[bugzilla]bzurl=http://my-project.org/bugzillauser=bugmail@my-project.orgpassword=plughversion=xmlrpctemplate=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\nstrip=5[web]baseurl=http://my-project.org/hgXMLRPC+email example configuration. This uses the Bugzilla athttp://my-project.org/bugzilla, logging in as userbugmail@my-project.org with passwordplugh. It is used with acollection of Mercurial repositories in/var/local/hg/repos/,with a web interface athttp://my-project.org/hg. Bug commentsare sent to the Bugzilla email addressbugzilla@my-project.org.
[bugzilla]bzurl=http://my-project.org/bugzillauser=bugmail@my-project.orgpassword=plughversion=xmlrpc+emailbzemail=bugzilla@my-project.orgtemplate=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\nstrip=5[web]baseurl=http://my-project.org/hg[usermap]user@emaildomain.com=user.name@bugzilladomain.comMySQL example configuration. This has a local Bugzilla 3.2 installationin/opt/bugzilla-3.2. The MySQL database is onlocalhost,the Bugzilla database name isbugs and MySQL isaccessed with MySQL usernamebugs passwordXYZZY. It is usedwith a collection of Mercurial repositories in/var/local/hg/repos/,with a web interface athttp://my-project.org/hg.
[bugzilla]host=localhostpassword=XYZZYversion=3.0bzuser=unknown@domain.combzdir=/opt/bugzilla-3.2template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\nstrip=5[web]baseurl=http://my-project.org/hg[usermap]user@emaildomain.com=user.name@bugzilladomain.comAll the above add a comment to the Bugzilla bug record of the form:
Changeset 3b16791d6642 in repository-name.http://my-project.org/hg/repository-name/rev/3b16791d6642Changeset commit comment. Bug 1234.
erase file content at a given revision
The censor command instructs Mercurial to erase all content of a file at a givenrevisionwithout updating the changeset hash. This allows existing history toremain valid while preventing future clones/pulls from receiving the eraseddata.
Typical uses for censor are due to security or legal requirements, including:
* Passwords, private keys, cryptographic material* Licensed data/code/libraries for which the license has expired* Personally Identifiable Information or other private data
Censored nodes can interrupt mercurial's typical operation whenever the exciseddata needs to be materialized. Some commands, likehg cat/hg revert,simply fail when asked to produce censored data. Others, likehg verify andhg update, must be capable of tolerating censored data to continue tofunction in a meaningful way. Such commands only tolerate censored filerevisions if they are allowed by the "censor.policy=ignore" config option.
hg censor -r REV [-t TEXT] [FILE]
Options:
| -r,--rev<REV> | |
| censor file from specified revision | |
| -t,--tombstone<TEXT> | |
| replacement tombstone data | |
command server extension for cHg (EXPERIMENTAL)
[chgserver]idletimeout = 3600 # seconds, after which an idle server will exitskiphash = False # whether to skip config or env change checks
command to display child changesets (DEPRECATED)
This extension is deprecated. You should usehg log-r"children(REV)" instead.
show the children of the given or working directory revision:
hg children [-r REV] [FILE]
Print the children of the working directory's revisions. If arevision is given via -r/--rev, the children of that revision willbe printed. If a file argument is given, revision in which thefile was last changed (after the working directory revision or theargument to --rev if given) is printed.
Please usehg log instead:
hg children => hg log -r "children()"hg children -r REV => hg log -r "children(REV)"
Seehg help log andhg help revsets.children.
Options:
| -r,--rev<REV> | |
| show children of the specified revision | |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
command to display statistics about repository history
histogram of changes to the repository:
hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]
This command will display a histogram representing the numberof changed lines or revisions, grouped according to the giventemplate. The default template will group changes by author.The --dateformat option may be used to group the results bydate instead.
Statistics are based on the number of changed lines, oralternatively the number of matching revisions if the--changesets option is specified.
Examples:
# display count of changed lines for every committerhg churn -t "{author|email}"# display daily activity graphhg churn -f "%H" -s -c# display activity of developers by monthhg churn -f "%Y-%m" -s -c# display count of lines changed in every yearhg churn -f "%Y" -sIt is possible to map alternate email addresses to a main addressby providing a file using the following format:
<alias email> = <actual email>
Such a file may be specified with the --aliases option, otherwisea .hgchurn file will be looked for in the working directory root.Aliases will be split from the rightmost "=".
Options:
| -r,--rev<REV[+]> | |
| count rate for the specified revision or revset | |
| -d,--date<DATE> | |
| count rate for revisions matching date spec | |
| -t,--oldtemplate<TEMPLATE> | |
| template to group changesets (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| template to group changesets (default: {author|email}) | |
| -f,--dateformat<FORMAT> | |
| strftime-compatible format for grouping by date | |
| -c,--changesets | |
| count rate by number of changesets | |
| -s,--sort | sort by key (default: sort by count) |
| --diffstat | display added/removed lines separately |
| --aliases<FILE> | |
| file with email aliases | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
advertise pre-generated bundles to seed clones
"clonebundles" is a server-side extension used to advertise the existenceof pre-generated, externally hosted bundle files to clients that arecloning so that cloning can be faster, more reliable, and require lessresources on the server.
Cloning can be a CPU and I/O intensive operation on servers. Traditionally,the server, in response to a client's request to clone, dynamically generatesa bundle containing the entire repository content and sends it to the client.There is no caching on the server and the server will have to redundantlygenerate the same outgoing bundle in response to each clone request. Forservers with large repositories or with high clone volume, the load fromclones can make scaling the server challenging and costly.
This extension provides server operators the ability to offload potentiallyexpensive clone load to an external service. Here's how it works.
Instead of the server generating full repository bundles for every clonerequest, it generates full bundles once and they are subsequently reused tobootstrap new clones. The server may still transfer data at clone time.However, this is only data that has been added/changed since the bundle wascreated. For large, established repositories, this can reduce server load forclones to less than 1% of original.
To work, this extension requires the following of server operators:
Strictly speaking, using a static file hosting server isn't required: a serveroperator could use a dynamic service for retrieving bundle data. However,static file hosting services are simple and scalable and should be sufficientfor most needs.
Bundle files can be generated with thehg bundle command. Typicallyhg bundle--all is used to produce a bundle of the entire repository.
hg debugcreatestreamclonebundle can be used to produce a specialstreaming clone bundle. These are bundle files that are extremely efficientto produce and consume (read: fast). However, they are larger thantraditional bundle formats and require that clients support the exact setof repository data store formats in use by the repository that created them.Typically, a newer server can serve data that is compatible with older clients.However,streaming clone bundles don't have this guarantee.Serveroperators need to be aware that newer versions of Mercurial may producestreaming clone bundles incompatible with older Mercurial versions.
A server operator is responsible for creating a.hg/clonebundles.manifestfile containing the list of available bundle files suitable for seedingclones. If this file does not exist, the repository will not advertise theexistence of clone bundles when clients connect.
The manifest file contains a newline () delimited list of entries.
Each line in this file defines an available bundle. Lines have the format:
<URL> [<key>=<value>[ <key>=<value>]]
That is, a URL followed by an optional, space-delimited list of key=valuepairs describing additional properties of this bundle. Both keys and valuesare URI encoded.
Keys in UPPERCASE are reserved for use by Mercurial and are defined below.All non-uppercase keys can be used by site installations. An example usefor custom properties is to use thedatacenter attribute to define whichdata center a file is hosted in. Clients could then prefer a server in thedata center closest to them.
The following reserved keys are currently defined:
A "bundle specification" string that describes the type of the bundle.
These are string values that are accepted by the "--type" argument ofhg bundle.
The values are parsed in strict mode, which means they must be of the"<compression>-<type>" form. Seemercurial.exchange.parsebundlespec() for more details.
hg debugbundle--spec can be used to print the bundle specificationstring for a bundle file. The output of this command can be used verbatimfor the value ofBUNDLESPEC (it is already escaped).
Clients will automatically filter out specifications that are unknown orunsupported so they won't attempt to download something that likely won'tapply.
The actual value doesn't impact client behavior beyond filtering:clients will still sniff the bundle type from the header of downloadedfiles.
Use of this key is highly recommended, as it allows clients toeasily skip unsupported bundles. If this key is not defined, an oldclient may attempt to apply a bundle that it is incapable of reading.
Whether Server Name Indication (SNI) is required to connect to the URL.SNI allows servers to use multiple certificates on the same IP. It issomewhat common in CDNs and other hosting providers. Older Pythonversions do not support SNI. Defining this attribute enables clientswith older Python versions to filter this entry without experiencingan opaque SSL failure at connection time.
If this is defined, it is important to advertise a non-SNI fallbackURL or clients running old Python releases may not be able to clonewith the clonebundles facility.
Value should be "true".
Manifests can contain multiple entries. Assuming metadata is defined, clientswill filter entries from the manifest that they don't support. The remainingentries are optionally sorted by client preferences(experimental.clonebundleprefers config option). The client then attemptsto fetch the bundle at the first URL in the remaining list.
Errors when downloading a bundle will fail the entire clone operation:clients do not automatically fall back to a traditional clone. The reasonfor this is that if a server is using clone bundles, it is probably doing sobecause the feature is necessary to help it scale. In other words, thereis an assumption that clone load will be offloaded to another service andthat the Mercurial server isn't responsible for serving this clone load.If that other service experiences issues and clients start mass falling back tothe original Mercurial server, the added clone load could overwhelm the serverdue to unexpected load and effectively take it offline. Not having clientsautomatically fall back to cloning from the original server mitigates thisscenario.
Because there is no automatic Mercurial server fallback on failure of thebundle hosting service, it is important for server operators to view the bundlehosting service as an extension of the Mercurial server in terms ofavailability and service level agreements: if the bundle hosting service goesdown, so does the ability for clients to clone. Note: clients will see amessage informing them how to bypass the clone bundles facility when a failureoccurs. So server operators should prepare for some people to follow theseinstructions when a failure occurs, thus driving more load to the originalMercurial server when the bundle hosting service fails.
colorize output from some commands
The color extension colorizes output from several Mercurial commands.For example, the diff command shows additions in green and deletionsin red, while the status command shows modified files in magenta. Manyother commands have analogous colors. It is possible to customizethese colors.
Other effects in addition to color, like bold and underlined text, arealso available. By default, the terminfo database is used to find theterminal codes used to change color and effect. If terminfo is notavailable, then effects are rendered with the ECMA-48 SGR controlfunction (aka ANSI escape codes).
The available effects in terminfo mode are 'blink', 'bold', 'dim','inverse', 'invisible', 'italic', 'standout', and 'underline'; inECMA-48 mode, the options are 'bold', 'inverse', 'italic', and'underline'. How each is rendered depends on the terminal emulator.Some may not be available for a given terminal type, and will besilently ignored.
If the terminfo entry for your terminal is missing codes for an effector has the wrong codes, you can add or override those codes in yourconfiguration:
[color]terminfo.dim = \E[2m
where 'E' is substituted with an escape character.
Text receives color effects depending on the labels that it has. Manydefault Mercurial commands emit labelled text. You can also defineyour own labels in templates using the label function, seehg helptemplates. A single portion of text may have more than one label. Inthat case, effects given to the last label will override any othereffects. This includes the special "none" effect, which nullifiesother effects.
Labels are normally invisible. In order to see these labels and theirposition in the text, use the global --color=debug option. The sameanchor text may be associated to multiple labels, e.g.
[log.changeset changeset.secret|changeset: 22611:6f0a53c8f587]
The following are the default effects for some default labels. Defaulteffects may be overridden from your configuration file:
[color]status.modified = blue bold underline red_backgroundstatus.added = green boldstatus.removed = red bold blue_backgroundstatus.deleted = cyan bold underlinestatus.unknown = magenta bold underlinestatus.ignored = black bold# 'none' turns off all effectsstatus.clean = nonestatus.copied = noneqseries.applied = blue bold underlineqseries.unapplied = black boldqseries.missing = red bolddiff.diffline = bolddiff.extended = cyan bolddiff.file_a = red bolddiff.file_b = green bolddiff.hunk = magentadiff.deleted = reddiff.inserted = greendiff.changed = whitediff.tab =diff.trailingwhitespace = bold red_background# Blank so it inherits the style of the surrounding labelchangeset.public =changeset.draft =changeset.secret =resolve.unresolved = red boldresolve.resolved = green boldbookmarks.active = greenbranches.active = nonebranches.closed = black boldbranches.current = greenbranches.inactive = nonetags.normal = greentags.local = black boldrebase.rebased = bluerebase.remaining = red boldshelve.age = cyanshelve.newest = green boldshelve.name = blue boldhistedit.remaining = red bold
Because there are only eight standard colors, this module allows youto define color names for other color slots which might be availablefor your terminal type, assuming terminfo mode. For instance:
color.brightblue = 12color.pink = 207color.orange = 202
to set 'brightblue' to color slot 12 (useful for 16 color terminalsthat have brighter colors defined in the upper eight) and, 'pink' and'orange' to colors in 256-color xterm's default color cube. Thesedefined colors may then be used as any of the pre-defined eight,including appending '_background' to set the background to that color.
By default, the color extension will use ANSI mode (or win32 mode onWindows) if it detects a terminal. To override auto mode (to enableterminfo mode, for example), set the following configuration option:
[color]mode = terminfo
Any value other than 'ansi', 'win32', 'terminfo', or 'auto' willdisable color.
Note that on some systems, terminfo mode may cause problems when usingcolor with the pager extension and less -R. less with the -R optionwill only display ECMA-48 color codes, and terminfo mode may sometimesemit codes that less doesn't understand. You can work around this byeither using ansi mode (or auto mode), or by using less -r (which willpass through all terminal control codes, not just color controlcodes).
On some systems (such as MSYS in Windows), the terminal may supporta different color mode than the pager (activated via the "pager"extension). It is possible to define separate modes depending on whetherthe pager is active:
[color]mode = autopagermode = ansi
Ifpagermode is not defined, themode will be used.
import revisions from foreign VCS repositories into Mercurial
convert a foreign SCM repository to a Mercurial one.:
hg convert [OPTION]... SOURCE [DEST [REVMAP]]
Accepted source formats [identifiers]:
Accepted destination formats [identifiers]:
If no revision is given, all revisions will be converted.Otherwise, convert will only import up to the named revision(given in a format understood by the source).
If no destination directory name is specified, it defaults to thebasename of the source with-hg appended. If the destinationrepository doesn't exist, it will be created.
By default, all sources except Mercurial will use --branchsort.Mercurial uses --sourcesort to preserve original revision numbersorder. Sort modes have the following effects:
| --branchsort | convert from parent to child revision when possible,which means branches are usually converted one afterthe other. It generates more compact repositories. |
| --datesort | sort revisions by date. Converted repositories havegood-looking changelogs but are often an order ofmagnitude larger than the same ones generated by--branchsort. |
| --sourcesort | try to preserve source revisions order, onlysupported by Mercurial sources. |
| --closesort | try to move closed revisions as close as possibleto parent branches, only supported by Mercurialsources. |
IfREVMAP isn't given, it will be put in a default location(<dest>/.hg/shamap by default). TheREVMAP is a simpletext file that maps each source commit ID to the destination IDfor that revision, like so:
<source ID> <destination ID>
If the file doesn't exist, it's automatically created. It'supdated on each commit copied, sohg convert can be interruptedand can be run repeatedly to copy new commits.
The authormap is a simple text file that maps each source commitauthor to a destination commit author. It is handy for source SCMsthat use unix logins to identify authors (e.g.: CVS). One line perauthor mapping and the line format is:
source author = destination author
Empty lines and lines starting with a# are ignored.
The filemap is a file that allows filtering and remapping of filesand directories. Each line can contain one of the followingdirectives:
include path/to/file-or-direxclude path/to/file-or-dirrename path/to/source path/to/destination
Comment lines start with#. A specified path matches if itequals the full relative name of a file or one of its parentdirectories. Theinclude orexclude directive with thelongest matching path applies, so line order does not matter.
Theinclude directive causes a file, or all files under adirectory, to be included in the destination repository. The defaultif there are noinclude statements is to include everything.If there are anyinclude statements, nothing else is included.Theexclude directive causes files or directories tobe omitted. Therename directive renames a file or directory ifit is converted. To rename from a subdirectory into the root ofthe repository, use. as the path to rename to.
--full will make sure the converted changesets contain exactlythe right files with the right content. It will make a fullconversion of all files, not just the ones that havechanged. Files that already are correct will not be changed. Thiscan be used to apply filemap changes when convertingincrementally. This is currently only supported for Mercurial andSubversion.
The splicemap is a file that allows insertion of synthetichistory, letting you specify the parents of a revision. This isuseful if you want to e.g. give a Subversion merge two parents, orgraft two disconnected series of history together. Each entrycontains a key, followed by a space, followed by one or twocomma-separated values:
key parent1, parent2
The key is the revision ID in the sourcerevision control system whose parents should be modified (sameformat as a key in .hg/shamap). The values are the revision IDs(in either the source or destination revision control system) thatshould be used as the new parents for that node. For example, ifyou have merged "release-1.0" into "trunk", then you shouldspecify the revision on "trunk" as the first parent and the one onthe "release-1.0" branch as the second.
The branchmap is a file that allows you to rename a branch when it isbeing brought in from whatever external repository. When used inconjunction with a splicemap, it allows for a powerful combinationto help fix even the most badly mismanaged repositories and turn theminto nicely structured Mercurial repositories. The branchmap containslines of the form:
original_branch_name new_branch_name
where "original_branch_name" is the name of the branch in thesource repository, and "new_branch_name" is the name of the branchis the destination repository. No whitespace is allowed in thebranch names. This can be used to (for instance) move code in onerepository from "default" to a named branch.
The Mercurial source recognizes the following configurationoptions, which you can set on the command line with--config:
| convert.hg.ignoreerrors: | |
|---|---|
| ignore integrity errors when reading.Use it to fix Mercurial repositories with missing revlogs, byconverting from and to Mercurial. Default is False. | |
| convert.hg.saverev: | |
| store original revision ID in changeset(forces target IDs to change). It takes a boolean argument anddefaults to False. | |
| convert.hg.startrev: | |
| specify the initial Mercurial revision.The default is 0. | |
| convert.hg.revs: | |
| revset specifying the source revisions to convert. | |
CVS source will use a sandbox (i.e. a checked-out copy) from CVSto indicate the starting point of what will be converted. Directaccess to the repository files is not needed, unless of course therepository is:local:. The conversion uses the top leveldirectory in the sandbox to find the CVS repository, and then usesCVS rlog commands to find files to convert. This means that unlessa filemap is given, all files under the starting directory will beconverted, and that any directory reorganization in the CVSsandbox is ignored.
The following options can be used with--config:
| convert.cvsps.cache: | |
|---|---|
| Set to False to disable remote log caching,for testing and debugging purposes. Default is True. | |
| convert.cvsps.fuzz: | |
| Specify the maximum time (in seconds) that isallowed between commits with identical user and log message ina single changeset. When very large files were checked in aspart of a changeset then the default may not be long enough.The default is 60. | |
| convert.cvsps.mergeto: | |
| Specify a regular expression to whichcommit log messages are matched. If a match occurs, then theconversion process will insert a dummy revision merging thebranch on which this log message occurs to the branchindicated in the regex. Default is{{mergetobranch([-\w]+)}} | |
| convert.cvsps.mergefrom: | |
| Specify a regular expression to whichcommit log messages are matched. If a match occurs, then theconversion process will add the most recent revision on thebranch indicated in the regex as the second parent of thechangeset. Default is{{mergefrombranch([-\w]+)}} | |
| convert.localtimezone: | |
| use local time (as determined by the TZenvironment variable) for changeset date/times. The defaultis False (use UTC). | |
| hooks.cvslog: | Specify a Python function to be called at the end ofgathering the CVS log. The function is passed a list with thelog entries, and can modify the entries in-place, or add ordelete them. |
| hooks.cvschangesets: | |
| Specify a Python function to be called afterthe changesets are calculated from the CVS log. Thefunction is passed a list with the changeset entries, and canmodify the changesets in-place, or add or delete them. | |
An additional "debugcvsps" Mercurial command allows the builtinchangeset merging code to be run without doing a conversion. Itsparameters and output are similar to that of cvsps 2.1. Please seethe command help for more details.
Subversion source detects classical trunk/branches/tags layouts.By default, the suppliedsvn://repo/path/ source URL isconverted as a single branch. Ifsvn://repo/path/trunk existsit replaces the default branch. Ifsvn://repo/path/branchesexists, its subdirectories are listed as possible branches. Ifsvn://repo/path/tags exists, it is looked for tags referencingconverted branches. Defaulttrunk,branches andtagsvalues can be overridden with following options. Set them to pathsrelative to the source URL, or leave them blank to disable autodetection.
The following options can be set with--config:
| convert.svn.branches: | |
|---|---|
| specify the directory containing branches.The default isbranches. | |
| convert.svn.tags: | |
| specify the directory containing tags. Thedefault istags. | |
| convert.svn.trunk: | |
| specify the name of the trunk branch. Thedefault istrunk. | |
| convert.localtimezone: | |
| use local time (as determined by the TZenvironment variable) for changeset date/times. The defaultis False (use UTC). | |
Source history can be retrieved starting at a specific revision,instead of being integrally converted. Only single branchconversions are supported.
| convert.svn.startrev: | |
|---|---|
| specify start Subversion revision number.The default is 0. | |
The Git importer converts commits from all reachable branches (refsin refs/heads) and remotes (refs in refs/remotes) to Mercurial.Branches are converted to bookmarks with the same name, with theleading 'refs/heads' stripped. Git submodules are converted to Gitsubrepos in Mercurial.
The following options can be set with--config:
| convert.git.similarity: | |
|---|---|
| specify how similar files modified in acommit must be to be imported as renames or copies, as apercentage between0 (disabled) and100 (files must beidentical). For example,90 means that a delete/add pair willbe imported as a rename if more than 90% of the file hasn'tchanged. The default is50. | |
| convert.git.findcopiesharder: | |
| while detecting copies, look at allfiles in the working copy instead of just changed ones. Thisis very expensive for large projects, and is only effective whenconvert.git.similarity is greater than 0. The default is False. | |
| convert.git.remoteprefix: | |
| remote refs are converted as bookmarks withconvert.git.remoteprefix as a prefix followed by a /. The defaultis 'remote'. | |
| convert.git.skipsubmodules: | |
| does not convert root level .gitmodules filesor files with 160000 mode indicating a submodule. Default is False. | |
The Perforce (P4) importer can be given a p4 depot path or aclient specification as source. It will convert all files in thesource to a flat Mercurial repository, ignoring labels, branchesand integrations. Note that when a depot path is given you thenusually should specify a target directory, because otherwise thetarget may be named...-hg.
The following options can be set with--config:
| convert.p4.encoding: | |
|---|---|
| specify the encoding to use when decoding standardoutput of the Perforce command line tool. The default is default systemencoding. | |
| convert.p4.startrev: | |
| specify initial Perforce revision (aPerforce changelist number). | |
The Mercurial destination will recognize Mercurial subrepositories in thedestination directory, and update the .hgsubstate file automatically if thedestination subrepositories contain the <dest>/<sub>/.hg/shamap file.Converting a repository with subrepositories requires converting a singlerepository at a time, from the bottom up.
An example showing how to convert a repository with subrepositories:
# so convert knows the type when it sees a non empty destination$ hg init converted$ hg convert orig/sub1 converted/sub1$ hg convert orig/sub2 converted/sub2$ hg convert orig converted
The following options are supported:
| convert.hg.clonebranches: | |
|---|---|
| dispatch source branches in separateclones. The default is False. | |
| convert.hg.tagsbranch: | |
| branch name for tag revisions, defaults todefault. | |
| convert.hg.usebranchnames: | |
| preserve branch names. The default isTrue. | |
| convert.hg.sourcename: | |
| records the given string as a 'convert_source' extravalue on each commit made in the target repository. The default is None. | |
All destination types accept the following options:
| convert.skiptags: | |
|---|---|
| does not convert tags from the source repo to the targetrepo. The default is False. | |
Options:
| --authors<FILE> | |
| username mapping filename (DEPRECATED) (use --authormap instead) | |
| -s,--source-type<TYPE> | |
| source repository type | |
| -d,--dest-type<TYPE> | |
| destination repository type | |
| -r,--rev<REV[+]> | |
| import up to source revision REV | |
| -A,--authormap<FILE> | |
| remap usernames using this file | |
| --filemap<FILE> | |
| remap file names using contents of file | |
| --full | apply filemap changes by converting all files again |
| --splicemap<FILE> | |
| splice synthesized history into place | |
| --branchmap<FILE> | |
| change branch names while converting | |
| --branchsort | try to sort changesets by branches |
| --datesort | try to sort changesets by date |
| --sourcesort | preserve source changesets order |
| --closesort | try to reorder closed revisions |
[+] marked option can be specified multiple times
automatically manage newlines in repository files
This extension allows you to manage the type of line endings (CRLF orLF) that are used in the repository and in the local workingdirectory. That way you can get CRLF line endings on Windows and LF onUnix/Mac, thereby letting everybody use their OS native line endings.
The extension reads its configuration from a versioned.hgeolconfiguration file found in the root of the working directory. The.hgeol file use the same syntax as all other Mercurialconfiguration files. It uses two sections,[patterns] and[repository].
The[patterns] section specifies how line endings should beconverted between the working directory and the repository. The format isspecified by a file pattern. The first match is used, so put morespecific patterns first. The available line endings areLF,CRLF, andBIN.
Files with the declared format ofCRLF orLF are alwayschecked out and stored in the repository in that format and filesdeclared to be binary (BIN) are left unchanged. Additionally,native is an alias for checking out in the platform's default lineending:LF on Unix (including Mac OS X) andCRLF onWindows. Note thatBIN (do nothing to line endings) is Mercurial'sdefault behavior; it is only needed if you need to override a later,more general pattern.
The optional[repository] section specifies the line endings touse for files stored in the repository. It has a single setting,native, which determines the storage line endings for filesdeclared asnative in the[patterns] section. It can be set toLF orCRLF. The default isLF. For example, this meansthat on Windows, files configured asnative (CRLF by default)will be converted toLF when stored in the repository. Filesdeclared asLF,CRLF, orBIN in the[patterns] sectionare always stored as-is in the repository.
Example versioned.hgeol file:
[patterns]**.py = native**.vcproj = CRLF**.txt = nativeMakefile = LF**.jpg = BIN[repository]native = LF
Note
The rules will first apply when files are touched in the workingdirectory, e.g. by updating to null and back to tip to touch all files.
The extension uses an optional[eol] section read from both thenormal Mercurial configuration files and the.hgeol file, with thelatter overriding the former. You can use that section to control theoverall behavior. There are three settings:
The extension providescleverencode: andcleverdecode: filterslike the deprecated win32text extension does. This means that you candisable win32text and enable eol and your filters will still work. Youonly need to these filters until you have prepared a.hgeol file.
Thewin32text.forbid* hooks provided by the win32text extensionhave been unified into a single hook namedeol.checkheadshook. Thehook will lookup the expected line endings from the.hgeol file,which means you must migrate to a.hgeol file first before usingthe hook.eol.checkheadshook only checks heads, intermediateinvalid revisions will be pushed. To forbid them completely, use theeol.checkallhook hook. These hooks are best used aspretxnchangegroup hooks.
Seehg help patterns for more information about the glob patternsused.
command to allow external programs to compare revisions
The extdiff Mercurial extension allows you to use external programsto compare revisions, or revision with working directory. The externaldiff programs are called with a configurable set of options and twonon-option arguments: paths to directories containing snapshots offiles to compare.
The extdiff extension also allows you to configure new diff commands, soyou do not need to typehg extdiff-p kdiff3 always.
[extdiff]# add new command that runs GNU diff(1) in 'context diff' modecdiff = gdiff -Nprc5## or the old way:#cmd.cdiff = gdiff#opts.cdiff = -Nprc5# add new command called meld, runs meld (no need to name twice). If# the meld executable is not available, the meld tool in [merge-tools]# will be used, if availablemeld =# add new command called vimdiff, runs gvimdiff with DirDiff plugin# (see http://www.vim.org/scripts/script.php?script_id=102) Non# English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in# your .vimrcvimdiff = gvim -f "+next" \ "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
Tool arguments can include variables that are expanded at runtime:
$parent1, $plabel1 - filename, descriptive label of first parent$child, $clabel - filename, descriptive label of child revision$parent2, $plabel2 - filename, descriptive label of second parent$root - repository root$parent is an alias for $parent1.
The extdiff extension will look in your [diff-tools] and [merge-tools]sections for diff tool arguments, when none are specified in [extdiff].
[extdiff]kdiff3 =[diff-tools]kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
You can use -I/-X and list of file or directory names like normalhg diff command. The extdiff extension makes snapshots of onlyneeded files, so running the external diff program will actually bepretty fast (at least faster than having to compare the entire tree).
use external program to diff repository (or selected files):
hg extdiff [OPT]... [FILE]...
Show differences between revisions for the specified files, usingan external program. The default program used is diff, withdefault options "-Npru".
To select a different program, use the -p/--program option. Theprogram will be passed the names of two directories to compare. Topass additional options to the program, use -o/--option. Thesewill be passed before the names of the directories to compare.
When two revision arguments are given, then changes are shownbetween those revisions. If only one revision is specified thenthat revision is compared to the working directory, and, when norevisions are specified, the working directory files are comparedto its parent.
Options:
| -p,--program<CMD> | |
| comparison program to run | |
| -o,--option<OPT[+]> | |
| pass option to comparison program | |
| -r,--rev<REV[+]> | |
| revision | |
| -c,--change<REV> | |
| change made by revision | |
| --patch | compare patches for two revisions |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
http authentication with factotum
This extension allows the factotum(4) facility on Plan 9 from Bell Labsplatforms to provide authentication information for HTTP access. Configurationentries specified in the auth section as well as authentication informationprovided in the repository URL are fully supported. If no prefix is specified,a value of "*" will be assumed.
By default, keys are specified as:
proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
If the factotum extension is unable to read the required key, one will berequested interactively.
A configuration section is available to customize runtime behavior. Bydefault, these entries are:
[factotum]executable = /bin/auth/factotummountpoint = /mnt/factotumservice = hg
The executable entry defines the full path to the factotum binary. Themountpoint entry defines the path to the factotum file service. Lastly, theservice entry controls the service name used when reading keys.
pull, update and merge in one command (DEPRECATED)
pull changes from a remote repository, merge new changes if needed.:
hg fetch [SOURCE]
This finds all changes from the repository at the specified pathor URL and adds them to the local repository.
If the pulled changes add a new branch head, the head isautomatically merged, and the result of the merge is committed.Otherwise, the working directory is updated to include the newchanges.
When a merge is needed, the working directory is first updated tothe newly pulled changes. Local changes are then merged into thepulled changes. To switch the merge order, use --switch-parent.
Seehg help dates for a list of formats valid for -d/--date.
Returns 0 on success.
Options:
| -r,--rev<REV[+]> | |
| a specific revision you would like to pull | |
| -e,--edit | invoke editor on commit messages |
| --force-editor | edit commit message (DEPRECATED) |
| --switch-parent | |
| switch parents when merging | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
Faster status operations with the Watchman file monitor (EXPERIMENTAL)
Integrates the file-watching program Watchman with Mercurial to produce fasterstatus results.
On a particular Linux system, for a real-world repository with over 400,000files hosted on ext4, vanillahg status takes 1.3 seconds. On the samesystem, with fsmonitor it takes about 0.3 seconds.
fsmonitor requires no configuration -- it will tell Watchman about yourrepository as necessary. You'll need to install Watchman fromhttps://facebook.github.io/watchman/ and make sure it is in your PATH.
The following configuration options exist:
[fsmonitor]mode = {off, on, paranoid}Whenmode = off, fsmonitor will disable itself (similar to not loading theextension at all). Whenmode = on, fsmonitor will be enabled (the default).Whenmode = paranoid, fsmonitor will query both Watchman and the filesystem,and ensure that the results are consistent.
[fsmonitor]timeout = (float)
A value, in seconds, that determines how long fsmonitor will wait for Watchmanto return results. Defaults to2.0.
[fsmonitor]blacklistusers = (list of userids)
A list of usernames for which fsmonitor will disable itself altogether.
[fsmonitor]walk_on_invalidate = (boolean)
Whether or not to walk the whole repo ourselves when our cached state has beeninvalidated, for example when Watchman has been restarted or .hgignore ruleshave been changed. Walking the repo in that case can result in competing forI/O with Watchman. For large repos it is recommended to set this value tofalse. You may wish to set this to true if you have a very fast filesystemthat can outpace the IPC overhead of getting the result data for the full repofrom Watchman. Defaults to false.
fsmonitor is incompatible with the largefiles and eol extensions, andwill disable itself if any of those are active.
commands to sign and verify changesets
verify all the signatures there may be for a particular revision:
hg sigcheck REV
verify all the signatures there may be for a particular revision
add a signature for the current or given revision:
hg sign [OPTION]... [REV]...
If no revision is given, the parent of the working directory is used,or tip if no revision is checked out.
Thegpg.cmd config setting can be used to specify the commandto run. A default key can be specified withgpg.key.
Seehg help dates for a list of formats valid for -d/--date.
Options:
| -l,--local | make the signature local |
| -f,--force | sign even if the sigfile is modified |
| --no-commit | do not commit the sigfile after signing |
| -k,--key<ID> | the key id to sign with |
| -m,--message<TEXT> | |
| use text as commit message | |
| -e,--edit | invoke editor on commit messages |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
list signed changesets:
hg sigs
list signed changesets
command to view revision graphs from a shell (DEPRECATED)
The functionality of this extension has been include in core Mercurialsince version 2.3. Please usehg log-G ... instead.
This extension adds a --graph option to the incoming, outgoing and logcommands. When this options is given, an ASCII representation of therevision graph is also shown.
show revision history alongside an ASCII revision graph:
hg glog [OPTION]... [FILE]
Print a revision history alongside a revision graph drawn withASCII characters.
Nodes printed as an @ character are parents of the workingdirectory.
This is an alias tohg log-G.
Options:
| -f,--follow | follow changeset history, or file history across copies and renames |
| --follow-first | only follow the first parent of merge changesets (DEPRECATED) |
| -d,--date<DATE> | |
| show revisions matching date spec | |
| -C,--copies | show copied files |
| -k,--keyword<TEXT[+]> | |
| do case-insensitive search for a given text | |
| -r,--rev<REV[+]> | |
| show the specified revision or revset | |
| --removed | include revisions where files were removed |
| -m,--only-merges | |
| show only merges (DEPRECATED) | |
| -u,--user<USER[+]> | |
| revisions committed by user | |
| --only-branch<BRANCH[+]> | |
| show only changesets within the given named branch (DEPRECATED) | |
| -b,--branch<BRANCH[+]> | |
| show changesets within the given named branch | |
| -P,--prune<REV[+]> | |
| do not display revision or any of its ancestors | |
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| -l,--limit<NUM> | |
| limit number of changes displayed | |
| -M,--no-merges | |
| do not show merges | |
| --stat | output diffstat-style summary of changes |
| -G,--graph | show the revision DAG |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
browse the repository in a graphical way
The hgk extension allows browsing the history of a repository in agraphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is notdistributed with Mercurial.)
hgk consists of two parts: a Tcl script that does the displaying andquerying of information, and an extension to Mercurial named hgk.py,which provides hooks for hgk to get information. hgk can be found inthe contrib directory, and the extension is shipped in the hgextrepository, and needs to be enabled.
Thehg view command will launch the hgk Tcl script. For this commandto work, hgk must be in your search path. Alternately, you can specifythe path to hgk in your configuration file:
[hgk]path = /location/of/hgk
hgk can make use of the extdiff extension to visualize revisions.Assuming you had already configured extdiff vdiff command, just add:
[hgk]vdiff=vdiff
Revisions context menu will now display additional entries to firevdiff on hovered and selected revisions.
start interactive history viewer:
hg view [-l LIMIT] [REVRANGE]
start interactive history viewer
Options:
| -l,--limit<NUM> | |
| limit number of changes displayed | |
syntax highlighting for hgweb (requires Pygments)
It depends on the Pygments syntax highlighting library:http://pygments.org/
There are the following configuration options:
[web]pygments_style = <style> (default: colorful)highlightfiles = <fileset> (default: size('<5M'))highlightonlymatchfilename = <bool> (default False)highlightonlymatchfilename will only highlight files if their type couldbe identified by their filename. When this is not enabled (the default),Pygments will try very hard to identify the file type from content and anymatch (even matches with a low confidence score) will be used.
interactive history editing
With this extension installed, Mercurial gains one new command: histedit. Usageis as follows, assuming the following history:
@ 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
If you were to runhg histedit c561b4e977df, you would see the followingfile open in your editor:
pick c561b4e977df Add betapick 030b686bedc4 Add gammapick 7c2fd3b9020c Add delta# Edit history between c561b4e977df and 7c2fd3b9020c## Commits are listed from least to most recent## Commands:# p, pick = use commit# e, edit = use commit, but stop for amending# f, fold = use commit, but combine it with the one above# r, roll = like fold, but discard this commit's description# d, drop = remove commit from history# m, mess = edit commit message without changing commit content#
In this file, lines beginning with# are ignored. You must specify a rulefor each revision in your history. For example, if you had meant to add gammabefore beta, and then wanted to add delta in the same revision as beta, youwould reorganize the file to look like this:
pick 030b686bedc4 Add gammapick c561b4e977df Add betafold 7c2fd3b9020c Add delta# Edit history between c561b4e977df and 7c2fd3b9020c## Commits are listed from least to most recent## Commands:# p, pick = use commit# e, edit = use commit, but stop for amending# f, fold = use commit, but combine it with the one above# r, roll = like fold, but discard this commit's description# d, drop = remove commit from history# m, mess = edit commit message without changing commit content#
At which point you close the editor andhistedit starts working. When youspecify afold operation,histedit will open an editor when it foldsthose revisions together, offering you a chance to clean up the commit message:
Add beta***Add delta
Edit the commit message to your liking, then close the editor. Forthis example, let's assume that the commit message was changed toAdd beta and delta. After histedit has run and had a chance toremove any old or temporary revisions it needed, the history lookslike this:
@ 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
Note thathistedit doesnot remove any revisions (even its own temporaryones) until after it has completed all the editing operations, so it willprobably 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 originalrevisions by passing the--keep flag.
Theedit operation will drop you back to a command prompt,allowing you to edit files freely, or even usehg record to commitsome changes as a separate commit. When you're done, any remaininguncommitted changes will be committed as well. When done, runhghistedit--continue to finish this step. You'll be prompted for anew commit message, but the default commit message will be theoriginal message for theedit ed revision.
Themessage operation will give you a chance to revise a commitmessage without changing the contents. It's a shortcut for doingedit immediately followed byhg histedit --continue`.
Ifhistedit encounters a conflict when moving a revision (whilehandlingpick orfold), it'll stop in a similar manner toedit with the difference that it won't prompt you for a commitmessage when done. If you decide at this point that you don't like howmuch work it will be to rearrange history, or that you made a mistake,you can usehg histedit--abort to abandon the new changes youhave made and return to the state before you attempted to edit yourhistory.
If we clone the histedit-ed example repository above and add four morechanges, such that we have the following history:
@ 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
If you runhg histedit--outgoing on the clone then it is the sameas runninghg histedit 836302820282. If you need plan to push to arepository that Mercurial does not detect to be related to the sourcerepo, you can add a--force option.
Histedit rule lines are truncated to 80 characters by default. Youcan customize this behavior by setting a different length in yourconfiguration file:
[histedit]linelen = 120 # truncate rule lines at 120 characters
hg histedit attempts to automatically choose an appropriate baserevision to use. To change which base revision is used, define arevset in your configuration file:
[histedit]defaultrev = only(.) & draft()
By default each edited revision needs to be present in histedit commands.To remove revision you need to usedrop operation. You can configurethe drop to be implicit for missing commits by adding:
[histedit]dropmissing = True
interactively edit changeset history:
hg histedit [OPTIONS] ([ANCESTOR] | --outgoing [URL])
This command lets you edit a linear series of changesets (up toand including the working directory, which should be clean).You can:
There are a number of ways to select the root changeset:
If you use --outgoing, this command will abort if there are ambiguousoutgoing revisions. For example, if there are multiple branchescontaining outgoing revisions.
Use "min(outgoing() and ::.)" or similar revset specificationinstead of --outgoing to specify edit target revision exactly insuch ambiguous situation. Seehg help revsets for detail aboutselecting revisions.
Examples:
A number of changes have been made.Revision 3 is no longer needed.
Start history editing from revision 3:
hg histedit -r 3An editor opens, containing the list of revisions,with specific actions specified:
pick 5339bf82f0ca 3 Zworgle the foobarpick 8ef592ce7cc4 4 Bedazzle the zerlogpick 0a9639fcda9d 5 Morgify the cromulancyAdditional information about the possible actionsto take appears below the list of revisions.
To remove revision 3 from the history,its action (at the beginning of the relevant line)is changed to 'drop':
drop 5339bf82f0ca 3 Zworgle the foobarpick 8ef592ce7cc4 4 Bedazzle the zerlogpick 0a9639fcda9d 5 Morgify the cromulancyA number of changes have been made.Revision 2 and 4 need to be swapped.
Start history editing from revision 2:
hg histedit -r 2An editor opens, containing the list of revisions,with specific actions specified:
pick 252a1af424ad 2 Blorb a morgwazzlepick 5339bf82f0ca 3 Zworgle the foobarpick 8ef592ce7cc4 4 Bedazzle the zerlogTo swap revision 2 and 4, its lines are swappedin the editor:
pick 8ef592ce7cc4 4 Bedazzle the zerlogpick 5339bf82f0ca 3 Zworgle the foobarpick 252a1af424ad 2 Blorb a morgwazzle
Returns 0 on success, 1 if user intervention is required (not onlyfor intentional "edit" command, but also for resolving unexpectedconflicts).
Options:
| --commands<FILE> | |
| read history edits from the specified file | |
| -c,--continue | continue an edit already in progress |
| --edit-plan | edit remaining actions list |
| -k,--keep | don't strip old nodes after edit is complete |
| --abort | abort an edit in progress |
| -o,--outgoing | changesets not found in destination |
| -f,--force | force outgoing even for unrelated repositories |
| -r,--rev<REV[+]> | |
| first revision to be edited | |
[+] marked option can be specified multiple times
Track previous positions of bookmarks (EXPERIMENTAL)
This extension adds a new command:hg journal, which shows you wherebookmarks were previously located.
show the previous position of bookmarks and the working copy:
hg journal [OPTION]... [BOOKMARKNAME]
The journal is used to see the previous commits that bookmarks and theworking copy pointed to. By default the previous locations for the workingcopy. Passing a bookmark name will show all the previous positions ofthat bookmark. Use the --all switch to show previous locations for allbookmarks and the working copy; each line will then include the bookmarkname, or '.' for the working copy, as well.
Ifname starts withre:, the remainder of the name is treated asa regular expression. To match a name that actually starts withre:,use the prefixliteral:.
By default hg journal only shows the commit hash and the command that wasrunning at that time. -v/--verbose will show the prior hash, the user, andthe time at which it happened.
Use -c/--commits to output log information on each commit hash; at thispoint you can use the usual--patch,--git,--stat and--templateswitches to alter the log output for these.
hg journal -T json can be used to produce machine readable output.
Options:
| --all | show history for all names |
| -c,--commits | show commit metadata |
| -p,--patch | show patch |
| -g,--git | use git extended diff format |
| -l,--limit<NUM> | |
| limit number of changes displayed | |
| --stat | output diffstat-style summary of changes |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
expand keywords in tracked files
This extension expands RCS/CVS-like or self-customized $Keywords$ intracked text files selected by your configuration.
Keywords are only expanded in local repositories and not stored in thechange history. The mechanism can be regarded as a convenience for thecurrent user or for archive distribution.
Keywords expand to the changeset data pertaining to the latest changerelative to the working directory parent of each file.
Configuration is done in the [keyword], [keywordset] and [keywordmaps]sections of hgrc files.
Example:
[keyword]# expand keywords in every python file except those matching "x*"**.py =x* = ignore[keywordset]# prefer svn- over cvs-like default keywordmapssvn = True
Note
The more specific you are in your filename patterns the less youlose speed in huge repositories.
For [keywordmaps] template mapping and expansion demonstration andcontrol runhg kwdemo. Seehg help templates for a list ofavailable templates and filters.
Three additional date template filters are provided:
| utcdate: | "2006/09/18 15:13:13" |
|---|---|
| svnutcdate: | "2006-09-18 15:13:13Z" |
| svnisodate: | "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)" |
The default template mappings (view withhg kwdemo-d) can bereplaced with customized keywords and templates. Again, runhg kwdemo to control the results of your configuration changes.
Before changing/disabling active keywords, you must runhg kwshrinkto avoid storing expanded keywords in the change history.
To force expansion after enabling it, or a configuration change, runhg kwexpand.
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.
print [keywordmaps] configuration and an expansion example:
hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...
Show current, custom, or default keyword template maps and theirexpansions.
Extend the current configuration by specifying maps as argumentsand using -f/--rcfile to source an external hgrc file.
Use -d/--default to disable current configuration.
Seehg help templates for information on templates and filters.
Options:
| -d,--default | show default keyword template maps |
| -f,--rcfile<FILE> | |
| read maps from rcfile | |
expand keywords in the working directory:
hg kwexpand [OPTION]... [FILE]...
Run after (re)enabling keyword expansion.
kwexpand refuses to run if given files contain local changes.
Options:
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
show files configured for keyword expansion:
hg kwfiles [OPTION]... [FILE]...
List which files in the working directory are matched by the[keyword] configuration patterns.
Useful to prevent inadvertent keyword expansion and to speed upexecution by including only files that are actual candidates forexpansion.
Seehg help keyword on how to construct patterns both forinclusion and exclusion of files.
With -A/--all and -v/--verbose the codes used to show the statusof files are:
K = keyword expansion candidatek = keyword expansion candidate (not tracked)I = ignoredi = ignored (not tracked)
Options:
| -A,--all | show keyword status flags of all files |
| -i,--ignore | show files excluded from expansion |
| -u,--unknown | only show unknown (not tracked) files |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
revert expanded keywords in the working directory:
hg kwshrink [OPTION]... [FILE]...
Must be run before changing/disabling active keywords.
kwshrink refuses to run if given files contain local changes.
Options:
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
track large binary files
Large binary files tend to be not very compressible, not verydiffable, and not at all mergeable. Such files are not handledefficiently by Mercurial's storage format (revlog), which is based oncompressed binary deltas; storing large binary files as regularMercurial files wastes bandwidth and disk space and increasesMercurial's memory usage. The largefiles extension addresses theseproblems by adding a centralized client-server layer on top ofMercurial: largefiles live in acentral store out on the networksomewhere, and you only fetch the revisions that you need when youneed them.
largefiles works by maintaining a "standin file" in .hglf/ for eachlargefile. The standins are small (41 bytes: an SHA-1 hash plusnewline) and are tracked by Mercurial. Largefile revisions areidentified by the SHA-1 hash of their contents, which is written tothe standin. largefiles uses that revision ID to get/put largefilerevisions from/to the central store. This saves both disk space andbandwidth, since you don't need to retrieve all historical revisionsof large files when you clone or pull.
To start a new repository or add new large binary files, just add--large to yourhg add command. For example:
$ dd if=/dev/urandom of=randomdata count=2000$ hg add --large randomdata$ hg commit -m "add randomdata as a largefile"
When you push a changeset that adds/modifies largefiles to a remoterepository, its largefile revisions will be uploaded along with it.Note that the remote Mercurial must also have the largefiles extensionenabled for this to work.
When you pull a changeset that affects largefiles from a remoterepository, the largefiles for the changeset will by default not bepulled down. However, when you update to such a revision, anylargefiles needed by that revision are downloaded and cached (ifthey have never been downloaded before). One way to pull largefileswhen pulling is thus to use --update, which will update your workingcopy to the latest pulled revision (and thereby downloading any newlargefiles).
If you want to pull largefiles you don't need for update yet, thenyou can use pull with the--lfrev option or thehg lfpull command.
If you know you are pulling from a non-default location and want todownload all the largefiles that correspond to the new changesets atthe same time, then you can pull with--lfrev "pulled()".
If you just want to ensure that you will have the largefiles needed tomerge or rebase with new heads that you are pulling, then you can pullwith--lfrev "head(pulled())" flag to pre-emptively download any largefilesthat are new in the heads you are pulling.
Keep in mind that network access may now be required to update tochangesets that you have not previously updated to. The nature of thelargefiles extension means that updating is no longer guaranteed tobe a local-only operation.
If you already have large files tracked by Mercurial without thelargefiles extension, you will need to convert your repository inorder to benefit from largefiles. This is done with thehg lfconvert command:
$ hg lfconvert --size 10 oldrepo newrepo
In repositories that already have largefiles in them, any new fileover 10MB will automatically be added as a largefile. To change thisthreshold, setlargefiles.minsize in your Mercurial config fileto the minimum size in megabytes to track as a largefile, or use the--lfsize option to the add command (also in megabytes):
[largefiles]minsize = 2$ hg add --lfsize 2
Thelargefiles.patterns config option allows you to specify a listof filename patterns (seehg help patterns) that should always betracked as largefiles:
[largefiles]patterns = *.jpg re:.*\.(png|bmp)$ library.zip content/audio/*
Files that match one of these patterns will be added as largefilesregardless of their size.
Thelargefiles.minsize andlargefiles.patterns config optionswill be ignored for any repositories not already containing alargefile. To add the first largefile to a repository, you mustexplicitly do so with the --large flag passed to thehg addcommand.
convert a normal repository to a largefiles repository:
hg lfconvert SOURCE DEST [FILE ...]
Convert repository SOURCE to a new repository DEST, identical toSOURCE except that certain files will be converted as largefiles:specifically, any file that matches any PATTERNor whose size isabove the minimum size threshold is converted as a largefile. Thesize used to determine whether or not to track a file as alargefile is the size of the first version of the file. Theminimum size can be specified either with --size or inconfiguration aslargefiles.size.
After running this command you will need to make sure thatlargefiles is enabled anywhere you intend to push the newrepository.
Use --to-normal to convert largefiles back to normal files; afterthis, the DEST repository can be used without largefiles at all.
Options:
| -s,--size<SIZE> | |
| minimum size (MB) for files to be converted as largefiles | |
| --to-normal | convert from a largefiles repo to a normal repo |
pull largefiles for the specified revisions from the specified source:
hg lfpull -r REV... [-e CMD] [--remotecmd CMD] [SOURCE]
Pull largefiles that are referenced from local changesets but missinglocally, pulling from a remote repository to the local cache.
If SOURCE is omitted, the 'default' path will be used.Seehg help urls for more information.
Some examples:
pull largefiles for all branch heads:
hg lfpull -r "head() and not closed()"
pull largefiles on the default branch:
hg lfpull -r "branch(default)"
Options:
| -r,--rev<VALUE[+]> | |
| pull largefiles for these revisions | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
Send ui.log() data to a subprocess (EXPERIMENTAL)
This extension lets you specify a shell command per ui.log() event,sending all remaining arguments to as environment variables to that command.
Each positional argument to the method results in aMSG[N] key in theenvironment, starting at 1 (soMSG1,MSG2, etc.). Each keyword argumentis set as aOPT_UPPERCASE_KEY variable (so the key is uppercased, andprefixed withOPT_). The original event name is passed in theEVENTenvironment variable, and the process ID of mercurial is given inHGPID.
So given a callui.log('foo', 'bar', 'baz', spam='eggs'), a script configuredfor the `foo event can expect an environment withMSG1=bar,MSG2=baz, andOPT_SPAM=eggs.
Scripts are configured in the[logtoprocess] section, each key an event name.For example:
[logtoprocess]commandexception = echo "$MSG2$MSG3" > /var/log/mercurial_exceptions.log
would log the warning message and traceback of any failed command dispatch.
Scripts are run asychronously as detached daemon processes; mercurial willnot ensure that they exit cleanly.
manage a stack of patches
This extension lets you work with a stack of patches in a Mercurialrepository. It manages two stacks of patches - all known patches, andapplied patches (subset of known patches).
Known patches are represented as patch files in the .hg/patchesdirectory. Applied patches are both patch files and changesets.
Common tasks (usehg help command for more details):
create new patch qnewimport existing patch qimportprint patch series qseriesprint applied patches qappliedadd known patch to applied stack qpushremove patch from applied stack qpoprefresh contents of top applied patch qrefresh
By default, mq will automatically use git patches when required toavoid losing file mode changes, copy records, binary files or emptyfiles creations or deletions. This behavior can be configured with:
[mq]git = auto/keep/yes/no
If set to 'keep', mq will obey the [diff] section configuration whilepreserving existing git patches upon qrefresh. If set to 'yes' or'no', mq will override the [diff] section and always generate git orregular patches, possibly losing data in the second case.
It may be desirable for mq changesets to be kept in the secret phase (seehg help phases), which can be enabled with the following setting:
[mq]secret = True
You will by default be managing a patch queue named "patches". You cancreate other, independent patch queues with thehg qqueue command.
If the working directory contains uncommitted files, qpush, qpop andqgoto abort immediately. If -f/--force is used, the changes arediscarded. Setting:
[mq]keepchanges = True
make them behave as if --keep-changes were passed, and non-conflictinglocal changes will be tolerated and preserved. If incompatible optionssuch as -f/--force or --exact are passed, this setting is ignored.
This extension used to provide a strip command. This command now livesin the strip extension.
print the patches already applied:
hg qapplied [-1] [-s] [PATCH]
Returns 0 on success.
Options:
| -1,--last | show only the preceding applied patch |
| -s,--summary | print first line of patch header |
clone main and patch repository at same time:
hg qclone [OPTION]... SOURCE [DEST]
If source is local, destination will have no patches applied. Ifsource is remote, this command can not check if patches areapplied in source, so cannot guarantee that patches are notapplied in destination. If you clone remote repository, be surebefore that it has no patches applied.
Source patch repository is looked for in <src>/.hg/patches bydefault. Use -p <url> to change.
The patch directory must be a nested Mercurial repository, aswould be created byhg init--mq.
Return 0 on success.
Options:
| --pull | use pull protocol to copy metadata |
| -U,--noupdate | do not update the new working directories |
| --uncompressed | use uncompressed transfer (fast over LAN) |
| -p,--patches<REPO> | |
| location of source patch repository | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
commit changes in the queue repository (DEPRECATED):
hg qcommit [OPTION]... [FILE]...
This command is deprecated; usehg commit--mq instead.
Options:
| -A,--addremove | |
| mark new/missing files as added/removed before committing | |
| --close-branch | mark a branch head as closed |
| --amend | amend the parent of the working directory |
| -s,--secret | use the secret phase for committing |
| -e,--edit | invoke editor on commit messages |
| -i,--interactive | |
| use interactive mode | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -S,--subrepos | recurse into subrepositories |
[+] marked option can be specified multiple times
aliases: qci
remove patches from queue:
hg qdelete [-k] [PATCH]...
The patches must not be applied, and at least one patch is required. Exactpatch identifiers must be given. With -k/--keep, the patch files arepreserved in the patch directory.
To stop managing a patch and move it into permanent history,use thehg qfinish command.
Options:
| -k,--keep | keep patch file |
| -r,--rev<REV[+]> | |
| stop managing a revision (DEPRECATED) | |
[+] marked option can be specified multiple times
aliases: qremove qrm
diff of the current patch and subsequent modifications:
hg qdiff [OPTION]... [FILE]...
Shows a diff which includes the current patch as well as anychanges which have been made in the working directory since thelast refresh (thus showing what the current patch would becomeafter a qrefresh).
Usehg diff if you only want to see the changes made since thelast qrefresh, orhg export qtip if you want to see changesmade by the current patch without including changes made since theqrefresh.
Returns 0 on success.
Options:
| -a,--text | treat all files as text |
| -g,--git | use git extended diff format |
| --nodates | omit dates from diff headers |
| --noprefix | omit a/ and b/ prefixes from filenames |
| -p,--show-function | |
| show which function each change is in | |
| --reverse | produce a diff that undoes the changes |
| -w,--ignore-all-space | |
| ignore white space when comparing lines | |
| -b,--ignore-space-change | |
| ignore changes in the amount of white space | |
| -B,--ignore-blank-lines | |
| ignore changes whose lines are all blank | |
| -U,--unified<NUM> | |
| number of lines of context to show | |
| --stat | output diffstat-style summary of changes |
| --root<DIR> | produce diffs relative to subdirectory |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
move applied patches into repository history:
hg qfinish [-a] [REV]...
Finishes the specified revisions (corresponding to appliedpatches) by moving them out of mq control into regular repositoryhistory.
Accepts a revision range or the -a/--applied option. If --appliedis specified, all applied mq revisions are removed from mqcontrol. Otherwise, the given revisions must be at the base of thestack of applied patches.
This can be especially useful if your changes have been applied toan upstream repository, or if you are about to push your changesto upstream.
Returns 0 on success.
Options:
| -a,--applied | finish all applied changesets |
fold the named patches into the current patch:
hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...
Patches must not yet be applied. Each patch will be successivelyapplied to the current patch in the order given. If all thepatches apply successfully, the current patch will be refreshedwith the new cumulative patch, and the folded patches will bedeleted. With -k/--keep, the folded patch files will not beremoved afterwards.
The header for each folded patch will be concatenated with thecurrent patch header, separated by a line of* * *.
Returns 0 on success.
Options:
| -e,--edit | invoke editor on commit messages |
| -k,--keep | keep folded patch files |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
push or pop patches until named patch is at top of stack:
hg qgoto [OPTION]... PATCH
Returns 0 on success.
Options:
| --keep-changes | tolerate non-conflicting local changes |
| -f,--force | overwrite any local changes |
| --no-backup | do not save backup copies of files |
set or print guards for a patch:
hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]
Guards control whether a patch can be pushed. A patch with noguards is always pushed. A patch with a positive guard ("+foo") ispushed only if thehg qselect command has activated it. A patch witha negative guard ("-foo") is never pushed if thehg qselect commandhas activated it.
With no arguments, print the currently active guards.With arguments, set guards for the named patch.
Note
Specifying negative guards now requires '--'.
To set guards on another patch:
hg qguard other.patch -- +2.6.17 -stable
Returns 0 on success.
Options:
| -l,--list | list all patches and guards |
| -n,--none | drop all guards |
print the header of the topmost or specified patch:
hg qheader [PATCH]
Returns 0 on success.
import a patch or existing changeset:
hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...
The patch is inserted into the series after the last appliedpatch. If no patches have been applied, qimport prepends the patchto the series.
The patch will have the same name as its source file unless yougive it a new one with -n/--name.
You can register an existing patch inside the patch directory withthe -e/--existing flag.
With -f/--force, an existing patch of the same name will beoverwritten.
An existing changeset may be placed under mq control with -r/--rev(e.g. qimport --rev . -n patch will place the current revisionunder mq control). With -g/--git, patches imported with --rev willuse the git diff format. See the diffs help topic for informationon why this is important for preserving rename/copy informationand permission changes. Usehg qfinish to remove changesetsfrom mq control.
To import a patch from standard input, pass - as the patch file.When importing from standard input, a patch name must be specifiedusing the --name flag.
To import an existing patch while renaming it:
hg qimport -e existing-patch -n new-name
Returns 0 if import succeeded.
Options:
| -e,--existing | import file in patch directory |
| -n,--name<NAME> | |
| name of patch file | |
| -f,--force | overwrite existing files |
| -r,--rev<REV[+]> | |
| place existing revisions under mq control | |
| -g,--git | use git extended diff format |
| -P,--push | qpush after importing |
[+] marked option can be specified multiple times
init a new queue repository (DEPRECATED):
hg qinit [-c]
The queue repository is unversioned by default. If-c/--create-repo is specified, qinit will create a separate nestedrepository for patches (qinit -c may also be run later to convertan unversioned patch repository into a versioned one). You can useqcommit to commit changes to this queue repository.
This command is deprecated. Without -c, it's implied by other relevantcommands. With -c, usehg init--mq instead.
Options:
| -c,--create-repo | |
| create queue repository | |
create a new patch:
hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...
qnew creates a new patch on top of the currently-applied patch (ifany). The patch will be initialized with any outstanding changesin the working directory. You may also use -I/--include,-X/--exclude, and/or a list of files after the patch name to addonly changes to matching files to the new patch, leaving the restas uncommitted modifications.
-u/--user and -d/--date can be used to set the (given) user anddate, respectively. -U/--currentuser and -D/--currentdate set userto current user and date to current date.
-e/--edit, -m/--message or -l/--logfile set the patch header aswell as the commit message. If none is specified, the header isempty and the commit message is '[mq]: PATCH'.
Use the -g/--git option to keep the patch in the git extended diffformat. Read the diffs help topic for more information on why thisis important for preserving permission changes and copy/renameinformation.
Returns 0 on successful creation of a new patch.
Options:
| -e,--edit | invoke editor on commit messages |
| -f,--force | import uncommitted changes (DEPRECATED) |
| -g,--git | use git extended diff format |
| -U,--currentuser | |
| add "From: <current user>" to patch | |
| -u,--user<USER> | |
| add "From: <USER>" to patch | |
| -D,--currentdate | |
| add "Date: <current date>" to patch | |
| -d,--date<DATE> | |
| add "Date: <DATE>" to patch | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
[+] marked option can be specified multiple times
print the name of the next pushable patch:
hg qnext [-s]
Returns 0 on success.
Options:
| -s,--summary | print first line of patch header |
pop the current patch off the stack:
hg qpop [-a] [-f] [PATCH | INDEX]
Without argument, pops off the top of the patch stack. If given apatch name, keeps popping off patches until the named patch is atthe top of the stack.
By default, abort if the working directory contains uncommittedchanges. With --keep-changes, abort only if the uncommitted filesoverlap with patched files. With -f/--force, backup and discardchanges made to such files.
Return 0 on success.
Options:
| -a,--all | pop all patches |
| -n,--name<NAME> | |
| queue name to pop (DEPRECATED) | |
| --keep-changes | tolerate non-conflicting local changes |
| -f,--force | forget any local changes to patched files |
| --no-backup | do not save backup copies of files |
print the name of the preceding applied patch:
hg qprev [-s]
Returns 0 on success.
Options:
| -s,--summary | print first line of patch header |
push the next patch onto the stack:
hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]
By default, abort if the working directory contains uncommittedchanges. With --keep-changes, abort only if the uncommitted filesoverlap with patched files. With -f/--force, backup and patch overuncommitted changes.
Return 0 on success.
Options:
| --keep-changes | tolerate non-conflicting local changes |
| -f,--force | apply on top of local changes |
| -e,--exact | apply the target patch to its recorded parent |
| -l,--list | list patch name in commit text |
| -a,--all | apply all patches |
| -m,--merge | merge from another queue (DEPRECATED) |
| -n,--name<NAME> | |
| merge queue name (DEPRECATED) | |
| --move | reorder patch series and apply only the patch |
| --no-backup | do not save backup copies of files |
manage multiple patch queues:
hg qqueue [OPTION] [QUEUE]
Supports switching between different patch queues, as well as creatingnew patch queues and deleting existing ones.
Omitting a queue name or specifying -l/--list will show you the registeredqueues - by default the "normal" patches queue is registered. The currentlyactive queue will be marked with "(active)". Specifying --active will printonly the name of the active queue.
To create a new queue, use -c/--create. The queue is automatically madeactive, except in the case where there are applied patches from thecurrently active queue in the repository. Then the queue will only becreated and switching will fail.
To delete an existing queue, use --delete. You cannot delete the currentlyactive queue.
Returns 0 on success.
Options:
| -l,--list | list all available queues |
| --active | print name of active queue |
| -c,--create | create new queue |
| --rename | rename active queue |
| --delete | delete reference to queue |
| --purge | delete queue, and remove patch dir |
update the current patch:
hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...
If any file patterns are provided, the refreshed patch willcontain only the modifications that match those patterns; theremaining modifications will remain in the working directory.
If -s/--short is specified, files currently included in the patchwill be refreshed just like matched files and remain in the patch.
If -e/--edit is specified, Mercurial will start your configured editor foryou to enter a message. In case qrefresh fails, you will find a backup ofyour message in.hg/last-message.txt.
hg add/remove/copy/rename work as usual, though you might want touse git-style patches (-g/--git or [diff] git=1) to track copiesand renames. See the diffs help topic for more information on thegit diff format.
Returns 0 on success.
Options:
| -e,--edit | invoke editor on commit messages |
| -g,--git | use git extended diff format |
| -s,--short | refresh only files already in the patch and specified files |
| -U,--currentuser | |
| add/update author field in patch with current user | |
| -u,--user<USER> | |
| add/update author field in patch with given user | |
| -D,--currentdate | |
| add/update date field in patch with current date | |
| -d,--date<DATE> | |
| add/update date field in patch with given date | |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
[+] marked option can be specified multiple times
rename a patch:
hg qrename PATCH1 [PATCH2]
With one argument, renames the current patch to PATCH1.With two arguments, renames PATCH1 to PATCH2.
Returns 0 on success.
aliases: qmv
restore the queue state saved by a revision (DEPRECATED):
hg qrestore [-d] [-u] REV
This command is deprecated, usehg rebase instead.
Options:
| -d,--delete | delete save entry |
| -u,--update | update queue working directory |
save current queue state (DEPRECATED):
hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]
This command is deprecated, usehg rebase instead.
Options:
| -c,--copy | copy patch directory |
| -n,--name<NAME> | |
| copy directory name | |
| -e,--empty | clear queue status file |
| -f,--force | force copy |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
set or print guarded patches to push:
hg qselect [OPTION]... [GUARD]...
Use thehg qguard command to set or print guards on patch, then useqselect to tell mq which guards to use. A patch will be pushed ifit has no guards or any positive guards match the currentlyselected guard, but will not be pushed if any negative guardsmatch the current guard. For example:
qguard foo.patch -- -stable (negative guard)qguard bar.patch +stable (positive guard)qselect stable
This activates the "stable" guard. mq will skip foo.patch (becauseit has a negative match) but push bar.patch (because it has apositive match).
With no arguments, prints the currently active guards.With one argument, sets the active guard.
Use -n/--none to deactivate guards (no other arguments needed).When no guards are active, patches with positive guards areskipped and patches with negative guards are pushed.
qselect can change the guards on applied patches. It does not popguarded patches by default. Use --pop to pop back to the lastapplied patch that is not guarded. Use --reapply (which implies--pop) to push back to the current patch afterwards, but skipguarded patches.
Use -s/--series to print a list of all guards in the series file(no other arguments needed). Use -v for more information.
Returns 0 on success.
Options:
| -n,--none | disable all guards |
| -s,--series | list all guards in series file |
| --pop | pop to before first guarded applied patch |
| --reapply | pop, then reapply patches |
print the entire series file:
hg qseries [-ms]
Returns 0 on success.
Options:
| -m,--missing | print patches not in series |
| -s,--summary | print first line of patch header |
print the name of the current patch:
hg qtop [-s]
Returns 0 on success.
Options:
| -s,--summary | print first line of patch header |
print the patches not yet applied:
hg qunapplied [-1] [-s] [PATCH]
Returns 0 on success.
Options:
| -1,--first | show only the first patch |
| -s,--summary | print first line of patch header |
hooks for sending email push notifications
This extension implements hooks to send email notifications whenchangesets are sent from or received by the local repository.
First, enable the extension as explained inhg help extensions, andregister the hook you want to run.incoming andchangegroup hooksare run when changesets are received, whileoutgoing hooks are forchangesets sent to another repository:
[hooks]# one email for each incoming changesetincoming.notify = python:hgext.notify.hook# one email for all incoming changesetschangegroup.notify = python:hgext.notify.hook# one email for all outgoing changesetsoutgoing.notify = python:hgext.notify.hook
This registers the hooks. To enable notification, subscribers mustbe assigned to repositories. The[usersubs] section maps multiplerepositories to a given recipient. The[reposubs] section mapsmultiple recipients to a single repository:
[usersubs]# key is subscriber email, value is a comma-separated list of repo patternsuser@host = pattern[reposubs]# key is repo pattern, value is a comma-separated list of subscriber emailspattern = user@host
Apattern is aglob matching the absolute path to a repository,optionally combined with a revset expression. A revset expression, ifpresent, is separated from the glob by a hash. Example:
[reposubs]*/widgets#branch(release) = qa-team@example.com
This sends toqa-team@example.com whenever a changeset on thereleasebranch triggers a notification in any repository ending inwidgets.
In order to place them under direct user management,[usersubs] and[reposubs] sections may be placed in a separatehgrc file andincorporated by reference:
[notify]config = /path/to/subscriptionsfile
Notifications will not be sent until thenotify.test value is settoFalse; see below.
Notifications content can be tweaked with the following configuration entries:
Space-separated list of change sources. Notifications are activated onlywhen a changeset's source is in this list. Sources may be:
| serve: | changesets received via http or ssh |
|---|---|
| pull: | changesets received viahg pull |
| unbundle: | changesets received viahg unbundle |
| push: | changesets sent or received viahg push |
| bundle: | changesets sent viahg unbundle |
Default: serve.
If set, the following entries will also be used to customize thenotifications:
browse command output with an external pager
To set the pager that should be used, set the application variable:
[pager]pager = less -FRX
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.
You can disable the pager for certain commands by adding them to thepager.ignore list:
[pager]ignore = version, help, update
You can also enable the pager only for certain commands usingpager.attend. Below is the default list of commands to be paged:
[pager]attend = annotate, cat, diff, export, glog, log, qdiff
Setting pager.attend to an empty value will cause all commands to bepaged.
If pager.attend is present, pager.ignore will be ignored.
Lastly, you can enable and disable paging for individual commands withthe attend-<command> option. This setting takes precedence overexisting attend and ignore options and defaults:
[pager]attend-cat = false
To ignore global commands likehg version orhg help, you haveto specify them in your user configuration file.
To control whether the pager is used at all for an individual command,you can use --pager=<value>:
- use as needed: `auto`.- require the pager: `yes` or `on`.- suppress the pager: `no` or `off` (any unrecognized valuewill also work).
command to send changesets as (a series of) patch emails
The series is started off with a "[PATCH 0 of N]" introduction, whichdescribes the series as a whole.
Each patch email has a Subject line of "[PATCH M of N] ...", using thefirst line of the changeset description as the subject text. Themessage contains two or three body parts:
Each message refers to the first in the series using the In-Reply-Toand References headers, so they will show up as a sequence in threadedmail and news readers, and in mail archives.
To configure other defaults, add a section like this to yourconfiguration file:
[email]from = My Name <my@email>to = recipient1, recipient2, ...cc = cc1, cc2, ...bcc = bcc1, bcc2, ...reply-to = address1, address2, ...
Use[patchbomb] as configuration section name if you need tooverride global[email] address settings.
Then you can use thehg email command to mail a series ofchangesets as a patchbomb.
You can also either configure the method option in the email sectionto be a sendmail compatible mailer or fill out the [smtp] section sothat the patchbomb extension can automatically send patchbombsdirectly from the commandline. See the [email] and [smtp] sections inhgrc(5) for details.
By default,hg email will prompt for aTo orCC header ifyou do not supply one via configuration or the command line. You canoverride this to never prompt by configuring an empty value:
[email]cc =
You can control the default inclusion of an introduction message with thepatchbomb.intro configuration option. The configuration is alwaysoverwritten by command line flags like --intro and --desc:
[patchbomb]intro=auto # include introduction message if more than 1 patch (default)intro=never # never include an introduction messageintro=always # always include an introduction message
You can set patchbomb to always ask for confirmation by settingpatchbomb.confirm to true.
send changesets by email:
hg email [OPTION]... [DEST]...
By default, diffs are sent in the format generated byhg export, one per message. The series starts with a "[PATCH 0of N]" introduction, which describes the series as a whole.
Each patch email has a Subject line of "[PATCH M of N] ...", usingthe first line of the changeset description as the subject text.The message contains two or three parts. First, the changesetdescription.
With the -d/--diffstat option, if the diffstat program isinstalled, the result of running diffstat on the patch is inserted.
Finally, the patch itself, as generated byhg export.
With the -d/--diffstat or --confirm options, you will be presentedwith a final summary of all messages and asked for confirmation beforethe messages are sent.
By default the patch is included as text in the email body foreasy reviewing. Using the -a/--attach option will instead createan attachment for the patch. With -i/--inline an inline attachmentwill be created. You can include a patch both as text in the emailbody and as a regular or an inline attachment by combining the-a/--attach or -i/--inline with the --body option.
With -o/--outgoing, emails will be generated for patches not foundin the destination repository (or only those which are ancestorsof the specified revisions if any are provided)
With -b/--bundle, changesets are selected as for --outgoing, but asingle email containing a binary Mercurial bundle as an attachmentwill be sent. Use thepatchbomb.bundletype config option tocontrol the bundle type as withhg bundle--type.
With -m/--mbox, instead of previewing each patchbomb message in apager or sending the messages directly, it will create a UNIXmailbox file with the patch emails. This mailbox file can bepreviewed with any mail user agent which supports UNIX mboxfiles.
With -n/--test, all steps will run, but mail will not be sent.You will be prompted for an email recipient address, a subject andan introductory message describing the patches of your patchbomb.Then when all is done, patchbomb messages are displayed. If thePAGER environment variable is set, your pager will be fired up oncefor each patchbomb message, so you can verify everything is alright.
In case email sending fails, you will find a backup of your seriesintroductory message in.hg/last-email.txt.
The default behavior of this command can be customized throughconfiguration. (Seehg help patchbomb for details)
Examples:
hg email -r 3000 # send patch 3000 onlyhg email -r 3000 -r 3001 # send patches 3000 and 3001hg email -r 3000:3005 # send patches 3000 through 3005hg email 3000 # send patch 3000 (deprecated)hg email -o # send all patches not in defaulthg email -o DEST # send all patches not in DESThg email -o -r 3000 # send all ancestors of 3000 not in defaulthg email -o -r 3000 DEST # send all ancestors of 3000 not in DESThg email -b # send bundle of all patches not in defaulthg email -b DEST # send bundle of all patches not in DESThg email -b -r 3000 # bundle of all ancestors of 3000 not in defaulthg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DESThg email -o -m mbox && # generate an mbox file... mutt -R -f mbox # ... and view it with mutthg email -o -m mbox && # generate an mbox file ... formail -s sendmail \ # ... and use formail to send from the mbox -bm -t < mbox # ... using sendmail
Before using this command, you will need to enable email in yourhgrc. See the [email] section in hgrc(5) for details.
Options:
| -g,--git | use git extended diff format |
| --plain | omit hg patch header |
| -o,--outgoing | send changes not found in the target repository |
| -b,--bundle | send changes not in target as a binary bundle |
| --bundlename<NAME> | |
| name of the bundle attachment file (default: bundle) | |
| -r,--rev<REV[+]> | |
| a revision to send | |
| --force | run even when remote repository is unrelated (with -b/--bundle) |
| --base<REV[+]> | |
| a base changeset to specify instead of a destination (with -b/--bundle) | |
| --intro | send an introduction email for a single patch |
| --body | send patches as inline message text (default) |
| -a,--attach | send patches as attachments |
| -i,--inline | send patches as inline attachments |
| --bcc<VALUE[+]> | |
| email addresses of blind carbon copy recipients | |
| -c,--cc<VALUE[+]> | |
| email addresses of copy recipients | |
| --confirm | ask for confirmation before sending |
| -d,--diffstat | add diffstat output to messages |
| --date<VALUE> | use the given date as the sending date |
| --desc<VALUE> | use the given file as the series description |
| -f,--from<VALUE> | |
| email address of sender | |
| -n,--test | print messages that would be sent |
| -m,--mbox<VALUE> | |
| write messages to mbox file instead of sending them | |
| --reply-to<VALUE[+]> | |
| email addresses replies should be sent to | |
| -s,--subject<VALUE> | |
| subject of first message (intro or single patch) | |
| --in-reply-to<VALUE> | |
| message identifier to reply to | |
| --flag<VALUE[+]> | |
| flags to add in subject prefixes | |
| -t,--to<VALUE[+]> | |
| email addresses of recipients | |
| -e,--ssh<CMD> | |
| specify ssh command to use | |
| --remotecmd<CMD> | |
| specify hg command to run on the remote side | |
| --insecure | do not verify server certificate (ignoring web.cacerts config) |
[+] marked option can be specified multiple times
command to delete untracked files from the working directory
removes files not tracked by Mercurial:
hg purge [OPTION]... [DIR]...
Delete files not known to Mercurial. This is useful to test localand uncommitted changes in an otherwise-clean source tree.
This means that purge will delete the following by default:
But it will leave untouched:
The --files and --dirs options can be used to direct purge to deleteonly files, only directories, or both. If neither option is given,both will be deleted.
If directories are given on the command line, only files in thesedirectories are considered.
Be careful with purge, as you could irreversibly delete some filesyou forgot to add to the repository. If you only want to print thelist of files that this program would delete, use the --printoption.
Options:
| -a,--abort-on-err | |
| abort if an error occurs | |
| --all | purge ignored files too |
| --dirs | purge empty directories |
| --files | purge files |
| -p,--print | print filenames instead of deleting them |
| -0,--print0 | end filenames with NUL, for use with xargs (implies -p/--print) |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
aliases: clean
command to move sets of revisions to a different ancestor
This extension lets you rebase changesets in an existing Mercurialrepository.
For more information:https://mercurial-scm.org/wiki/RebaseExtension
move changeset (and descendants) to a different branch:
hg rebase [-s REV | -b REV] [-d REV] [OPTION]
Rebase uses repeated merging to graft changesets from one part ofhistory (the source) onto another (the destination). This can beuseful for linearizinglocal changes relative to a masterdevelopment tree.
Published commits cannot be rebased (seehg help phases).To copy commits, seehg help graft.
If you don't specify a destination changeset (-d/--dest), rebasewill use the same logic ashg merge to pick a destination. ifthe current branch contains exactly one other head, the other headis merged with by default. Otherwise, an explicit revision withwhich to merge with must be provided. (destination changeset is notmodified by rebasing, but new changesets are added as itsdescendants.)
Here are the ways to select changesets:
- Explicitly select them using--rev.
- Use--source to select a root changeset and include all of itsdescendants.
- Use--base to select a changeset; rebase will find ancestorsand their descendants which are not also ancestors of the destination.
- If you do not specify any of--rev,source, or--base,rebase will use--base . as above.
Rebase will destroy original changesets unless you use--keep.It will also move your bookmarks (even if you do).
Some changesets may be dropped if they do not contribute changes(e.g. merges from the destination branch).
Unlikemerge, rebase will do nothing if you are at the branch tip ofa named branch with two heads. You will need to explicitly specify sourceand/or destination.
If you need to use a tool to automate merge/conflict decisions, youcan specify one with--tool, seehg helpmerge-tools.As a caveat: the tool will not be used to mediate when a file wasdeleted, there is no hook presently available for this.
If a rebase is interrupted to manually resolve a conflict, it can becontinued with --continue/-c or aborted with --abort/-a.
Examples:
move "local changes" (current commit back to branching point)to the current branch tip after a pull:
hg rebase
move a single changeset to the stable branch:
hg rebase -r 5f493448 -d stable
splice a commit and all its descendants onto another part of history:
hg rebase --source c0c3 --dest 4cf9
rebase everything on a branch marked by a bookmark onto thedefault branch:
hg rebase --base myfeature --dest default
collapse a sequence of changes into a single commit:
hg rebase --collapse -r 1520:1525 -d .
move a named branch while preserving its name:
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
Returns 0 on success, 1 if nothing to rebase or there areunresolved conflicts.
Options:
| -s,--source<REV> | |
| rebase the specified changeset and descendants | |
| -b,--base<REV> | |
| rebase everything from branching point of specified changeset | |
| -r,--rev<REV[+]> | |
| rebase these revisions | |
| -d,--dest<REV> | |
| rebase onto the specified changeset | |
| --collapse | collapse the rebased changesets |
| -m,--message<TEXT> | |
| use text as collapse commit message | |
| -e,--edit | invoke editor on commit messages |
| -l,--logfile<FILE> | |
| read collapse commit message from file | |
| -k,--keep | keep original changesets |
| --keepbranches | keep original branch names |
| -D,--detach | (DEPRECATED) |
| -i,--interactive | |
| (DEPRECATED) | |
| -t,--tool<VALUE> | |
| specify merge tool | |
| -c,--continue | continue an interrupted rebase |
| -a,--abort | abort an interrupted rebase |
| --style<STYLE> | |
| display using template map file (DEPRECATED) | |
| -T,--template<TEMPLATE> | |
| display with template | |
[+] marked option can be specified multiple times
commands to interactively select changes for commit/qrefresh (DEPRECATED)
The feature provided by this extension has been moved into core Mercurial ashg commit--interactive.
interactively record a new patch:
hg qrecord [OPTION]... PATCH [FILE]...
Seehg help qnew &hg help record for more information andusage.
interactively select changes to commit:
hg record [OPTION]... [FILE]...
If a list of files is omitted, all changes reported byhg statuswill be candidates for recording.
Seehg help dates for a list of formats valid for -d/--date.
You will be prompted for whether to record changes to eachmodified file, and for files with multiple changes, for eachchange to use. For each query, the following responses arepossible:
y - record this changen - skip this changee - edit this change manuallys - skip remaining changes to this filef - record remaining changes to this filed - done, skip remaining changes and filesa - record all changes to all remaining filesq - quit, recording no changes? - display help
This command is not available when committing a merge.
Options:
| -A,--addremove | |
| mark new/missing files as added/removed before committing | |
| --close-branch | mark a branch head as closed |
| --amend | amend the parent of the working directory |
| -s,--secret | use the secret phase for committing |
| -e,--edit | invoke editor on commit messages |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
| -m,--message<TEXT> | |
| use text as commit message | |
| -l,--logfile<FILE> | |
| read commit message from file | |
| -d,--date<DATE> | |
| record the specified date as commit date | |
| -u,--user<USER> | |
| record the specified user as committer | |
| -S,--subrepos | recurse into subrepositories |
| -w,--ignore-all-space | |
| ignore white space when comparing lines | |
| -b,--ignore-space-change | |
| ignore changes in the amount of white space | |
| -B,--ignore-blank-lines | |
| ignore changes whose lines are all blank | |
[+] marked option can be specified multiple times
recreates hardlinks between repository clones
recreate hardlinks between two repositories:
hg relink [ORIGIN]
When repositories are cloned locally, their data files will behardlinked so that they only use the space of a single repository.
Unfortunately, subsequent pulls into either repository will breakhardlinks for any files touched by the new changesets, even ifboth repositories end up pulling the same changes.
Similarly, passing --rev to "hg clone" will fail to use anyhardlinks, falling back to a complete copy of the sourcerepository.
This command lets you recreate those hardlinks and reclaim thatwasted space.
This repository will be relinked to share space with ORIGIN, whichmust be on the same local disk. If ORIGIN is omitted, looks for"default-relink", then "default", in [paths].
Do not attempt any read operations on this repository while thecommand is running. (Both repositories will be locked againstwrites.)
extend schemes with shortcuts to repository swarms
This extension allows you to specify shortcuts for parent URLs with alot of repositories to act like a scheme, for example:
[schemes]py = http://code.python.org/hg/
After that you can use it like:
hg clone py://trunk/
Additionally there is support for some more complex schemas, forexample used by Google Code:
[schemes]gcode = http://{1}.googlecode.com/hg/The syntax is taken from Mercurial templates, and you have unlimitednumber of variables, starting with{1} and continuing with{2},{3} and so on. This variables will receive parts of URLsupplied, split by/. Anything not specified as{part} will bejust appended to an URL.
For convenience, the extension adds these schemes by default:
[schemes]py = http://hg.python.org/bb = https://bitbucket.org/bb+ssh = ssh://hg@bitbucket.org/gcode = https://{1}.googlecode.com/hg/kiln = https://{1}.kilnhg.com/Repo/You can override a predefined scheme by defining a new scheme with thesame name.
share a common history between several working directories
When this extension is active,hg clone can be configured toautomatically share/pool storage across multiple clones. Thismode effectively convertshg clone tohg clone +hg share.The benefit of using this mode is the automatic management ofstore paths and intelligent pooling of related repositories.
The followingshare. config options influence this feature:
How directory names inshare.pool are constructed.
"identity" means the name is derived from the first changeset in therepository. In this mode, different remotes share storage if theirroot/initial changeset is identical. In this mode, the local sharedrepository is an aggregate of all encountered remote repositories.
"remote" means the name is derived from the source repository'spath or URL. In this mode, storage is only shared if the path or URLrequested in thehg clone command matches exactly to a repositorythat was cloned before.
The default naming mode is "identity."
create a new shared repository:
hg share [-U] [-B] SOURCE [DEST]
Initialize a new repository and working directory that shares itshistory (and optionally bookmarks) with another repository.
Note
using rollback or extensions that destroy/modify history (mq,rebase, etc.) can cause considerable confusion with sharedclones. In particular, if two shared clones are both updated tothe same changeset, and one of them destroys that changesetwith rollback, the other clone will suddenly stop working: alloperations will fail with "abort: working directory has unknownparent". The only known workaround is to use debugsetparents onthe broken clone to reset it to a changeset that still exists.
Options:
| -U,--noupdate | do not create a working directory |
| -B,--bookmarks | |
| also share bookmarks | |
convert a shared repository to a normal one:
hg unshare
Copy the store data to the repo and remove the sharedpath data.
save and restore changes to the working directory
The "hg shelve" command saves changes made to the working directoryand reverts those changes, resetting the working directory to a cleanstate.
Later on, the "hg unshelve" command restores the changes saved by "hgshelve". Changes can be restored even after updating to a differentparent, in which case Mercurial's merge machinery will resolve anyconflicts if necessary.
You can have more than one shelved change outstanding at a time; eachshelved change has a distinct name. For details, see the help for "hgshelve".
save and set aside changes from the working directory:
hg shelve [OPTION]... [FILE]...
Shelving takes files that "hg status" reports as not clean, savesthe modifications to a bundle (a shelved change), and reverts thefiles so that their state in the working directory becomes clean.
To restore these changes to the working directory, using "hgunshelve"; this will work even if you switch to a differentcommit.
When no files are specified, "hg shelve" saves all not-cleanfiles. If specific files or directories are named, only changes tothose files are shelved.
In bare shelve(when no files are specified, without interactive,include and exclude option), shelving remembers information if theworking directory was on newly created branch, in other words workingdirectory was on different branch than its first parent. In thissituation unshelving restores branch information to the working directory.
Each shelved change has a name that makes it easier to find later.The name of a shelved change defaults to being based on the activebookmark, or if there is no active bookmark, the current namedbranch. To specify a different name, use--name.
To see a list of existing shelved changes, use the--listoption. For each shelved change, this will print its name, age,and description; use--patch or--stat for more details.
To delete specific shelved changes, use--delete. To deleteall shelved changes, use--cleanup.
Options:
| -A,--addremove | |
| mark new/missing files as added/removed before shelving | |
| -u,--unknown | store unknown files in the shelve |
| --cleanup | delete all shelved changes |
| --date<DATE> | shelve with the specified commit date |
| -d,--delete | delete the named shelved change(s) |
| -e,--edit | invoke editor on commit messages |
| -l,--list | list current shelves |
| -m,--message<TEXT> | |
| use text as shelve message | |
| -n,--name<NAME> | |
| use the given name for the shelved commit | |
| -p,--patch | show patch |
| -i,--interactive | |
| interactive mode, only works while creating a shelve | |
| --stat | output diffstat-style summary of changes |
| -I,--include<PATTERN[+]> | |
| include names matching the given patterns | |
| -X,--exclude<PATTERN[+]> | |
| exclude names matching the given patterns | |
[+] marked option can be specified multiple times
restore a shelved change to the working directory:
hg unshelve [SHELVED]
This command accepts an optional name of a shelved change torestore. If none is given, the most recent shelved change is used.
If a shelved change is applied successfully, the bundle thatcontains the shelved changes is moved to a backup location(.hg/shelve-backup).
Since you can restore a shelved change on top of an arbitrarycommit, it is possible that unshelving will result in a conflictbetween your changes and the commits you are unshelving onto. Ifthis occurs, you must resolve the conflict, then use--continue to complete the unshelve operation. (The bundlewill not be moved until you successfully complete the unshelve.)
(Alternatively, you can use--abort to abandon an unshelvethat causes a conflict. This reverts the unshelved changes, andleaves the bundle in place.)
If bare shelved change(when no files are specified, without interactive,include and exclude option) was done on newly created branch it wouldrestore branch information to the working directory.
After a successful unshelve, the shelved changes are stored in abackup directory. Only the N most recent backups are kept. Ndefaults to 10 but can be overridden using theshelve.maxbackupsconfiguration option.
Options:
| -a,--abort | abort an incomplete unshelve operation |
| -c,--continue | continue an incomplete unshelve operation |
| -k,--keep | keep shelve after unshelving |
| -t,--tool<VALUE> | |
| specify merge tool | |
| --date<DATE> | set date for temporary commits (DEPRECATED) |
strip changesets and their descendants from history
This extension allows you to strip changesets and all their descendants from therepository. See the command help for details.
strip changesets and all their descendants from the repository:
hg strip [-k] [-f] [-B bookmark] [-r] REV...
The strip command removes the specified changesets and all theirdescendants. If the working directory has uncommitted changes, theoperation is aborted unless the --force flag is supplied, in whichcase changes will be discarded.
If a parent of the working directory is stripped, then the workingdirectory will automatically be updated to the most recentavailable ancestor of the stripped parent after the operationcompletes.
Any stripped changesets are stored in.hg/strip-backup as abundle (seehg help bundle andhg help unbundle). They canbe restored by runninghg unbundle.hg/strip-backup/BUNDLE,where BUNDLE is the bundle file created by the strip. Note thatthe local revision numbers will in general be different after therestore.
Use the --no-backup option to discard the backup bundle once theoperation completes.
Strip is not a history-rewriting operation and can be used onchangesets in the public phase. But if the stripped changesets havebeen pushed to a remote repository you will likely pull them again.
Return 0 on success.
Options:
| -r,--rev<REV[+]> | |
| strip specified revision (optional, can specify revisions without this option) | |
| -f,--force | force removal of changesets, discard uncommitted changes (no backup) |
| --no-backup | no backups |
| --nobackup | no backups (DEPRECATED) |
| -n | ignored (DEPRECATED) |
| -k,--keep | do not modify working directory during strip |
| -B,--bookmark<VALUE[+]> | |
| remove revs only reachable from given bookmark | |
[+] marked option can be specified multiple times
command to transplant changesets from another branch
This extension allows you to transplant changes to another parent revision,possibly in another repository. The transplant is done using 'diff' patches.
Transplanted patches are recorded in .hg/transplant/transplants, as amap from a changeset hash to its hash in the source repository.
transplant changesets from another branch:
hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...
Selected changesets will be applied on top of the current workingdirectory with the log of the original changeset. The changesetsare copied and will thus appear twice in the history with differentidentities.
Consider using the graft command if everything is inside the samerepository - it will use merges and will usually give a better result.Use the rebase extension if the changesets are unpublished and you wantto move them instead of copying them.
If --log is specified, log messages will have a comment appendedof the form:
(transplanted from CHANGESETHASH)
You can rewrite the changelog message with the --filter option.Its argument will be invoked with the current changelog message as$1 and the patch as $2.
--source/-s specifies another repository to use for selecting changesets,just as if it temporarily had been pulled.If --branch/-b is specified, these revisions will be used asheads when deciding which changesets to transplant, just as if onlythese revisions had been pulled.If --all/-a is specified, all the revisions up to the heads specifiedwith --branch will be transplanted.
Example:
transplant all changes up to REV on top of your current revision:
hg transplant --branch REV --all
You can optionally mark selected transplanted changesets as mergechangesets. You will not be prompted to transplant any ancestorsof a merged transplant, and you can merge descendants of themnormally instead of transplanting them.
Merge changesets may be transplanted directly by specifying theproper parent changeset by callinghg transplant--parent.
If no merges or revisions are provided,hg transplant willstart an interactive changeset browser.
If a changeset application fails, you can fix the merge by handand then resume where you left off by callinghg transplant--continue/-c.
Options:
| -s,--source<REPO> | |
| transplant changesets from REPO | |
| -b,--branch<REV[+]> | |
| use this source changeset as head | |
| -a,--all | pull all changesets up to the --branch revisions |
| -p,--prune<REV[+]> | |
| skip over REV | |
| -m,--merge<REV[+]> | |
| merge at REV | |
| --parent<REV> | parent to choose when transplanting merge |
| -e,--edit | invoke editor on commit messages |
| --log | append transplant info to log message |
| -c,--continue | continue last transplant session after fixing conflicts |
| --filter<CMD> | filter changesets through command |
[+] marked option can be specified multiple times
allow the use of MBCS paths with problematic encodings
Some MBCS encodings are not good for some path operations (i.e.splitting path, case conversion, etc.) with its encoded bytes. We callsuch a encoding (i.e. shift_jis and big5) as "problematic encoding".This extension can be used to fix the issue with those encodings bywrapping some functions to convert to Unicode string before pathoperation.
This extension is useful for:
This extension is not needed for:
Note that there are some limitations on using this extension:
By default, win32mbcs uses encoding.encoding decided by Mercurial.You can specify the encoding by config option:
[win32mbcs]encoding = sjis
It is useful for the users who want to commit with UTF-8 log message.
perform automatic newline conversion (DEPRECATED)
Deprecation: The win32text extension requires each user to configurethe extension again and again for each clone since the configurationis not copied when cloning.
We have therefore made theeol as an alternative. Theeoluses a version controlled file for its configuration and each clonewill therefore use the right settings from the start.
To perform automatic newline conversion, use:
[extensions]win32text =[encode]** = cleverencode:# or ** = macencode:[decode]** = cleverdecode:# or ** = macdecode:
If not doing conversion, to make sure you do not commit CRLF/CR by accident:
[hooks]pretxncommit.crlf = python:hgext.win32text.forbidcrlf# or pretxncommit.cr = python:hgext.win32text.forbidcr
To do the same check on a server to prevent CRLF/CR from beingpushed or pulled:
[hooks]pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr
discover and advertise repositories on the local network
Zeroconf-enabled repositories will be announced in a network withoutthe need to configure a server or a service. They can be discoveredwithout knowing their actual IP address.
To allow other people to discover your repository using runhg serve in your repository:
$ cd test$ hg serve
You can discover Zeroconf-enabled repositories by runninghg paths:
$ hg pathszc-test = http://example.com:8000/test
Some commands (e.g. revert) produce backup files ending in.orig,if the.orig file already exists and is not tracked by Mercurial,it will be overwritten.
Written by Matt Mackall <mpm@selenic.com>
Main Web Site:https://mercurial-scm.org/
Source code repository:http://selenic.com/hg
Mailing list:http://selenic.com/mailman/listinfo/mercurial
Copyright (C) 2005-2016 Matt Mackall.Free use of this software is granted under the terms of the GNU GeneralPublic License version 2 or any later version.