196N/A .TH HG 1 "" "" "Mercurial Manual"
196N/A hg \- Mercurial source code management system
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" .rstReportMargin pre:
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A \fBhg\fP \fIcommand\fP [\fIoption\fP]... [\fIargument\fP]...
2302N/A The \fBhg\fP command provides a command line interface to the Mercurial
196N/A indicates one or more filename or relative path filenames; see
196N/A-\%File Name Patterns\: for information on pattern matching
196N/A+File Name Patterns for information on pattern matching
2302N/A either the pathname of a local repository or the URI of a remote
196N/A hg add [OPTION]... [FILE]...
196N/A Schedule files to be version controlled and added to the
196N/A The files will be added to the repository at the next commit. To
196N/A-undo an add before that, see \%\fBhg forget\fP\:.
196N/A+undo an add before that, see \fBhg forget\fP.
196N/A If no names are given, add all files to the repository.
196N/A An example showing how new (unknown) files are added
196N/A-automatically by \%\fBhg add\fP\::
196N/A+automatically by \fBhg add\fP:
196N/A Returns 0 if all files are successfully added.
2302N/A do not perform actions, just print output
196N/A hg addremove [OPTION]... [FILE]...
196N/A Add all new files and remove all missing files from the
2302N/A New files are ignored if they match any of the patterns in
2302N/A+\fB\&.hgignore\fP. As with add, these changes take effect at the next
2302N/A Use the \-s/\-\-similarity option to detect renamed files. This
2302N/A be identical) as its parameter. With a parameter greater than 0,
2302N/A this compares every removed file with every added file and records
2302N/A those similar enough as renames. Detecting renamed files this way
196N/A-can be expensive. After using this option, \%\fBhg status \-C\fP\: can be
196N/A+can be expensive. After using this option, \fBhg status \-C\fP can be
2302N/A used to check which files were identified as moved or renamed. If
2302N/A not specified, \-s/\-\-similarity defaults to 100 and only renames of
2302N/A identical files are detected.
196N/A Returns 0 if all files are successfully added.
2302N/A do not perform actions, just print output
196N/A hg annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...
196N/A List changes in files, showing the revision id responsible for
196N/A-don\(aqt follow copies and renames
196N/A+don't follow copies and renames
2302N/A exclude names matching the given patterns
196N/A hg archive [OPTION]... DEST
196N/A By default, the revision used is the parent of the working
2302N/A extension (or override using \-t/\-\-type).
871N/A create a zip file containing the 1.0 release:
871N/A create a tarball excluding .hg files:
2302N/A zip archive, compressed using deflate
196N/A The exact name of the destination archive or directory is given
196N/A-using a format string; see \%\fBhg help export\fP\: for details.
196N/A+using a format string; see \fBhg help export\fP for details.
196N/A Each member added to an archive file has a directory prefix
196N/A prepended. Use \-p/\-\-prefix to specify a format string for the
2302N/A exclude names matching the given patterns
196N/A hg backout [OPTION]... [\-r] REV
196N/A Prepare a new changeset with the effect of REV undone in the
871N/A working directory and a new child of REV that simply undoes REV.
871N/A Before version 1.7, the behavior without \-\-merge was equivalent
871N/A-to specifying \-\-merge followed by \%\fBhg update \-\-clean .\fP\: to
871N/A+to specifying \-\-merge followed by \fBhg update \-\-clean .\fP to
871N/A cancel the merge and leave the child of REV as a head to be
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
2302N/A record the specified user as committer
196N/A hg bisect [\-gbsr] [\-U] [\-c CMD] [REV]
196N/A This command helps to find changesets which introduce problems. To
2302N/A start a bisection with known bad revision 34, and good revision 12:
871N/A that revision is not usable because of another issue):
2302N/A skip all revisions that do not touch directories \fBfoo\fP or \fBbar\fP:
2302N/A-hg bisect \-\-skip "!( file(\(aqpath:foo\(aq) & file(\(aqpath:bar\(aq) )"
2302N/A+hg bisect \-\-skip "!( file('path:foo') & file('path:bar') )"
871N/A forget the current bisection:
871N/A-use \(aqmake && make tests\(aq to automatically find the first broken
871N/A+use 'make && make tests' to automatically find the first broken
2302N/A hg bisect \-\-command "make && make tests"
871N/A hg log \-r "bisect(pruned)"
2302N/A if running with \-U/\-\-noupdate):
2302N/A hg log \-r "bisect(current)"
871N/A see all changesets that took part in the current bisection:
871N/A hg log \-r "bisect(range)"
2302N/A you can even get a nice graph:
871N/A hg log \-\-graph \-r "bisect(range)"
871N/A-See \%\fBhg help revsets\fP\: for more about the \fIbisect()\fP keyword.
871N/A+See \fBhg help revsets\fP for more about the \fIbisect()\fP keyword.
2302N/A hg bookmarks [OPTIONS]... [NAME]...
871N/A Bookmarks are pointers to certain commits that move when committing.
871N/A Bookmarks are local. They can be renamed, copied and deleted. It is
871N/A-possible to use \%\fBhg merge NAME\fP\: to merge from a given bookmark, and
871N/A-\%\fBhg update NAME\fP\: to update to a given bookmark.
871N/A+possible to use \fBhg merge NAME\fP to merge from a given bookmark, and
871N/A+\fBhg update NAME\fP to update to a given bookmark.
196N/A-You can use \%\fBhg bookmark NAME\fP\: to set a bookmark on the working
196N/A-directory\(aqs parent revision with the given name. If you specify
196N/A+You can use \fBhg bookmark NAME\fP to set a bookmark on the working
196N/A+directory's parent revision with the given name. If you specify
196N/A a revision using \-r REV (where REV may be an existing bookmark),
196N/A the bookmark is assigned to that revision.
196N/A-Bookmarks can be pushed and pulled between repositories (see \%\fBhg help
196N/A-push\fP\: and \%\fBhg help pull\fP\:). This requires both the local and remote
196N/A+Bookmarks can be pushed and pulled between repositories (see \fBhg help
196N/A+push\fP and \fBhg help pull\fP). This requires both the local and remote
196N/A repositories to support bookmarks. For versions prior to 1.8, this means
196N/A the bookmarks extension must be enabled.
2302N/A-If you set a bookmark called \(aq@\(aq, new clones of the repository will
2302N/A+If you set a bookmark called '@', new clones of the repository will
2302N/A have that revision checked out (and the bookmark made active) by
2302N/A current active bookmark will be marked inactive.
196N/A hg branch [\-fC] [NAME]
871N/A-Branch names are permanent and global. Use \%\fBhg bookmark\fP\: to create a
871N/A-light\-weight bookmark instead. See \%\fBhg help glossary\fP\: for more
871N/A+Branch names are permanent and global. Use \fBhg bookmark\fP to create a
871N/A+light\-weight bookmark instead. See \fBhg help glossary\fP for more
871N/A information about named branches and bookmarks.
196N/A With no argument, show the current branch name. With one argument,
196N/A set the working directory branch name (the branch will not exist
196N/A in the repository until the next commit). Standard practice
196N/A-recommends that primary development take place on the \(aqdefault\(aq
196N/A+recommends that primary development take place on the 'default'
196N/A Unless \-f/\-\-force is specified, branch will not let you set a
196N/A-branch name that already exists, even if it\(aqs inactive.
196N/A+branch name that already exists, even if it's inactive.
196N/A Use \-C/\-\-clean to reset the working directory branch to that of
196N/A the parent of the working directory, negating a previous branch
196N/A-Use the command \%\fBhg update\fP\: to switch to an existing branch. Use
196N/A-\%\fBhg commit \-\-close\-branch\fP\: to mark this branch as closed.
196N/A+Use the command \fBhg update\fP to switch to an existing branch. Use
196N/A+\fBhg commit \-\-close\-branch\fP to mark this branch as closed.
2302N/A reset branch name to parent branch name
196N/A-List the repository\(aqs named branches, indicating which ones are
196N/A+List the repository's named branches, indicating which ones are
196N/A inactive. If \-c/\-\-closed is specified, also list branches which have
196N/A-been marked closed (see \%\fBhg commit \-\-close\-branch\fP\:).
196N/A+been marked closed (see \fBhg commit \-\-close\-branch\fP).
196N/A If \-a/\-\-active is specified, only show active branches. A branch
196N/A is considered active if it contains repository heads.
196N/A-Use the command \%\fBhg update\fP\: to switch to an existing branch.
196N/A+Use the command \fBhg update\fP to switch to an existing branch.
2302N/A show normal and closed branches
196N/A hg bundle [\-f] [\-t TYPE] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST]
196N/A Generate a compressed changegroup file collecting changesets not
2302N/A Returns 0 on success, 1 if no changes found.
196N/A hg cat [OPTION]... FILE...
196N/A Print the specified files as they were at the given revision. If
2302N/A Output may be to a file, in which case the name of the file is
2302N/A given using a format string. The formatting rules are the same as
2302N/A for the export command, with the following additions:
196N/A-dirname of file being printed, or \(aq.\(aq if in repository root
196N/A+dirname of file being printed, or '.' if in repository root
2302N/A root\-relative path name of file being printed
2302N/A exclude names matching the given patterns
196N/A hg clone [OPTION]... SOURCE [DEST]
196N/A Create a copy of an existing repository in a new directory.
196N/A If no destination directory name is specified, it defaults to the
196N/A basename of the source.
196N/A-The location of the source is added to the new repository\(aqs
196N/A+The location of the source is added to the new repository's
2302N/A+\fB\&.hg/hgrc\fP file, as the default to be used for future pulls.
871N/A Only local paths and \fBssh://\fP URLs are supported as
2302N/A destinations. For \fBssh://\fP destinations, no working directory or
2302N/A+\fB\&.hg/hgrc\fP will be created on the remote side.
871N/A To pull only a subset of changesets, specify one or more revisions
871N/A identifiers with \-r/\-\-rev or branches with \-b/\-\-branch. The
871N/A resulting clone will contain only the specified changesets and
871N/A-their ancestors. These options (or \(aqclone src#rev dest\(aq) imply
871N/A+their ancestors. These options (or 'clone src#rev dest') imply
871N/A \-\-pull, even for local source repositories. Note that specifying a
871N/A tag will include the tagged changeset but not the changeset
2302N/A-If the source repository has a bookmark called \(aq@\(aq set, that
2302N/A+If the source repository has a bookmark called '@' set, that
2302N/A revision will be checked out in the new repository by default.
2302N/A To check out a particular version, use \-u/\-\-update, or
871N/A directory using full hardlinks with
871N/A $ cp \-al REPO REPOCLONE
196N/A This is the fastest way to clone, but it is not always safe. The
2302N/A Mercurial will update the working directory to the first applicable
2302N/A null if \-U or the source repository has no changesets
196N/A if \-u . and the source repository is local, the first parent of
196N/A-the source repository\(aqs working directory
196N/A+the source repository's working directory
196N/A the changeset specified with \-u (if a branch name, this means the
2302N/A the tipmost head specified with the url#branch source syntax
2302N/A-the revision marked with the \(aq@\(aq bookmark, if present
2302N/A+the revision marked with the '@' bookmark, if present
2302N/A the tipmost head of the default branch
871N/A clone a remote repository to a new directory named hg/:
871N/A create a lightweight local clone:
871N/A hg clone project/ project\-feature/
871N/A clone from an absolute path on an ssh server (note double\-slash):
871N/A create a repository without changesets after a particular revision:
871N/A hg clone \-r 04e544 experimental/ good/
871N/A clone (and track) a particular named branch:
871N/A-See \%\fBhg help urls\fP\: for details on specifying URLs.
871N/A+See \fBhg help urls\fP for details on specifying URLs.
196N/A hg commit [OPTION]... [FILE]...
196N/A Commit changes to the given files into the repository. Unlike a
196N/A centralized SCM, this operation is a local operation. See
196N/A-\%\fBhg push\fP\: for a way to actively distribute your changes.
196N/A+\fBhg push\fP for a way to actively distribute your changes.
196N/A-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
196N/A+If a list of files is omitted, all changes reported by \fBhg status\fP
196N/A If you are committing the result of a merge, do not provide any
2302N/A If no commit message is specified, Mercurial starts your
2302N/A configured editor where you can enter a message. In case your
2302N/A commit fails, you will find a backup of your message in
871N/A The \-\-amend flag can be used to amend the parent of the
871N/A working directory with a new commit that contains the changes
871N/A-in the parent in addition to those currently reported by \%\fBhg status\fP\:,
871N/A+in the parent in addition to those currently reported by \fBhg status\fP,
871N/A if there are any. The old commit is stored in a backup bundle in
871N/A-\
fB.hg/strip\-backup\fP (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:
2302N/A+\fB\&.hg/strip\-backup\fP (see \fBhg help bundle\fP and \fBhg help unbundle\fP
871N/A Message, user and date are taken from the amended commit unless
871N/A-specified. When a message isn\(aqt specified on the command line,
871N/A+specified. When a message isn't specified on the command line,
871N/A the editor will open with the message of the amended commit.
871N/A-It is not possible to amend public changesets (see \%\fBhg help phases\fP\:)
871N/A+It is not possible to amend public changesets (see \fBhg help phases\fP)
871N/A or changesets that have children.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A Returns 0 on success, 1 if nothing changed.
2302N/A recurse into subrepositories
196N/A hg copy [OPTION]... [SOURCE]... DEST
196N/A Mark dest as having copies of source files. If dest is a
196N/A operation is recorded, but no copying is performed.
196N/A This command takes effect with the next commit. To undo a copy
196N/A-before that, see \%\fBhg revert\fP\:.
196N/A+before that, see \fBhg revert\fP.
196N/A Returns 0 on success, 1 if errors are encountered.
2302N/A do not perform actions, just print output
196N/A hg diff [OPTION]... ([\-c REV] | [\-r REV1 [\-r REV2]]) [FILE]...
196N/A Show differences between revisions for the specified files.
196N/A diff may generate unexpected results for merges, as it will
196N/A-default to comparing against the working directory\(aqs first
196N/A+default to comparing against the working directory's first
196N/A parent changeset if no revisions are specified.
196N/A anyway, probably with undesirable results.
196N/A Use the \-g/\-\-git option to generate diffs in the git extended diff
196N/A-format. For more information, read \%\fBhg help diffs\fP\:.
196N/A+format. For more information, read \fBhg help diffs\fP.
871N/A compare a file in the current working directory to its parent:
871N/A compare two historical versions of a directory, with rename info:
871N/A hg diff \-\-git \-r 1.0:1.2 lib/
871N/A get change stats relative to the last change on some date:
871N/A-hg diff \-\-stat \-r "date(\(aqmay 2\(aq)"
871N/A+hg diff \-\-stat \-r "date('may 2')"
871N/A diff all newly\-added files that contain a keyword:
871N/A hg diff "set:added() and grep(GNU)"
871N/A compare a revision and its parents:
871N/A hg diff \-c 9353 # compare against first parent
871N/A hg diff \-r 9353^:9353 # same using revset syntax
871N/A hg diff \-r 9353^2:9353 # compare against the second parent
2302N/A recurse into subrepositories
2302N/A hg export [OPTION]... [\-o OUTFILESPEC] [\-r] [REV]...
196N/A Print the changeset header and diffs for one or more revisions.
2302N/A Output may be to a file, in which case the name of the file is
2302N/A given using a format string. The formatting rules are as follows:
2302N/A zero\-padded changeset revision number
2302N/A Without the \-a/\-\-text option, export will avoid generating diffs
2302N/A of files it detects as binary. With \-a, export will generate a
196N/A diff anyway, probably with undesirable results.
196N/A Use the \-g/\-\-git option to generate diffs in the git extended diff
196N/A-format. See \%\fBhg help diffs\fP\: for more information.
196N/A+format. See \fBhg help diffs\fP for more information.
196N/A With the \-\-switch\-parent option, the diff will be against the
196N/A second parent. It can be useful to review a merge.
2302N/A use export and import to transplant a bugfix to the current
871N/A hg export \-r 9353 | hg import \-
2302N/A omit dates from diff headers
196N/A hg forget [OPTION]... FILE...
196N/A Mark the specified files so they will no longer be tracked
196N/A entire project history, and it does not delete them from the
196N/A-To undo a forget before the next commit, see \%\fBhg add\fP\:.
196N/A+To undo a forget before the next commit, see \fBhg add\fP.
871N/A forget newly\-added binary files:
871N/A hg forget "set:added() and binary()"
871N/A forget files that would be excluded by .hgignore:
871N/A hg forget "set:hgignore()"
2302N/A exclude names matching the given patterns
2302N/A hg graft [OPTION]... [\-r] REV...
871N/A-This command uses Mercurial\(aqs merge logic to copy individual
871N/A+This command uses Mercurial's merge logic to copy individual
871N/A changes from other branches without merging branches in the
871N/A-history graph. This is sometimes known as \(aqbackporting\(aq or
871N/A-\(aqcherry\-picking\(aq. By default, graft will copy user, date, and
2302N/A+history graph. This is sometimes known as 'backporting' or
2302N/A+\&'cherry\-picking'. By default, graft will copy user, date, and
871N/A description from the source changesets.
871N/A Changesets that are ancestors of the current revision, that have
2302N/A (grafted from CHANGESETHASH)
2302N/A If a graft merge results in conflicts, the graft process is
871N/A copy a single change to the stable branch and edit its description:
871N/A graft a range of changesets with one exception, updating dates:
871N/A hg graft \-D "2085::2093 and not 2091"
871N/A continue a graft after resolving conflicts:
871N/A show the source of a grafted changeset:
2302N/A Returns 0 on successful completion.
2302N/A do not perform actions, just print output
196N/A hg grep [OPTION]... PATTERN [FILE]...
196N/A Search revisions of files for a regular expression.
2302N/A Returns 0 if a match is found, 1 otherwise.
2302N/A exclude names matching the given patterns
2302N/A hg heads [\-ct] [\-r STARTREV] [REV]...
2302N/A With no arguments, show all open branch heads in the repository.
2302N/A If one or more REVs are given, only open branch heads on the
2302N/A branches associated with the specified changesets are shown. This
2302N/A-means that you can use \%\fBhg heads .\fP\: to see the heads on the
2302N/A+means that you can use \fBhg heads .\fP to see the heads on the
2302N/A currently checked\-out branch.
196N/A If \-c/\-\-closed is specified, also show branch heads marked closed
196N/A-(see \%\fBhg commit \-\-close\-branch\fP\:).
196N/A+(see \fBhg commit \-\-close\-branch\fP).
196N/A If STARTREV is specified, only those heads that are descendants of
196N/A STARTREV will be displayed.
2302N/A Returns 0 if matching heads are found, 1 if not.
196N/A With no arguments, print a list of commands with short help messages.
2302N/A show topics matching keyword
196N/A hg identify [\-nibtB] [\-r REV] [SOURCE]
871N/A Print a summary identifying the repository state at REV using one or
871N/A generate a build identifier for the working directory:
871N/A find the revision corresponding to a tag:
871N/A check the most recent revision of a remote repository:
196N/A hg import [OPTION]... PATCH...
196N/A Import a list of patches and commit them individually (unless
196N/A-If the imported patch was generated by \%\fBhg export\fP\:, user and
196N/A+If the imported patch was generated by \fBhg export\fP, user and
196N/A description from patch override values from message headers and
196N/A body. Values given on command line with \-m/\-\-message and \-u/\-\-user
196N/A With \-s/\-\-similarity, hg will attempt to discover renames and
871N/A-copies in the patch in the same way as \%\fBhg addremove\fP\:.
871N/A+copies in the patch in the same way as \fBhg addremove\fP.
196N/A To read a patch from standard input, use "\-" as the patch name. If
196N/A a URL is specified, the patch will be downloaded from it.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
871N/A import a traditional patch from a website and detect renames:
871N/A import a changeset from an hgweb server:
871N/A import all the patches in an Unix\-style mbox:
196N/A-don\(aqt commit, just update the working directory
196N/A+don't commit, just update the working directory
2302N/A guess renamed files by similarity (0<=s<=100)
196N/A hg incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE]
196N/A Show new changesets found in the specified
path/URL or the default
2302N/A Returns 0 if there are incoming changes, 1 otherwise.
2302N/A recurse into subrepositories
196N/A hg init [\-e CMD] [\-\-remotecmd CMD] [DEST]
196N/A Initialize a new repository in the given directory. If the given
196N/A If no directory is given, the current directory is used.
196N/A It is possible to specify an \fBssh://\fP URL as the destination.
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+See \fBhg help urls\fP for more information.
196N/A hg locate [OPTION]... [PATTERN]...
196N/A Print files under Mercurial control in the working directory whose
2302N/A Returns 0 if a match is found, 1 otherwise.
2302N/A exclude names matching the given patterns
196N/A hg log [OPTION]... [FILE]
196N/A Print the revision history of the specified files or the entire
871N/A changesets with full descriptions and file lists:
871N/A changesets ancestral to the working directory:
871N/A last 10 commits on the current branch:
871N/A changesets showing all modifications of a file, including removals:
871N/A all changesets that touch a directory, with diffs, excluding merges:
871N/A all revision numbers that match a keyword:
871N/A hg log \-k bug \-\-template "{rev}\en"
871N/A check if a given changeset is included is a tagged release:
871N/A hg log \-r "a21ccf and ancestor(1.9)"
871N/A find all changesets by some user in a date range:
871N/A hg log \-k alice \-d "may 2008 to jul 2008"
871N/A summary of all changesets after the last tag:
871N/A hg log \-r "last(tagged())::" \-\-template "{desc|firstline}\en"
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
871N/A-See \%\fBhg help revisions\fP\: and \%\fBhg help revsets\fP\: for more about
871N/A+See \fBhg help revisions\fP and \fBhg help revsets\fP for more about
871N/A-See \%\fBhg help templates\fP\: for more about pre\-packaged styles and
871N/A+See \fBhg help templates\fP for more about pre\-packaged styles and
871N/A specifying custom templates.
2302N/A exclude names matching the given patterns
196N/A Print a list of version controlled files for the given revision.
2302N/A list files from all revisions
196N/A hg merge [\-P] [\-f] [[\-r] REV]
196N/A The current working directory is updated with all changes made in
871N/A \fB\-\-tool\fP can be used to specify the merge tool used for file
196N/A merges. It overrides the HGMERGE environment variable and your
871N/A-configuration files. See \%\fBhg help merge\-tools\fP\: for options.
871N/A+configuration files. See \fBhg help merge\-tools\fP for options.
196N/A-If no revision is specified, the working directory\(aqs parent is a
196N/A+If no revision is specified, the working directory's parent is a
196N/A head revision, and the current branch contains exactly one other
196N/A head, the other head is merged with by default. Otherwise, an
196N/A explicit revision with which to merge with must be provided.
196N/A-\%\fBhg resolve\fP\: must be used to resolve unresolved files.
196N/A+\fBhg resolve\fP must be used to resolve unresolved files.
196N/A-To undo an uncommitted merge, use \%\fBhg update \-\-clean .\fP\: which
196N/A+To undo an uncommitted merge, use \fBhg update \-\-clean .\fP which
196N/A will check out a clean copy of the original merge parent, losing
2302N/A Returns 0 on success, 1 if there are unresolved files.
196N/A hg outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST]
196N/A Show changesets not found in the specified destination repository
2302N/A Returns 0 if there are outgoing changes, 1 otherwise.
2302N/A recurse into subrepositories
196N/A hg parents [\-r REV] [FILE]
196N/A-Print the working directory\(aqs parent revisions. If a revision is
196N/A+Print the working directory's parent revisions. If a revision is
196N/A given via \-r/\-\-rev, the parent of that revision will be printed.
196N/A If a file argument is given, the revision in which the file was
196N/A last changed (before the working directory revision or the
196N/A Show definition of symbolic path name NAME. If no name is given,
196N/A as the fallback for both. When cloning a repository, the clone
196N/A \fBdefault\fP and \fBdefault\-push\fP apply to all inbound (
e.g. 196N/A-\%\fBhg incoming\fP\:) and outbound (
e.g. \%\fBhg outgoing\fP\:, \%\fBhg email\fP\: and
196N/A-\%\fBhg bundle\fP\:) operations.
196N/A+\fBhg incoming\fP) and outbound (
e.g. \fBhg outgoing\fP, \fBhg email\fP and
196N/A+\fBhg bundle\fP) operations.
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+See \fBhg help urls\fP for more information.
871N/A hg phase [\-p|\-d|\-s] [\-f] [\-r] REV...
871N/A With no argument, show the phase name of specified revisions.
871N/A With one of \-p/\-\-public, \-d/\-\-draft or \-s/\-\-secret, change the
871N/A phase value of the specified revisions.
871N/A-Unless \-f/\-\-force is specified, \%\fBhg phase\fP\: won\(aqt move changeset from a
871N/A+Unless \-f/\-\-force is specified, \fBhg phase\fP won't move changeset from a
871N/A lower phase to an higher phase. Phases are ordered as follows:
871N/A public < draft < secret
871N/A Return 0 on success, 1 if no phases were changed or some could not
196N/A hg pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
196N/A Pull changes from a remote repository to a local one.
196N/A \-R is specified). By default, this does not update the copy of the
196N/A project in the working directory.
196N/A-Use \%\fBhg incoming\fP\: if you want to see what would have been added
196N/A+Use \fBhg incoming\fP if you want to see what would have been added
196N/A by a pull at the time you issued this command. If you then decide
196N/A-to add those changes to the repository, you should use \%\fBhg pull
196N/A-\-r X\fP\: where \fBX\fP is the last changeset listed by \%\fBhg incoming\fP\:.
196N/A+to add those changes to the repository, you should use \fBhg pull
196N/A+\-r X\fP where \fBX\fP is the last changeset listed by \fBhg incoming\fP.
196N/A-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
196N/A-See \%\fBhg help urls\fP\: for more information.
196N/A+If SOURCE is omitted, the 'default' path will be used.
196N/A+See \fBhg help urls\fP for more information.
196N/A Returns 0 on success, 1 if an update had unresolved files.
196N/A hg push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST]
196N/A Push changesets from the local repository to the specified
2302N/A ancestors, and the bookmark will be pushed to the remote
196N/A-Please see \%\fBhg help urls\fP\: for important details about \fBssh://\fP
196N/A+Please see \fBhg help urls\fP for important details about \fBssh://\fP
196N/A URLs. If DESTINATION is omitted, a default path will be used.
196N/A Returns 0 if push was successful, 1 if nothing to push.
196N/A Recover from an interrupted commit or pull.
196N/A hg remove [OPTION]... FILE...
871N/A Schedule the indicated files for removal from the current branch.
871N/A This command schedules the files to be removed at the next commit.
871N/A-To undo a remove before that, see \%\fBhg revert\fP\:. To undo added
871N/A-files, see \%\fBhg forget\fP\:.
871N/A+To undo a remove before that, see \fBhg revert\fP. To undo added
871N/A+files, see \fBhg forget\fP.
871N/A \-A/\-\-after can be used to remove only files that have already
871N/A been deleted, \-f/\-\-force can be used to force deletion, and \-Af
196N/A The following table details the behavior of remove for different
196N/A file states (columns) and option combinations (rows). The file
871N/A states are Added [A], Clean [C], Modified [M] and Missing [!]
871N/A-(as reported by \%\fBhg status\fP\:). The actions are Warn, Remove
871N/A+(as reported by \fBhg status\fP). The actions are Warn, Remove
871N/A (from branch) and Delete (from disk):
2302N/A Returns 0 on success, 1 if any warnings encountered.
2302N/A exclude names matching the given patterns
196N/A hg rename [OPTION]... SOURCE... DEST
196N/A Mark dest as copies of sources; mark sources for deletion. If dest
196N/A operation is recorded, but no copying is performed.
196N/A This command takes effect at the next commit. To undo a rename
196N/A-before that, see \%\fBhg revert\fP\:.
196N/A+before that, see \fBhg revert\fP.
196N/A Returns 0 on success, 1 if errors are encountered.
2302N/A do not perform actions, just print output
196N/A hg resolve [OPTION]... [FILE]...
196N/A Merges with unresolved conflicts are often the result of
196N/A non\-interactive merging using the \fBinternal:merge\fP configuration
196N/A setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
196N/A command is used to manage the files involved in a merge, after
196N/A-\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (
i.e. the
871N/A-working directory must have two parents). See \%\fBhg help
871N/A-merge\-tools\fP\: for information on configuring merge tools.
196N/A+\fBhg merge\fP has been run, and before \fBhg commit\fP is run (
i.e. the
871N/A+working directory must have two parents). See \fBhg help
871N/A+merge\-tools\fP for information on configuring merge tools.
196N/A The resolve command can be used in the following ways:
196N/A-\%\fBhg resolve [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge the specified
196N/A+\fBhg resolve [\-\-tool TOOL] FILE...\fP: attempt to re\-merge the specified
196N/A files, discarding any previous merge attempts. Re\-merging is not
196N/A performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
871N/A to select all unresolved files. \fB\-\-tool\fP can be used to specify
196N/A-\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
196N/A+\fBhg resolve \-m [FILE]\fP: mark a file as having been resolved
196N/A (
e.g. after having manually fixed\-up the files). The default is
196N/A to mark all unresolved files.
196N/A-\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The
196N/A+\fBhg resolve \-u [FILE]...\fP: mark a file as unresolved. The
196N/A default is to mark all resolved files.
196N/A-\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts.
196N/A+\fBhg resolve \-l\fP: list files which had or still have conflicts.
196N/A In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
196N/A Note that Mercurial will not let you commit files with unresolved
196N/A-merge conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
196N/A+merge conflicts. You must use \fBhg resolve \-m ...\fP before you can
196N/A commit after a conflicting merge.
196N/A Returns 0 on success, 1 if any files fail a resolve attempt.
2302N/A exclude names matching the given patterns
196N/A hg revert [OPTION]... [\-r REV] [NAME]...
871N/A-To check out earlier revisions, you should use \%\fBhg update REV\fP\:.
871N/A+To check out earlier revisions, you should use \fBhg update REV\fP.
2302N/A To cancel an uncommitted merge (and lose your changes),
2302N/A-use \%\fBhg update \-\-clean .\fP\:.
2302N/A+use \fBhg update \-\-clean .\fP.
871N/A With no revision specified, revert the specified files or directories
871N/A directories to their states as of a specific revision. Because
871N/A revert does not change the working directory parents, this will
871N/A cause these files to appear modified. This can be helpful to "back
871N/A-out" some or all of an earlier change. See \%\fBhg backout\fP\: for a
871N/A+out" some or all of an earlier change. See \fBhg backout\fP for a
871N/A Modified files are saved with a .orig suffix before reverting.
871N/A To disable these backups, use \-\-no\-backup.
871N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
871N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
2302N/A do not perform actions, just print output
2302N/A-Please use \%\fBhg commit \-\-amend\fP\: instead of rollback to correct
2302N/A+Please use \fBhg commit \-\-amend\fP instead of rollback to correct
2302N/A mistakes in the last commit.
196N/A This command should be used with care. There is only one level of
2302N/A For example, the following commands are transactional, and their
2302N/A effects can be rolled back:
871N/A To avoid permanent data loss, rollback will refuse to rollback a
871N/A-commit transaction if it isn\(aqt checked out. Use \-\-force to
871N/A+commit transaction if it isn't checked out. Use \-\-force to
871N/A override this protection.
871N/A This command is not intended for use on public repositories. Once
2302N/A Returns 0 on success, 1 if no rollback data is available.
196N/A Print the root directory of the current repository.
196N/A Start a local HTTP repository browser and pull server. You can use
196N/A hg showconfig [\-u] [NAME]...
196N/A With no arguments, print names and values of all config items.
2302N/A show untrusted configuration options
196N/A hg status [OPTION]... [FILE]...
196N/A Show status of files in the repository. If names are given, only
196N/A The codes used to show the status of files are:
196N/A = origin of the previous file listed as A (added)
2302N/A show changes in the working directory relative to a
871N/A show all changes including copies in an existing changeset:
871N/A hg status \-\-copies \-\-change 9353
871N/A get a NUL separated list of added files, suitable for xargs:
2302N/A recurse into subrepositories
196N/A hg summary [\-\-remote]
196N/A This generates a brief summary of the working directory state,
196N/A hg tag [\-f] [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME...
196N/A Name a particular revision using <name>.
196N/A Tag commits are usually made at the head of a branch. If the parent
196N/A-of the working directory is not a branch head, \%\fBhg tag\fP\: aborts; use
196N/A+of the working directory is not a branch head, \fBhg tag\fP aborts; use
196N/A \-f/\-\-force to force the tag commit to be based on a non\-head
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A Since tag names have priority over branch names during revision
196N/A lookup, using an existing branch name as a tag name is discouraged.
2302N/A record the specified user as committer
196N/A This lists both regular and local tags. When the \-v/\-\-verbose
196N/A The tip revision (usually just called the tip) is the changeset
2302N/A that repository becomes the current tip. The "tip" tag is special
2302N/A and cannot be renamed or assigned to a different changeset.
2302N/A-This command is deprecated, please use \%\fBhg heads\fP\: instead.
2302N/A+This command is deprecated, please use \fBhg heads\fP instead.
196N/A hg unbundle [\-u] FILE...
196N/A Apply one or more compressed changegroup files generated by the
2302N/A Returns 0 on success, 1 if an update has unresolved files.
2302N/A update to new branch head if changesets were unbundled
196N/A hg update [\-c] [\-C] [\-d DATE] [[\-r] REV]
196N/A-Update the repository\(aqs working directory to the specified
196N/A+Update the repository's working directory to the specified
196N/A changeset. If no changeset is specified, update to the tip of the
871N/A-current named branch and move the current bookmark (see \%\fBhg help
871N/A+current named branch and move the current bookmark (see \fBhg help
2302N/A-Update sets the working directory\(aqs parent revision to the specified
2302N/A-changeset (see \%\fBhg help parents\fP\:).
2302N/A+Update sets the working directory's parent revision to the specified
2302N/A+changeset (see \fBhg help parents\fP).
2302N/A If the changeset is not a descendant or ancestor of the working
2302N/A-directory\(aqs parent, the update is aborted. With the \-c/\-\-check
2302N/A+directory's parent, the update is aborted. With the \-c/\-\-check
2302N/A option, the working directory is checked for uncommitted changes; if
2302N/A none are found, the working directory is updated to the specified
871N/A The following rules apply when the working directory contains
196N/A If neither \-c/\-\-check nor \-C/\-\-clean is specified, and if
196N/A the requested changeset is an ancestor or descendant of
196N/A-the working directory\(aqs parent, the uncommitted changes
196N/A+the working directory's parent, the uncommitted changes
196N/A are merged into the requested changeset and the merged
196N/A result is left uncommitted. If the requested changeset is
196N/A not an ancestor or descendant (that is, it is on another
2302N/A With the \-C/\-\-clean option, uncommitted changes are discarded and
2302N/A the working directory is updated to the requested changeset.
2302N/A To cancel an uncommitted merge (and lose your changes), use
2302N/A-\%\fBhg update \-\-clean .\fP\:.
2302N/A+\fBhg update \-\-clean .\fP.
196N/A Use null as the changeset to remove the working directory (like
196N/A-\%\fBhg clone \-U\fP\:).
871N/A If you want to revert just one file to an older revision, use
871N/A-\%\fBhg revert [\-r REV] NAME\fP\:.
871N/A+\fBhg revert [\-r REV] NAME\fP.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A Returns 0 on success, 1 if there are unresolved files.
196N/A Verify the integrity of the current repository.
196N/A-This will perform an extensive check of the repository\(aqs
196N/A+This will perform an extensive check of the repository's
196N/A integrity, validating the hashes and checksums of each entry in
196N/A the changelog, manifest, and tracked files, as well as the
196N/A integrity of their crosslinks and indices.
2302N/A for more information about recovery from corruption of the
196N/A output version and copyright information
2302N/A Some commands allow the user to specify a date,
e.g.:
2302N/A backout, commit, import, tag: Specify the commit date.
2302N/A log, revert, update: Select revision(s) by date.
2302N/A Many date formats are valid. Here are some examples:
2302N/A \fBWed Dec 6 13:18:29 2006\fP (local timezone assumed)
196N/A-Lastly, there is Mercurial\(aqs internal format:
196N/A+Lastly, there is Mercurial's internal format:
2302N/A \fB1165411109 0\fP (Wed Dec 6 13:18:29 2006 UTC)
2302N/A This is the internal representation format for dates. The first number
2302N/A is the number of seconds since the epoch (1970\-01\-01 00:00 UTC). The
2302N/A (negative if the timezone is east of UTC).
2302N/A The log command also accepts date ranges:
2302N/A \fB\-DAYS\fP \- within a given number of days of today
196N/A-Mercurial\(aqs default format for showing changes between two versions of
196N/A+Mercurial's default format for showing changes between two versions of
196N/A a file is compatible with the unified format of GNU diff, which can be
196N/A used by GNU patch and many other standard tools.
2302N/A While this standard format is often enough, it does not encode the
2302N/A executable status and other permission bits
2302N/A creation or deletion of empty files
2302N/A Mercurial also supports the extended diff format from the git VCS
2302N/A which addresses these limitations. The git diff format is not produced
196N/A This means that when generating diffs from a Mercurial repository
196N/A-(
e.g. with \%\fBhg export\fP\:), you should be careful about things like file
196N/A+(
e.g. with \fBhg export\fP), you should be careful about things like file
196N/A copies and renames or other things mentioned above, because when
196N/A applying a standard diff to a different repository, this extra
196N/A-information is lost. Mercurial\(aqs internal operations (like push and
196N/A+information is lost. Mercurial's internal operations (like push and
196N/A pull) are not affected by this, because they use an internal binary
196N/A format for communicating changes.
196N/A To make Mercurial produce the git extended diff format, use the \-\-git
196N/A-option available for many commands, or set \(aqgit = True\(aq in the [diff]
196N/A+option available for many commands, or set 'git = True' in the [diff]
196N/A section of your configuration file. You do not need to set this option
196N/A when importing diffs in this format or using them in the mq extension.
871N/A .SH ENVIRONMENT VARIABLES
871N/A-Path to the \(aqhg\(aq executable, automatically passed when running
871N/A+Path to the 'hg' executable, automatically passed when running
871N/A hooks, extensions or external tools. If unset or empty, this is
871N/A-the hg executable\(aqs name if it\(aqs frozen, or an executable named
871N/A+the hg executable's name if it's frozen, or an executable named
871N/A-This sets Mercurial\(aqs behavior for handling unknown characters
871N/A+This sets Mercurial's behavior for handling unknown characters
871N/A while transcoding user input. The default is "strict", which
871N/A-causes Mercurial to abort if it can\(aqt map a character. Other
871N/A+causes Mercurial to abort if it can't map a character. Other
871N/A settings include "replace", which replaces unknown characters, and
871N/A "ignore", which drops them. This setting can be overridden with
871N/A the \-\-encodingmode command\-line option.
871N/A-This sets Mercurial\(aqs behavior for handling characters with
871N/A+This sets Mercurial's behavior for handling characters with
871N/A "ambiguous" widths like accented Latin characters with East Asian
871N/A fonts. By default, Mercurial assumes ambiguous characters are
871N/A narrow, set this variable to "wide" if such characters cause
2302N/A the .hg/hgrc from the current repository is read.
2302N/A For each element in HGRCPATH:
871N/A-if it\(aqs a directory, all files ending with .rc are added
871N/A+if it's a directory, all files ending with .rc are added
871N/A otherwise, the file itself will be added
871N/A When set, this disables any configuration settings that might
871N/A-change Mercurial\(aqs default output. This includes encoding,
871N/A+change Mercurial's default output. This includes encoding,
871N/A defaults, verbose mode, debug mode, quiet mode, tracebacks, and
871N/A localization. This can be useful when scripting against Mercurial
871N/A in the face of existing user configuration.
2302N/A This is the string used as the author of a commit. If not set,
2302N/A available values will be considered in this order:
2302N/A LOGNAME (with \fB@hostname\fP appended)
2302N/A (deprecated, use configuration file)
871N/A editor it uses is determined by looking at the environment
871N/A variables HGEDITOR, VISUAL and EDITOR, in that order. The first
871N/A non\-empty one is chosen. If all of them are empty, the editor
871N/A-defaults to \(aqvi\(aq.
2302N/A This is used by Python to find imported modules and may need to be
2302N/A set appropriately if this Mercurial is not installed system\-wide.
2302N/A .SH USING ADDITIONAL FEATURES
2302N/A Mercurial has the ability to add new features through the use of
196N/A You may also specify the full path to an extension:
2302N/A-See \%\fBhg help config\fP\: for more information on configuration files.
2302N/A+See \fBhg help config\fP for more information on configuration files.
2302N/A Extensions are not loaded by default for a variety of reasons:
2302N/A they can increase startup overhead; they may be meant for advanced
196N/A broader scope, prepend its path with !:
196N/A # ditto, but no path was supplied for extension baz
196N/A-accelerate status report using Linux\(aqs inotify service
196N/A+accelerate status report using Linux's inotify service
2302N/A discover and advertise repositories on the local network
2302N/A Mercurial supports a functional language for selecting a set of
871N/A Like other file patterns, this pattern type is indicated by a prefix,
871N/A-\(aqset:\(aq. The language supports a number of predicates which are joined
2302N/A+\&'set:'. The language supports a number of predicates which are joined
871N/A by infix operators. Parenthesis can be used for grouping.
871N/A Identifiers such as filenames or patterns must be quoted with single
871N/A Special characters can be used in quoted identifiers by escaping them,
871N/A e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
871N/A-interpreted, strings can be prefixed with \fBr\fP,
e.g. \fBr\(aq...\(aq\fP.
871N/A+interpreted, strings can be prefixed with \fBr\fP,
e.g. \fBr'...'\fP.
871N/A There is a single prefix operator:
2302N/A Files not in x. Short form is \fB! x\fP.
2302N/A These are the supported infix operators:
2302N/A The following predicates are supported:
2302N/A File size matches the given expression. Examples:
2302N/A 1k (files from 1024 to 2047 bytes)
2302N/A 4k \- 1MB (files from 4096 bytes to 1048576 bytes)
2302N/A .B \fBsubrepo([pattern])\fP
2302N/A File that is marked unresolved according to the resolve state.
871N/A Show status of files that appear to be binary in the working directory:
871N/A hg status \-A "set:binary()"
871N/A Forget files that are in .hgignore but are already tracked:
871N/A hg forget "set:hgignore() and not ignored()"
871N/A Find text files that contain a string:
871N/A hg locate "set:grep(magic) and not binary()"
871N/A Find C files in a non\-standard encoding:
871N/A-hg locate "set:**.c and not encoding(\(aqUTF\-8\(aq)"
871N/A+hg locate "set:**.c and not encoding('UTF\-8')"
871N/A Revert copies of large binary files:
871N/A-hg revert "set:copied() and binary() and size(\(aq>1M\(aq)"
871N/A+hg revert "set:copied() and binary() and size('>1M')"
871N/A Remove files listed in
foo.lst that contain the letter a or b:
871N/A-hg remove "set: \(aqlistfile:
foo.lst\(aq and (**a* or **b*)"
871N/A-See also \%\fBhg help patterns\fP\:.
871N/A+See also \fBhg help patterns\fP.
196N/A changesets from a given changeset. More precisely, the ancestors
196N/A of a changeset can be defined by two properties: a parent of a
196N/A changeset is an ancestor, and a parent of an ancestor is an
196N/A-ancestor. See also: \(aqDescendant\(aq.
196N/A+ancestor. See also: 'Descendant'.
871N/A Bookmarks are pointers to certain commits that move when
871N/A committing. They are similar to tags in that it is possible to use
871N/A bookmark names in all places where Mercurial expects a changeset
871N/A-ID,
e.g., with \%\fBhg update\fP\:. Unlike tags, bookmarks move along
871N/A+ID,
e.g., with \fBhg update\fP. Unlike tags, bookmarks move along
871N/A when you make a commit.
871N/A Bookmarks can be renamed, copied and deleted. Bookmarks are local,
196N/A (Noun) A child changeset that has been created from a parent that
196N/A is not a head. These are known as topological branches, see
196N/A-\(aqBranch, topological\(aq. If a topological branch is named, it becomes
2302N/A+\&'Branch, topological'. If a topological branch is named, it becomes
196N/A a named branch. If a topological branch is not named, it becomes
196N/A-an anonymous branch. See \(aqBranch, anonymous\(aq and \(aqBranch, named\(aq.
196N/A+an anonymous branch. See 'Branch, anonymous' and 'Branch, named'.
196N/A Branches may be created when changes are pulled from or pushed to
196N/A a remote repository, since new heads may be created by these
196N/A (Verb) The action of creating a child changeset which results in
196N/A its parent having more than one child.
196N/A-Example: "I\(aqm going to branch at X".
196N/A+Example: "I'm going to branch at X".
196N/A-See \(aqHead, branch\(aq.
196N/A If a named branch has no topological heads, it is considered to be
196N/A inactive. As an example, a feature branch becomes inactive when it
196N/A-is merged into the default branch. The \%\fBhg branches\fP\: command
196N/A+is merged into the default branch. The \fBhg branches\fP command
196N/A shows inactive branches by default, though they can be hidden with
196N/A-\%\fBhg branches \-\-active\fP\:.
196N/A+\fBhg branches \-\-active\fP.
196N/A NOTE: this concept is deprecated because it is too implicit.
196N/A-Branches should now be explicitly closed using \%\fBhg commit
196N/A-\-\-close\-branch\fP\: when they are no longer needed.
196N/A+Branches should now be explicitly closed using \fBhg commit
196N/A+\-\-close\-branch\fP when they are no longer needed.
196N/A A collection of changesets which have the same branch name. By
196N/A default, children of a changeset in a named branch belong to the
196N/A same named branch. A child can be explicitly assigned to a
196N/A-different branch. See \%\fBhg help branch\fP\:, \%\fBhg help branches\fP\: and
196N/A-\%\fBhg commit \-\-close\-branch\fP\: for more information on managing
196N/A+different branch. See \fBhg help branch\fP, \fBhg help branches\fP and
196N/A+\fBhg commit \-\-close\-branch\fP for more information on managing
196N/A Named branches can be thought of as a kind of namespace, dividing
196N/A-See \(aqTip, branch\(aq.
196N/A revision. This use should probably be avoided where possible, as
196N/A changeset is much more appropriate than checkout in this context.
196N/A-Example: "I\(aqm using checkout X."
196N/A+Example: "I'm using checkout X."
196N/A (Verb) Updating the working directory to a specific changeset. See
196N/A-\%\fBhg help update\fP\:.
196N/A-Example: "I\(aqm going to check out changeset X."
196N/A+Example: "I'm going to check out changeset X."
196N/A-See \(aqChangeset, child\(aq.
196N/A+See 'Changeset, child'.
871N/A-See \(aqHead, closed branch\(aq
871N/A+See 'Head, closed branch'
196N/A-See \(aqBranch, closed\(aq.
196N/A Example: "Is your clone up to date?".
196N/A-(Verb) The process of creating a clone, using \%\fBhg clone\fP\:.
196N/A+(Verb) The process of creating a clone, using \fBhg clone\fP.
196N/A-Example: "I\(aqm going to clone the repository".
196N/A+Example: "I'm going to clone the repository".
196N/A-See \(aqHead, closed branch\(aq.
196N/A+See 'Head, closed branch'.
196N/A system (DVCS) can be described as a directed acyclic graph (DAG),
196N/A consisting of nodes and edges, where nodes correspond to
196N/A changesets and edges imply a parent \-> child relation. This graph
2302N/A-can be visualized by graphical tools such as \%\fBhg log \-\-graph\fP\:. In
2302N/A+can be visualized by graphical tools such as \fBhg log \-\-graph\fP. In
2302N/A Mercurial, the DAG is limited by the requirement for children to
196N/A-See \(aqBranch, default\(aq.
196N/A from a given changeset. More precisely, the descendants of a
196N/A changeset can be defined by two properties: the child of a
196N/A changeset is a descendant, and the child of a descendant is a
196N/A-descendant. See also: \(aqAncestor\(aq.
196N/A+descendant. See also: 'Ancestor'.
196N/A Mercurial, that will be recorded in the next commit. The working
196N/A directory initially corresponds to the snapshot at an existing
196N/A changeset, known as the parent of the working directory. See
196N/A-\(aqParent, working directory\(aq. The state may be modified by changes
2302N/A+\&'Parent, working directory'. The state may be modified by changes
196N/A to the files introduced manually or by a merge. The repository
196N/A metadata exists in the .hg directory inside the working directory.
871N/A Changesets in the draft phase have not been shared with publishing
871N/A repositories and may thus be safely changed by history\-modifying
871N/A-extensions. See \%\fBhg help phases\fP\:.
871N/A+extensions. See \fBhg help phases\fP.
2302N/A-See DAG and \%\fBhg log \-\-graph\fP\:.
2302N/A+See DAG and \fBhg log \-\-graph\fP.
196N/A-The term \(aqhead\(aq may be used to refer to both a branch head or a
196N/A-repository head, depending on the context. See \(aqHead, branch\(aq and
196N/A-\(aqHead, repository\(aq for specific definitions.
196N/A+The term 'head' may be used to refer to both a branch head or a
196N/A+repository head, depending on the context. See 'Head, branch' and
2302N/A+\&'Head, repository' for specific definitions.
196N/A Heads are where development generally takes place and are the
196N/A usual targets for update and merge operations.
196N/A A changeset that marks a head as no longer interesting. The closed
196N/A-head is no longer listed by \%\fBhg heads\fP\:. A branch is considered
196N/A+head is no longer listed by \fBhg heads\fP. A branch is considered
196N/A closed when all its heads are closed and consequently is not
196N/A-listed by \%\fBhg branches\fP\:.
196N/A+listed by \fBhg branches\fP.
871N/A Closed heads can be re\-opened by committing new changeset as the
871N/A child of the changeset that marks a head as closed.
196N/A-See \(aqHistory, immutable\(aq.
196N/A+See 'History, immutable'.
196N/A-See \(aqChangeset, merge\(aq.
196N/A+See 'Changeset, merge'.
196N/A-See \(aqBranch, named\(aq.
196N/A The empty changeset. It is the parent state of newly\-initialized
196N/A repositories and repositories with no checked out revision. It is
196N/A thus the parent of root changesets and the effective ancestor when
196N/A-merging unrelated changesets. Can be specified by the alias \(aqnull\(aq
196N/A-or by the changeset ID \(aq000000000000\(aq.
196N/A+merging unrelated changesets. Can be specified by the alias 'null'
196N/A+or by the changeset ID '000000000000'.
196N/A-See \(aqChangeset, parent\(aq.
196N/A+See 'Changeset, parent'.
196N/A-See \(aqChangeset, parent\(aq.
196N/A+See 'Changeset, parent'.
196N/A .B Parent, working directory
196N/A The working directory parent reflects a virtual revision which is
196N/A the child of the changeset (or two changesets with an uncommitted
196N/A-merge) shown by \%\fBhg parents\fP\:. This is changed with
196N/A-\%\fBhg update\fP\:. Other commands to see the working directory parent
196N/A-are \%\fBhg summary\fP\: and \%\fBhg id\fP\:. Can be specified by the alias ".".
196N/A+merge) shown by \fBhg parents\fP. This is changed with
196N/A+\fBhg update\fP. Other commands to see the working directory parent
196N/A+are \fBhg summary\fP and \fBhg id\fP. Can be specified by the alias ".".
196N/A (Noun) The product of a diff operation.
196N/A-Example: "I\(aqve sent you my patch."
196N/A+Example: "I've sent you my patch."
196N/A (Verb) The process of using a patch file to transform one
196N/A changeset into another.
871N/A A per\-changeset state tracking how the changeset has been or
871N/A-should be shared. See \%\fBhg help phases\fP\:.
871N/A+should be shared. See \fBhg help phases\fP.
871N/A Changesets in the public phase have been shared with publishing
871N/A-repositories and are therefore considered immutable. See \%\fBhg help
871N/A+repositories and are therefore considered immutable. See \fBhg help
196N/A not in the local repository are brought into the local
196N/A repository. Note that this operation without special arguments
196N/A only updates the repository, it does not update the files in the
196N/A-working directory. See \%\fBhg help pull\fP\:.
196N/A+working directory. See \fBhg help pull\fP.
196N/A not in a remote repository are sent to the remote repository. Note
196N/A that this operation only adds changesets which have been committed
196N/A locally to the remote repository. Uncommitted changes are not
196N/A-sent. See \%\fBhg help push\fP\:.
196N/A+sent. See \fBhg help push\fP.
196N/A-See \(aqHead, repository\(aq.
196N/A+See 'Head, repository'.
196N/A A state of the repository at some point in time. Earlier revisions
196N/A-can be updated to by using \%\fBhg update\fP\:. See also \(aqRevision
196N/A-number\(aq; See also \(aqChangeset\(aq.
196N/A+can be updated to by using \fBhg update\fP. See also 'Revision
196N/A+number'; See also 'Changeset'.
196N/A to a repository, starting with revision number 0. Note that the
196N/A revision number may be different in each clone of a repository. To
196N/A identify changesets uniquely between different clones, see
196N/A-See \(aqHistory, rewriting\(aq.
196N/A+See 'History, rewriting'.
871N/A Changesets in the secret phase may not be shared via push, pull,
871N/A-or clone. See \%\fBhg help phases\fP\:.
871N/A+or clone. See \fBhg help phases\fP.
871N/A An alternative name given to a changeset. Tags can be used in all
871N/A places where Mercurial expects a changeset ID,
e.g., with
871N/A-\%\fBhg update\fP\:. The creation of a tag is stored in the history and
871N/A+\fBhg update\fP. The creation of a tag is stored in the history and
871N/A will thus automatically be shared with other using push and pull.
196N/A The head of a given branch with the highest revision number. When
196N/A a branch name is used as a revision identifier, it refers to the
196N/A-branch tip. See also \(aqBranch, head\(aq. Note that because revision
196N/A+branch tip. See also 'Branch, head'. Note that because revision
196N/A numbers may be different in different repository clones, the
196N/A branch tip may be different in different cloned repositories.
196N/A (Noun) Another synonym of changeset.
196N/A-Example: "I\(aqve pushed an update".
196N/A+Example: "I've pushed an update".
196N/A (Verb) This term is usually used to describe updating the state of
196N/A the working directory to that of a specific changeset. See
196N/A-\%\fBhg help update\fP\:.
196N/A Example: "You should update".
196N/A-See \(aqDirectory, working\(aq.
196N/A+See 'Directory, working'.
196N/A .B Working directory parent
196N/A-See \(aqParent, working directory\(aq.
196N/A+See 'Parent, working directory'.
871N/A .SH SYNTAX FOR MERCURIAL IGNORE FILES
871N/A In addition, a Mercurial configuration file can reference a set of
871N/A per\-user or global ignore files. See the \fBignore\fP configuration
871N/A-key on the \fB[ui]\fP section of \%\fBhg help config\fP\: for details of how to
871N/A+key on the \fB[ui]\fP section of \fBhg help config\fP for details of how to
871N/A-To control Mercurial\(aqs handling of files that it manages, many
871N/A+To control Mercurial's handling of files that it manages, many
871N/A commands support the \fB\-I\fP and \fB\-X\fP options; see
871N/A-\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
871N/A+\fBhg help <command>\fP and \fBhg help patterns\fP for details.
2302N/A Files that are already tracked are not affected by .hgignore, even
2302N/A if they appear in .hgignore. An untracked file X can be explicitly
2302N/A-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
2302N/A+added with \fBhg add X\fP, even if X would be excluded by a pattern
871N/A To change the syntax used, use a line of the following form:
871N/A where \fBNAME\fP is one of the following:
2302N/A The chosen syntax stays in effect when parsing all patterns that
2302N/A follow, until another syntax is selected.
871N/A-Please see \%\fBhg help patterns\fP\: for details.
871N/A+Please see \fBhg help patterns\fP for details.
871N/A Here is an example ignore file.
871N/A # switch to regexp syntax.
871N/A-Mercurial\(aqs internal web server, hgweb, can serve either a single
871N/A+Mercurial's internal web server, hgweb, can serve either a single
2302N/A repository, or a tree of repositories. In the second case, repository
2302N/A paths and global options can be defined using a dedicated
2302N/A This file uses the same syntax as other Mercurial configuration files
2302N/A but recognizes only the following sections:
2302N/A-The \fBweb\fP options are thoroughly described in \%\fBhg help config\fP\:.
2302N/A+The \fBweb\fP options are thoroughly described in \fBhg help config\fP.
2302N/A The \fBpaths\fP section maps URL paths to paths of repositories in the
2302N/A filesystem. hgweb will not expose the filesystem directly \- only
2302N/A path ends with \fB*\fP or \fB**\fP the filesystem will be searched
2302N/A recursively for repositories below that point.
2302N/A With \fB*\fP it will not recurse into the repositories it finds (except for
2302N/A With \fB**\fP it will also search inside repository working directories
2302N/A and possibly find subrepositories.
2302N/A The first two entries make two repositories in different directories
2302N/A The \fBcollections\fP section is deprecated and has been superseded by
871N/A ancestor of the two file versions, so they can determine the changes
871N/A-Merge tools are used both for \%\fBhg resolve\fP\:, \%\fBhg merge\fP\:, \%\fBhg update\fP\:,
871N/A-\%\fBhg backout\fP\: and in several extensions.
871N/A+Merge tools are used both for \fBhg resolve\fP, \fBhg merge\fP, \fBhg update\fP,
871N/A+\fBhg backout\fP and in several extensions.
871N/A Usually, the merge tool tries to automatically reconcile the files by
871N/A combining all non\-overlapping changes that occurred separately in
2302N/A There are some internal merge tools which can be used. The internal
2302N/A Asks the user which of the local or the other version to keep as
2302N/A Internal tools are always available and do not require a GUI but will by default
2302N/A not handle symlinks or binary files.
2302N/A Mercurial uses these rules when deciding which merge tool to use:
2302N/A If a tool has been specified with the \-\-tool option to merge or resolve, it
871N/A The merge of the file fails and must be resolved before commit.
871N/A After selecting a merge program, Mercurial will by default attempt
871N/A-to merge the files using a simple merge algorithm first. Only if it doesn\(aqt
871N/A+to merge the files using a simple merge algorithm first. Only if it doesn't
871N/A succeed because of conflicting changes Mercurial will actually execute the
871N/A merge program. Whether to use the simple merge algorithm first can be
871N/A controlled by the premerge setting of the merge tool. Premerge is enabled by
871N/A-Please see \%\fBhg help hgignore\fP\: for details.
871N/A+Please see \fBhg help hgignore\fP for details.
871N/A To use a plain path name without any pattern matching, start it with
871N/A path:
foo/bar a name bar in a directory named foo in the root
871N/A path:path:name a file or directory named "path:name"
871N/A glob:*.c any name ending in ".c" in the current directory
871N/A *.c any name ending in ".c" in the current directory
871N/A **.c any name ending in ".c" in any subdirectory of the
871N/A foo/*.c any name ending in ".c" in the directory foo
871N/A foo/**.c any name ending in ".c" in any subdirectory of foo
871N/A re:.*\
e.c$ any name ending in ".c", anywhere in the repository
871N/A-See also \%\fBhg help filesets\fP\:.
871N/A+See also \fBhg help filesets\fP.
871N/A .SH WORKING WITH PHASES
2302N/A (for instance, with the mq or rebase extensions).
2302N/A Each changeset in a repository is in one of the following phases:
2302N/A public : changeset is visible on a public server
2302N/A secret : changeset should not be pushed, pulled, or cloned
2302N/A These phases are ordered (public < draft < secret) and no changeset
2302N/A can be in a lower phase than its ancestors. For instance, if a
871N/A Once changesets become public, extensions like mq and rebase will
871N/A refuse to operate on them to prevent creating duplicate changesets.
871N/A-Phases can also be manually manipulated with the \%\fBhg phase\fP\: command
871N/A-if needed. See \%\fBhg help \-v phase\fP\: for examples.
871N/A+Phases can also be manually manipulated with the \fBhg phase\fP command
871N/A+if needed. See \fBhg help \-v phase\fP for examples.
871N/A Normally, all servers are \fBpublishing\fP by default. This means:
871N/A \- all draft changesets that are pulled or cloned appear in phase
871N/A \- secret changesets are neither pushed, pulled, or cloned
871N/A repository to disable publishing in its configuration file:
2302N/A-See \%\fBhg help config\fP\: for more information on configuration files.
2302N/A+See \fBhg help config\fP for more information on configuration files.
871N/A Servers running older versions of Mercurial are treated as
871N/A list changesets in draft or secret phase:
871N/A hg log \-r "not public()"
871N/A change all secret changesets to draft:
871N/A hg phase \-\-draft "secret()"
871N/A forcibly move the current changeset and descendants from public to draft:
871N/A hg phase \-\-force \-\-draft .
871N/A show a list of changeset revision and phase:
871N/A hg log \-\-template "{rev} {phase}\en"
871N/A resynchronize draft changesets relative to a remote repository:
2302N/A hg phase \-fd "outgoing(URL)"
871N/A-See \%\fBhg help phase\fP\: for more information on manually manipulating phases.
871N/A+See \fBhg help phase\fP for more information on manually manipulating phases.
871N/A .SH SPECIFYING SINGLE REVISIONS
871N/A Mercurial supports several ways to specify individual revisions.
871N/A Special characters can be used in quoted identifiers by escaping them,
871N/A e.g., \fB\en\fP is interpreted as a newline. To prevent them from being
871N/A-interpreted, strings can be prefixed with \fBr\fP,
e.g. \fBr\(aq...\(aq\fP.
871N/A+interpreted, strings can be prefixed with \fBr\fP,
e.g. \fBr'...'\fP.
871N/A There is a single prefix operator:
2302N/A Changesets not in x. Short form is \fB! x\fP.
2302N/A These are the supported infix operators:
2302N/A The nth first ancestor of x; \fBx~0\fP is x; \fBx~3\fP is \fBx^^^\fP.
2302N/A There is a single postfix operator:
2302N/A Equivalent to \fBx^1\fP, the first parent of each changeset in x.
2302N/A The following predicates are supported:
2302N/A Changesets marked in the specified bisect status:
2302N/A \fBcurrent\fP : the cset currently being bisected
871N/A .B \fBcontains(pattern)\fP
871N/A-Revision contains a file matching pattern. See \%\fBhg help patterns\fP\:
871N/A+Revision contains a file matching pattern. See \fBhg help patterns\fP
871N/A for information about file patterns.
871N/A .B \fBdate(interval)\fP
871N/A-Changesets within the interval, see \%\fBhg help dates\fP\:.
871N/A+Changesets within the interval, see \fBhg help dates\fP.
2302N/A Changesets connected to the specified filelog.
2302N/A For performance reasons, \fBfilelog()\fP does not show every changeset
2302N/A-that affects the requested file(s). See \%\fBhg help log\fP\: for details. For
2302N/A+that affects the requested file(s). See \fBhg help log\fP for details. For
2302N/A a slower, more accurate result, use \fBfile()\fP.
871N/A .B \fBfollow([file])\fP
871N/A-An alias for \fB::.\fP (ancestors of the working copy\(aqs first parent).
871N/A+An alias for \fB::.\fP (ancestors of the working copy's first parent).
871N/A If a filename is specified, the history of the given file is followed,
871N/A-Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r\(aq...\(aq)\fP
871N/A+Like \fBkeyword(string)\fP but accepts a regex. Use \fBgrep(r'...')\fP
871N/A to ensure special escape characters are handled correctly. Unlike
871N/A \fBkeyword(string)\fP, the match is case\-sensitive.
871N/A-An empty set, if any revision in set isn\(aqt found; otherwise,
871N/A+An empty set, if any revision in set isn't found; otherwise,
2302N/A If any of specified revisions is not present in the local repository,
871N/A .B \fBremote([id [,path]])\fP
871N/A Local revision that corresponds to the given identifier in a
871N/A-remote repository, if present. Here, the \(aq.\(aq identifier is a
871N/A+remote repository, if present. Here, the '.' identifier is a
871N/A synonym for the current local branch.
871N/A .B \fBremoves(pattern)\fP
2302N/A as \fB\-key\fP to sort in descending order.
2302N/A \fBrev\fP for the revision number,
2302N/A \fBdate\fP for the commit date
2302N/A If \fIstring\fP starts with \fIre:\fP, the remainder of the string is treated as
2302N/A a regular expression. To match a user that actually contains \fIre:\fP, use
2302N/A New predicates (known as "aliases") can be defined, using any combination of
871N/A existing predicates or other aliases. An alias definition looks like:
871N/A in the \fBrevsetalias\fP section of a Mercurial configuration file. Arguments
871N/A rs($1, $2) = reverse(sort($1, $2))
871N/A defines three aliases, \fBh\fP, \fBd\fP, and \fBrs\fP. \fBrs(0:tip, author)\fP is
871N/A exactly equivalent to \fBreverse(sort(0:tip, author))\fP.
871N/A-Command line equivalents for \%\fBhg log\fP\::
871N/A+Command line equivalents for \fBhg log\fP:
871N/A \-l x \-> limit(expr, x)
871N/A Changesets on the default branch:
871N/A hg log \-r "branch(default)"
871N/A Changesets on the default branch since tag 1.5 (excluding merges):
871N/A hg log \-r "branch(default) and 1.5:: and not merge()"
871N/A hg log \-r "head() and not closed()"
871N/A-hg log \-r "1.3::1.5 and keyword(bug) and file(\(aqhgext/*\(aq)"
871N/A+hg log \-r "1.3::1.5 and keyword(bug) and file('hgext/*')"
871N/A Changesets committed in May 2008, sorted by user:
871N/A-hg log \-r "sort(date(\(aqMay 2008\(aq), user)"
871N/A+hg log \-r "sort(date('May 2008'), user)"
2302N/A hg log \-r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
2302N/A Subrepositories let you nest external repositories or projects into a
2302N/A Subrepositories are made of three components:
2302N/A Nested repository checkouts. They can appear anywhere in the
2302N/A subrepositories are referenced like:
2302N/A Git and Subversion subrepos are also supported:
2302N/A subrepository entry as described above. At this point, the
2302N/A subrepository is tracked and the next commit will record its state in
2302N/A+\fB\&.hgsubstate\fP and bind it to the committed changeset.
2302N/A .SS Synchronizing a Subrepository
2302N/A Subrepos do not automatically track the latest changeset of their
2302N/A To remove a subrepository from the parent repository, delete its
2302N/A .SS Interaction with Mercurial Commands
871N/A have been modified, Mercurial will abort. Mercurial can be made
871N/A to instead commit all modified subrepositories by specifying
871N/A-configuration file (see \%\fBhg help config\fP\:). After there are no
871N/A+configuration file (see \fBhg help config\fP). After there are no
871N/A longer any modified subrepositories, it records their state and
871N/A finally commits it in the parent repository.
871N/A pull is not recursive since it is not clear what to pull prior
871N/A-to running \%\fBhg update\fP\:. Listing and retrieving all
871N/A+to running \fBhg update\fP. Listing and retrieving all
871N/A subrepositories changes referenced by the parent repository pulled
871N/A changesets is expensive at best, impossible in the Subversion
2302N/A changeset is not available in the current subrepository, Mercurial
2302N/A will pull it in first before updating. This means that updating
2302N/A can require network access when using subrepositories.
2302N/A .SS Remapping Subrepositories Sources
2302N/A A subrepository source location may change during a project life,
871N/A $ hg log \-r1 \-\-style changelog
871N/A A template is a piece of text, with markup to invoke variable
871N/A $ hg log \-r1 \-\-template "{node}\en"
871N/A b56ce7b07c52de7d5fd79fb89701ea538af65746
871N/A Strings in curly braces are called keywords. The availability of
2302N/A keywords depends on the exact context of the templater. These
2302N/A keywords are usually available for templating a log\-like command:
2302N/A-String. The identification hash of the changeset\(aqs first parent,
2302N/A+String. The identification hash of the changeset's first parent,
2302N/A as a 40 digit hexadecimal string. If the changeset has no parents, all
2302N/A-Integer. The repository\-local revision number of the changeset\(aqs
2302N/A+Integer. The repository\-local revision number of the changeset's
2302N/A first parent, or \-1 if the changeset has no parents.
2302N/A-String. The identification hash of the changeset\(aqs second
2302N/A+String. The identification hash of the changeset's second
2302N/A parent, as a 40 digit hexadecimal string. If the changeset has no second
2302N/A-Integer. The repository\-local revision number of the changeset\(aqs
2302N/A+Integer. The repository\-local revision number of the changeset's
2302N/A second parent, or \-1 if the changeset has no second parent.
2302N/A List of strings. Any tags associated with the changeset.
871N/A The "date" keyword does not produce human\-readable output. If you
871N/A want to use a date in your output, you can use a filter to process
871N/A it. Filters are functions which return a string based on the input
871N/A-variable. Be sure to use the stringify filter first when you\(aqre
871N/A+variable. Be sure to use the stringify filter first when you're
871N/A applying a string\-input filter to a list\-like input variable.
871N/A You can also use a chain of filters to get the desired output:
871N/A $ hg tip \-\-template "{date|isodate}\en"
871N/A 2008\-08\-21 18:22 +0000
871N/A-Any text. Returns \(aq(none)\(aq if the string is empty.
871N/A+Any text. Returns '(none)' if the string is empty.
2302N/A Any text. Returns a short representation of a user name or email
2302N/A Note that a filter is nothing more than a function call,
i.e. 2302N/A \fBexpr|filter\fP is equivalent to \fBfilter(expr)\fP.
2302N/A In addition to filters, there are some basic built\-in functions:
2302N/A Also, for any expression that returns a list, there is a list operator:
2302N/A Some sample command line templates:
2302N/A-$ hg log \-r 0 \-\-template "files:\en{files % \(aq {file}\en\(aq}"
2302N/A+$ hg log \-r 0 \-\-template "files:\en{files % ' {file}\en'}"
2302N/A Join the list of files with a ", ":
2302N/A-$ hg log \-r 0 \-\-template "files: {join(files, \(aq, \(aq)}\en"
2302N/A+$ hg log \-r 0 \-\-template "files: {join(files, ', ')}\en"
2302N/A-$ hg log \-r 0 \-\-template "{date(date, \(aq%Y\(aq)}\en"
2302N/A+$ hg log \-r 0 \-\-template "{date(date, '%Y')}\en"
2302N/A Output the description set to a fill\-width of 30:
2302N/A-$ hg log \-r 0 \-\-template "{fill(desc, \(aq30\(aq)}"
2302N/A+$ hg log \-r 0 \-\-template "{fill(desc, '30')}"
2302N/A Use a conditional to test for the default branch:
2302N/A-$ hg log \-r 0 \-\-template "{ifeq(branch, \(aqdefault\(aq, \(aqon the main branch\(aq,
2302N/A-\(aqon branch {branch}\(aq)}\en"
2302N/A+$ hg log \-r 0 \-\-template "{ifeq(branch, 'default', 'on the main branch',
2302N/A+\&'on branch {branch}')}\en"
2302N/A Append a newline if not empty:
2302N/A-$ hg tip \-\-template "{if(author, \(aq{author}\en\(aq)}"
2302N/A+$ hg tip \-\-template "{if(author, '{author}\en')}"
2302N/A Label the output for use with the color extension:
2302N/A-$ hg log \-r 0 \-\-template "{label(\(aqchangeset.{phase}\(aq, node|short)}\en"
2302N/A+$ hg log \-r 0 \-\-template "{label('changeset.{phase}', node|short)}\en"
2302N/A Invert the firstline filter,
i.e. everything but the first line:
2302N/A-$ hg log \-r 0 \-\-template "{sub(r\(aq^.*\en?\en?\(aq, \(aq\(aq, desc)}\en"
2302N/A+$ hg log \-r 0 \-\-template "{sub(r'^.*\en?\en?', '', desc)}\en"
871N/A Valid URLs are of the form:
871N/A http://[user[:pass]@]host[:port]/[path][#revision]
871N/A https://[user[:pass]@]host[:port]/[path][#revision]
871N/A ssh://[user@]host[:port]/[path][#revision]
871N/A Paths in the local filesystem can either point to Mercurial
2302N/A-repositories or to bundle files (as created by \%\fBhg bundle\fP\: or
2302N/A-\%\fBhg incoming \-\-bundle\fP\:). See also \%\fBhg help paths\fP\:.
2302N/A+repositories or to bundle files (as created by \fBhg bundle\fP or
2302N/A+\fBhg incoming \-\-bundle\fP). See also \fBhg help paths\fP.
871N/A An optional identifier after # indicates a particular branch, tag, or
871N/A-changeset to use from the remote repository. See also \%\fBhg help
871N/A+changeset to use from the remote repository. See also \fBhg help
871N/A-Some features, such as pushing to \%http://\: and \%https://\: URLs are only
871N/A+Some features, such as pushing to http:// and https:// URLs are only
871N/A possible if the feature is explicitly enabled on the remote Mercurial
2302N/A Some notes about using SSH with Mercurial:
2302N/A SSH requires an accessible shell account on the destination machine
871N/A and a copy of hg in the remote path or specified with as remotecmd.
871N/A-path is relative to the remote user\(aqs home directory by default. Use
871N/A+path is relative to the remote user's home directory by default. Use
871N/A an extra slash at the start of a path to specify an absolute path:
871N/A-Mercurial doesn\(aqt use its own compression via SSH; the right thing
871N/A+Mercurial doesn't use its own compression via SSH; the right thing
871N/A to do is to configure it in your ~/.ssh/config,
e.g.:
871N/A Alternatively specify "ssh \-C" as your ssh command in your
2302N/A configuration file or with the \-\-ssh command line option.
2302N/A These URLs can all be stored in your configuration file with path
871N/A aliases under the [paths] section like so:
871N/A You can then use the alias for any command that uses a URL (for
871N/A-example \%\fBhg pull alias1\fP\: will be treated as \%\fBhg pull URL1\fP\:).
871N/A+example \fBhg pull alias1\fP will be treated as \fBhg pull URL1\fP).
871N/A Two path aliases are special because they are used as defaults when
871N/A you do not provide the URL to a command:
871N/A When you create a repository with hg clone, the clone command saves
871N/A-the location of the source repository as the new repository\(aqs
871N/A-\(aqdefault\(aq path. This is then used when you omit path from push\- and
2302N/A+the location of the source repository as the new repository's
2302N/A+\&'default' path. This is then used when you omit path from push\- and
871N/A pull\-like commands (including incoming and outgoing).
871N/A-The push command will look for a path named \(aqdefault\-push\(aq, and
871N/A-prefer it over \(aqdefault\(aq if both are defined.
871N/A+The push command will look for a path named 'default\-push', and
871N/A+prefer it over 'default' if both are defined.
2302N/A This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system.
2302N/A The order in which access checks are performed is:
2302N/A The allow and deny sections take key\-value pairs.
2302N/A .SS Branch\-based Access Control
2302N/A have branch\-based access control. Keys in these sections can be
2302N/A an asterisk, to match any branch;
2302N/A The corresponding values can be either:
2302N/A a comma\-separated list containing users and groups, or
2302N/A an asterisk, to match anyone;
2302N/A You can add the "!" prefix to a user or group name to invert the sense
196N/A .SS Example Configuration
196N/A # Use this if you want to check access restrictions at commit time
196N/A \&.hgtags = release_engineer
2302N/A .SS Examples using the "!" prefix
2302N/A-Suppose there\(aqs a branch that only a given user (or group) should be able to
2302N/A-push to, and you don\(aqt want to restrict access to any other branch that may
2302N/A+Suppose there's a branch that only a given user (or group) should be able to
2302N/A+push to, and you don't want to restrict access to any other branch that may
2302N/A The "!" prefix allows you to prevent anyone except a given user or group to
2302N/A 3) Deny access to a file to anyone but user "gollum"
2302N/A-# 1) only \(aqgollum\(aq can commit to branch \(aqring\(aq;
2302N/A-# \(aqgollum\(aq and anyone else can still commit to any other branch.
2302N/A+# 1) only 'gollum' can commit to branch 'ring';
2302N/A+# 'gollum' and anyone else can still commit to any other branch.
2302N/A-# 2) only members of the group \(aqhobbit\(aq can commit to branch \(aqlake\(aq;
2302N/A-# \(aqhobbit\(aq members and anyone else can still commit to any other branch.
2302N/A+# 2) only members of the group 'hobbit' can commit to branch 'lake';
2302N/A+# 'hobbit' members and anyone else can still commit to any other branch.
2302N/A # You can also deny access based on file paths:
2302N/A-# 3) only \(aqgollum\(aq can change the file below;
2302N/A-# \(aqgollum\(aq and anyone else can still change any other file.
2302N/A+# 3) only 'gollum' can change the file below;
2302N/A+# 'gollum' and anyone else can still change any other file.
2302N/A # rotate up to N log files when the current one gets too big
2302N/A view the recent repository events
2302N/A the number of events to show (default: 10)
2302N/A hooks for integrating with the Bugzilla bug tracker
2302N/A hours spent working on the bug. Bugs can also be marked fixed.
2302N/A Three basic modes of access to Bugzilla are provided:
2302N/A Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
2302N/A Writing directly to the Bugzilla database. Only Bugzilla installations
2302N/A using MySQL are supported. Requires Python MySQLdb.
2302N/A Writing directly to the database is susceptible to schema changes, and
2302N/A relies on a Bugzilla contrib script to send out bug change
2302N/A works on all supported Bugzilla versions.
2302N/A Configuration items common to all access modes:
2302N/A The access type to use. Values recognized are:
2302N/A MySQL access, Bugzilla 2.16 and up to but not
2302N/A Template to use when formatting comments. Overrides style if
2302N/A specified. In addition to the usual Mercurial keywords, the
2302N/A Base URL for browsing Mercurial repositories.
2302N/A Default \fBchangeset {node|short} in repo {root} refers to bug
2302N/A {bug}.\endetails:\en\et{desc|tabindent}\fP
2302N/A Base URL for browsing Mercurial repositories. Referenced from
2302N/A templates as \fB{hgweb}\fP.
2302N/A Configuration items common to XMLRPC+email and MySQL access modes:
871N/A committer = Bugzilla user
871N/A See also the \fB[usermap]\fP section.
2302N/A The \fB[usermap]\fP section is used to specify mappings of Mercurial
2302N/A Contains entries of the form \fBcommitter = Bugzilla user\fP.
2302N/A XMLRPC access mode configuration:
2302N/A The password for Bugzilla login.
2302N/A XMLRPC+email access mode uses the XMLRPC access mode configuration items,
2302N/A The Bugzilla email address.
2302N/A In addition, the Mercurial email settings must be configured. See the
2302N/A documentation in hgrc(5), sections \fB[email]\fP and \fB[smtp]\fP.
2302N/A MySQL access mode configuration:
2302N/A id) and \fBuser\fP (committer bugzilla email). Default depends on
2302N/A version; from 2.18 it is "cd %(bzdir)s && perl \-T
196N/A Activating the extension:
196N/A # run bugzilla hook on every change pulled or pushed in here
871N/A Example configurations:
871N/A XMLRPC+email example configuration. This uses the Bugzilla at
871N/A user@emaildomain.com=user.name@bugzilladomain.com
871N/A MySQL example configuration. This has a local Bugzilla 3.2 installation
196N/A user@emaildomain.com=user.name@bugzilladomain.com
871N/A All the above add a comment to the Bugzilla bug record of the form:
196N/A Changeset 3b16791d6642 in repository\-name.
196N/A Changeset commit comment. Bug 1234.
2302N/A command to display child changesets (DEPRECATED)
2302N/A-This extension is deprecated. You should use \%\fBhg log \-r
2302N/A-"children(REV)"\fP\: instead.
2302N/A+This extension is deprecated. You should use \fBhg log \-r
2302N/A+"children(REV)"\fP instead.
196N/A hg children [\-r REV] [FILE]
196N/A-Print the children of the working directory\(aqs revisions. If a
196N/A+Print the children of the working directory's revisions. If a
196N/A revision is given via \-r/\-\-rev, the children of that revision will
196N/A be printed. If a file argument is given, revision in which the
196N/A file was last changed (after the working directory revision or the
2302N/A argument to \-\-rev if given) is printed.
2302N/A command to display statistics about repository history
196N/A hg churn [\-d DATE] [\-r REV] [\-\-aliases FILE] [FILE]
196N/A This command will display a histogram representing the number
196N/A # display count of changed lines for every committer
2302N/A hg churn \-t "{author|email}"
196N/A # display count of lines changed in every year
196N/A It is possible to map alternate email addresses to a main address
196N/A by providing a file using the following format:
196N/A <alias email> = <actual email>
196N/A Such a file may be specified with the \-\-aliases option, otherwise
2302N/A Aliases will be split from the rightmost "=".
2302N/A exclude names matching the given patterns
2302N/A colorize output from some commands
196N/A Default effects may be overridden from your configuration file:
196N/A-# \(aqnone\(aq turns off all effects
196N/A+# 'none' turns off all effects
871N/A-The available effects in terminfo mode are \(aqblink\(aq, \(aqbold\(aq, \(aqdim\(aq,
871N/A-\(aqinverse\(aq, \(aqinvisible\(aq, \(aqitalic\(aq, \(aqstandout\(aq, and \(aqunderline\(aq; in
871N/A-ECMA\-48 mode, the options are \(aqbold\(aq, \(aqinverse\(aq, \(aqitalic\(aq, and
871N/A-\(aqunderline\(aq. How each is rendered depends on the terminal emulator.
2302N/A+The available effects in terminfo mode are 'blink', 'bold', 'dim',
2302N/A+\&'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
871N/A+ECMA\-48 mode, the options are 'bold', 'inverse', 'italic', and
2302N/A+\&'underline'. How each is rendered depends on the terminal emulator.
871N/A Some may not be available for a given terminal type, and will be
871N/A Note that on some systems, terminfo mode may cause problems when using
871N/A color with the pager extension and less \-R. less with the \-R option
871N/A will only display ECMA\-48 color codes, and terminfo mode may sometimes
871N/A-emit codes that less doesn\(aqt understand. You can work around this by
871N/A+emit codes that less doesn't understand. You can work around this by
871N/A either using ansi mode (or auto mode), or by using less \-r (which will
871N/A pass through all terminal control codes, not just color control
871N/A for your terminal type, assuming terminfo mode. For instance:
871N/A-to set \(aqbrightblue\(aq to color slot 12 (useful for 16 color terminals
871N/A-that have brighter colors defined in the upper eight) and, \(aqpink\(aq and
871N/A-\(aqorange\(aq to colors in 256\-color xterm\(aqs default color cube. These
871N/A+to set 'brightblue' to color slot 12 (useful for 16 color terminals
871N/A+that have brighter colors defined in the upper eight) and, 'pink' and
2302N/A+\&'orange' to colors in 256\-color xterm's default color cube. These
871N/A defined colors may then be used as any of the pre\-defined eight,
871N/A-including appending \(aq_background\(aq to set the background to that color.
871N/A+including appending '_background' to set the background to that color.
871N/A By default, the color extension will use ANSI mode (or win32 mode on
871N/A Windows) if it detects a terminal. To override auto mode (to enable
871N/A terminfo mode, for example), set the following configuration option:
871N/A-Any value other than \(aqansi\(aq, \(aqwin32\(aq, \(aqterminfo\(aq, or \(aqauto\(aq will
871N/A+Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will
196N/A hg convert [OPTION]... SOURCE [DEST [REVMAP]]
196N/A Accepted source formats [identifiers]:
2302N/A Accepted destination formats [identifiers]:
2302N/A Subversion [svn] (history on branches is not preserved)
2302N/A If no revision is given, all revisions will be converted.
2302N/A Otherwise, convert will only import up to the named revision
196N/A If no destination directory name is specified, it defaults to the
196N/A basename of the source with \fB\-hg\fP appended. If the destination
196N/A-repository doesn\(aqt exist, it will be created.
196N/A+repository doesn't exist, it will be created.
196N/A By default, all sources except Mercurial will use \-\-branchsort.
196N/A Mercurial uses \-\-sourcesort to preserve original revision numbers
2302N/A order. Sort modes have the following effects:
2302N/A try to move closed revisions as close as possible
2302N/A to parent branches, only supported by Mercurial
196N/A-If \fBREVMAP\fP isn\(aqt given, it will be put in a default location
196N/A+If \fBREVMAP\fP isn't given, it will be put in a default location
196N/A (\fB<dest>/.hg/shamap\fP by default). The \fBREVMAP\fP is a simple
196N/A text file that maps each source commit ID to the destination ID
196N/A for that revision, like so:
196N/A <source ID> <destination ID>
196N/A-If the file doesn\(aqt exist, it\(aqs automatically created. It\(aqs
196N/A-updated on each commit copied, so \%\fBhg convert\fP\: can be interrupted
196N/A+If the file doesn't exist, it's automatically created. It's
196N/A+updated on each commit copied, so \fBhg convert\fP can be interrupted
196N/A and can be run repeatedly to copy new commits.
196N/A The authormap is a simple text file that maps each source commit
196N/A author mapping and the line format is:
196N/A source author = destination author
196N/A Empty lines and lines starting with a \fB#\fP are ignored.
196N/A Comment lines start with \fB#\fP. A specified path matches if it
196N/A comma\-separated values:
196N/A The key is the revision ID in the source
196N/A original_branch_name new_branch_name
196N/A where "original_branch_name" is the name of the branch in the
2302N/A The Mercurial source recognizes the following configuration
2302N/A options, which you can set on the command line with \fB\-\-config\fP:
2302N/A revset specifying the source revisions to convert.
2302N/A CVS source will use a sandbox (
i.e. a checked\-out copy) from CVS
2302N/A The following options can be used with \fB\-\-config\fP:
2302N/A the changesets are calculated from the CVS log. The
2302N/A function is passed a list with the changeset entries, and can
2302N/A modify the changesets in\-place, or add or delete them.
2302N/A An additional "debugcvsps" Mercurial command allows the builtin
2302N/A changeset merging code to be run without doing a conversion. Its
2302N/A The following options can be set with \fB\-\-config\fP:
2302N/A use local time (as determined by the TZ
2302N/A Source history can be retrieved starting at a specific revision,
2302N/A instead of being integrally converted. Only single branch
2302N/A specify start Subversion revision number.
2302N/A The Perforce (P4) importer can be given a p4 depot path or a
2302N/A It is possible to limit the amount of source history to be
2302N/A converted by specifying an initial Perforce revision:
2302N/A specify initial Perforce revision (a
2302N/A Perforce changelist number).
2302N/A The following options are supported:
2302N/A preserve branch names. The default is
2302N/A try to reorder closed revisions
2302N/A automatically manage newlines in repository files
2302N/A The extension reads its configuration from a versioned \
fB.hgeol\fP
2302N/A configuration file found in the root of the working copy. The
2302N/A+\fB\&.hgeol\fP file use the same syntax as all other Mercurial
2302N/A configuration files. It uses two sections, \fB[patterns]\fP and
196N/A Files with the declared format of \fBCRLF\fP or \fBLF\fP are always
196N/A checked out and stored in the repository in that format and files
196N/A declared to be binary (\fBBIN\fP) are left unchanged. Additionally,
196N/A-\fBnative\fP is an alias for checking out in the platform\(aqs default line
196N/A+\fBnative\fP is an alias for checking out in the platform's default line
196N/A ending: \fBLF\fP on Unix (including Mac OS X) and \fBCRLF\fP on
196N/A-Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial\(aqs
196N/A+Windows. Note that \fBBIN\fP (do nothing to line endings) is Mercurial's
196N/A default behaviour; it is only needed if you need to override a later,
2302N/A normal Mercurial configuration files and the \
fB.hgeol\fP file, with the
2302N/A latter overriding the former. You can use that section to control the
2302N/A overall behavior. There are three settings:
196N/A \fBCRLF\fP to override the default interpretation of \fBnative\fP for
196N/A-checkout. This can be used with \%\fBhg archive\fP\: on Unix, say, to
196N/A+checkout. This can be used with \fBhg archive\fP on Unix, say, to
196N/A generate an archive where files have line endings for Windows.
2302N/A ensure that converted files end with a EOL character (either \fB\en\fP
2302N/A or \fB\er\en\fP as per the configured patterns).
2302N/A The extension provides \fBcleverencode:\fP and \fBcleverdecode:\fP filters
2302N/A like the deprecated win32text extension does. This means that you can
871N/A \fBpretxnchangegroup\fP hooks.
196N/A-See \%\fBhg help patterns\fP\: for more information about the glob patterns
196N/A+See \fBhg help patterns\fP for more information about the glob patterns
871N/A The extdiff extension also allows you to configure new diff commands, so
196N/A-you do not need to type \%\fBhg extdiff \-p kdiff3\fP\: always.
196N/A+you do not need to type \fBhg extdiff \-p kdiff3\fP always.
196N/A-# add new command that runs GNU diff(1) in \(aqcontext diff\(aq mode
196N/A+# add new command that runs GNU diff(1) in 'context diff' mode
196N/A # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
871N/A vimdiff = gvim \-f "+next" \e
871N/A- "+execute \(aqDirDiff\(aq fnameescape(argv(0)) fnameescape(argv(1))"
871N/A+ "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
196N/A Tool arguments can include variables that are expanded at runtime:
196N/A $parent1, $plabel1 \- filename, descriptive label of first parent
196N/A $child, $clabel \- filename, descriptive label of child revision
196N/A $parent2, $plabel2 \- filename, descriptive label of second parent
871N/A $root \- repository root
196N/A $parent is an alias for $parent1.
196N/A The extdiff extension will look in your [diff\-tools] and [merge\-tools]
196N/A sections for diff tool arguments, when none are specified in [extdiff].
196N/A You can use \-I/\-X and list of file or directory names like normal
196N/A-\%\fBhg diff\fP\: command. The extdiff extension makes snapshots of only
196N/A+\fBhg diff\fP command. The extdiff extension makes snapshots of only
196N/A needed files, so running the external diff program will actually be
196N/A pretty fast (at least faster than having to compare the entire tree).
196N/A hg extdiff [OPT]... [FILE]...
196N/A Show differences between revisions for the specified files, using
2302N/A exclude names matching the given patterns
2302N/A http authentication with factotum
871N/A By default, keys are specified as:
871N/A proto=pass service=hg prefix=<prefix> user=<username> !password=<password>
871N/A If the factotum extension is unable to read the required key, one will be
871N/A default, these entries are:
871N/A The executable entry defines the full path to the factotum binary. The
196N/A This finds all changes from the repository at the specified path
871N/A the newly pulled changes. Local changes are then merged into the
871N/A pulled changes. To switch the merge order, use \-\-switch\-parent.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
2302N/A commands to sign and verify changesets
196N/A verify all the signatures there may be for a particular revision
2302N/A hg sign [OPTION]... [REV]...
196N/A If no revision is given, the parent of the working directory is used,
196N/A or tip if no revision is checked out.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
2302N/A record the specified user as committer
196N/A hg glog [OPTION]... [FILE]
196N/A Print a revision history alongside a revision graph drawn with
2302N/A exclude names matching the given patterns
2302N/A hooks for integrating with the
CIA.vc notification service
196N/A configure it, set the following options in your hgrc:
196N/A # your registered CIA user name
196N/A # If you want hyperlinks (optional)
871N/A hgk consists of two parts: a Tcl script that does the displaying and
871N/A querying of information, and an extension to Mercurial named
hgk.py,
871N/A-which provides hooks for hgk to get information. hgk can be found in
871N/A-the contrib directory, and the extension is shipped in the hgext
871N/A-repository, and needs to be enabled.
871N/A+which provides hooks for hgk to get information.
196N/A-The \%\fBhg view\fP\: command will launch the hgk Tcl script. For this command
871N/A-to work, hgk must be in your search path. Alternately, you can specify
871N/A-the path to hgk in your configuration file:
871N/A+The \fBhg view\fP command will launch the hgk Tcl script. The script is
2302N/A+it. You can specify the path to an alternate hgk in your configuration
196N/A hgk can make use of the extdiff extension to visualize revisions.
196N/A Assuming you had already configured extdiff vdiff command, just add:
196N/A Revisions context menu will now display additional entries to fire
196N/A hg view [\-l LIMIT] [REVRANGE]
196N/A start interactive history viewer
2302N/A limit number of changes displayed
196N/A syntax highlighting for hgweb (requires Pygments)
196N/A It depends on the Pygments syntax highlighting library:
196N/A There is a single configuration option:
196N/A pygments_style = <style>
196N/A-The default is \(aqcolorful\(aq.
196N/A+The default is 'colorful'.
2302N/A interactive history editing
2302N/A is as follows, assuming the following history:
2302N/A @ 3[tip] 7c2fd3b9020c 2009\-04\-27 18:04 \-0500 durin42
2302N/A o 0 d8d2fcd0e319 2009\-04\-27 18:04 \-0500 durin42
2302N/A If you were to run \fBhg histedit c561b4e977df\fP, you would see the following
2302N/A pick 030b686bedc4 Add gamma
2302N/A pick 7c2fd3b9020c Add delta
2302N/A # d, drop = remove commit from history
2302N/A # m, mess = edit message without changing commit content
2302N/A In this file, lines beginning with \fB#\fP are ignored. You must specify a rule
2302N/A would reorganize the file to look like this:
2302N/A pick 030b686bedc4 Add gamma
2302N/A fold 7c2fd3b9020c Add delta
2302N/A # d, drop = remove commit from history
2302N/A # m, mess = edit message without changing commit content
2302N/A At which point you close the editor and \fBhistedit\fP starts working. When you
2302N/A those revisions together, offering you a chance to clean up the commit message:
2302N/A Edit the commit message to your liking, then close the editor. For
2302N/A-this example, let\(aqs assume that the commit message was changed to
2302N/A+this example, let's assume that the commit message was changed to
2302N/A \fBAdd beta and delta.\fP After histedit has run and had a chance to
2302N/A remove any old or temporary revisions it needed, the history looks
2302N/A @ 2[tip] 989b4d060121 2009\-04\-27 18:04 \-0500 durin42
2302N/A o 0 d8d2fcd0e319 2009\-04\-27 18:04 \-0500 durin42
2302N/A Note that \fBhistedit\fP does \fInot\fP remove any revisions (even its own temporary
2302N/A ones) until after it has completed all the editing operations, so it will
2302N/A-probably perform several strip operations when it\(aqs done. For the above example,
2302N/A+probably perform several strip operations when it's done. For the above example,
2302N/A it had to run strip twice. Strip can be slow depending on a variety of factors,
2302N/A so you might need to be a little patient. You can choose to keep the original
2302N/A revisions by passing the \fB\-\-keep\fP flag.
2302N/A The \fBedit\fP operation will drop you back to a command prompt,
2302N/A allowing you to edit files freely, or even use \fBhg record\fP to commit
2302N/A-some changes as a separate commit. When you\(aqre done, any remaining
2302N/A+some changes as a separate commit. When you're done, any remaining
2302N/A uncommitted changes will be committed as well. When done, run \fBhg
2302N/A-histedit \-\-continue\fP to finish this step. You\(aqll be prompted for a
2302N/A+histedit \-\-continue\fP to finish this step. You'll be prompted for a
2302N/A new commit message, but the default commit message will be the
2302N/A original message for the \fBedit\fP ed revision.
2302N/A The \fBmessage\fP operation will give you a chance to revise a commit
2302N/A-message without changing the contents. It\(aqs a shortcut for doing
2302N/A+message without changing the contents. It's a shortcut for doing
2302N/A \fBedit\fP immediately followed by \fIhg histedit \-\-continue\(ga\fP.
2302N/A If \fBhistedit\fP encounters a conflict when moving a revision (while
2302N/A-handling \fBpick\fP or \fBfold\fP), it\(aqll stop in a similar manner to
2302N/A-\fBedit\fP with the difference that it won\(aqt prompt you for a commit
2302N/A-message when done. If you decide at this point that you don\(aqt like how
2302N/A+handling \fBpick\fP or \fBfold\fP), it'll stop in a similar manner to
2302N/A+\fBedit\fP with the difference that it won't prompt you for a commit
2302N/A+message when done. If you decide at this point that you don't like how
2302N/A much work it will be to rearrange history, or that you made a mistake,
2302N/A you can use \fBhg histedit \-\-abort\fP to abandon the new changes you
2302N/A have made and return to the state before you attempted to edit your
2302N/A changes, such that we have the following history:
2302N/A @ 6[tip] 038383181893 2009\-04\-27 18:04 \-0500 stefan
2302N/A o 0 d8d2fcd0e319 2009\-04\-27 18:04 \-0500 durin42
2302N/A If you run \fBhg histedit \-\-outgoing\fP on the clone then it is the same
2302N/A hg histedit ANCESTOR | \-\-outgoing [URL]
2302N/A This command edits changesets between ANCESTOR and the parent of
2302N/A With \-\-outgoing, this edits changesets not found in the
2302N/A destination repository. If URL of the destination is omitted, the
2302N/A-\(aqdefault\-push\(aq (or \(aqdefault\(aq) path will be used.
2302N/A+\&'default\-push' (or 'default') path will be used.
2302N/A For safety, this command is aborted, also if there are ambiguous
2302N/A outgoing revisions which may confuse users: for example, there are
2302N/A Use "min(outgoing() and ::.)" or similar revset specification
2302N/A instead of \-\-outgoing to specify edit target revision exactly in
2302N/A-such ambiguous situation. See \%\fBhg help revsets\fP\: for detail about
2302N/A+such ambiguous situation. See \fBhg help revsets\fP for detail about
2302N/A Returns 0 on success, 1 if user intervention is required (not only
2302N/A-don\(aqt strip old nodes after edit is complete
2302N/A+don't strip old nodes after edit is complete
2302N/A first revision to be edited
196N/A-accelerate status report using Linux\(aqs inotify service
196N/A+accelerate status report using Linux's inotify service
196N/A start an inotify server for this repository
2302N/A name of file to write process ID to
196N/A # expand keywords in every python file except those matching "x*"
196N/A # prefer svn\- over cvs\-like default keywordmaps
196N/A For [keywordmaps] template mapping and expansion demonstration and
196N/A-control run \%\fBhg kwdemo\fP\:. See \%\fBhg help templates\fP\: for a list of
196N/A+control run \fBhg kwdemo\fP. See \fBhg help templates\fP for a list of
196N/A available templates and filters.
196N/A Three additional date template filters are provided:
871N/A "2006\-09\-18 08:13:13 \-700 (Mon, 18 Sep 2006)"
196N/A-The default template mappings (view with \%\fBhg kwdemo \-d\fP\:) can be
196N/A+The default template mappings (view with \fBhg kwdemo \-d\fP) can be
196N/A replaced with customized keywords and templates. Again, run
196N/A-\%\fBhg kwdemo\fP\: to control the results of your configuration changes.
196N/A+\fBhg kwdemo\fP to control the results of your configuration changes.
196N/A to avoid storing expanded keywords in the change history.
196N/A To force expansion after enabling it, or a configuration change, run
196N/A Expansions spanning more than one line and incremental expansions,
196N/A-like CVS\(aq $Log$, are not supported. A keyword template map "Log =
196N/A+like CVS' $Log$, are not supported. A keyword template map "Log =
196N/A {desc}" expands to the first line of the changeset description.
196N/A hg kwdemo [\-d] [\-f RCFILE] [TEMPLATEMAP]...
196N/A Show current, custom, or default keyword template maps and their
196N/A Use \-d/\-\-default to disable current configuration.
196N/A-See \%\fBhg help templates\fP\: for information on templates and filters.
196N/A+See \fBhg help templates\fP for information on templates and filters.
196N/A hg kwexpand [OPTION]... [FILE]...
196N/A Run after (re)enabling keyword expansion.
2302N/A kwexpand refuses to run if given files contain local changes.
2302N/A exclude names matching the given patterns
196N/A hg kwfiles [OPTION]... [FILE]...
196N/A List which files in the working directory are matched by the
196N/A execution by including only files that are actual candidates for
196N/A-See \%\fBhg help keyword\fP\: on how to construct patterns both for
196N/A+See \fBhg help keyword\fP on how to construct patterns both for
196N/A inclusion and exclusion of files.
196N/A With \-A/\-\-all and \-v/\-\-verbose the codes used to show the status
196N/A K = keyword expansion candidate
196N/A k = keyword expansion candidate (not tracked)
196N/A i = ignored (not tracked)
2302N/A exclude names matching the given patterns
196N/A hg kwshrink [OPTION]... [FILE]...
2302N/A kwshrink refuses to run if given files contain local changes.
2302N/A exclude names matching the given patterns
871N/A Large binary files tend to be not very compressible, not very
871N/A diffable, and not at all mergeable. Such files are not handled
871N/A-efficiently by Mercurial\(aqs storage format (revlog), which is based on
871N/A+efficiently by Mercurial's storage format (revlog), which is based on
871N/A compressed binary deltas; storing large binary files as regular
871N/A Mercurial files wastes bandwidth and disk space and increases
871N/A-Mercurial\(aqs memory usage. The largefiles extension addresses these
871N/A+Mercurial's memory usage. The largefiles extension addresses these
871N/A problems by adding a centralized client\-server layer on top of
871N/A Mercurial: largefiles live in a \fIcentral store\fP out on the network
871N/A somewhere, and you only fetch the revisions that you need when you
871N/A identified by the SHA\-1 hash of their contents, which is written to
871N/A the standin. largefiles uses that revision ID to
get/put largefile
871N/A revisions
from/to the central store. This saves both disk space and
871N/A-bandwidth, since you don\(aqt need to retrieve all historical revisions
871N/A+bandwidth, since you don't need to retrieve all historical revisions
871N/A of large files when you clone or pull.
871N/A To start a new repository or add new large binary files, just add
871N/A-\-\-large to your \%\fBhg add\fP\: command. For example:
871N/A+\-\-large to your \fBhg add\fP command. For example:
871N/A $ hg add \-\-large randomdata
871N/A-$ hg commit \-m \(aqadd randomdata as a largefile\(aq
871N/A+$ hg commit \-m 'add randomdata as a largefile'
2302N/A copy to the latest pulled revision (and thereby downloading any new
2302N/A-If you want to pull largefiles you don\(aqt need for update yet, then
2302N/A-you can use pull with the \fI\-\-lfrev\fP option or the \%\fBhg lfpull\fP\: command.
2302N/A+If you want to pull largefiles you don't need for update yet, then
2302N/A+you can use pull with the \fI\-\-lfrev\fP option or the \fBhg lfpull\fP command.
2302N/A If you know you are pulling from a non\-default location and want to
2302N/A download all the largefiles that correspond to the new changesets at
871N/A If you already have large files tracked by Mercurial without the
871N/A largefiles extension, you will need to convert your repository in
871N/A order to benefit from largefiles. This is done with the
871N/A-\%\fBhg lfconvert\fP\: command:
871N/A+\fBhg lfconvert\fP command:
871N/A $ hg lfconvert \-\-size 10 oldrepo newrepo
871N/A In repositories that already have largefiles in them, any new file
871N/A \-\-lfsize option to the add command (also in megabytes):
871N/A-of filename patterns (see \%\fBhg help patterns\fP\:) that should always be
871N/A+of filename patterns (see \fBhg help patterns\fP) that should always be
871N/A Files that match one of these patterns will be added as largefiles
871N/A will be ignored for any repositories not already containing a
871N/A largefile. To add the first largefile to a repository, you must
871N/A-explicitly do so with the \-\-large flag passed to the \%\fBhg add\fP\:
871N/A+explicitly do so with the \-\-large flag passed to the \fBhg add\fP
871N/A hg lfconvert SOURCE DEST [FILE ...]
871N/A Convert repository SOURCE to a new repository DEST, identical to
2302N/A this, the DEST repository can be used without largefiles at all.
2302N/A convert from a largefiles repo to a normal repo
2302N/A hg lfpull \-r REV... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
2302N/A Pull largefiles that are referenced from local changesets but missing
2302N/A locally, pulling from a remote repository to the local cache.
2302N/A-If SOURCE is omitted, the \(aqdefault\(aq path will be used.
2302N/A-See \%\fBhg help urls\fP\: for more information.
2302N/A+If SOURCE is omitted, the 'default' path will be used.
2302N/A+See \fBhg help urls\fP for more information.
2302N/A pull largefiles for all branch heads:
2302N/A hg lfpull \-r "head() and not closed()"
2302N/A pull largefiles on the default branch:
2302N/A hg lfpull \-r "branch(default)"
196N/A Known patches are represented as patch files in the .hg/patches
196N/A directory. Applied patches are both patch files and changesets.
196N/A-Common tasks (use \%\fBhg help command\fP\: for more details):
196N/A+Common tasks (use \fBhg help command\fP for more details):
196N/A import existing patch qimport
196N/A add known patch to applied stack qpush
196N/A remove patch from applied stack qpop
196N/A refresh contents of top applied patch qrefresh
196N/A By default, mq will automatically use git patches when required to
196N/A files creations or deletions. This behaviour can be configured with:
196N/A-If set to \(aqkeep\(aq, mq will obey the [diff] section configuration while
196N/A-preserving existing git patches upon qrefresh. If set to \(aqyes\(aq or
196N/A-\(aqno\(aq, mq will override the [diff] section and always generate git or
196N/A+If set to 'keep', mq will obey the [diff] section configuration while
196N/A+preserving existing git patches upon qrefresh. If set to 'yes' or
2302N/A+\&'no', mq will override the [diff] section and always generate git or
196N/A regular patches, possibly losing data in the second case.
871N/A It may be desirable for mq changesets to be kept in the secret phase (see
871N/A-\%\fBhg help phases\fP\:), which can be enabled with the following setting:
871N/A+\fBhg help phases\fP), which can be enabled with the following setting:
196N/A You will by default be managing a patch queue named "patches". You can
196N/A-create other, independent patch queues with the \%\fBhg qqueue\fP\: command.
196N/A+create other, independent patch queues with the \fBhg qqueue\fP command.
2302N/A If the working directory contains uncommitted files, qpush, qpop and
2302N/A qgoto abort immediately. If \-f/\-\-force is used, the changes are
2302N/A make them behave as if \-\-keep\-changes were passed, and non\-conflicting
196N/A hg qapplied [\-1] [\-s] [PATCH]
2302N/A print first line of patch header
196N/A hg qclone [OPTION]... SOURCE [DEST]
196N/A If source is local, destination will have no patches applied. If
196N/A default. Use \-p <url> to change.
196N/A The patch directory must be a nested Mercurial repository, as
196N/A-would be created by \%\fBhg init \-\-mq\fP\:.
196N/A+would be created by \fBhg init \-\-mq\fP.
196N/A hg qcommit [OPTION]... [FILE]...
196N/A-This command is deprecated; use \%\fBhg commit \-\-mq\fP\: instead.
196N/A+This command is deprecated; use \fBhg commit \-\-mq\fP instead.
2302N/A recurse into subrepositories
196N/A hg qdelete [\-k] [PATCH]...
871N/A The patches must not be applied, and at least one patch is required. Exact
871N/A preserved in the patch directory.
196N/A To stop managing a patch and move it into permanent history,
196N/A-use the \%\fBhg qfinish\fP\: command.
196N/A+use the \fBhg qfinish\fP command.
2302N/A stop managing a revision (DEPRECATED)
196N/A hg qdiff [OPTION]... [FILE]...
196N/A Shows a diff which includes the current patch as well as any
196N/A last refresh (thus showing what the current patch would become
196N/A-Use \%\fBhg diff\fP\: if you only want to see the changes made since the
196N/A-last qrefresh, or \%\fBhg export qtip\fP\: if you want to see changes
196N/A+Use \fBhg diff\fP if you only want to see the changes made since the
196N/A+last qrefresh, or \fBhg export qtip\fP if you want to see changes
196N/A made by the current patch without including changes made since the
2302N/A exclude names matching the given patterns
196N/A hg qfinish [\-a] [REV]...
196N/A Finishes the specified revisions (corresponding to applied
2302N/A finish all applied changesets
196N/A hg qfold [\-e] [\-k] [\-m TEXT] [\-l FILE] PATCH...
196N/A Patches must not yet be applied. Each patch will be successively
2302N/A read commit message from file
196N/A hg qgoto [OPTION]... PATCH
2302N/A do not save backup copies of files
196N/A hg qguard [\-l] [\-n] [PATCH] [\-\- [+GUARD]... [\-GUARD]...]
196N/A Guards control whether a patch can be pushed. A patch with no
196N/A guards is always pushed. A patch with a positive guard ("+foo") is
196N/A-pushed only if the \%\fBhg qselect\fP\: command has activated it. A patch with
196N/A-a negative guard ("\-foo") is never pushed if the \%\fBhg qselect\fP\: command
196N/A+pushed only if the \fBhg qselect\fP command has activated it. A patch with
196N/A+a negative guard ("\-foo") is never pushed if the \fBhg qselect\fP command
196N/A With no arguments, print the currently active guards.
196N/A With arguments, set guards for the named patch.
196N/A-Specifying negative guards now requires \(aq\-\-\(aq.
196N/A+Specifying negative guards now requires '\-\-'.
196N/A To set guards on another patch:
2302N/A hg qimport [\-e] [\-n NAME] [\-f] [\-g] [\-P] [\-r REV]... [FILE]...
196N/A The patch is inserted into the series after the last applied
2302N/A under mq control). With \-g/\-\-git, patches imported with \-\-rev will
2302N/A use the git diff format. See the diffs help topic for information
2302N/A-and permission changes. Use \%\fBhg qfinish\fP\: to remove changesets
2302N/A+and permission changes. Use \fBhg qfinish\fP to remove changesets
871N/A To import a patch from standard input, pass \- as the patch file.
196N/A To import an existing patch while renaming it:
196N/A hg qimport \-e existing\-patch \-n new\-name
196N/A Returns 0 if import succeeded.
196N/A The queue repository is unversioned by default. If
196N/A an unversioned patch repository into a versioned one). You can use
196N/A qcommit to commit changes to this queue repository.
196N/A-This command is deprecated. Without \-c, it\(aqs implied by other relevant
196N/A-commands. With \-c, use \%\fBhg init \-\-mq\fP\: instead.
196N/A+This command is deprecated. Without \-c, it's implied by other relevant
196N/A+commands. With \-c, use \fBhg init \-\-mq\fP instead.
196N/A hg qnew [\-e] [\-m TEXT] [\-l FILE] PATCH [FILE]...
196N/A qnew creates a new patch on top of the currently\-applied patch (if
196N/A \-e/\-\-edit, \-m/\-\-message or \-l/\-\-logfile set the patch header as
196N/A well as the commit message. If none is specified, the header is
196N/A-empty and the commit message is \(aq[mq]: PATCH\(aq.
196N/A+empty and the commit message is '[mq]: PATCH'.
196N/A Use the \-g/\-\-git option to keep the patch in the git extended diff
196N/A format. Read the diffs help topic for more information on why this
2302N/A Returns 0 on successful creation of a new patch.
2302N/A read commit message from file
2302N/A print first line of patch header
196N/A hg qpop [\-a] [\-f] [PATCH | INDEX]
2302N/A Without argument, pops off the top of the patch stack. If given a
2302N/A do not save backup copies of files
2302N/A print first line of patch header
196N/A hg qpush [\-f] [\-l] [\-a] [\-\-move] [PATCH | INDEX]
2302N/A By default, abort if the working directory contains uncommitted
2302N/A do not save backup copies of files
196N/A hg qqueue [OPTION] [QUEUE]
196N/A Supports switching between different patch queues, as well as creating
2302N/A delete queue, and remove patch dir
196N/A hg qrefresh [\-I] [\-X] [\-e] [\-m TEXT] [\-l FILE] [\-s] [FILE]...
196N/A If any file patterns are provided, the refreshed patch will
2302N/A read commit message from file
196N/A hg qrename PATCH1 [PATCH2]
196N/A With one argument, renames the current patch to PATCH1.
2302N/A With two arguments, renames PATCH1 to PATCH2.
196N/A hg qrestore [\-d] [\-u] REV
196N/A-This command is deprecated, use \%\fBhg rebase\fP\: instead.
196N/A+This command is deprecated, use \fBhg rebase\fP instead.
2302N/A update queue working directory
196N/A hg qsave [\-m TEXT] [\-l FILE] [\-c] [\-n NAME] [\-e] [\-f]
196N/A-This command is deprecated, use \%\fBhg rebase\fP\: instead.
196N/A+This command is deprecated, use \fBhg rebase\fP instead.
2302N/A read commit message from file
196N/A hg qselect [OPTION]... [GUARD]...
196N/A-Use the \%\fBhg qguard\fP\: command to set or print guards on patch, then use
196N/A+Use the \fBhg qguard\fP command to set or print guards on patch, then use
196N/A qselect to tell mq which guards to use. A patch will be pushed if
196N/A it has no guards or any positive guards match the currently
196N/A selected guard, but will not be pushed if any negative guards
196N/A match the current guard. For example:
2302N/A print first line of patch header
2302N/A print first line of patch header
196N/A hg qunapplied [\-1] [\-s] [PATCH]
2302N/A print first line of patch header
2302N/A hooks for sending email push notifications
2302N/A This extension implements hooks to send email notifications when
2302N/A changesets are sent from or received by the local repository.
871N/A-First, enable the extension as explained in \%\fBhg help extensions\fP\:, and
871N/A+First, enable the extension as explained in \fBhg help extensions\fP, and
871N/A register the hook you want to run. \fBincoming\fP and \fBchangegroup\fP hooks
2302N/A are run when changesets are received, while \fBoutgoing\fP hooks are for
2302N/A changesets sent to another repository:
871N/A # one email for each incoming changeset
871N/A # one email for all outgoing changesets
2302N/A This registers the hooks. To enable notification, subscribers must
2302N/A multiple recipients to a single repository:
2302N/A # key is subscriber email, value is a comma\-separated list of repo patterns
2302N/A # key is repo pattern, value is a comma\-separated list of subscriber emails
2302N/A A \fBpattern\fP is a \fBglob\fP matching the absolute path to a repository,
2302N/A present, is separated from the glob by a hash. Example:
2302N/A */widgets#branch(release) = qa\-team@example.com
2302N/A This sends to \fBqa\-team@example.com\fP whenever a changeset on the \fBrelease\fP
2302N/A Notifications content can be tweaked with the following configuration entries:
2302N/A Space\-separated list of change sources. Notifications are activated only
2302N/A-when a changeset\(aqs source is in this list. Sources may be:
2302N/A+when a changeset's source is in this list. Sources may be:
2302N/A changesets sent via \fBhg unbundle\fP
2302N/A-Maximum number of characters in email\(aqs subject line. Default: 67.
2302N/A+Maximum number of characters in email's subject line. Default: 67.
2302N/A If set, use the committer of the first changeset in a changegroup for
2302N/A the "From" field of the notification mail. If not set, take the user
2302N/A from the pushing repo. Default: False.
2302N/A If set, the following entries will also be used to customize the
2302N/A Root repository URL to combine with repository paths when making
2302N/A browse command output with an external pager
196N/A To set the pager that should be used, set the application variable:
196N/A If no pager is set, the pager extensions uses the environment variable
196N/A ignore = version, help, update
196N/A You can also enable the pager only for certain commands using
196N/A attend = annotate, cat, diff, export, glog, log, qdiff
196N/A-To ignore global commands like \%\fBhg version\fP\: or \%\fBhg help\fP\:, you have
196N/A+To ignore global commands like \fBhg version\fP or \fBhg help\fP, you have
196N/A to specify them in your user configuration file.
196N/A The \-\-pager=... option can also be used to control when the pager is
2302N/A Each patch email has a Subject line of "[PATCH M of N] ...", using the
2302N/A first line of the changeset description as the subject text. The
2302N/A message contains two or three body parts:
196N/A [Optional] The result of running diffstat on the patch.
196N/A-The patch itself, as generated by \%\fBhg export\fP\:.
196N/A+The patch itself, as generated by \fBhg export\fP.
196N/A Each message refers to the first in the series using the In\-Reply\-To
2302N/A and References headers, so they will show up as a sequence in threaded
196N/A from = My Name <my@email>
196N/A to = recipient1, recipient2, ...
196N/A reply\-to = address1, address2, ...
196N/A Use \fB[patchbomb]\fP as configuration section name if you need to
196N/A override global \fB[email]\fP address settings.
196N/A-Then you can use the \%\fBhg email\fP\: command to mail a series of
196N/A+Then you can use the \fBhg email\fP command to mail a series of
196N/A changesets as a patchbomb.
196N/A You can also either configure the method option in the email section
196N/A hg email [OPTION]... [DEST]...
196N/A By default, diffs are sent in the format generated by
196N/A-\%\fBhg export\fP\:, one per message. The series starts with a "[PATCH 0
196N/A+\fBhg export\fP, one per message. The series starts with a "[PATCH 0
196N/A of N]" introduction, which describes the series as a whole.
196N/A Each patch email has a Subject line of "[PATCH M of N] ...", using
196N/A With the \-d/\-\-diffstat option, if the diffstat program is
196N/A installed, the result of running diffstat on the patch is inserted.
196N/A-Finally, the patch itself, as generated by \%\fBhg export\fP\:.
196N/A+Finally, the patch itself, as generated by \fBhg export\fP.
2302N/A With the \-d/\-\-diffstat or \-\-confirm options, you will be presented
196N/A with a final summary of all messages and asked for confirmation before
196N/A hg email \-r 3000 # send patch 3000 only
196N/A hg email \-r 3000 \-r 3001 # send patches 3000 and 3001
196N/A hg email \-r 3000:3005 # send patches 3000 through 3005
196N/A hg email \-o \-m mbox && # generate an mbox file ...
196N/A formail \-s sendmail \e # ... and use formail to send from the mbox
196N/A \-bm \-t < mbox # ... using sendmail
196N/A Before using this command, you will need to enable email in your
2302N/A hgrc. See the [email] section in hgrc(5) for details.
2302N/A show progress bars for some actions
196N/A The following settings are available:
196N/A delay = 3 # number of seconds (float) before showing the progress bar
871N/A changedelay = 1 # changedelay: minimum delay before showing a new topic.
196N/A format = topic bar number estimate # format of the progress bar
196N/A width = <none> # if set, the maximum width of the progress information
196N/A # (that is, min(width, term width) will be used)
196N/A-clear\-complete = True # clear the progress bar after it\(aqs done
196N/A-disable = False # if true, don\(aqt show a progress bar
196N/A+clear\-complete = True # clear the progress bar after it's done
196N/A+disable = False # if true, don't show a progress bar
196N/A assume\-tty = False # if true, ALWAYS show a progress bar, unless
196N/A Valid entries for the format field are topic, bar, number, unit,
196N/A hg purge [OPTION]... [DIR]...
196N/A Delete files not known to Mercurial. This is useful to test local
2302N/A and uncommitted changes in an otherwise\-clean source tree.
2302N/A This means that purge will delete:
196N/A-Unknown files: files marked with "?" by \%\fBhg status\fP\:
196N/A+Unknown files: files marked with "?" by \fBhg status\fP
196N/A Empty directories: in fact Mercurial ignores directories unless
2302N/A they contain files under source control management
2302N/A But it will leave untouched:
2302N/A Modified and unmodified tracked files
196N/A Ignored files (unless \-\-all is specified)
196N/A-New files added to the repository (with \%\fBhg add\fP\:)
196N/A+New files added to the repository (with \fBhg add\fP)
196N/A If directories are given on the command line, only files in these
2302N/A directories are considered.
2302N/A exclude names matching the given patterns
2302N/A command to move sets of revisions to a different ancestor
2302N/A hg rebase [\-s REV | \-b REV] [\-d REV] [OPTION]
196N/A Rebase uses repeated merging to graft changesets from one part of
196N/A pulling in your rebased changesets.
2302N/A In its default configuration, Mercurial will prevent you from
2302N/A-rebasing published changes. See \%\fBhg help phases\fP\: for details.
2302N/A+rebasing published changes. See \fBhg help phases\fP for details.
196N/A-If you don\(aqt specify a destination changeset (\fB\-d/\-\-dest\fP),
196N/A+If you don't specify a destination changeset (\fB\-d/\-\-dest\fP),
2302N/A rebase uses the current branch tip as the destination. (The
2302N/A destination changeset is not modified by rebasing, but new
2302N/A changesets are added as its descendants.)
196N/A and source branch is that, unlike \fBmerge\fP, rebase will do
2302N/A nothing if you are at the branch tip of a named branch
196N/A with two heads. You need to explicitly specify source
and/or 196N/A-destination (or \fBupdate\fP to the other head, if it\(aqs the head of
196N/A+destination (or \fBupdate\fP to the other head, if it's the head of
196N/A the intended source branch).
196N/A If a rebase is interrupted to manually resolve a merge, it can be
871N/A hg qrecord [OPTION]... PATCH [FILE]...
871N/A-See \%\fBhg help qnew\fP\: & \%\fBhg help record\fP\: for more information and
871N/A+See \fBhg help qnew\fP & \fBhg help record\fP for more information and
196N/A hg record [OPTION]... [FILE]...
196N/A-If a list of files is omitted, all changes reported by \%\fBhg status\fP\:
196N/A+If a list of files is omitted, all changes reported by \fBhg status\fP
196N/A will be candidates for recording.
196N/A-See \%\fBhg help dates\fP\: for a list of formats valid for \-d/\-\-date.
196N/A+See \fBhg help dates\fP for a list of formats valid for \-d/\-\-date.
196N/A You will be prompted for whether to record changes to each
196N/A modified file, and for files with multiple changes, for each
196N/A y \- record this change
871N/A e \- edit this change manually
196N/A q \- quit, recording no changes
196N/A This command is not available when committing a merge.
2302N/A .B \-B, \-\-ignore\-blank\-lines
2302N/A ignore changes whose lines are all blank
2302N/A recreates hardlinks between repository clones
196N/A When repositories are cloned locally, their data files will be
196N/A lot of repositories to act like a scheme, for example:
196N/A After that you can use it like:
196N/A Additionally there is support for some more complex schemas, for
196N/A example used by Google Code:
196N/A The syntax is taken from Mercurial templates, and you have unlimited
196N/A For convenience, the extension adds these schemes by default:
196N/A bb+ssh = ssh://hg@bitbucket.org/
196N/A You can override a predefined scheme by defining a new scheme with the
196N/A hg share [\-U] SOURCE [DEST]
196N/A Initialize a new repository and working directory that shares its
2302N/A do not create a working copy
871N/A Copy the store data to the repo and remove the sharedpath data.
2302N/A Later on, the "hg unshelve" command restores the changes saved by "hg
2302N/A shelve". Changes can be restored even after updating to a different
2302N/A-parent, in which case Mercurial\(aqs merge machinery will resolve any
2302N/A+parent, in which case Mercurial's merge machinery will resolve any
2302N/A You can have more than one shelved change outstanding at a time; each
2302N/A Shelving takes files that "hg status" reports as not clean, saves
2302N/A all shelved changes, use \fB\-\-cleanup\fP.
2302N/A output diffstat\-style summary of changes
2302N/A This command accepts an optional name of a shelved change to
2302N/A does not delete the bundle.)
2302N/A keep shelve after unshelving
2302N/A strip changesets and their descendents from history
2302N/A hg strip [\-k] [\-f] [\-n] [\-B bookmark] [\-r] REV...
2302N/A The strip command removes the specified changesets and all their
2302N/A-bundle (see \%\fBhg help bundle\fP\: and \%\fBhg help unbundle\fP\:). They can
2302N/A-be restored by running \%\fBhg unbundle .hg/strip\-backup/BUNDLE\fP\:,
2302N/A+bundle (see \fBhg help bundle\fP and \fBhg help unbundle\fP). They can
2302N/A+be restored by running \fBhg unbundle .hg/strip\-backup/BUNDLE\fP,
2302N/A where BUNDLE is the bundle file created by the strip. Note that
2302N/A the local revision numbers will in general be different after the
2302N/A remove revs only reachable from given bookmark
2302N/A command to transplant changesets from another branch
2302N/A This extension allows you to transplant changes to another parent revision,
2302N/A-possibly in another repository. The transplant is done using \(aqdiff\(aq patches.
2302N/A+possibly in another repository. The transplant is done using 'diff' patches.
2302N/A map from a changeset hash to its hash in the source repository.
196N/A hg transplant [\-s REPO] [\-b BRANCH [\-a]] [\-p REV] [\-m REV] [REV]...
196N/A Selected changesets will be applied on top of the current working
196N/A (transplanted from CHANGESETHASH)
196N/A You can rewrite the changelog message with the \-\-filter option.
2302N/A with \-\-branch will be transplanted.
2302N/A transplant all changes up to REV on top of your current revision:
2302N/A hg transplant \-\-branch REV \-\-all
2302N/A You can optionally mark selected transplanted changesets as merge
2302N/A changesets. You will not be prompted to transplant any ancestors
196N/A normally instead of transplanting them.
871N/A Merge changesets may be transplanted directly by specifying the
871N/A-proper parent changeset by calling \%\fBhg transplant \-\-parent\fP\:.
871N/A+proper parent changeset by calling \fBhg transplant \-\-parent\fP.
196N/A-If no merges or revisions are provided, \%\fBhg transplant\fP\: will
196N/A+If no merges or revisions are provided, \fBhg transplant\fP will
196N/A start an interactive changeset browser.
196N/A If a changeset application fails, you can fix the merge by hand
196N/A-and then resume where you left off by calling \%\fBhg transplant
196N/A+and then resume where you left off by calling \fBhg transplant
2302N/A filter changesets through command
2302N/A allow the use of MBCS paths with problematic encodings
2302N/A This extension is useful for:
2302N/A Japanese Windows users using shift_jis encoding.
2302N/A All users who use a repository with one of problematic encodings on
2302N/A case\-insensitive file system.
2302N/A This extension is not needed for:
2302N/A Any user who use only ASCII chars in path.
2302N/A Any user who do not use any of problematic encodings.
2302N/A Note that there are some limitations on using this extension:
2302N/A You should use single encoding in one repository.
2302N/A win32mbcs is not compatible with fixutf8 extension.
196N/A You can specify the encoding by config option:
196N/A It is useful for the users who want to commit with UTF\-8 log message.
2302N/A perform automatic newline conversion
2302N/A Deprecation: The win32text extension requires each user to configure
2302N/A the extension again and again for each clone since the configuration
2302N/A We have therefore made the \fBeol\fP as an alternative. The \fBeol\fP
2302N/A uses a version controlled file for its configuration and each clone
2302N/A will therefore use the right settings from the start.
196N/A To perform automatic newline conversion, use:
196N/A If not doing conversion, to make sure you do not commit
CRLF/CR by accident:
196N/A To do the same check on a server to prevent
CRLF/CR from being
196N/A without knowing their actual IP address.
196N/A To allow other people to discover your repository using run
196N/A-\%\fBhg serve\fP\: in your repository:
196N/A+\fBhg serve\fP in your repository:
196N/A You can discover Zeroconf\-enabled repositories by running
871N/A This file contains defaults and configuration. Values in
2302N/A+\fB\&.hg/hgrc\fP override those in \fB$HOME/.hgrc\fP, and these override
871N/A-See \%\fBhgrc\fP(5)\: for details of the contents and format of these
871N/A+See \fBhgrc\fP(5) for details of the contents and format of these
196N/A This file contains regular expressions (one per line) that
196N/A describe file names that should be ignored by \fBhg\fP. For details,
196N/A-see \%\fBhgignore\fP(5)\:.
871N/A This file defines the locations of all subrepositories, and
871N/A tells where the subrepository checkouts came from. For details, see
871N/A-\%\fBhg help subrepos\fP\:.
871N/A+\fBhg help subrepos\fP.
871N/A-This file is used by \%\fBhg commit\fP\: to store a backup of the commit message
871N/A+This file is used by \fBhg commit\fP to store a backup of the commit message
871N/A in case the commit fails.
2302N/A This file can be used to define local tags which are not shared among
2302N/A repositories. The file format is the same as for \
fB.hgtags\fP, but it is
2302N/A encoded using the local system encoding.
2302N/A+This directory contains assorted files which are part of the Mercurial
2302N/A+distribution, but not core to its functionality. They will generally
2302N/A+need to be copied elsewhere to be of use.
196N/A if the \
fB.orig\fP file already exists and is not tracked by Mercurial,
196N/A it will be overwritten.
196N/A-Probably lots, please post them to the mailing list (see \%Resources\:
196N/A+Probably lots, please post them to the mailing list (see Resources
196N/A below) when you find them.
196N/A-\%\fBhgignore\fP(5)\:, \%\fBhgrc\fP(5)\:
196N/A+\fBhgignore\fP(5), \fBhgrc\fP(5)
196N/A-Written by Matt Mackall <\%mpm@selenic.com\:>
196N/A+Written by Matt Mackall <mpm@selenic.com>
2302N/A Copyright (C) 2005\-2013 Matt Mackall.
196N/A .TH HGIGNORE 5 "" "" "Mercurial Manual"
196N/A hgignore \- syntax for Mercurial ignore files
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" .rstReportMargin pre:
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A In addition, a Mercurial configuration file can reference a set of
871N/A per\-user or global ignore files. See the \fBignore\fP configuration
871N/A-key on the \fB[ui]\fP section of \%\fBhg help config\fP\: for details of how to
871N/A+key on the \fB[ui]\fP section of \fBhg help config\fP for details of how to
871N/A-To control Mercurial\(aqs handling of files that it manages, many
871N/A+To control Mercurial's handling of files that it manages, many
871N/A commands support the \fB\-I\fP and \fB\-X\fP options; see
871N/A-\%\fBhg help <command>\fP\: and \%\fBhg help patterns\fP\: for details.
871N/A+\fBhg help <command>\fP and \fBhg help patterns\fP for details.
2302N/A Files that are already tracked are not affected by .hgignore, even
2302N/A if they appear in .hgignore. An untracked file X can be explicitly
2302N/A-added with \%\fBhg add X\fP\:, even if X would be excluded by a pattern
2302N/A+added with \fBhg add X\fP, even if X would be excluded by a pattern
196N/A To change the syntax used, use a line of the following form:
196N/A where \fBNAME\fP is one of the following:
2302N/A The chosen syntax stays in effect when parsing all patterns that
2302N/A follow, until another syntax is selected.
2302N/A-Please see \%\fBhg help patterns\fP\: for details.
2302N/A+Please see \fBhg help patterns\fP for details.
196N/A Here is an example ignore file.
196N/A # switch to regexp syntax.
196N/A-Vadim Gelfer <\%vadim.gelfer@gmail.com\:>
196N/A+Vadim Gelfer <vadim.gelfer@gmail.com>
196N/A-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
196N/A+Mercurial was written by Matt Mackall <mpm@selenic.com>.
196N/A-\%\fBhg\fP(1)\:, \%\fBhgrc\fP(5)\:
196N/A+\fBhg\fP(1), \fBhgrc\fP(5)
196N/A This manual page is copyright 2006 Vadim Gelfer.
196N/A .TH HGRC 5 "" "" "Mercurial Manual"
196N/A hgrc \- configuration files for Mercurial
196N/A-level \\n[rst2man-indent-level]
196N/A-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" .rstReportMargin pre:
196N/A-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
196N/A-. nr rst2man-indent-level +1
196N/A-.\" .rstReportMargin post:
196N/A-.\" indent \\n[an-margin]
196N/A-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
196N/A-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
196N/A The Mercurial system uses a set of configuration files to control
871N/A by \fBname = value\fP entries:
871N/A username = Firstname Lastname <firstname.lastname@example.net>
2302N/A Mercurial reads configuration data from several files, if they exist.
2302N/A These files do not exist by default and you will have to create the
2302N/A appropriate configuration files yourself: global configuration like
2302N/A-the username setting is typically put into
2302N/A+the username setting is typically put into \fB$HOME/.hgrc\fP and local
2302N/A configuration is put into the per\-repository \fB<repo>/.hg/hgrc\fP file.
2302N/A The names of these files depend on the system on which Mercurial is
871N/A-(All) \fB<repo>/.hg/hgrc\fP
196N/A Per\-repository configuration options that only apply in a
196N/A particular repository. This file is not version\-controlled, and
196N/A will not get transferred during a "clone" operation. Options in
196N/A-this file override options in all other configuration files. On
871N/A-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
196N/A+this file override options in all other configuration files.
871N/A+Most of this file will be ignored if it doesn't
871N/A belong to a trusted user or to a trusted group. See the documentation
871N/A for the \fB[trusted]\fP section below for more details.
196N/A-(Unix) \fB$HOME/.hgrc\fP
196N/A-Per\-user configuration file(s), for the user running Mercurial. On
196N/A-Windows 9x, \fB%HOME%\fP is replaced by \fB%APPDATA%\fP. Options in these
196N/A-files apply to all Mercurial commands executed by this user in any
196N/A-directory. Options in these files override per\-system and per\-installation
2302N/A+Per\-user configuration file, for the user running Mercurial. Options in this
2302N/A+file apply to all Mercurial commands executed by this user in any
871N/A+directory. Options in this file override per\-system and per\-installation
2302N/A Per\-system configuration files, for the system on which Mercurial
2302N/A is running. Options in these files apply to all Mercurial commands
2302N/A executed by any user in any directory. Options in these files
196N/A override per\-installation options.
196N/A-Per\-installation configuration files, searched for in the
196N/A-directory where Mercurial is installed. \fB<install\-root>\fP is the
196N/A-parent directory of the \fBhg\fP executable (or symlink) being run. For
196N/A-to all Mercurial commands executed by any user in any directory.
196N/A-(Windows) \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eMercurial\fP
196N/A-Per\-installation/system configuration files, for the system on
196N/A-which Mercurial is running. Options in these files apply to all
196N/A-Mercurial commands executed by any user in any directory. Registry
196N/A-keys contain PATH\-like strings, every part of which must reference
196N/A-be read. Mercurial checks each of these locations in the specified
2302N/A-order until one or more configuration files are detected.
2302N/A-The registry key \fBHKEY_LOCAL_MACHINE\eSOFTWARE\eWow6432Node\eMercurial\fP
2302N/A-is used when running 32\-bit Python on 64\-bit Windows.
196N/A A configuration file consists of sections, led by a \fB[section]\fP header
196N/A \fBconfiguration keys\fP):
196N/A Each line contains one entry. If the lines that follow are indented,
196N/A will use the value that was configured last. As an example:
196N/A This would set the configuration key named \fBeggs\fP to \fBsmall\fP.
196N/A This would set the \fBeggs\fP, \fBham\fP, and \fBbread\fP configuration keys
196N/A \fBfile\fP. This lets you do something like:
196N/A to include a different configuration file on each computer you use.
196N/A placed in double quotation marks:
196N/A allow_read = "John Doe, PhD", brian, betty
196N/A Quotation marks can be escaped by prefixing them with a backslash. Only
196N/A Alias definitions consist of lines of the form:
871N/A <alias> = <command> [<argument>]...
196N/A For example, this definition:
196N/A latest = log \-\-limit 5
196N/A creates a new command \fBlatest\fP that shows only the five most recent
196N/A changesets. You can define subsequent aliases using earlier ones:
196N/A stable5 = latest \-b stable
871N/A run arbitrary commands. As an example,
871N/A will let you do \fBhg echo foo\fP to have \fBfoo\fP printed in your
871N/A terminal. A better example might be:
871N/A purge = !$HG status \-\-no\-status \-\-unknown \-0 | xargs \-0 rm
871N/A which will make \fBhg purge\fP delete all unknown files in the
2302N/A Settings used when displaying file annotations. All values are
2302N/A Booleans and default to False. See \fBdiff\fP section for related
2302N/A options for the diff command.
2302N/A Ignore changes whose lines are all blank.
2302N/A Authentication credentials for HTTP authentication. This section
196N/A Each line has the following format:
196N/A <name>.<argument> = <value>
196N/A where \fB<name>\fP is used to group arguments into authentication
196N/A Either \fB*\fP or a URI prefix with or without the scheme part.
196N/A The authentication entry with the longest matching prefix is used
196N/A (where \fB*\fP matches everything and counts as a match of length
196N/A-1). If the prefix doesn\(aqt include a scheme, the match is performed
196N/A+1). If the prefix doesn't include a scheme, the match is performed
196N/A against the URI with its scheme stripped as well, and the schemes
196N/A argument,
q.v., is then subsequently consulted.
196N/A Optional. Space separated list of URI schemes to use this
196N/A-authentication entry with. Only used if the prefix doesn\(aqt include
196N/A+authentication entry with. Only used if the prefix doesn't include
196N/A a scheme. Supported schemes are http and https. They will match
196N/A static\-http and static\-https respectively, as well.
2302N/A If no suitable authentication entry is found, the user is prompted
2302N/A for credentials as usual if required by the remote.
196N/A # uncompress gzip files on checkin to improve delta compression
196N/A # note: not necessarily a good idea, just an example
196N/A # recompress gzip files when writing them to the working dir (we
196N/A-# can safely omit "pipe:", because it\(aqs the default)
196N/A+# can safely omit "pipe:", because it's the default)
196N/A A \fBtempfile:\fP command is a template. The string \fBINFILE\fP is replaced
196N/A filtered by the command. The string \fBOUTFILE\fP is replaced with the name
196N/A of an empty temporary file, where the filtered data must be written by
196N/A-The tempfile mechanism is recommended for Windows systems,
196N/A-where the standard shell I/O redirection operators often have
196N/A-strange effects and may corrupt the contents of your files.
196N/A This filter mechanism is used internally by the \fBeol\fP extension to
196N/A translate line ending characters between Windows (CRLF) and Unix (LF)
196N/A format. We suggest you use the \fBeol\fP extension for convenience.
196N/A-(defaults are deprecated. Don\(aqt use them. Use aliases instead)
196N/A+(defaults are deprecated. Don't use them. Use aliases instead)
196N/A Use the \fB[defaults]\fP section to define command defaults,
i.e. the
196N/A-The following example makes \%\fBhg log\fP\: run in verbose mode, and
196N/A-\%\fBhg status\fP\: show only the modified files, by default:
196N/A+The following example makes \fBhg log\fP run in verbose mode, and
196N/A+\fBhg status\fP show only the modified files, by default:
196N/A The actual commands, instead of their aliases, must be used when
2302N/A Settings used when displaying diffs. Everything except for \fBunified\fP
2302N/A is a Boolean and defaults to False. See \fBannotate\fP section for
2302N/A related options for the annotate command.
196N/A-Don\(aqt include dates in diff headers.
196N/A+Don't include dates in diff headers.
2302N/A Number of lines of context to show.
2302N/A Settings for extensions that send email messages.
196N/A-Optional. Comma\-separated list of recipients\(aq email addresses.
196N/A+Optional. Comma\-separated list of recipients' email addresses.
196N/A-Optional. Comma\-separated list of carbon copy recipients\(aq
196N/A+Optional. Comma\-separated list of carbon copy recipients'
196N/A-Optional. Comma\-separated list of blind carbon copy recipients\(aq
196N/A+Optional. Comma\-separated list of blind carbon copy recipients'
2302N/A Order of outgoing email character sets:
2302N/A \fBus\-ascii\fP: always first, regardless of settings
2302N/A \fButf\-8\fP: always last, regardless of settings
196N/A from = Joseph User <joe.user@example.com>
196N/A # charsets for western Europeans
196N/A # us\-ascii, utf\-8 omitted, as they are tried first and last
196N/A charsets = iso\-8859\-1, iso\-8859\-15, windows\-1252
196N/A Mercurial has an extension mechanism for adding new features. To
196N/A enable an extension, create an entry for it in this section.
196N/A-If you know that the extension is already in Python\(aqs search path,
196N/A+If you know that the extension is already in Python's search path,
196N/A you can give the name of the module, followed by \fB=\fP, with nothing
196N/A Example for \fB~/.hgrc\fP:
2302N/A-# (the progress extension will get loaded from Mercurial\(aqs path)
2302N/A+# (the progress extension will get loaded from Mercurial's path)
196N/A # (this extension will get loaded from the file specified)
2302N/A Mac OS X and spaces on Windows. Enabled by default. Disabling this
2302N/A option ensures that the on\-disk format of newly created
2302N/A repositories will be compatible with Mercurial before version 1.7.
2302N/A Web graph view configuration. This section let you change graph
871N/A Each line has the following format:
871N/A <branch>.<argument> = <value>
871N/A where \fB<branch>\fP is the name of the branch being
2302N/A Set branch edges color in hexadecimal RGB notation.
2302N/A Commands or Python functions that get automatically executed by
871N/A # update working directory after adding changesets
871N/A # force autobuild hook to run before other incoming hooks
871N/A Most hooks are run with environment variables set that give useful
2302N/A additional information. For each hook below, the environment
2302N/A variables it is passed are listed with names of the form \fB$HG_foo\fP.
871N/A representations of the data internally passed to <command>. \fB$HG_OPTS\fP
871N/A is a dictionary of options (with unspecified options set to their
871N/A defaults). \fB$HG_PATS\fP is a list of arguments. If the hook returns
871N/A-failure, the command doesn\(aqt execute and Mercurial returns the failure
871N/A+failure, the command doesn't execute and Mercurial returns the failure
871N/A .B \fBprechangegroup\fP
2302N/A new parent is in \fB$HG_PARENT1\fP. If merge, ID of second new parent is
871N/A in \fB$HG_PARENT2\fP. If the update succeeded, \fB$HG_ERROR=0\fP. If the
871N/A update failed (
e.g. because conflicts not resolved), \fB$HG_ERROR=1\fP.
871N/A It is generally better to use standard hooks rather than the
871N/A Also, hooks like "commit" will be called in all contexts that
871N/A generate a commit (
e.g. tag) and not just the commit command.
871N/A-Environment variables with empty values may not be passed to
871N/A-hooks on platforms such as Windows. As an example, \fB$HG_PARENT2\fP
871N/A-will have an empty value under Unix\-like platforms for non\-merge
871N/A-changesets, while it will not be available at all under Windows.
871N/A The syntax for Python hooks is as follows:
871N/A Python hooks are run within the Mercurial process. Each hook is
196N/A This feature is only supported when using Python 2.6 or later.
2302N/A Used to access web\-based Mercurial repositories through a HTTP
2302N/A Optional. Always use the proxy, even for localhost and any entries
2302N/A This section specifies merge tools to associate with particular file
196N/A # Override stock tool location
196N/A-Either just the name of the executable or its pathname. On Windows,
196N/A-the path can use environment variables with ${ProgramFiles} syntax.
2302N/A+Either just the name of the executable or its pathname. Default: the tool name.
2302N/A A list of merge success\-checking options:
2302N/A Always prompt for merge success, regardless of success reported by tool.
196N/A This tool requires a graphical interface to run. Default: False
196N/A-Windows registry key which describes install location of this
196N/A-tool. Mercurial will search for this key first under
196N/A-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
196N/A-An alternate Windows registry key to try if the first key is not
196N/A-found. The alternate key uses the same \fBregname\fP and \fBregappend\fP
196N/A-semantics of the primary key. The most common use for this key
196N/A-is to search for 32bit applications on 64bit operating systems.
196N/A-Name of value to read from specified registry key. Defaults to the
196N/A-unnamed (default) value.
196N/A-String to append to the value read from the registry, typically
196N/A-the executable name of the tool.
196N/A-Settings used when applying patches, for instance through the \(aqimport\(aq
196N/A+Settings used when applying patches, for instance through the 'import'
196N/A command or with Mercurial Queues extension.
196N/A-When set to \(aqstrict\(aq patch content and patched files end of lines
196N/A+When set to 'strict' patch content and patched files end of lines
196N/A are preserved. When set to \fBlf\fP or \fBcrlf\fP, both files end of
196N/A lines are ignored when patching and the result line endings are
196N/A normalized to either LF (Unix) or CRLF (Windows). When set to
2302N/A on a per\-file basis. If target file does not exist or has no end
2302N/A of line, patch line endings are preserved.
2302N/A Assigns symbolic names to repositories. The left side is the
2302N/A symbolic name, and the right gives the directory or URL that is the
2302N/A location of the repository. Default paths can be declared by setting
2302N/A Optional. Directory or URL to use when pushing if no destination
2302N/A Custom paths can be defined by assigning the path to a name that later can be
2302N/A used from the command line. Example:
2302N/A To push to the path defined in \fBmy_path\fP run the command:
871N/A-Specifies default handling of phases. See \%\fBhg help phases\fP\: for more
871N/A+Specifies default handling of phases. See \fBhg help phases\fP for more
871N/A information about working with phases.
2302N/A Phase of newly\-created commits.
2302N/A Specifies profiling type, format, and file output. Two profilers are
871N/A supported: an instrumenting profiler (named \fBls\fP), and a sampling
871N/A profiler (named \fBstat\fP).
871N/A-In this section description, \(aqprofiling data\(aq stands for the raw data
871N/A-collected during profiling, while \(aqprofiling report\(aq stands for a
871N/A+In this section description, 'profiling data' stands for the raw data
871N/A+collected during profiling, while 'profiling report' stands for a
871N/A statistical text report generated from the profiling data. The
871N/A profiling is done using lsprof.
2302N/A The type of profiler to use.
871N/A-Use Python\(aqs built\-in instrumenting profiler. This profiler
871N/A+Use Python's built\-in instrumenting profiler. This profiler
871N/A works on all platforms, but each line number it reports is the
871N/A first line of a function. This restriction makes it difficult to
871N/A identify the expensive parts of a non\-trivial function.
2302N/A Use a third\-party statistical profiler, statprof. This profiler
2302N/A currently runs only on Unix systems, and is most useful for
2302N/A profiling commands that run for longer than about 0.1 seconds.
2302N/A Profiling format. Specific to the \fBls\fP instrumenting profiler.
2302N/A Format profiling data for kcachegrind use: when saving to a
2302N/A file, the generated file can directly be loaded into
2302N/A This can help explain the difference between Total and Inline.
2302N/A Specific to the \fBls\fP instrumenting profiler.
871N/A-Alias definitions for revsets. See \%\fBhg help revsets\fP\: for details.
871N/A+Alias definitions for revsets. See \fBhg help revsets\fP for details.
871N/A Controls generic server settings.
2302N/A Whether to validate the completeness of pushed changesets by
2302N/A checking that all new file revisions specified in manifests are
2302N/A Configuration for extensions that need to send email messages.
2302N/A \fB[web] cacerts\fP also). For "strict", sending email is also
2302N/A aborted, if there is no configuration for mail server in
2302N/A \fB[hostfingerprints]\fP and \fB[web] cacerts\fP. \-\-insecure for
2302N/A-\%\fBhg email\fP\: overwrites this as "loose". Default: "strict".
2302N/A+\fBhg email\fP overwrites this as "loose". Default: "strict".
871N/A .B \fBlocal_hostname\fP
871N/A-Optional. It\(aqs the hostname that the sender can use to identify
871N/A+Optional. It's the hostname that the sender can use to identify
2302N/A Subrepository source URLs can go stale if a remote server changes name
871N/A rewrite rules of the form:
196N/A <pattern> = <replacement>
871N/A where \fBpattern\fP is a regular expression matching a subrepository
871N/A \fBreplacements\fP. For instance:
871N/A Mercurial will not use the settings in the
196N/A-\
fB.hg/hgrc\fP file from a repository if it doesn\(aqt belong to a trusted
2302N/A+\fB\&.hg/hgrc\fP file from a repository if it doesn't belong to a trusted
196N/A user or to a trusted group, as various hgrc features allow arbitrary
196N/A commands to be run. This issue is often encountered when configuring
196N/A hooks or extensions for shared repositories or servers. However,
2302N/A group with name \fB*\fP. These settings must be placed in an
2302N/A \fIalready\-trusted file\fP to take effect, such as \fB$HOME/.hgrc\fP of the
2302N/A user or service running Mercurial.
2302N/A Comma\-separated list of trusted groups.
196N/A (hashes for the repository base and for tip) in archives created
196N/A-by the \%\fBhg archive\fP\: command or downloaded via hgweb.
196N/A+by the \fBhg archive\fP command or downloaded via hgweb.
196N/A .B \fBfallbackencoding\fP
196N/A-Encoding to try if it\(aqs not possible to decode the changelog using
196N/A+Encoding to try if it's not possible to decode the changelog using
196N/A UTF\-8. Default is ISO\-8859\-1.
196N/A The conflict resolution program to use during a manual merge.
196N/A-For more information on merge tools see \%\fBhg help merge\-tools\fP\:.
196N/A+For more information on merge tools see \fBhg help merge\-tools\fP.
871N/A For configuring merge tools see the \fB[merge\-tools]\fP section.
871N/A .B \fBportablefilenames\fP
871N/A If set to \fBwarn\fP (or \fBtrue\fP), a warning message is printed on POSIX
871N/A platforms, if a file with a non\-portable filename is added (
e.g. a file
871N/A-with a name that can\(aqt be created on Windows because it contains reserved
871N/A+with a name that can't be created on Windows because it contains reserved
871N/A parts like \fBAUX\fP, reserved characters like \fB:\fP, or would cause a case
871N/A collision with an existing file).
871N/A If set to \fBignore\fP (or \fBfalse\fP), no warning is printed.
196N/A The committer of a changeset created when running "commit".
196N/A-Typically a person\(aqs name and email address,
e.g. \fBFred Widget
196N/A+Typically a person's name and email address,
e.g. \fBFred Widget
196N/A <fred@example.com>\fP. Default is \fB$EMAIL\fP or \fBusername@hostname\fP. If
196N/A the username in hgrc is empty, it has to be specified manually or
196N/A in a different hgrc file (
e.g. \fB$HOME/.hgrc\fP, if the admin set
2302N/A Increase the amount of output printed. True or False. Default is False.
196N/A Web interface configuration. The settings in this section apply to
196N/A-both the builtin webserver (started by \%\fBhg serve\fP\:) and the script you
196N/A+both the builtin webserver (started by \fBhg serve\fP) and the script you
196N/A Note that this will allow anybody to push anything to the server and
2302N/A that this should not be used for public servers.
2302N/A The full set of options is:
871N/A To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
871N/A-You can use OpenSSL\(aqs CA certificate file if your platform has
871N/A+You can use OpenSSL's CA certificate file if your platform has
871N/A one. On most Linux systems this will be
871N/A generate this file manually. The form must be as follows:
196N/A \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
196N/A \&... (certificate in base64 PEM encoding) ...
196N/A \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
196N/A \-\-\-\-\-BEGIN CERTIFICATE\-\-\-\-\-
196N/A \&... (certificate in base64 PEM encoding) ...
196N/A \-\-\-\-\-END CERTIFICATE\-\-\-\-\-
196N/A-Textual description of the repository\(aqs purpose or contents.
196N/A+Textual description of the repository's purpose or contents.
196N/A-Prefix path to serve from. Default is \(aq\(aq (server root).
196N/A+Prefix path to serve from. Default is '' (server root).
2302N/A Where to find the HTML templates. Default is install path.
2302N/A Web substitution filter definition. You can use this section to
2302N/A which in turn imitates the Unix sed replacement syntax:
2302N/A You can use any separator other than "/". The final "i" is optional
2302N/A italic = s/\eb_(\eS+)_\eb/<i>\e1<\e/i>/
2302N/A bold = s/\e*\eb(\eS+)\eb\e*/<b>\e1<\e/b>/
2302N/A directory updates in parallel on Unix\-like systems, which greatly
2302N/A Number of CPUs to use for parallel operations. Default is 4 or the
2302N/A number of CPUs on the system, whichever is larger. A zero or
2302N/A negative value is treated as \fBuse the default\fP.
196N/A-Bryan O\(aqSullivan <\%bos@serpentine.com\:>.
196N/A+Bryan O'Sullivan <bos@serpentine.com>.
196N/A-Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
196N/A+Mercurial was written by Matt Mackall <mpm@selenic.com>.
196N/A-\%\fBhg\fP(1)\:, \%\fBhgignore\fP(5)\:
196N/A+\fBhg\fP(1), \fBhgignore\fP(5)
196N/A-This manual page is copyright 2005 Bryan O\(aqSullivan.
196N/A+This manual page is copyright 2005 Bryan O'Sullivan.
2302N/A Mercurial is copyright 2005\-2013 Matt Mackall.
196N/A Free use of this software is granted under the terms of the GNU General
196N/A Public License version 2 or any later version.