HG(1)
👑 hg — Mercurial, bestie edition 💖
(that's HG(1) in the Mercurial Manual, if you're keeping receipts)
✨ NAME ✨
hg — the Mercurial source code management system. yes it's literally that girl. 🌸
✨ SYNOPSIS ✨
hg command [option]... [argument]...✨ DESCRIPTION ✨
The hg command is your ride-or-die command line interface to the whole Mercurial system. that's the vibe. 💅
✨ COMMAND ELEMENTS ✨
these are the little building blocks every command eats, okay bestie, memorize them:
files...— means one or more filename or relative path filenames 🦋. for the tea on how pattern matching works, go read File Name Patterns.path— means a path on your local machine. just, like, here. 💖revision— means a changeset, and you can point at it with a changeset revision number, a tag, or a unique substring of the changeset hash value. three flavors, all valid, all slay. ✨repository path— either the pathname of a local repository or the URI of a remote repository. local girl or internet girl, both iconic. 🌈
✨ OPTIONS ✨
these are the global ones, the ones you can sprinkle on basically anything:
-R,--repository <REPO>— repository root directory, or the name of an overlay bundle file 🎀--cwd <DIR>— change working directory (yes, like cd but make it an option)-y,--noninteractive— do not prompt, just automatically pick the first choice for all prompts. no questions, we move. 💅-q,--quiet— suppress output. shhh. 🤫-v,--verbose— enable additional output. give me more. 👑--color <TYPE>— when to colorize:boolean,always,auto,never, ordebug🌸--config <CONFIG[+]>— set/override a config option (use'section.name=value')--config-file <HGRC[+]>— load a config file to set/override config options--debug— enable debugging output 🐛--debugger— start the debugger--encoding <ENCODE>— set the charset encoding (default:UTF-8)--encodingmode <MODE>— set the charset encoding mode (default:strict)--traceback— always print a traceback on exception 😭--time— time how long the command takes ⏱️--profile— print command execution profile--version— output version information and exit-h,--help— display help and exit 🫶--hidden— consider hidden changesets 🙈--pager <TYPE>— when to paginate:boolean,always,auto, ornever(default:auto)
[+] marked option can be specified multiple times. stack 'em, bestie. 💖✨ COMMANDS ✨
buckle up, this is the main character section. 🌟
Repository creation
🎀 clone
make a copy of an existing repository:
hg clone [OPTION]... SOURCE [DEST]Create a copy of an existing repository in a new directory. that's it, that's the whole thing. ✨
If you don't specify a destination directory name, it defaults to the basename of the source. lazy girl behavior but it works. 💅
The location of the source gets added to the new repository's .hg/hgrc file, as the default to be used for future pulls. it's a little love letter to where you came from. 💌
Only local paths and ssh:// URLs are supported as destinations. For ssh:// destinations, no working directory or .hg/hgrc will be created on the remote side. heads up. ⚠️
If the source repository has a bookmark called '@' set, that revision will be checked out in the new repository by default. it just knows. 👑
To check out a particular version, use -u/--update, or -U/--noupdate to create a clone with no working directory.
To pull only a subset of changesets, specify one or more revisions identifiers with -r/--rev or branches with -b/--branch. The resulting clone will contain only the specified changesets and their ancestors. These options (or 'clone src#rev dest') imply --pull, even for local source repositories. 📥
In normal clone mode, the remote normalizes repository data into a common exchange format and the receiving end translates this data into its local storage format. --stream activates a different clone mode that essentially copies repository files from the remote with minimal data processing. This significantly reduces the CPU cost of a clone both remotely and locally 🔥. However, it often increases the transferred data size by 30-40%. This can result in substantially faster clones where I/O throughput is plentiful, especially for larger repositories. A side-effect of --stream clones is that storage settings and requirements on the remote are applied locally: a modern client may inherit legacy or inefficient storage used by the remote, or a legacy Mercurial client may not be able to clone from a modern Mercurial remote. so like… iconic but read the fine print. 😭
Note — Specifying a tag will include the tagged changeset but not the changeset containing the tag. sneaky!! 🙈
For efficiency, hardlinks are used for cloning whenever the source and destination are on the same filesystem (note this applies only to the repository data, not to the working directory). Some filesystems, such as AFS, implement hardlinking incorrectly, but do not report errors. In these cases, use the --pull option to avoid hardlinking. 🚨
Mercurial will update the working directory to the first applicable revision from this list, in order, no cap:
- a. null if
-Uor the source repository has no changesets - b. if
-u .and the source repository is local, the first parent of the source repository's working directory - c. the changeset specified with
-u(if a branch name, this means the latest head of that branch) - d. the changeset specified with
-r - e. the tipmost head specified with
-b - f. the tipmost head specified with the
url#branchsource syntax - g. the revision marked with the
'@'bookmark, if present - h. the tipmost head of the default branch
- i. tip
When cloning from servers that support it, Mercurial may fetch pre-generated data from a server-advertised URL or inline from the same stream. When this is done, hooks operating on incoming changesets and changegroups may fire more than once, once for each pre-generated bundle and as well as for any additional remaining data. In addition, if an error occurs, the repository may be rolled back to a partial clone. This behavior may change in future releases. See hg help -e clonebundles for more. 📚
Examples, aka the tutorial arc:
- clone a remote repository to a new directory named
hg/:
hg clone https://www.mercurial-scm.org/repo/hg/- create a lightweight local clone:
hg clone project/ project-feature/- clone from an absolute path on an ssh server (note double-slash):
hg clone ssh://user@server//home/projects/alpha/- do a streaming clone while checking out a specified version:
hg clone --stream http://server/repo -u 1.5- create a repository without changesets after a particular revision:
hg clone -r 04e544 experimental/ good/- clone (and track) a particular named branch:
hg clone https://www.mercurial-scm.org/repo/hg/#stableSee hg help urls for details on specifying URLs. 🔗
Returns 0 on success. ✅
Options:
-U,--noupdate— the clone will include an empty working directory (only a repository)-u,--updaterev <REV>— revision, tag, or branch to check out-r,--rev <REV[+]>— do not clone everything, but include this changeset and its ancestors-b,--branch <BRANCH[+]>— do not clone everything, but include this branch's changesets and their ancestors--pull— use pull protocol to copy metadata--uncompressed— an alias to--stream(DEPRECATED) 💀--stream— clone with minimal data processing-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times. 💖🎀 init
create a new repository in the given directory:
hg init [-e CMD] [--remotecmd CMD] [DEST]Initialize a new repository in the given directory. If the given directory does not exist, it will be created. manifestation, basically. ✨
If no directory is given, the current directory is used.
It is possible to specify an ssh:// URL as the destination. See hg help urls for more information. 🔗
Returns 0 on success. ✅
Options:
-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
Remote repository management
🦋 incoming
show new changesets found in source:
hg incoming [-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]Show new changesets found in the specified path/URL or the default pull location. These are the changesets that would have been pulled by hg pull at the time you issued this command. it's a little preview. a sneak peek. 👀
See pull for valid source format details.
With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:
BM1 01234567890a added
BM2 1234567890ab advanced
BM3 234567890abc diverged
BM4 34567890abcd changedThe action taken locally when pulling depends on the status of each bookmark:
added— pull will create it 🌱advanced— pull will update it ⬆️diverged— pull will create a divergent bookmark 😵changed— result depends on remote changesets 🤷
From the point of view of pulling behavior, bookmark existing only in the remote repository are treated as added, even if it is in fact locally deleted. plot twist. 😭
For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull. efficiency queen. 👑
Examples:
- show incoming changes with patches and full description:
hg incoming -vp- show incoming changes excluding merges, store a bundle:
hg in -vpM --bundle incoming.hg
hg pull incoming.hg- briefly list changes inside a bundle:
hg in changes.hg -T "{desc|firstline}\n"Returns 0 if there are incoming changes, 1 otherwise. 📊
Options:
-f,--force— run even if remote repository is unrelated-n,--newest-first— show newest record first--bundle <FILE>— file to store the bundles into-r,--rev <REV[+]>— a remote changeset intended to be added-B,--bookmarks— compare bookmarks 🔖-b,--branch <BRANCH[+]>— a specific branch you would like to pull--remote-hidden— include changesets hidden on the remote (EXPERIMENTAL) 🧪-p,--patch— show patch-g,--git— use git extended diff format-l,--limit <NUM>— limit number of changes displayed-M,--no-merges— do not show merges--stat— output diffstat-style summary of changes-G,--graph— show the revision DAG 🌳--style <STYLE>— display using template map file (DEPRECATED) 💀-T,--template <TEMPLATE>— display with template-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)-S,--subrepos— recurse into subrepositories 🪆
(part 1 of 48 — more incoming, don't go anywhere bestie 💖)
[+] marked option can be specified multiple times
aliases: in
📤 outgoing
show changesets not found in the destination:
hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]...Okay so outgoing is literally the mirror twin of incoming — it shows you the changesets that are NOT in the destination repo (or in your default push location). Basically: these are the ones that would get pushed if you asked for a push. Bestie, this is your "what am I about to send into the world" check. 👀
See pull for details of valid destination formats, fr fr.
With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:
BM1 01234567890a added
BM2 deleted
BM3 234567890abc advanced
BM4 34567890abcd diverged
BM5 4567890abcde changedThe action taken when pushing depends on the status of each bookmark:
- added push with
-Bwill create it - deleted push with
-Bwill delete it - advanced push will update it
- diverged push with
-Bwill update it - changed push with
-Bwill update it
From the point of view of pushing behavior, bookmarks existing only in the remote repository are treated as deleted, even if it is in fact added remotely. (yes this is a little cursed, it's just how it is 💅)
Returns 0 if there are outgoing changes, 1 otherwise.
Options:
-f,--force— run even when the destination is unrelated-r,--rev <REV[+]>— a changeset intended to be included in the destination-n,--newest-first— show newest record first-B,--bookmarks— compare bookmarks-b,--branch <BRANCH[+]>— a specific branch you would like to push-p,--patch— show patch-g,--git— use git extended diff format-l,--limit <NUM>— limit number of changes displayed-M,--no-merges— do not show merges--stat— output diffstat-style summary of changes-G,--graph— show the revision DAG--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times
aliases: out
🗺️ paths
show aliases for remote repositories:
hg paths [NAME]Show definition of symbolic path name NAME. If no name is given, show definition of all available names. It's giving "address book but for repos" 💖
Option -q/--quiet suppresses all output when searching for NAME, and shows only the path names when listing all definitions.
Path names are defined in the [paths] section of your configuration file and in /etc/mercurial/hgrc. If run inside a repository, .hg/hgrc is used, too.
The path names default and default-push have a special meaning. When performing a push or pull operation, they are used as fallbacks if no location is specified on the command-line. When default-push is set, it will be used for push and default will be used for pull; otherwise default is used as the fallback for both. When cloning a repository, the clone source is written as default in .hg/hgrc.
Note —defaultanddefault-pushapply to all inbound (e.g.hg incoming) and outbound (e.g.hg outgoing,hg emailandhg bundle) operations.
See hg help urls for more information.
Template:
The following keywords are supported. See also hg help templates.
name— String. Symbolic name of the path alias.pushurl— String. URL for push operations.url— String. URL or directory path for the other operations.
Returns 0 on success.
Options:
-T,--template <TEMPLATE>— display with template
⬇️ pull
pull changes from the specified source:
hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...Pull changes from a remote repository to a local one. ✨
This finds all changes from the repository at the specified path or URL and adds them to a local repository (the current one unless -R is specified). By default, this does not update the copy of the project in the working directory. (so your files on disk stay exactly where they are — no surprise glow-ups 🙈)
When cloning from servers that support it, Mercurial may fetch pre-generated data. When this is done, hooks operating on incoming changesets and changegroups may fire more than once, once for each pre-generated bundle and as well as for any additional remaining data. See hg help -e clonebundles for more. yes, hooks can fire multiple times — plan accordingly bestie 💀
Use hg incoming if you want to see what would have been added by a pull at the time you issued this command. If you then decide to add those changes to the repository, you should use hg pull -r X where X is the last changeset listed by hg incoming.
If SOURCE is omitted, the default path will be used. See hg help urls for more information.
If multiple sources are specified, they will be pulled sequentially as if the command was run multiple times. If --update is specified, the command will stop at the first failed --update.
Specifying bookmark as . is equivalent to specifying the active bookmark's name. little shorthand moment 🎀
One can use the --remote-hidden flag to pull changesets hidden on the remote. This flag is "best effort", and will only work if the server supports the feature and is configured to allow the user to access hidden changesets. This option is experimental and backwards compatibility is not guaranteed. ⚠️ experimental alert — do not build your whole life around it ⚠️
Returns 0 on success, 1 if an update had unresolved files.
Options:
-u,--update— update to new branch head if new descendants were pulled-f,--force— run even when remote repository is unrelated--confirm— confirm pull before applying changes-r,--rev <REV[+]>— a remote changeset intended to be added-B,--bookmark <BOOKMARK[+]>— bookmark to pull-b,--branch <BRANCH[+]>— a specific branch you would like to pull--remote-hidden— include changesets hidden on the remote (EXPERIMENTAL)-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times
📤 push
push changes to the specified destination:
hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...Push changesets from the local repository to the specified destination. 🚀
This operation is symmetrical to pull: it is identical to a pull in the destination repository from the current one. mirror mirror on the wall 🪞
By default, push will not allow creation of new heads at the destination, since multiple heads would make it unclear which head to use. In this situation, it is recommended to pull and merge before pushing. pull + merge + push = the holy trinity, no cap 🙏
Use --new-branch if you want to allow push to create a new named branch that is not present at the destination. This allows you to only create a new branch without forcing other changes.
Note — Extra care should be taken with the-f/--forceoption, which will push all new heads on all branches, an action which will almost always cause confusion for collaborators. like, seriously, read that twice 🔥
If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository.
If -B/--bookmark is used, the specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository. Specifying . is equivalent to specifying the active bookmark's name. Use the --all-bookmarks option for pushing all current bookmarks.
Please see hg help urls for important details about ssh:// URLs. If DESTINATION is omitted, a default path will be used.
When passed multiple destinations, push will process them one after the other, but stop should an error occur.
The --pushvars option sends strings to the server that become environment variables prepended with HG_USERVAR_. For example, --pushvars ENABLE_FEATURE=true, provides the server side hooks with HG_USERVAR_ENABLE_FEATURE=true as part of their environment. iykyk 👑
pushvars can provide for user-overridable hooks as well as set debug levels. One example is having a hook that blocks commits containing conflict markers, but enables the user to override the hook if the file is using conflict markers for testing purposes or the file format has strings that look like conflict markers.
By default, servers will ignore --pushvars. To enable it add the following to your configuration file:
[push]
pushvars.server = trueReturns 0 if push was successful, 1 if nothing to push.
Options:
-f,--force— force push-r,--rev <REV[+]>— a changeset intended to be included in the destination-B,--bookmark <BOOKMARK[+]>— bookmark to push--all-bookmarks— push all bookmarks (EXPERIMENTAL)-b,--branch <BRANCH[+]>— a specific branch you would like to push--new-branch— allow pushing a new branch--pushvars <VALUE[+]>— variables that can be sent to server (ADVANCED)--publish— push the changeset as public (EXPERIMENTAL)-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times
🌐 serve
start stand-alone webserver:
hg serve [OPTION]...Start a local HTTP repository browser and pull server. You can use this for ad-hoc sharing and browsing of repositories. It is recommended to use a real web server to serve a repository for longer periods of time. (ad-hoc = cute lil hangout, not a permanent address 🏠)
Please note — the server does not implement access control. This means that, by default, anybody can read from the server and nobody can write to it by default. Set theweb.allow-pushoption to*to allow everybody to push to the server. You should use a real web server if you need to authenticate users. ⚠️ no auth, no gatekeeping, just vibes — do NOT expose this to the open internet ⚠️
By default, the server logs accesses to stdout and errors to stderr. Use the -A/--accesslog and -E/--errorlog options to log to files.
To have the server choose a free port number to listen on, specify a port number of 0; in this case, the server will print the port number it uses. free port roulette, she picks for you ✨
Returns 0 on success.
Options:
-A,--accesslog <FILE>— name of access log file to write to-d,--daemon— run server in background--daemon-postexec <VALUE[+]>— used internally by daemon mode-E,--errorlog <FILE>— name of error log file to write to-p,--port<PORT> — the port you're listening on (default:8000)-a,--address<ADDR> — the address you're listening on (default: all interfaces)--prefix<PREFIX> — the prefix path you're serving from (default: server root)-n,--name<NAME> — the name that shows up in the web pages (default: working directory)--web-conf<FILE> — name of the hgweb config file (peephg help hgwebfor the deets)--webdir-conf<FILE> — name of the hgweb config file (DEPRECATED, bestie, it's giving old news)--pid-file<FILE> — name of the file to write the process ID into--stdio— for remote clients (ADVANCED)--cmdserver<MODE> — for remote clients (ADVANCED)-t,--templates<TEMPLATE> — the web templates to use--style<STYLE> — the template style to use-6,--ipv6— use IPv6 instead of IPv4--certificate<FILE> — the SSL certificate file--print-url— start up and print only the URL-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times ✨
🌸 Change creation 🌸
commit 💖
commit the specified files or all outstanding changes:
hg commit [OPTION]... [FILE]...Commit changes to the given files into the repository. Okay so unlike a centralized SCM, this operation is a local operation — it happens right here, on your machine, no internet required, no waiting on anyone. See hg push if you want a way to actively distribute your changes out into the world.
If you leave out the list of files, everything that hg status reports gets committed. All of it. The whole vibe.
If you're committing the result of a merge, do not provide any filenames or -I/-X filters. Just don't. 🙈
If you don't specify a commit message, Mercurial starts up your configured editor so you can type one in. And if your commit fails, don't panic — you'll find a backup of your message in .hg/last-message.txt. Iconic safety net behaviour honestly.
The --close-branch flag marks the current branch head as closed. When all heads of a branch are closed, the branch is considered closed and won't be listed anymore. Bye bestie 👋
The --amend flag lets you amend the parent of the working directory with a new commit that contains the changes in the parent plus those currently reported by hg status, if there are any. The old commit gets stored in a backup bundle in .hg/strip-backup (see hg help bundle and hg help unbundle for how to restore it, because yes, you can get it back).
Message, user and date are taken from the amended commit unless you specify otherwise. And when a message isn't specified on the command line, the editor opens with the message of the amended commit already in it.
It is not possible to amend public changesets (see hg help phases) or changesets that have children. That's a hard no, bestie.
See hg help dates for a list of formats valid for -d/--date.
Returns 0 on success, 1 if nothing changed. (Not me getting a 1 because literally nothing happened 💀)
Examples:
- commit all files ending in
.py:
hg commit --include "set:**.py"- commit all non-binary files:
hg commit --exclude "set:binary()"- amend the current commit and set the date to now:
hg commit --amend --date nowOptions:
-A,--addremove— mark new/missing files as added/removed before committing--close-branch— mark a branch head as closed--amend— amend the parent of the working directory-s,--secret— use the secret phase for committing--draft— use the draft phase for committing-e,--edit— invoke editor on commit messages--force-close-branch— forcibly close branch from a non-head changeset (ADVANCED)-i,--interactive— use interactive mode-I,--include<PATTERN[+]> — include names matching the given patterns-X,--exclude<PATTERN[+]> — exclude names matching the given patterns-m,--message<TEXT> — use text as commit message-l,--logfile<FILE> — read commit message from file-d,--date<DATE> — record the specified date as commit date-u,--user<USER> — record the specified user as committer-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times 🦋
aliases: ci (short and sweet, we love her)
🎀 Change manipulation 🎀
abort 🧚
abort an unfinished operation (EXPERIMENTAL):
hg abortAborts a multistep operation like graft, histedit, rebase, merge, and unshelve if they're in an unfinished state. Like hitting the escape hatch when a multi-step thing got messy mid-way.
use --dry-run/-n to dry run the command.
Options:
-n,--dry-run— do not perform actions, just print output
backout 👑
reverse effect of earlier changeset:
hg backout [OPTION]... [-r] REVPrepare a new changeset with the effect of REV undone in the current working directory. If no conflicts were encountered, it will be committed immediately. ✨
If REV is the parent of the working directory, then this new changeset is committed automatically (unless --no-commit is specified).
Note hg backout cannot be used to fix either an unwanted or incorrect merge. Sorry bestie, that's just not the job.
Examples:
- Reverse the effect of the parent of the working directory. This backout will be committed immediately:
hg backout -r .- Reverse the effect of previous bad revision
23:
hg backout -r 23- Reverse the effect of previous bad revision
23and leave changes uncommitted:
hg backout -r 23 --no-commit
hg commit -m "Backout revision 23"By default, the pending changeset will have one parent, maintaining a linear history. With --merge, the pending changeset will instead have two parents: the old parent of the working directory and a new child of REV that simply undoes REV.
Before version 1.7, the behavior without --merge was equivalent to specifying --merge followed by hg update --clean . to cancel the merge and leave the child of REV as a head to be merged separately.
See hg help dates for a list of formats valid for -d/--date.
See hg help revert for a way to restore files to the state of another revision.
Returns 0 on success, 1 if nothing to backout or there are unresolved files.
Options:
--merge— merge with old dirstate parent after backout--commit— commit if no conflicts were encountered (DEPRECATED)--no-commit— do not commit--parent<REV> — parent to choose when backing out merge (DEPRECATED)-r,--rev<REV> — revision to backout-e,--edit— invoke editor on commit messages-t,--tool<TOOL> — specify merge tool-I,--include<PATTERN[+]> — include names matching the given patterns-X,--exclude<PATTERN[+]> — exclude names matching the given patterns-m,--message<TEXT> — use text as commit message-l,--logfile<FILE> — read commit message from file-d,--date<DATE> — record the specified date as commit date-u,--user<USER> — record the specified user as committer
[+] marked option can be specified multiple times 🌈
continue 💅
resumes an interrupted operation (EXPERIMENTAL):
hg continueFinishes a multistep operation like graft, histedit, rebase, merge, and unshelve if they're in an interrupted state. The glow-up from "ugh it stopped" to "okay we're back" 💖
use --dry-run/-n to dry run the command.
Options:
-n,--dry-run— do not perform actions, just print output
graft 🍓
copy changes from other branches onto the current branch:
hg graft [OPTION]... [-r REV]... REV...This command uses Mercurial's merge logic to copy individual changes from other branches without merging branches in the history graph. Sometimes this is known as 'backporting' or 'cherry-picking'. By default, graft will copy user, date, and description from the source changesets.
Changesets that are ancestors of the current revision, that have already been grafted, or that are merges will be skipped.
If --log is specified, log messages will have a comment appended of the form:
(grafted from CHANGESETHASH)If --force is specified, revisions will be grafted even if they are already ancestors of, or have been grafted to, the destination. This is useful when the revisions have since been backed out.
If a graft merge results in conflicts, the graft process is interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option.
The -c/--continue option reapplies all the earlier options.
The --base option exposes more of how graft internally uses merge with a custom base revision. --base can be used to specify another ancestor than the first and only parent.
The command:
hg graft -r 345 --base 234is thus pretty much the same as:
hg diff --from 234 --to 345 | hg importbut using merge to resolve conflicts and track moved files.
The result of a merge can thus be backported as a single commit by specifying one of the merge parents as base, and thus effectively grafting the changes from the other side.
It is also possible to collapse multiple changesets and clean up history by specifying another ancestor as base, much like rebase --collapse --keep.
The commit message can be tweaked after the fact using commit --amend .
For using non-ancestors as the base to backout changes, see the backout command and the hidden --parent option.
The experimental --to option allows grafting a revision in-memory, independent of the working copy. Merge conflicts are not currently supported, and the operation will be aborted if the configured tool cannot handle the conflicts that might be encountered.
As the operation is performed in-memory, the on-disk files will not be modified, and some hooks might not be run.
Examples:
- copy a single change to the stable branch and edit its description:
hg update stable
hg graft --edit 9393- graft a range of changesets with one exception, updating dates:
hg graft -D "2085::2093 and not 2091"- continue a graft after resolving conflicts:
hg graft -c- show the source of a grafted changeset:
hg log --debug -r .- show revisions sorted by date:
hg log -r "sort(all(), date)"- backport the result of a merge as a single commit:
hg graft -r 123 --base 123^- land a feature branch as one changeset:
hg up -cr default
hg graft -r featureX --base "ancestor('featureX', 'default')"See hg help revisions for more about specifying revisions.
Returns 0 on successful completion, 1 if there are unresolved files.
Options:
-r,--rev<REV[+]> — revisions to graft--base<REV> — base revision when doing the graft merge (ADVANCED)--to<VALUE> — graft to this destination, in-memory (EXPERIMENTAL)-c,--continue— resume interrupted graft--stop— stop interrupted graft--abort— abort interrupted graft-e,--edit— invoke editor on commit messages--log— append graft info to the log message 💖--no-commit— don't commit anything, just apply the changes in the working directory-f,--force— force that graft, bestie 💅-D,--currentdate— record the current date as the commit date-U,--currentuser— record the current user as the committer-d,--date <DATE>— record the specified date as the commit date-u,--user <USER>— record the specified user as the committer-t,--tool <TOOL>— specify the merge tool-n,--dry-run— do not perform any actions, just print the output 👀
[+] marked option can be specified multiple times
merge 🔀
merge another revision into the working directory, fr fr:
hg merge [-P] [[-r] REV]The current working directory gets updated with all the changes made in the requested revision since the last common predecessor revision. It's giving "bring the other timeline into mine" ✨
Files that changed between either parent get marked as changed for the next commit, and you must perform a commit before any further updates to the repository are allowed. The next commit is gonna have two parents. Two. Parents. Iconic 💅
--tool can be used to specify the merge tool used for file merges. It overrides the HGMERGE environment variable and your configuration files. See hg help merge-tools for options.
If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head, then the other head is merged with by default. Otherwise, you must provide an explicit revision to merge with. No cap.
See hg help resolve for info on handling file conflicts.
To undo an uncommitted merge, use hg merge --abort, which will check out a clean copy of the original merge parent — losing all changes. 😭
Returns 0 on success, 1 if there are unresolved files.
Options:
-f,--force— force a merge including outstanding changes (DEPRECATED)-r,--rev <REV>— revision to merge-P,--preview— review revisions to merge (no merge is performed)--abort— abort the ongoing merge-t,--tool <TOOL>— specify merge tool
Change organization 🗂️
bookmarks 🔖
create a new bookmark or list the existing bookmarks:
hg bookmarks [OPTIONS]... [NAME]...Bookmarks are labels on changesets that help you track lines of development. They are unversioned and can be moved, renamed and deleted. Deleting or moving a bookmark has no effect on the associated changesets. Slay, low-stakes.
Creating or updating to a bookmark causes it to be marked as 'active'. The active bookmark is indicated with a '*'. When a commit is made, the active bookmark will advance to the new commit. A plain hg update will also advance an active bookmark, if possible. Updating away from a bookmark will cause it to be deactivated. 💤
Bookmarks can be pushed and pulled between repositories (see hg help push and hg help pull). If a shared bookmark has diverged, a new 'divergent bookmark' of the form 'name@path' will be created. Using hg merge will resolve the divergence.
Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying the active bookmark's name.
A bookmark named '@' has the special property that hg clone will check it out by default if it exists. 👑
Template:
The following keywords are supported in addition to the common template keywords and functions such as {bookmark}. See also hg help templates.
active— Boolean. True if the bookmark is active.
Examples:
- create an active bookmark for a new line of development:
hg book new-feature- create an inactive bookmark as a place marker:
hg book -i reviewed- create an inactive bookmark on another changeset:
hg book -r .^ tested- rename bookmark turkey to dinner:
hg book -m turkey dinner- move the
'@'bookmark from another branch:
hg book -f @- print only the active bookmark name:
hg book -ql .Options:
-f,--force— force-r,--rev <REV>— revision for bookmark action-d,--delete— delete a given bookmark-m,--rename <OLD>— rename a given bookmark-i,--inactive— mark a bookmark inactive-l,--list— list existing bookmarks-T,--template <TEMPLATE>— display with template
aliases: bookmark
branch 🌿
set or show the current branch name:
hg branch [-fC] [NAME]Note — Branch names are permanent and global. Usehg bookmarkto create a light-weight bookmark instead. Seehg help glossaryfor more info about named branches and bookmarks. Choose wisely bestie, that name is forever 😭
With no argument, show the current branch name. With one argument, set the working directory branch name (the branch won't exist in the repository until the next commit). Standard practice recommends that primary development take place on the 'default' branch. It's giving main character energy ✨
Unless -f/--force is specified, branch will not let you set a branch name that already exists.
Use -C/--clean to reset the working directory branch to that of the parent of the working directory, negating a previous branch change. Undo button 🫶
Use the command hg update to switch to an existing branch. Use hg commit --close-branch to mark this branch head as closed. When all heads of a branch are closed, the branch will be considered closed.
Returns 0 on success.
Options:
-f,--force— set branch name even if it shadows an existing branch-C,--clean— reset branch name to parent branch name-r,--rev <VALUE[+]>— change branches of the given revs (EXPERIMENTAL)
[+] marked option can be specified multiple times
branches 🌈
list the repository's named branches:
hg branches [-c]Lists the repository's named branches, indicating which ones are inactive. If -c/--closed is specified, also list branches which have been marked closed (see hg commit --close-branch).
Use the command hg update to switch to an existing branch.
Template:
The following keywords are supported in addition to the common template keywords and functions such as {branch}. See also hg help templates.
active— Boolean. True if the branch is active.closed— Boolean. True if the branch is closed.current— Boolean. True if it is the current branch.
Returns 0.
Options:
-a,--active— show only branches that have unmerged heads (DEPRECATED)-c,--closed— show normal and closed branches-r,--rev <VALUE[+]>— show branch name(s) of the given rev-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times
phase 🌗
set or show the current phase name:
hg phase [-p|-d|-s] [-f] [-r] [REV...]With no argument, show the phase name of the current revision(s).
With one of -p/--public, -d/--draft or -s/--secret, change the phase value of the specified revisions.
Unless -f/--force is specified, hg phase won't move changesets from a lower phase to a higher phase. Phases are ordered like this, and no you cannot skip ahead:
public < draft < secretReturns 0 on success, 1 if some phases could not be changed.
(For more info about the phases concept, see hg help phases.)
Options:
-p,--public— set changeset phase to public-d,--draft— set changeset phase to draft-s,--secret— set changeset phase to secret-f,--force— allow to move boundary backward-r,--rev <REV[+]>— target revision
[+] marked option can be specified multiple times
tag 🏷️
add one or more tags for the current or a given revision:
hg tag [-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...Name a particular revision using <name>.
Tags are used to name particular revisions of the repository and are so useful for comparing different revisions, going back to significant earlier versions, or marking branch points as releases, etc. Changing an existing tag is normally disallowed — use -f/--force to override. 💅
If no revision is given, the parent of the working directory is used.
To facilitate version control, distribution, and merging of tags, they are stored as a file named ".hgtags", which is managed similarly to other project files and can be hand-edited if necessary. This also means that tagging creates a new commit. The file ".hg/localtags" is used for local tags (not shared among repositories). 👀
Tag commits are usually made at the head of a branch. If the parent of the working directory is not a branch head, hg tag aborts; use -f/--force to force the tag commit to be based on a non-head changeset.
See hg help dates for a list of formats valid for -d/--date.
Since tag names have priority over branch names during revision lookup, using an existing branch name as a tag name is discouraged. 🙈
Returns 0 on success.
Options:
-f,--force— force tag-l,--local— make the tag local-r,--rev <REV>— revision to tag--remove— remove a tag-e,--edit— invoke editor on commit messages-m,--message <TEXT>— use text as commit message-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer
tags 🌸
list repository tags:
hg tagsThis lists both regular and local tags. When the -v/--verbose switch is used, a third column "local" is printed for local tags. When the -q/--quiet switch is used, only the tag name is printed. Minimalist queen 💅
Template:
The following keywords are supported in addition to the common template keywords and functions such as {tag}. See also hg help templates.
type— String.localfor local tags.
Returns 0 on success.
Options:
-T,--template <TEMPLATE>— display with template
File content management 📂
annotate 🔍
show changeset information by line for each file:
hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...List changes in files, showing the revision id responsible for each line.
This command is useful for discovering when a change was made and by whom. Detective mode 🔎
If you include --file, --user, or --date, the revision number is suppressed unless you also include --number.
Without the -a/--text option, annotate will avoid processing files it detects as binary. With -a, annotate will annotate the file anyway, although the results will probably be neither useful nor desirable. 😭
Use -L/--line-range FILE,M:N options to filter the output to the lines from M to N in FILE. This option is incompatible with --no-follow and cannot be combined with file pattern arguments. When combined with --rev the line ranges refer to the state of the file at the requested revision.
Template:
The following keywords are supported in addition to the common template keywords and functions, bestie. Also go peek at hg help templates if you want the full lore. ✨
lines— List of lines with annotation data. 📝path— String. Repository-absolute path of the specified file. 🛤️
And every single entry of {lines} hands you these sub-keywords, plus the usual suspects like {date}, {node}, {rev}, {user}, etc.:
line— String. Line content.lineno— Integer. Line number at that revision.path— String. Repository-absolute path of the file at that revision.
For the list expansion syntax (iykyk), go read hg help templates.operators. 💅
Returns 0 on success. ✅
🌸 Options 🌸
-r,--rev <REV>— annotate the specified revision--follow— follow copies/renames and list the filename (DEPRECATED — it's giving legacy, bestie)--no-follow— don't follow copies and renames-a,--text— treat all files as text-u,--user— list the author (long with-v)-f,--file— list the filename-d,--date— list the date (short with-q)-n,--number— list the revision number (default)-c,--changeset— list the changeset-l,--line-number— show line number at the first appearance--skip <REV[+]>— revset to not display (EXPERIMENTAL 🧪)-L,--line-range <FILE,RANGE[+]>— follow line range of specified file (EXPERIMENTAL 🧪)-w,--ignore-all-space— ignore white space when comparing lines-b,--ignore-space-change— ignore changes in the amount of white space-B,--ignore-blank-lines— ignore changes whose lines are all blank-Z,--ignore-space-at-eol— ignore changes in whitespace at EOL-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times 🔁
aliases: blame
🐱 cat 🐱
output the current or given revision of files:
hg cat [OPTION]... FILE...Print the specified files exactly as they were at the given revision. If you don't give a revision, it uses the parent of the working directory. Periodt. 💅
Output can go to a file, and in that case the name of the file is given using a template string. See hg help templates. On top of the common template keywords, these formatting rules are supported too:
%%— literal%character%s— basename of file being printed%d— dirname of file being printed, or.if in repository root%p— root-relative path name of file being printed%H— changeset hash (40 hexadecimal digits)%R— changeset revision number%h— short-form changeset hash (12 hexadecimal digits)%r— zero-padded changeset revision number%b— basename of the exporting repository\— literal\character
🦋 Template 🦋
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
data— String. File content. 📄path— String. Repository-absolute path of the file. 🛤️
Returns 0 on success. ✅
✨ Options ✨
-o,--output <FORMAT>— print output to file with formatted name-r,--rev <REV>— print the given revision--decode— apply any matching decode filter-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times 🔁
🎀 copy 🎀
mark files as copied for the next commit:
hg copy [OPTION]... (SOURCE... DEST | --forget DEST...)Mark dest as having copies of source files. If dest is a directory, the copies get dropped into that directory. If dest is a file, then source has to be a single file. No cap. 🫶
By default, this command copies the contents of files as they exist in the working directory. If you invoke it with -A/--after, the operation is recorded but no copying is performed — it's just the receipts, bestie. 🧾
To undo marking a destination file as copied, use --forget. With that option, all the given (positional) arguments get unmarked as copies. The destination file(s) will be left in place (still tracked). And heads up: hg copy --forget behaves the same way as hg rename --forget. 👯
This command takes effect with the next commit by default.
Returns 0 on success, 1 if errors are encountered. ✅💀
🌈 Options 🌈
--forget— unmark a destination file as copied-A,--after— record a copy that has already occurred--at-rev <REV>— (un)mark copies in the given revision (EXPERIMENTAL 🧪)-f,--force— forcibly copy over an existing managed file-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times 🔁
aliases: cp
💅 diff 💅
diff repository (or selected files):
hg diff [OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format.
Note —hg diffmay generate unexpected results for merges, because it'll default to comparing against the working directory's first parent changeset if no revisions are specified. To diff against the conflict regions, you can use--config diff.merge=yes. 😭
By default, the working directory files are compared to its first parent. To see the differences from another revision, use --from. To see the difference to another revision, use --to. For example, hg diff --from .^ will show the differences from the working copy's grandparent to the working copy, hg diff --to . will show the diff from the working copy to its parent (i.e. the reverse of the default), and hg diff --from 1.0 --to 1.2 will show the diff between those two revisions. Chef's kiss. 👑
Alternatively you can specify -c/--change with a revision to see the changes in that changeset relative to its first parent (i.e. hg diff -c 42 is equivalent to hg diff --from 42^ --to 42).
Without the -a/--text option, diff will avoid generating diffs of files it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results. 🙈
Use the -g/--git option to generate diffs in the git extended diff format. For more information, read hg help diffs.
⭐ Examples ⭐
- compare a file in the current working directory to its parent:
hg diff foo.c- compare two historical versions of a directory, with rename info:
hg diff --git --from 1.0 --to 1.2 lib/- get change stats relative to the last change on some date:
hg diff --stat --from "date('may 2')"- diff all newly-added files that contain a keyword:
hg diff "set:added() and grep(GNU)"- compare a revision and its parents:
hg diff -c 9353 # compare against first parent
hg diff --from 9353^ --to 9353 # same using revset syntax
hg diff --from 9353^2 --to 9353 # compare against the second parentReturns 0 on success. ✅
🔥 Options 🔥
-r,--rev <REV[+]>— revision (DEPRECATED)--from <REV1>— revision to diff from--to <REV2>— revision to diff to-c,--change <REV>— change made by revision--ignore-changes-from-ancestors— only compare the change made by the selected revision (EXPERIMENTAL 🧪)-a,--text— treat all files as text-g,--git— use git extended diff format (DEFAULT:diff.git)--binary— generate binary diffs in git mode (default)--nodates— omit dates from diff headers--noprefix— omita/andb/prefixes from filenames-p,--show-function— show which function each change is in (DEFAULT:diff.showfunc)--reverse— produce a diff that undoes the changes-w,--ignore-all-space— ignore white space when comparing lines-b,--ignore-space-change— ignore changes in the amount of white space-B,--ignore-blank-lines— ignore changes whose lines are all blank-Z,--ignore-space-at-eol— ignore changes in whitespace at EOL-U,--unified <NUM>— number of lines of context to show--stat— output diffstat-style summary of changes--root <DIR>— produce diffs relative to subdirectory-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times 🔁
🔍 grep 🔍
search for a pattern in specified files:
hg grep [--diff] [OPTION]... PATTERN [FILE]...Search the working directory or revision history for a regular expression in the specified files for the entire repository. It's giving detective energy. 🕵️♀️
By default, grep searches the repository files in the working directory and prints the files where it finds a match. To specify historical revisions instead of the working directory, use the --rev flag.
To search instead historical revision differences that contains a change in match status (- for a match that becomes a non-match, or + for a non-match that becomes a match), use the --diff flag.
PATTERN can be any Python (roughly Perl-compatible) regular expression. 🐍
If no *FILE*s are specified and the --rev flag isn't supplied, all files in the working directory are searched. When using the --rev flag and specifying *FILE*s, use the --follow argument to also follow the specified *FILE*s across renames and copies.
🧚 Template 🧚
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
change— String. Character denoting insertion+or removal-. Available if--diffis specified.lineno— Integer. Line number of the match.path— String. Repository-absolute path of the file.texts— List of text chunks.
And each entry of {texts} provides these sub-keywords:
matched— Boolean. True if the chunk matches the specified pattern.text— String. Chunk content.
See hg help templates.operators for the list expansion syntax.
Returns 0 if a match is found, 1 otherwise. ✅💀
🌸 Options 🌸
-0,--print0— end fields with NUL--all— an alias to--diff(DEPRECATED)--diff— search revision differences for when the pattern was added or removed-a,--text— treat all files as text-f,--follow— follow that changeset history bestie, or follow file history across copies and renames 💫-i,--ignore-case— ignore case while matching, soBugandbugare the same vibe-l,--files-with-matches— print only the filenames and revisions that match, no extra yapping-n,--line-number— print the matching line numbers too-r,--rev <REV[+]>— search files changed within a revision range--all-files— include all files in the changeset while grepping (DEPRECATED ⚠️ — it's giving legacy, don't build your whole personality on it)-u,--user— list the author (long version when you add-v)-d,--date— list the date (short version when you add-q)-T,--template <TEMPLATE>— display with a template, make it cute ✨-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times — so stack it up, no cap 💅
Change navigation 🧭
bisect 🎯
subdivision search of changesets — literally binary search but for "which commit broke everything":
hg bisect [-gbsr] [-U] [-c CMD] [REV]This command helps to find changesets which introduce problems. Here's the whole vibe: mark the earliest changeset you know exhibits the problem as bad, then mark the latest changeset which is free from the problem as good. Bisect will update your working directory to a revision for testing (unless the -U/--noupdate option is specified). Once you have performed tests, mark the working directory as good or bad, and bisect will either update to another candidate changeset or announce that it has found the bad revision. Iconic detective work fr 🔍
As a shortcut, you can also use the revision argument to mark a revision as good or bad without checking it out first.
If you supply a command, it will be used for automatic bisection. The environment variable HG_NODE will contain the ID of the changeset being tested. The exit status of the command will be used to mark revisions as good or bad: status 0 means good, 125 means to skip the revision, 127 (command not found) will abort the bisection, and any other non-zero exit status means the revision is bad. 💀
Some examples:
- start a bisection with known bad revision 34, and good revision 12:
hg bisect --bad 34
hg bisect --good 12- advance the current bisection by marking current revision as good or bad:
hg bisect --good
hg bisect --bad- mark the current revision, or a known revision, to be skipped (e.g. if that revision is not usable because of another issue):
hg bisect --skip
hg bisect --skip 23- skip all revisions that do not touch directories
fooorbar:
hg bisect --skip "!( file('path:foo') & file('path:bar') )"- forget the current bisection:
hg bisect --reset- use
make && make teststo automatically find the first broken revision:
hg bisect --reset
hg bisect --bad 34
hg bisect --good 12
hg bisect --command "make && make tests"- see all changesets whose states are already known in the current bisection:
hg log -r "bisect(pruned)"- see the changeset currently being bisected (especially useful if running with
-U/--noupdate):
hg log -r "bisect(current)"- see all changesets that took part in the current bisection:
hg log -r "bisect(range)"- you can even get a nice graph:
hg log --graph -r "bisect(range)"See hg help revisions.bisect for more about the bisect() predicate.
Returns 0 on success. 🫶
Options:
-r,--reset— reset bisect state, wipe the slate bestie-g,--good— mark changeset good 🟢-b,--bad— mark changeset bad 🔴-s,--skip— skip testing changeset-e,--extend— extend the bisect range-c,--command <CMD>— use command to check changeset state-U,--noupdate— do not update to target
heads 👑
show branch heads:
hg heads [-ct] [-r STARTREV] [REV]...With no arguments, show all open branch heads in the repository. Branch heads are changesets that have no descendants on the same branch. They are where development generally takes place and are the usual targets for update and merge operations. They're the main characters of the branch, periodt 👑
If one or more REVs are given, only open branch heads on the branches associated with the specified changesets are shown. This means that you can use hg heads . to see the heads on the currently checked-out branch. So handy ngl.
If -c/--closed is specified, also show branch heads marked closed (see hg commit --close-branch).
If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed.
If -t/--topo is specified, named branch mechanics will be ignored and only topological heads (changesets with no children) will be shown.
Returns 0 if matching heads are found, 1 if not.
Options:
-r,--rev <STARTREV>— show only heads which are descendants of STARTREV-t,--topo— show topological heads only-a,--active— show active branchheads only (DEPRECATED ⚠️)-c,--closed— show normal and closed branch heads--style <STYLE>— display using template map file (DEPRECATED ⚠️)-T,--template <TEMPLATE>— display with template ✨
identify 🪪
identify the working directory or specified revision:
hg identify [-nibtB] [-r REV] [SOURCE]Print a summary identifying the repository state at REV using one or two parent hash identifiers, followed by a "+" if the working directory has uncommitted changes, the branch name (if not default), a list of tags, and a list of bookmarks. It's like a lil ID card for your repo 🪪
When REV is not given, print a summary of the current state of the repository including the working directory. Specify -r. to get information of the working directory parent without scanning uncommitted changes.
Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle.
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
dirty— String. Character+denoting if the working directory has uncommitted changes.id— String. One or two nodes, optionally followed by+.parents— List of strings. Parent nodes of the changeset.
Examples:
- generate a build identifier for the working directory:
hg id --id > build-id.dat- find the revision corresponding to a tag:
hg id -n -r 1.3- check the most recent revision of a remote repository:
hg id -r tip https://www.mercurial-scm.org/repo/hg/See hg log for generating more information about specific revisions, including full hash identifiers.
Returns 0 if successful.
Options:
-r,--rev <REV>— identify the specified revision-n,--num— show local revision number-i,--id— show global revision id-b,--branch— show branch-t,--tags— show tags-B,--bookmarks— show bookmarks-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig) 🙈-T,--template <TEMPLATE>— display with template
aliases: id
log 📜
show revision history of entire repository or files:
hg log [OPTION]... [FILE]Print the revision history of the specified files or the entire project. It's the receipts, the whole story, the timeline 🕰️
If no revision range is specified, the default is tip:0 unless --follow is set.
File history is shown without following rename or copy history of files. Use -f/--follow with a filename to follow history across renames and copies. --follow without a filename will only show ancestors of the starting revisions. The starting revisions can be specified by -r/--rev, which default to the working directory parent.
By default this command prints revision number and changeset id, tags, non-trivial parents, user, date and time, and a summary for each commit. When the -v/--verbose switch is used, the list of changed files and full commit message are shown.
With --graph the revisions are shown as an ASCII art DAG with the most recent changeset at the top. 'o' is a changeset, '@' is a working directory parent, '%' is a changeset involved in an unresolved merge conflict, '_' closes a branch, 'x' is obsolete, '*' is unstable, and '+' represents a fork where the changeset from the lines below is a parent of the 'o' merge on the same line. Paths in the DAG are represented with '|', '/' and so forth. ':' in place of a '|' indicates one or more revisions in a path are omitted. So aesthetic ✨
Use -L/--line-range FILE,M:N options to follow the history of lines from M to N in FILE. With -p/--patch only diff hunks affecting specified line range will be shown. This option requires --follow; it can be specified multiple times. Currently, this option is not compatible with --graph. This option is experimental.
Notehg log --patchmay generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear infiles:. 💀
Note For performance reasons,hg log FILEmay omit duplicate changes made on branches and will not show removals or mode changes. To see all such changes, use the--removedswitch.
Note The history resulting from-L/--line-rangeoptions depends on diff options; for instance if white-spaces are ignored, respective changes with only white-spaces in specified line range will not be listed.
Some examples:
- changesets with full descriptions and file lists:
hg log -v- changesets ancestral to the working directory:
hg log -f- last 10 commits on the current branch:
hg log -l 10 -b .- changesets showing all modifications of a file, including removals:
hg log --removed file.c- all changesets that touch a directory, with diffs, excluding merges:
hg log -Mp lib/- all revision numbers that match a keyword:
hg log -k bug --template "{rev}\n"- the full hash identifier of the working directory parent:
hg log -r . --template "{node}\n"- list available log templates:
hg log -T list- check if a given changeset is included in a tagged release:
hg log -r "a21ccf and ancestor(1.9)"- find all changesets by some user in a date range:
hg log -k alice -d "may 2008 to jul 2008"- summary of all changesets after the last tag:
hg log -r "last(tagged())::" --template "{desc|firstline}\n"- changesets touching lines 13 to 23 for
file.c:
hg log -L file.c,13:23- changesets touching lines 13 to 23 for
file.cand lines 2 to 6 ofmain.cwith patch:
hg log -L file.c,13:23 -L main.c,2:6 -pSee hg help dates for a list of formats valid for -d/--date. 🗓️
See hg help revisions for more about specifying and ordering revisions.
See hg help templates for more about pre-packaged styles and specifying custom templates. The default template used by the log command can be customized via the command-templates.log configuration setting.
Returns 0 on success.
Options:
-f,--follow— follow changeset history, or file history across copies and renames 👀--follow-first— only follow the first parent of merge changesets (DEPRECATED)-d,--date <DATE>— show revisions matching date spec-C,--copies— show copied files-k,--keyword <TEXT[+]>— do case-insensitive search for a given text 🔍-r,--rev <REV[+]>— revisions to select or follow from-L,--line-range <FILE,RANGE[+]>— follow line range of specified file (EXPERIMENTAL)--removed— include revisions where files were removed-m,--only-merges— show only merges (DEPRECATED) (use-r "merge()"instead)-u,--user <USER[+]>— revisions committed by user--only-branch <BRANCH[+]>— show only changesets within the given named branch (DEPRECATED)-b,--branch <BRANCH[+]>— show changesets within the given named branch-B,--bookmark <BOOKMARK[+]>— show changesets within the given bookmark-P,--prune <REV[+]>— do not display revision or any of its ancestors-p,--patch— show patch-g,--git— use git extended diff format-l,--limit <NUM>— limit number of changes displayed-M,--no-merges— do not show merges--stat— output diffstat-style summary of changes-G,--graph— show the revision DAG 🌳--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times
aliases: history
parents 🍼
show the parents of the working directory or revision (DEPRECATED):
hg parents [-r REV] [FILE]Print the working directory's parent revisions. If a revision is given via -r/--rev, the parent of that revision will be printed. If a file argument is given, the revision in which the file was last changed (before the working directory revision or the argument to --rev if given) is printed. like, it's literally telling you who your commit's parents are 💖
This command is equivalent to:
hg log -r "p1()+p2()" or
hg log -r "p1(REV)+p2(REV)" or
hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"See hg summary and hg help revsets for related information.
Returns 0 on success.
Options:
-r,--rev <REV>— show parents of the specified revision--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template
tip 👑
show the tip revision (DEPRECATED):
hg tip [-p] [-g]The tip revision (usually just called the tip) is the changeset most recently added to the repository (and therefore the most recently changed head). main character energy, honestly ✨
If you have just made a commit, that commit will be the tip. If you have just pulled changes from another repository, the tip of that repository becomes the current tip. The "tip" tag is special and cannot be renamed or assigned to a different changeset.
This command is deprecated, please use hg heads instead. 💀
Returns 0 on success.
Options:
-p,--patch— show patch-g,--git— use git extended diff format--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template
🌸 Working directory management 🌸
add ➕
add the specified files on the next commit:
hg add [OPTION]... [FILE]...Schedule files to be version controlled and added to the repository. 🫶
The files will be added to the repository at the next commit. To undo an add before that, see hg forget.
If no names are given, add all files to the repository (except files matching .hgignore).
Examples:
- New (unknown) files are added automatically by
hg add:
$ ls
foo.c
$ hg status
? foo.c
$ hg add
adding foo.c
$ hg status
A foo.c- Specific files to be added can be specified:
$ ls
bar.c foo.c
$ hg status
? bar.c
? foo.c
$ hg add bar.c
$ hg status
A bar.c
? foo.cReturns 0 if all files are successfully added.
Options:
-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-S,--subrepos— recurse into subrepositories-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times
addremove 🧹
add all new files, delete all missing files:
hg addremove [OPTION]... [FILE]...Add all new files and remove all missing files from the repository.
Unless names are given, new files are ignored if they match any of the patterns in .hgignore. As with add, these changes take effect at the next commit.
Use the -s/--similarity option to detect renamed files. This option takes a percentage between 0 (disabled) and 100 (files must be identical) as its parameter. With a parameter greater than 0, this compares every removed file with every added file and records those similar enough as renames. Detecting renamed files this way can be expensive. After using this option, hg status -C can be used to check which files were identified as moved or renamed. If not specified, -s/--similarity defaults to 100 and only renames of identical files are detected. ngl that can get slow, bestie, be warned 💅
Examples:
- A number of files (
bar.candfoo.c) are new, whilefoobar.chas been removed (without usinghg remove) from the repository:
$ ls
bar.c foo.c
$ hg status
! foobar.c
? bar.c
? foo.c
$ hg addremove
adding bar.c
adding foo.c
removing foobar.c
$ hg status
A bar.c
A foo.c
R foobar.c- A file
foobar.cwas moved tofoo.cwithout usinghg rename. Afterwards, it was edited slightly:
$ ls
foo.c
$ hg status
! foobar.c
? foo.c
$ hg addremove --similarity 90
removing foobar.c
adding foo.c
recording removal of foobar.c as rename to foo.c (94% similar)
$ hg status -C
A foo.c
foobar.c
R foobar.cReturns 0 if all files are successfully added.
Options:
-s,--similarity <SIMILARITY>— guess renamed files by similarity (0<=s<=100)-S,--subrepos— recurse into subrepositories-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times
files 📁
list tracked files:
hg files [OPTION]... [FILE]...Print files under Mercurial control in the working directory or specified revision for given files (excluding removed files). Files can be specified as filenames or filesets.
If no files are given to match, this command prints the names of all files under Mercurial control.
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
flags— String. Character denoting file's symlink and executable bits.path— String. Repository-absolute path of the file.size— Integer. Size of the file in bytes.
Examples:
- list all files under the current directory:
hg files .
- shows sizes and flags for current revision:
hg files -vr .
- list all files named
README:
hg files -I "**/README"
- list all binary files:
hg files "set:binary()"
- find files containing a regular expression:
hg files "set:grep('bob')"
- search tracked file contents with
xargsandgrep:
hg files -0 | xargs -0 grep foo
See hg help patterns and hg help filesets for more information on specifying file patterns.
Returns 0 if a match is found, 1 otherwise.
Options:
-r,--rev <REV>— search the repository as it is inREV-0,--print0— end filenames with NUL, for use withxargs-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-T,--template <TEMPLATE>— display with template-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times
forget 🫥
forget the specified files on the next commit:
hg forget [OPTION]... FILE...Mark the specified files so they will no longer be tracked after the next commit.
This only removes files from the current branch, not from the entire project history, and it does not delete them from the working directory. it's giving "we don't talk anymore" but the file is literally still right there 😭
To delete the file from the working directory, see hg remove.
To undo a forget before the next commit, see hg add.
Examples:
- forget newly-added binary files:
hg forget "set:added() and binary()"
- forget files that would be excluded by
.hgignore:
hg forget "set:hgignore()"
Returns 0 on success.
Options:
-i,--interactive— use interactive mode-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times
locate 📍
locate files matching specific patterns (DEPRECATED):
hg locate [OPTION]... [PATTERN]...Print files under Mercurial control in the working directory whose names match the given patterns.
By default, this command searches all directories in the working directory. To search just the current directory and its subdirectories, use "--include .".
If no patterns are given to match, this command prints the names of all files under Mercurial control in the working directory.
If you wanna pipe this command's output into xargs, bestie, use -0 on both this command and xargs. That's the whole trick to stop xargs from seeing a single filename with whitespace in it and being like "oh, three filenames??" 🙈
For a way more versatile command, go peep hg help files.
Returns 0 if a match is found, 1 otherwise. ✨
Options:
-r,--rev <REV>— search the repository as it is in REV-0,--print0— end filenames with NUL, for use with xargs-f,--fullpath— print complete paths from the filesystem root-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times 💅
🧹 purge
removes files not tracked by Mercurial:
hg purge [OPTION]... [DIR]...Okay so this one deletes files that Mercurial doesn't know about. So useful for testing local and uncommitted changes in an otherwise-clean source tree. 🫶
Which means, by default, purge will delete:
- Unknown files: files marked with
"?"byhg status - Empty directories: fr, Mercurial just ignores directories unless they contain files under source control management
But it will leave these untouched:
- Modified and unmodified tracked files
- Ignored files (unless
-ior--allis specified) - New files added to the repository (with
hg add)
The --files and --dirs options can direct purge to delete only files, only directories, or both. If neither option is given, both get deleted. 💅
If directories are given on the command line, only files in those directories are considered.
⚠️ Be careful with purge, bestie, because you could irreversibly delete some files you forgot to add to the repository. 😭 If you only wanna print the list of files this program would delete, use --print.
Options:
-a,--abort-on-err— abort if an error occurs--all— purge ignored files too-i,--ignored— purge only ignored files--dirs— purge empty directories--files— purge files-p,--print— print filenames instead of deleting them-0,--print0— end filenames with NUL, for use with xargs (implies-p/--print)--confirm— ask before permanently deleting files-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times ✨
aliases: clean
🗑️ remove
remove the specified files on the next commit:
hg remove [OPTION]... FILE...Schedule the indicated files for removal from the current branch. 📋
This command schedules the files to be removed at the next commit. To undo a remove before that, see hg revert. To undo added files, see hg forget.
-A/--after can be used to remove only files that have already been deleted, -f/--force can be used to force deletion, and -Af can be used to remove files from the next revision without deleting them from the working directory. 👑
The following table details the behavior of remove for different file states (columns) and option combinations (rows). The file states are Added [A], Clean [C], Modified [M] and Missing [!] (as reported by hg status). The actions are Warn, Remove (from branch) and Delete (from disk):
┌───────────┬───┬────┬────┬───┐
│ opt/state │ A │ C │ M │ ! │
├───────────┼───┼────┼────┼───┤
│ none │ W │ RD │ W │ R │
├───────────┼───┼────┼────┼───┤
│ -f │ R │ RD │ RD │ R │
├───────────┼───┼────┼────┼───┤
│ -A │ W │ W │ W │ R │
├───────────┼───┼────┼────┼───┤
│ -Af │ R │ R │ R │ R │
└───────────┴───┴────┴────┴───┘📌 Notehg removenever deletes files in Added[A]state from the working directory — not even if--forceis specified. That's just how it is, bestie. 💅
Returns 0 on success, 1 if any warnings encountered.
Options:
-A,--after— record delete for missing files-f,--force— forget added files, delete modified files-S,--subrepos— recurse into subrepositories-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times 🌸
aliases: rm
🔁 rename
rename files; equivalent of copy + remove:
hg rename [OPTION]... SOURCE... DESTMark dest as copies of sources; mark sources for deletion. If dest is a directory, copies are put in that directory. If dest is a file, there can only be one source. 😌
By default, this command copies the contents of files as they exist in the working directory. If invoked with -A/--after, the operation is recorded, but no copying is performed.
To undo marking a destination file as renamed, use --forget. With that option, all given (positional) arguments are unmarked as renames. The destination file(s) will be left in place (still tracked). The source file(s) will not be restored. Note that hg rename --forget behaves the same way as hg copy --forget. 🫶
This command takes effect with the next commit by default.
Returns 0 on success, 1 if errors are encountered.
Options:
--forget— unmark a destination file as renamed-A,--after— record a rename that has already occurred--at-rev <REV>— (un)mark renames in the given revision (EXPERIMENTAL)-f,--force— forcibly move over an existing managed file-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-n,--dry-run— do not perform actions, just print output
[+] marked option can be specified multiple times ✨
aliases:movemv
🧩 resolve
redo merges or set/view the merge status of files:
hg resolve [OPTION]... [FILE]...Merges with unresolved conflicts are often the result of non-interactive merging using the internal:merge configuration setting, or a command-line merge tool like diff3. The resolve command is used to manage the files involved in a merge, after hg merge has been run, and before hg commit is run (i.e. the working directory must have two parents). See hg help merge-tools for info on configuring merge tools. 🛠️
The resolve command can be used in these ways:
hg resolve [--re-merge] [--tool TOOL] FILE...: attempt to re-merge the specified files, discarding any previous merge attempts. Re-merging is not performed for files already marked as resolved. Use--all/-ato select all unresolved files.--toolcan be used to specify the merge tool used for the given files. It overrides theHGMERGEenvironment variable and your configuration files. Previous file contents are saved with a.origsuffix. 💾hg resolve -m [FILE]: mark a file as having been resolved (e.g. after having manually fixed-up the files). The default is to mark all unresolved files.hg resolve -u [FILE]...: mark a file as unresolved. The default is to mark all resolved files.hg resolve -l: list files which had or still have conflicts. In the printed list,U= unresolved andR= resolved. You can useset:unresolved()orset:resolved()to filter the list. Seehg help filesetsfor details.
📌 Note Mercurial will not let you commit files with unresolved merge conflicts. You must use hg resolve -m ... before you can commit after a conflicting merge. No skipping, bestie. 😭
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
mergestatus— String. Character denoting merge conflicts,UorR.path— String. Repository-absolute path of the file.
Returns 0 on success, 1 if any files fail a resolve attempt.
Options:
-a,--all— select all unresolved files-l,--list— list state of files needing merge-m,--mark— mark files as resolved-u,--unmark— mark files as unresolved-n,--no-status— hide status prefix--re-merge— re-merge files-t,--tool <TOOL>— specify merge tool-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times 💖
⏪ revert
restore files to their checkout state:
hg revert [OPTION]... [-r REV] [NAME]...📌 Note To check out earlier revisions, you should usehg update REV. To cancel an uncommitted merge (and lose your changes 💀), usehg merge --abort.
With no revision specified, revert the specified files or directories to the contents they had in the parent of the working directory. This restores the contents of files to an unmodified state and unschedules adds, removes, copies, and renames. If the working directory has two parents, you must explicitly specify a revision. 🙈
Using the -r/--rev or -d/--date options, revert the given files or directories to their states as of a specific revision. Because revert does not change the working directory parents, this will cause these files to appear modified. This can be helpful to "back out" some or all of an earlier change. See hg backout for a related method. 👑
Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup. It is possible to store the backup files in a custom directory relative to the root of the repository by setting the ui.origbackuppath configuration option. ✨
See hg help dates for a list of formats valid for -d/--date.
See hg help backout for a way to reverse the effect of an earlier changeset.
Returns 0 on success.
Options:
-a,--all— revert all changes when no arguments given-d,--date <DATE>— tipmost revision matching date-r,--revREV — rewind to the revision you name, bestie, like nothing ever happened ✨-C,--no-backup— don't save backup copies of your files (living dangerously, I see 💅)-i,--interactive— pick the changes yourself, one by one, very hands-on 👑-I,--includePATTERN[+] — only include names matching these patterns 🎀-X,--excludePATTERN[+] — skip names matching these patterns 🚫-n,--dry-run— don't actually do anything, just print what would happen (the safest vibe fr fr)
[+] marked option can be specified multiple times — stack 'em up, she's flexible 💖🌳 root
print the root (top) of the current working directory:
hg rootPrint the root directory of the current repository. That's it, that's the whole job, and she does it flawlessly 💅
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
hgpath— String. Path to the.hgdirectory.storepath— String. Path to the directory holding versioned data.
Returns 0 on success. 🫶
Options:
--share-source— print the share source root instead-T,--templateTEMPLATE — display with template
🛍️ shelve
save and set aside changes from the working directory:
hg shelve [OPTION]... [FILE]...Okay so shelving takes files that hg status reports as not clean, saves the modifications to a bundle (a shelved change), and reverts the files so that their state in the working directory becomes clean. It's giving "put that in the closet for later" 🧹✨
To restore these changes to the working directory, use hg unshelve; this will work even if you switch to a different commit. Iconic behaviour, honestly.
When no files are specified, hg shelve saves all not-clean files. If specific files or directories are named, only changes to those files are shelved. 🎯
In bare shelve (when no files are specified, without interactive, include and exclude option), shelving remembers information if the working directory was on newly created branch — in other words, working directory was on a different branch than its first parent. In this situation unshelving restores branch information to the working directory. Lowkey magical 🌈
Each shelved change has a name that makes it easier to find later. The name of a shelved change defaults to being based on the active bookmark, or if there is no active bookmark, the current named branch. To specify a different name, use --name. 🏷️
To see a list of existing shelved changes, use the --list option. For each shelved change, this will print its name, age, and description; use --patch or --stat for more details. 👀
To delete specific shelved changes, use --delete. To delete all shelved changes, use --cleanup.
Options:
-A,--addremove— mark new/missing files as added/removed before shelving-u,--unknown— store unknown files in the shelve--cleanup— delete all shelved changes (bye forever bestie 💀)--dateDATE — shelve with the specified commit date-d,--delete— delete the named shelved change(s)-e,--edit— invoke editor on commit messages-k,--keep— shelve, but keep changes in the working directory (have it both ways, queen 👑)-l,--list— list current shelves-m,--messageTEXT — use text as shelve message-n,--nameNAME — use the given name for the shelved commit-p,--patch— output patches for changes (provide the names of the shelved changes as positional arguments)-i,--interactive— interactive mode--stat— output diffstat-style summary of changes (provide the names of the shelved changes as positional arguments)-I,--includePATTERN[+] — include names matching the given patterns-X,--excludePATTERN[+] — exclude names matching the given patterns
[+] marked option can be specified multiple times 💖📋 status
show changed files in the working directory:
hg status [OPTION]... [FILE]...Show status of files in the repository. If names are given, only files that match are shown. Files that are clean or ignored or the source of a copy/move operation are not listed unless -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. Unless options described with "show only ..." are given, the options -mardu are used. 🌸
Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored.
Note —hg statusmay appear to disagree withdiffif permissions have changed or a merge has occurred. The standarddiffformat does not report permission changes anddiffonly reports changes relative to one merge parent. Don't come for her, it's not her fault 😭
If one revision is given, it is used as the base revision. If two revisions are given, the differences between them are shown. The --change option can also be used as a shortcut to list the changed files of a revision from its first parent. 🦋
The codes used to show the status of files are:
M = modified
A = added
R = removed
C = clean
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
= origin of the previous file (with --copies)The -t/--terse option abbreviates the output by showing only the directory name if all the files in it share the same status. The option takes an argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean.
It abbreviates only those statuses which are passed. Note that clean and ignored files are not displayed with '--terse ic' unless the -c/--clean and -i/--ignored options are also used. 🙈
The -v/--verbose option shows information when the repository is in an unfinished merge, shelve, rebase state etc. You can have this behavior turned on by default by enabling the commands.status.verbose option.
You can skip displaying some of these states by setting commands.status.skipstates to one or more of: 'bisect', 'graft', 'histedit', 'merge', 'rebase', or 'unshelve'. 🧚
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
path— String. Repository-absolute path of the file.source— String. Repository-absolute path of the file originated from. Available if--copiesis specified.status— String. Character denoting file's status.
Examples:
- show changes in the working directory relative to a changeset:
hg status --rev 9353- show changes in the working directory relative to the current directory (see
hg help patternsfor more information):
hg status re:- show all changes including copies in an existing changeset:
hg status --copies --change 9353- get a
NULseparated list of added files, suitable forxargs:
hg status -an0- show more information about the repository status, abbreviating added, removed, modified, deleted, and untracked paths:
hg status -v -t marduReturns 0 on success. ✨
Options:
-A,--all— show status of all files-m,--modified— show only modified files-a,--added— show only added files-r,--removed— show only removed files-d,--deleted— show only missing files-c,--clean— show only files without changes-u,--unknown— show only unknown (not tracked) files-i,--ignored— show only ignored files-n,--no-status— hide status prefix-t,--terseVALUE — show the terse output (EXPERIMENTAL) (default: nothing)-C,--copies— show source of copied files (DEFAULT:ui.statuscopies)-0,--print0— end filenames withNUL, for use withxargs--revREV[+] — show difference from revision--changeREV — list the changed files of a revision-I,--includePATTERN[+] — include names matching the given patterns-X,--excludePATTERN[+] — exclude names matching the given patterns-S,--subrepos— recurse into subrepositories-T,--templateTEMPLATE — display with template
[+] marked option can be specified multiple times 💅aliases: st
📝 summary
summarize working directory state:
hg summary [--remote]This generates a brief summary of the working directory state, including parents, branch, commit status, phase and available updates. It's the "so what's the vibe rn" command 🫶
With the --remote option, this will check the default paths for incoming and outgoing changes. This can be time-consuming. ⏳
Returns 0 on success.
Options:
--remote— check for push and pull
aliases: sum
🔓 unshelve
restore a shelved change to the working directory:
hg unshelve [OPTION]... [[-n] SHELVED]This command accepts an optional name of a shelved change to restore. If none is given, the most recent shelved change is used. 🎀
If a shelved change is applied successfully, the bundle that contains the shelved changes is moved to a backup location (.hg/shelve-backup).
Since you can restore a shelved change on top of an arbitrary commit, it is possible that unshelving will result in a conflict between your changes and the commits you are unshelving onto. If this occurs, you must resolve the conflict, then use --continue to complete the unshelve operation. (The bundle will not be moved until you successfully complete the unshelve.) 😤
(Alternatively, you can use --abort to abandon an unshelve that causes a conflict. This reverts the unshelved changes, and leaves the bundle in place.)
If bare shelved change (without interactive, include and exclude option) was done on newly created branch it would restore branch information to the working directory. 🌈
After a successful unshelve, the shelved changes are stored in a backup directory. Only the N most recent backups are kept. N defaults to 10 but can be overridden using the shelve.maxbackups configuration option.
Timestamp in seconds is used to decide order of backups. More than maxbackups backups are kept, if same timestamp prevents from deciding exact order of them, for safety. 🛡️
Selected changes can be unshelved with --interactive flag. The working directory is updated with the selected changes, and only the unselected changes remain shelved.
Note — The whole shelve is applied to working directory first before running interactively. So, this will bring up all the conflicts between working directory and the shelve, irrespective of which changes will be unshelved. 😭
Options:
-a,--abort— abort an incomplete unshelve operation-c,--continue— continue an incomplete unshelve operation-i,--interactive— use interactive mode (EXPERIMENTAL)-k,--keep— keep shelve after unshelving-n,--nameNAME — restore shelved change with given name-t,--tool <VALUE>— tell hg which merge tool to use, bestie, you pick 💅--date <DATE>— sets the date for temporary commits. DEPRECATED, so like… don't 🫠
update 🦋
okay so this one refreshes your working directory (or hops you over to a whole other revision, no big deal):
hg update [-C|-c|-m] [-d DATE] [[-r] REV]It updates the repo's working directory to whatever changeset you name. Name none? Then it goes to the tip of the current named branch and moves the active bookmark along with it (peep hg help bookmarks for that whole situation).
Update sets the working directory's parent revision to the changeset you specified (see hg help parents).
If the changeset is not a descendant or ancestor of the working directory's parent and you've got uncommitted changes lying around? The update just gets aborted. Rude but fair. With the -c/--check option, hg checks the working directory for uncommitted changes; if there are none, it updates you to the specified changeset. Clean girl behaviour ✨
The -C/--clean, -c/--check, and -m/--merge options control what goes down when your working directory has uncommitted changes. And listen: at most one of them can be specified. Pick a lane 💅
- No option specified, and the requested changeset is an ancestor or descendant of the working directory's parent? Your uncommitted changes get merged into the requested changeset and the merged result is left uncommitted. But if the requested changeset is not an ancestor or descendant (aka it's on another branch), the update is aborted and your uncommitted changes are preserved. no cap.
- With the
-m/--mergeoption, the update is allowed even if the requested changeset is not an ancestor or descendant of the working directory's parent. we love a permissive queen 👑 - With the
-c/--checkoption, the update is aborted and the uncommitted changes are preserved. protective. i respect it. - With the
-C/--cleanoption, uncommitted changes are discarded and the working directory is updated to the requested changeset. this one eats your work fr fr 😭
To cancel an uncommitted merge (and lose your changes), use hg merge --abort. yes bestie it really does just say "lose your changes". i'm not being dramatic, the manpage is.
Use null as the changeset to remove the working directory entirely (like hg clone -U does). bye bye working dir 🫶
If you only wanna revert one file to an older revision, use hg revert [-r REV] NAME instead. don't nuke the whole thing for one little file, that's giving main character energy in the worst way.
See hg help dates for a list of formats valid for -d/--date.
Returns 0 on success, 1 if there are unresolved files. noted. 📝
Options (update)
-C,--clean— discard uncommitted changes (no backup). no backup. NO BACKUP. 😭-c,--check— require clean working directory-m,--merge— merge uncommitted changes-d,--date <DATE>— tipmost revision matching date-r,--rev <REV>— revision-t,--tool <TOOL>— specify merge tool
aliases: up checkout co 🌈
Change import/export 🎀
archive
create an unversioned archive of a repository revision. cute lil snapshot, no hg baggage:
hg archive [OPTION]... DESTBy default, the revision used is the parent of the working directory; use -r/--rev to specify a different revision.
The archive type is auto-detected based on file extension (to override, use -t/--type). she's smart like that 💅
Examples:
- create a zip file containing the 1.0 release:
hg archive -r 1.0 project-1.0.zip- create a tarball excluding
.hgfiles:
hg archive project.tar.gz -X ".hg*"Valid types are:
files : a directory full of files (default) — just a folder, iconic, no notes
tar : tar archive, uncompressed
tbz2 : tar archive, compressed using bzip2
tgz : tar archive, compressed using gzip
txz : tar archive, compressed using lzma (only in Python 3) 🐍
uzip : zip archive, uncompressed
zip : zip archive, compressed using deflate
The exact name of the destination archive or directory is given using a format string; see hg help export for details.
Each member added to an archive file has a directory prefix prepended. Use -p/--prefix to specify a format string for the prefix. The default is the basename of the archive, with suffixes removed. so project-1.0.zip becomes project-1.0 as the prefix. cute.
Returns 0 on success. 🎉
Options (archive)
--no-decode— do not pass files through decoders-p,--prefix <PREFIX>— directory prefix for files in archive-r,--rev <REV>— revision to distribute-t,--type <TYPE>— type of distribution to create-S,--subrepos— recurse into subrepositories-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times 🔁
bundle
create a bundle file. it's like a lil suitcase of changesets you can carry around 🧳:
hg bundle [-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...Generate a bundle file containing data to be transferred to another repository.
To create a bundle containing all changesets, use -a/--all (or --base null). Otherwise, hg assumes the destination will have all the nodes you specify with --base parameters. Otherwise, hg will assume the repository has all the nodes in destination, or default-push/default if no destination is specified, where destination is the repositories you provide through the DEST option. yeah it's a lot of "otherwise", she's thorough, we love that for her 🫶
You can change the bundle format with the -t/--type option. See hg help bundlespec for documentation on this format. By default, the most appropriate format is used and compression defaults to bzip2.
The bundle file can then be transferred using conventional means and applied to another repository with the unbundle or pull command. This is useful when direct push and pull are not available or when exporting an entire repository is undesirable.
Applying bundles preserves all changeset contents including permissions, copy/rename information, and revision history. nothing gets lost in the mail bestie 💌
Returns 0 on success, 1 if no changes found.
Options (bundle)
--exact— compute the base from the revision specified-f,--force— run even when the destination is unrelated-r,--rev <REV[+]>— a changeset intended to be added to the destination-b,--branch <BRANCH[+]>— a specific branch you would like to bundle--base <REV[+]>— a base changeset assumed to be available at the destination-a,--all— bundle all changesets in the repository-t,--type <TYPE>— bundle compression type to use (default:bzip2)-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times 🔁
export
dump the header and diffs for one or more changesets. it's giving "show me the receipts" 🧾:
hg export [OPTION]... [-o OUTFILESPEC] [-r] [REV]...Print the changeset header and diffs for one or more revisions. If no revision is given, the parent of the working directory is used.
The info shown in the changeset header is: author, date, branch name (if non-default), changeset hash, parent(s) and commit comment.
Note — hg export may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. so like. heads up bestie 🙈
Output may be to a file, in which case the name of the file is given using a template string. See hg help templates. In addition to the common template keywords, the following formatting rules are supported:
%% : literal "%" character
%H : changeset hash (40 hexadecimal digits)
%N : number of patches being generated
%R : changeset revision number
%b : basename of the exporting repository
%h : short-form changeset hash (12 hexadecimal digits)
%m : first line of the commit message (only alphanumeric characters)
%n : zero-padded sequence number, starting at 1
%r : zero-padded changeset revision number
\ : literal "\" character
Without the -a/--text option, export will avoid generating diffs of files it detects as binary. With -a, export will generate a diff anyway, probably with undesirable results. she said "probably with undesirable results" and she meant it 😭
With -B/--bookmark changesets reachable by the given bookmark are selected.
Use the -g/--git option to generate diffs in the git extended diff format. See hg help diffs for more information.
With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge.
Template:
The following keywords are supported in addition to the common template keywords and functions. See also hg help templates.
diff : String. Diff content.
parents : List of strings. Parent nodes of the changeset.
Examples:
- use export and import to transplant a bugfix to the current branch:
hg export -r 9353 | hg import -- export all the changesets between two revisions to a file with rename information:
hg export --git -r 123:150 > changes.txt- split outgoing changes into a series of patches with descriptive names:
hg export -r "outgoing()" -o "%n-%m.patch"Returns 0 on success. ✨
Options (export)
-B,--bookmark <BOOKMARK>— export changes only reachable by given bookmark-o,--output <FORMAT>— print output to file with formatted name--switch-parent— diff against the second parent-r,--rev <REV[+]>— revisions to export-a,--text— treat all files as text-g,--git— use git extended diff format (DEFAULT: diff.git)--binary— generate binary diffs in git mode (default)--nodates— omit dates from diff headers-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times 🔁
import
import an ordered set of patches. the reverse girlies, rise 🌸:
hg import [OPTION]... PATCH...Import a list of patches and commit them individually (unless --no-commit is specified).
To read a patch from standard input (stdin), use "-" as the patch name. If a URL is specified, the patch will be downloaded from there. she'll go get it herself 💅
Import first applies changes to the working directory (unless --bypass is specified), import will abort if there are outstanding changes. clean your room first bestie 🧹
Use --bypass to apply and commit patches directly to the repository, without affecting the working directory. Without --exact, patches will be applied on top of the working directory parent revision.
You can import a patch straight from a mail message. Even patches as attachments work (to use the body part, it must have type text/plain or text/x-patch). From and Subject headers of email message are used as default committer and commit message. All text/plain body parts before first diff are added to the commit message. emails?? in my version control?? it's more likely than you think 💌
If the imported patch was generated by hg export, user and description from patch override values from message headers and body. Values given on command line with -m/--message and -u/--user override these. priority order, no cap.
If you hit it with --exact, import gets so particular: it sets the working directory to the parent of each patch before applying it, and it will abort if the changeset that comes out has a different ID than the one recorded in the patch. It's basically a bodyguard against all the ways portable patch formats and mail systems can fail to transfer Mercurial data or metadata. (Want the lossless route? See hg bundle. 🎀)
Then there's --partial, which guarantees a changeset gets created from the patch even if some hunks refuse to apply. Those stubborn hunks get written out to a <target-file>.rej file — classic — and you can resolve the conflicts by hand before running hg commit --amend to update the changeset that was created. This flag exists so people can import patches that only partially apply without losing the associated metadata (author, date, description, ...). 💅
Note — When no hunks apply cleanly at all, hg import --partial will create an empty changeset, importing only the patch metadata. Yeah. Empty. Bestie, it's giving "technically a commit." 🙈
With -s/--similarity, hg will attempt to discover renames and copies in the patch, the same way hg addremove does. 👑
You can also bring in external patch programs to do the patching by setting the ui.patch configuration option. And for the default internal tool, the fuzz can be configured via patch.fuzz. See hg help config for more info about configuration files and how to use these options.
For the list of formats valid for -d/--date, see hg help dates. 🦋
Examples:
- import a traditional patch from a website and detect renames:
hg import -s 80 http://example.com/bugfix.patch- import a changeset from an hgweb server:
hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa- import all the patches in an Unix-style mbox:
hg import incoming-patches.mbox- import patches from stdin:
hg import -- attempt to exactly restore an exported changeset (not always possible):
hg import --exact proposed-fix.patch- use an external tool to apply a patch which is too fuzzy for the default internal tool.
hg import --config ui.patch="patch --merge" fuzzy.patch- change the default fuzzing from 2 to a less strict 7
hg import --config ui.fuzz=7 fuzz.patchReturns 0 on success, 1 on partial success (see --partial).
Options:
-p,--strip <NUM>— directory strip option for patch. Same meaning as the corresponding patch option (default:1)-b,--base <PATH>— base path (DEPRECATED)--secret— use the secret phase for committing-e,--edit— invoke editor on commit messages-f,--force— skip check for outstanding uncommitted changes (DEPRECATED)--no-commit— don't commit, just update the working directory--bypass— apply patch without touching the working directory--partial— commit even if some hunks fail--exact— abort if patch would apply lossily--prefix <DIR>— apply patch to subdirectory--import-branch— use any branch information in patch (implied by--exact)-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer-s,--similarity <SIMILARITY>— guess renamed files by similarity (0<=s<=100)
aliases: patch
🧺 unbundle 🧺
apply one or more bundle files:
hg unbundle [-u] FILE...Apply one or more bundle files generated by hg bundle. It's the un-squish. 🌈
Returns 0 on success, 1 if an update has unresolved files.
Options:
-u,--update— update to new branch head if changesets were unbundled
🛠️ Repository maintenance 🛠️
admin::narrow-client
Narrow-related client administration utils. (EXPERIMENTAL):
hg admin::narrow-clientThis command is experimental and is subject to change. ⚠️
Options:
--store-fingerprint— get the fingerprint for this repo's store narrowspec
admin::narrow-server
Narrow-related server administration utils. (EXPERIMENTAL):
hg admin::narrow-serverThis command is experimental and is subject to change. ⚠️
Options:
--shape-fingerprints— list the fingerprint for each shape--shape-patterns <SHAPE-PATTERNS>— list the path patterns for the given shape--shape-narrow-patterns <SHAPE-NARROW-PATTERNS>— list the legacy narrow-style patterns for the given shape--shape-files <VALUE>— list the files covered by the given shape--shape-files-hidden <VALUE>— list this shape's files that are not in the working copy-T,--template <TEMPLATE>— display with template
admin::verify
verify the integrity of the repository:
hg admin::verifyAn alternative UI to hg verify with a lot more control over the verification process and better error reporting. Glow up. ✨
Options:
-c,--check <CHECK[+]>— add a check-o,--option <OPTION[+]>— pass an option to a check
[+] marked option can be specified multiple times
manifest
output the current or given revision of the project manifest:
hg manifest [-r REV]Prints a list of version controlled files for the given revision. If no revision is given, the first parent of the working directory is used, or the null revision if no revision is checked out. 📋
With -v, it prints file permissions, symlink and executable bits. With --debug, it prints file revision hashes.
If the option --all is specified, the list of all files from all revisions is printed. Yes, all of them — deleted and renamed files included. It's giving "the whole receipts folder." 💀
Returns 0 on success.
Options:
-r,--rev <REV>— revision to display--all— list files from all revisions-T,--template <TEMPLATE>— display with template
recover
roll back an interrupted transaction:
hg recoverRecover from an interrupted commit or pull. 🩹
This command tries to fix the repository status after an interrupted operation. It should only be necessary when Mercurial suggests it. Like, it's not a vibe, it's first aid.
Returns 0 if successful, 1 if nothing to recover or verify fails.
Options:
--verify— runhg verifyafter successful recover
rollback
roll back the last transaction (DANGEROUS) (DEPRECATED):
hg rollbackPlease use hg commit --amend instead of rollback to correct mistakes in the last commit. fr fr. 🙏
This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time. This command does not alter the working directory.
Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository.
For example, the following commands are transactional, and their effects can be rolled back:
commitimportpullpush(with this repository as the destination)unbundle
To avoid permanent data loss, rollback will refuse to rollback a commit transaction if it isn't checked out. Use --force to override this protection. 😭
The rollback command can be entirely disabled by setting the ui.rollback configuration setting to false. If you're here because you want to use rollback and it's disabled, you can re-enable the command by setting ui.rollback to true.
This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction back locally is ineffective (someone else may already have pulled the changes). Furthermore, a race is possible with readers of the repository; for example an in-progress pull from the repository may fail if a rollback is performed. 🚨
Returns 0 on success, 1 if no rollback data is available.
Options:
-n,--dry-run— do not perform actions, just print output-f,--force— ignore safety measures
verify
verify the integrity of the repository:
hg verifyVerify the integrity of the current repository. 🔍
This will perform an extensive check of the repository's integrity, validating the hashes and checksums of each entry in the changelog, manifest, and tracked files, as well as the integrity of their crosslinks and indices. Thorough queen behavior.
Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more information about recovery from corruption of the repository.
For an alternative UI with a lot more control over the verification process and better error reporting, try hg help admin::verify. 🎀
Returns 0 on success, 1 if errors are encountered.
Options:
--full— perform more checks (EXPERIMENTAL)
💖 Help 💖
config
show combined config settings from all hgrc files:
hg config [-u] [NAME]...With no arguments, it prints names and values of all config items.
With one argument of the form section.name, it prints just the value of that config item.
With multiple arguments, it prints names and values of all config items with matching section names or section.names.
With --edit, it starts an editor on the user-level config file. With --global, edit the system-wide config file. With --local, edit the repository-level config file. 📝
With --source, the source (filename and line number) is printed for each config item.
See hg help config for more information about config files.
The --non-shared flag is used to edit .hg/hgrc-not-shared config file. This file is not shared across shares when in share-safe mode.
Template:
The following keywords are supported. See also hg help templates.
name— String. Config name.source— String. Filename and line number where the item is defined.value— String. Config value.
The --shared flag can be used to edit the config file of shared source repository. It only works when you have shared using the experimental share safe feature.
Returns 0 on success, 1 if NAME does not exist.
Options:
-u,--untrusted— show untrusted configuration options--exp-all-known— show all known config option (EXPERIMENTAL)-e,--edit— edit user config-l,--local— edit repository config--source— show source of configuration value--shared— edit shared source repository config--non-shared— edit non shared config-g,--global— edit global config-T,--template <TEMPLATE>— display with template
aliases: showconfig debugconfig
help
show help for a given topic or a help overview:
hg help [-eck] [-s PLATFORM] [TOPIC]With no arguments, it prints a list of commands with short help messages.
okay so give it a topic, an extension, or a command name, and it prints the help for that thing. That's the whole vibe.
Returns 0 if successful. 💖
Options, bestie:
-e,--extension— show only help for extensions-c,--command— show only help for commands-k,--keyword— show topics matching the keyword-s,--system <PLATFORM[+]>— show help for specific platform(s)
✨ any option marked with [+] can be specified multiple times, slay
version 💅
outputs the version and copyright info, like:
hg versionTemplate:
the following keywords are supported. see also hg help templates.
extensions— List of extensions.ver— String. Version number.
and each entry of {extensions} provides these sub-keywords on top of {ver}:
bundled— Boolean. True if included in the release.name— String. Extension name.
Options:
-T,--template <TEMPLATE>— display with template
🌈 Uncategorized commands 🌈
admin::chainsaw-update 🪚
pull and update to a given revision, no matter what, (EXPERIMENTAL):
hg admin::chainsaw-update [OPTION] --rev REV --source SOURCE --dest DESTWhere this is meant to be used: some Continuous Integration (CI) systems, packaging or deployment tools. iykyk.
What you want at the end: a local repository sitting at the given REPO_PATH, holding the latest changes to the given revision, with a clean working directory updated to that same revision. ✨
chainsaw-update pulls from one source, then updates the working directory to the given revision, overcoming anything that would stand in the way. it is not subtle. it is a chainsaw. 🪚
By default, it will:
- clone if the local repo does not exist yet, removing any directory at the given path that would not be a Mercurial repository. The initial clone is full by default, so that clonebundles can be applied. Use the
--initial-clone-minimalflag to avoid this. - break locks if needed, leading to possible corruption if there is a concurrent write access. 😭
- perform recovery actions if needed
- revert any local modification.
- purge unknown and ignored files.
- go as far as to reclone if everything else failed (not implemented yet).
DO NOT use it for anything else than performing a series of unattended updates, with full exclusive repository access each time and without any other local work than running build scripts. In case the local repository is a share (see hg help share), exclusive write access to the share source is also mandatory.
It is recommended to run these commands with the HGPLAIN environment variable (see hg scripting). 🫶
Motivation: in Continuous Integration and Delivery systems (CI/CD), the occasional remnant or bogus lock are common sources of waste of time (both working time and calendar time). CI/CD scripts tend to grow with counter-measures, often done in urgency. Also, whilst it is neat to keep repositories from one job to the next (especially with large repositories), an exceptional recloning is better than missing a release deadline. periodt. 💅
Options:
--purge-unknown— Remove unversioned files before update. Disabling this can in some cases interfere with the update. See alsohg purge. (default: True)--purge-ignored— Remove ignored files before update. Disable this for instance to reuse previous compiler object files. See alsohg purge. (default: True)--rev <VALUE>— revision to update to--source <VALUE>— repository to clone from--dest <VALUE>— repository to update toREV(possibly cloning)--initial-clone-minimal— Pull only the prescribed revision upon initial cloning. This has the side effect of ignoring clone-bundles, which if often slower on the client side and stressful to the server than applying available clone bundles.
🎀 BUNDLE FILE FORMATS 🎀
Mercurial supports generating standalone "bundle" files that hold repository data. These "bundles" are typically saved locally and used later, or exchanged between different repositories, possibly on different machines. Example commands using bundles are hg bundle and hg unbundle. 🦋
Generation of bundle files is controlled by a "bundle specification" ("bundlespec") string. This string tells the bundle generation process how to create the bundle.
A "bundlespec" string is composed of the following elements:
type— A string denoting the bundle format to use.compression— Denotes the compression engine to use compressing the raw bundle data.parameters— Arbitrary key-value parameters to further control bundle generation.
A "bundlespec" string has the following formats:
<type>— The literal bundle format string is used.<compression>-<type>— The compression engine and format are delimited by a hyphen (-).
Optional parameters follow the <type>. Parameters are URI escaped key=value pairs. Each pair is delimited by a semicolon (;). The first parameter begins after a ; immediately following the <type> value.
⭐ Available Types ⭐
The following bundle <type> strings are available:
v1— Produces a legacy "changegroup" version 1 bundle.
This format is compatible with nearly all Mercurial clients because it is the oldest. However, it has some limitations, which is why it is no longer the default for new repositories.
v1 bundles can be used with modern repositories using the "generaldelta" storage format. However, it may take longer to produce the bundle and the resulting bundle may be significantly larger than a v2 bundle.
v1 bundles can only use the gzip, bzip2, and none compression formats.
v2— Produces a version 2 bundle.
Version 2 bundles are an extensible format that can store additional repository data (such as bookmarks and phases information) and they can store data more efficiently, resulting in smaller bundles. 💖
Version 2 bundles can also use modern compression engines, such as zstd, making them faster to compress and often smaller.
🌸 Available Compression Engines 🌸
The following bundle <compression> engines can be used:
bzip2— An algorithm that produces smaller bundles thangzip.
All Mercurial clients should support this format.
This engine will likely produce smaller bundles than gzip but will be significantly slower, both during compression and decompression. 😴
If available, the zstd engine can yield similar or better compression at much higher speeds.
gzip—zlibcompression using theDEFLATEalgorithm.
All Mercurial clients should support this format. The compression algorithm strikes a reasonable balance between compression ratio and size.
none— No compression is performed.
Use this compression engine to explicitly disable compression.
The compression engines can be prepended with stream to create a streaming bundle. These are bundles that are extremely efficient to produce and consume, but do not have guaranteed compatibility with older clients. 🔥
💜 Available Options 💜
The following options exist:
changegroup— Include the changegroup data in the bundle (default to True).cg.version— Select the version of the changegroup to use. Available options are :01,02,03, or04. By default it will be automatically selected according to the current repository format.cg.delta-compression— Starting withcg.version"04", changegroups can include pre-compressed deltas that the receiving end might reuse as-is. If this option is omitted, no such delta will be part of the changegroup. The option accepts a comma-separated list of accepted compression formats. Supported format are:none: delta explicitly non-compressed (useful to prevent the receiver from even trying to compress such deltas)zlib:zlib-compressed deltazstd:zstd-compressed delta
obsolescence— Include obsolescence-markers relevant to the bundled changesets.phases— Include phase information relevant to the bundled changesets.revbranchcache— Include the "rev-branch" cache inside the bundle.tagsfnodescache— Include the "tags-fnodes" cache inside the bundle.
🧚 Examples 🧚
v2— Produce av2bundle using default options, including compression.none-v1— Produce av1bundle with no compression.zstd-v2— Produce av2bundle with zstandard compression using default settings.zstd-v1— This errors becausezstdis not supported forv1types. 💀none-streamv2— Produce av2streaming bundle with no compression.zstd-v2;obsolescence=true;phases=true— Produce av2bundle with zstandard compression which includes obsolescence markers and phases.
🌈 COLORIZING OUTPUTS 🌈
ok so bestie, Mercurial will literally paint your terminal for a bunch of commands and it's giving ✨aesthetic✨.
For example, diff shows additions in green and deletions in red, while status shows modified files in magenta. So many other commands have their own analogous colors, and yes, you can customize all of them 💅.
Wanna enable color (that's the default, btw) whenever it's possible? Do this:
[ui]
color = yesWanna shut the color off entirely? Do this instead:
[ui]
color = noMore deets live at hg help config.ui.color.
🚨 Heads up bestie: the default pager on Windows does not support color, so if you turn the pager on, you're effectively killing color too. Seehg help config.ui.paginateto disable the pager. Or, alternately, MSYS and Cygwin shells providelessas a pager, and you can configure that to support ANSI color mode. Also, Windows 10 natively supports ANSI color mode, so slay.
🎨 Mode
Mercurial can use various systems to display color, because of course she can 💁♀️. The supported modes are ansi, win32, and terminfo. Wanna know how to control the mode? hg help config.color. iykyk.
✨ Effects
Color is not the only glow-up available — you also get effects like bold and underlined text 🎀. By default, the terminfo database is what's used to find the terminal codes for changing color and effect. If terminfo isn't available, then effects get rendered with the ECMA-48 SGR control function (aka ANSI escape codes).
The available effects in terminfo mode are 'blink', 'bold', 'dim', 'inverse', 'invisible', 'italic', 'standout', and 'underline'. In ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and 'underline'. How each one renders depends on your terminal emulator — some may not be available for a given terminal type, and those just get silently ignored 🙈.
If your terminal's terminfo entry is missing codes for an effect, or has the wrong codes (rude), you can add or override them in your configuration:
[color]
terminfo.dim = \E[2mwhere 'E' gets substituted with an escape character. periodt.
🏷️ Labels
Text receives color effects depending on the labels it has. Lots of default Mercurial commands emit labelled text, and you can also define your own labels in templates using the label function — see hg help templates 👑.
For effects to actually happen, labels must have a dot, likelog.secretorbranch.active.
A single portion of text may have more than one label. When that happens, the effects given to the last label override any other effects. This includes the special "none" effect, which nullifies other effects. iconic.
Labels are normally invisible, so to see them and their position in the text, use the global --color=debug option. The same anchor text may be associated to multiple labels, e.g.
[log.changeset changeset.secret|changeset: 22611:6f0a53c8f587]The following are the default effects for some default labels. Default effects may be overridden from your configuration file:
[color]
status.modified = blue bold underline red_background
status.added = green bold
status.removed = red bold blue_background
status.deleted = cyan bold underline
status.unknown = magenta bold underline
status.ignored = black bold
# 'none' turns off all effects
status.clean = none
status.copied = none
qseries.applied = blue bold underline
qseries.unapplied = black bold
qseries.missing = red bold
diff.diffline = bold
diff.extended = cyan bold
diff.file_a = red bold
diff.file_b = green bold
diff.hunk = magenta
diff.deleted = red
diff.inserted = green
diff.changed = white
diff.tab =
diff.trailingwhitespace = bold red_background
# Blank so it inherits the style of the surrounding label
changeset.public =
changeset.draft =
changeset.secret =
resolve.unresolved = red bold
resolve.resolved = green bold
bookmarks.active = green
branches.active = none
branches.closed = black bold
branches.current = green
branches.inactive = none
tags.normal = green
tags.local = black bold
rebase.rebased = blue
rebase.remaining = red bold
shelve.age = cyan
shelve.newest = green bold
shelve.name = blue bold
histedit.remaining = red bold💖 Custom colors
So here's the thing — there are only eight standard colors 😭. So Mercurial lets you define color names for other color slots which might be available for your terminal type, assuming terminfo mode. For instance:
color.brightblue = 12
color.pink = 207
color.orange = 202This sets 'brightblue' to color slot 12 (useful for 16 color terminals that have brighter colors defined in the upper eight) and 'pink' and 'orange' to colors in 256-color xterm's default color cube 🍓. These defined colors may then be used as any of the pre-defined eight, including appending '_background' to set the background to that color. obsessed.
📅 DATE FORMATS 📅
Some commands let you, the user, specify a date, e.g.:
backout,commit,import,tag: Specify the commit date.log,revert,update: Select revision(s) by date.
Many date formats are valid — here are some examples:
Wed Dec 6 13:18:29 2006(local timezone assumed)Dec 6 13:18 -0600(year assumed, time offset provided)Dec 6 13:18 UTC(UTC and GMT are aliases for +0000)Dec 6(midnight)13:18(today assumed)3:39(3:39AM assumed)3:39pm(15:39)2006-12-06 13:18:29(ISO 8601 format)2006-12-6 13:182006-12-612-612/612/6/6(Dec 6 2006)today(midnight)yesterday(midnight)now- right now
Lastly, there is Mercurial's internal format:
1165411109 0(Wed Dec 6 13:18:29 2006 UTC)
This is the internal representation format for dates. The first number is the number of seconds since the epoch (1970-01-01 00:00 UTC). The second is the offset of the local timezone, in seconds west of UTC (negative if the timezone is east of UTC). fun little numbers 🧚.
The log command also accepts date ranges:
<DATE- at or before a given date/time>DATE- on or after a given date/timeDATE to DATE- a date range, inclusive-DAYS- within a given number of days from today
💀 DEPRECATED FEATURES 💀
Mercurial evolves over time — some features, options, and commands get replaced by better and more secure alternatives. This topic will help you migrate your existing usage and/or configuration to newer features, bestie. no cap.
🫠 Commands
The following commands are still available but their use are not recommended:
locate
This command has been replaced by hg files.
parents
This command can be replaced by hg summary or hg log with appropriate revsets. See hg help revsets for more information.
tip
The recommended alternative is hg heads.
⚠️ Options
web.allowpull
Renamed to allow-pull.
web.allow_push
Renamed to allow-push.
🔥 DIFF FORMATS 🔥
Mercurial's default format for showing changes between two versions of a file is compatible with the unified format of GNU diff, which can be used by GNU patch and many other standard tools. classic, reliable, we love her 💖.
While this standard format is often enough, it does not encode the following information:
- executable status and other permission bits
- copy or rename information
- changes in binary files
- creation or deletion of empty files
Mercurial also supports the extended diff format from the git VCS which addresses these limitations. The git diff format is not produced by default because a few widespread tools still do not understand this format 🙈.
This means that when generating diffs from a Mercurial repository (e.g. with hg export), you should be careful about things like file copies and renames or other things mentioned above, because when applying a standard diff to a different repository, this extra information is lost 😭. Mercurial's internal operations (like push and pull) are not affected by this, because they use an internal binary format for communicating changes.
To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] section of your configuration file. You do not need to set this option when importing diffs in this format or using them in the mq extension. slay.
ENVIRONMENT VARIABLES 💜
okay bestie, these are the env vars Mercurial actually reads, so listen up 🎧
HG— the path to thehgexecutable, and it gets auto-passed when you're running hooks, extensions or external tools. If it's unset or empty, then it's the hg executable's name if it's frozen, otherwise it searches for an executable namedhg(with%PATHEXT%extensions on Windows, which default toCOM/EXE/BAT/CMD). fr fr, it just goes looking.HGEDITOR— the name of the editor to run when committing. SeeEDITOR. (deprecated, seehg help config.ui.editor)HGENCODING— overrides the default locale setting Mercurial detected on its own. This setting gets used to convert data including usernames, changeset descriptions, tag names, and branches. You can override it again with the--encodingcommand-line option. it's giving layers of overrides, iykykHGENCODINGMODE— sets how Mercurial handles unknown characters while transcoding user input. Default is"strict", which makes Mercurial abort if it can't map a character 😭. Other settings:"replace", which replaces unknown characters, and"ignore", which just drops them. Override it with the--encodingmodecommand-line option.HGENCODINGAMBIGUOUS— sets how Mercurial handles characters with "ambiguous" widths, like accented Latin characters with East Asian fonts. By default Mercurial assumes ambiguous characters are narrow — set this variable to"wide"if those characters cause formatting problems. formatting chaos, we hate to see itHGMERGE— an executable to use for resolving merge conflicts. It gets run with three arguments: local file, remote file, ancestor file. (deprecated, seehg help config.ui.merge)HGRCPATH— a list of files or directories to search for configuration files. Item separator is":"on Unix,";"on Windows. IfHGRCPATHis not set, the platform default search path is used. If it's empty, only the.hg/hgrcfrom the current repository is read.
For each element in HGRCPATH:
- if it's a directory, all files ending with
.rcare added - otherwise, the file itself will be added
HGRCSKIPREPO— when set, the.hg/hgrcfrom repositories are not read. simple as that 💅HGPLAIN— when set, this disables any configuration settings that might change Mercurial's default output. That includes encoding, defaults, verbose mode, debug mode, quiet mode, tracebacks, and localization. Super useful when you're scripting against Mercurial while existing user config is lurking around. scripting bestie rise up 📜
On top of the features disabled by HGPLAIN=, you can specify the following values to adjust behavior:
+strictflags- Restrict parsing of command line flags.
Equivalent options set via command line flags or environment variables are not overridden.
See hg help scripting for details.
HGPLAINEXCEPT— a comma-separated list of features to preserve whenHGPLAINis enabled. Currently these values are supported:alias- Don't remove aliases.
color- Don't disable colored output.
i18n- Preserve internationalization.
revsetalias- Don't remove revset aliases.
templatealias- Don't remove template aliases.
progress- Don't hide progress output.
Setting HGPLAINEXCEPT to anything (even an empty string) will enable plain mode. anything!! even nothing!!
HGUSER— this is the string used as the author of a commit. If it's not set, available values get considered in this order:HGUSER(deprecated)- configuration files from the
HGRCPATH EMAIL- interactive prompt
LOGNAME(with@hostnameappended)
(deprecated, see hg help config.ui.username)
EMAIL— may be used as the author of a commit; seeHGUSER.LOGNAME— may be used as the author of a commit; seeHGUSER.VISUAL— this is the name of the editor to use when committing. SeeEDITOR.EDITOR— sometimes Mercurial needs to open a text file in an editor so a user can modify it, for example when writing commit messages. The editor it uses is determined by checking the environment variablesHGEDITOR,VISUALandEDITOR, in that order. The first non-empty one wins 👑. If all of them are empty, the editor defaults tovi.PYTHONPATH— this is used by Python to find imported modules and may need to be set appropriately if this Mercurial is not installed system-wide.HGZSTDPOLICY— controls which zstd implementation will be used for the Python code. This is a list of options in priority order.vendored: use the pinned version of python-zstandard shipped in Mercurialsystem: use a possibly installed "zstandard" python packagenone: don't use zstd (ommiting this will raise an error if the above fails)
Default value is "vendored,system,none".
This variable might be deprecated in the future depending on how zstd wrapper library and they integration in Mercurial evolves. This config has no effect on the Rust code. the Rust stays unbothered 😌
SAFELY REWRITING HISTORY (EXPERIMENTAL) 🦋
Obsolescence markers make it possible to mark changesets that have been deleted or superseded in a new version of the changeset. okay so this is the ✨fancy✨ way
Unlike the previous way of handling such changes — by stripping the old changesets from the repository — obsolescence markers can be propagated between repositories. This allows for a safe and simple way of exchanging mutable history and altering it after the fact. Changeset phases are respected, such that only draft and secret changesets can be altered (see hg help phases for details).
Obsolescence is tracked using "obsolescence markers", a piece of metadata tracking which changesets have been made obsolete, potential successors for a given changeset, the moment the changeset was marked as obsolete, and the user who performed the rewriting operation. The markers are stored separately from standard changeset data and can be exchanged without any of the precursor changesets, preventing unnecessary exchange of obsolescence data. no wasted data, we love efficiency 💅
The complete set of obsolescence markers describes a history of changeset modifications that is orthogonal to the repository history of file modifications. This changeset history allows for detection and automatic resolution of edge cases arising from multiple users rewriting the same part of history concurrently. concurrent rewrites handled, periodt ✨
Current feature status 🌸
This feature is still in development. so like... be careful bestie
Instability 💀
Rewriting changesets might introduce instability.
There are two main kinds of instability: orphaning and diverging.
Orphans are changesets left behind when their ancestors are rewritten. Divergence has two variants:
- Content-divergence occurs when independent rewrites of the same changesets lead to different results.
- Phase-divergence occurs when the old (obsolete) version of a changeset becomes public.
It is possible to prevent local creation of orphans by using the following config:
[experimental]
evolution.createmarkers = true
evolution.exchange = trueYou can also enable that option explicitly:
[experimental]
evolution.createmarkers = true
evolution.exchange = true
evolution.allowunstable = true✨ USING ADDITIONAL FEATURES ✨
Bestie. Okay so Mercurial can straight up grow new powers, and it does it through extensions. Like, extensions can add whole new commands, sprinkle extra options onto commands you already have, change what a command does by default, or implement hooks. It's giving ✨glow-up✨.
To turn on the "foo" extension — whether it ships with Mercurial or just lives somewhere on the Python search path — you make an entry for it in your configuration file, like this:
[extensions]
foo =You can also be extra and give the full path to an extension:
[extensions]
myfeature = ~/.hgext/myfeature.pyFor more info on config files, see hg help config. 🫶
Not me about to explain why they're off by default: extensions are not loaded by default, and there are a whole bunch of reasons. They can increase startup overhead; they may be meant for advanced usage only; they may provide potentially dangerous abilities (like letting you destroy or modify history 😭); they might not be ready for prime time; or they may alter some usual behaviors of stock Mercurial. So yeah — it is up to you, the user, to activate extensions as needed.
Now if you wanna explicitly disable an extension that some config file of broader scope already enabled? Prepend its path with !:
[extensions]
# disabling extension bar residing in /path/to/extension/bar.py
bar = !/path/to/extension/bar.py
# ditto, but no path was supplied for extension baz
baz = !🚫 disabled extensions 🚫
These are the ones that exist but are sitting there disabled, minding their business:
acl— hooks for controlling repository accessblackbox— log repository events to a blackbox for debuggingbugzilla— hooks for integrating with the Bugzilla bug trackercensor— erase file content at a given revisionchurn— command to display statistics about repository historyclonebundles— advertise pre-generated bundles to seed clonesclosehead— close arbitrary heads without checking them out firstconvert— import revisions from foreign VCS repositories into Mercurialeol— automatically manage newlines in repository filesextdiff— command to allow external programs to compare revisionsfactotum— http authentication with factotumfastexport— export repositories as git fast-import streamgithelp— try mapping git commands to Mercurial commandsgpg— commands to sign and verify changesetshgk— browse the repository in a graphical wayhighlight— syntax highlighting for hgweb (requires Pygments)histedit— interactive history editingkeyword— expand keywords in tracked fileslargefiles— track large binary filesmq— manage a stack of patchesnotify— hooks for sending email push notificationspatchbomb— command to send changesets as (a series of) patch emailsrebase— command to move sets of revisions to a different ancestorrelink— recreates hardlinks between repository clonesschemes— extend schemes with shortcuts to repository swarmsshare— share a common history between several working directoriestransplant— command to transplant changesets from another branchwin32mbcs— allow the use of MBCS paths with problematic encodingszeroconf— discover and advertise repositories on the local network
🌈 SPECIFYING FILE SETS 🌈
Okay so Mercurial has a whole functional language for selecting a set of files. Yes, a language. For picking files. Iconic behavior honestly. 💅
Like other file patterns, this pattern type is indicated by a prefix: set:. The language supports a number of predicates which are joined by infix operators. Parenthesis can be used for grouping.
Identifiers such as filenames or patterns must be quoted with single or double quotes if they contain characters outside of [.*{}[]?/\_a-zA-Z0-9\x80-\xff] or if they match one of the predefined predicates. This generally applies to file patterns other than globs and arguments for predicates. Pattern prefixes such as path: may be specified without quoting.
Special characters can be used in quoted identifiers by escaping them, e.g., \n is interpreted as a newline. To prevent them from being interpreted, strings can be prefixed with r, e.g. r'...'.
See also hg help patterns.
Operators
There is a single prefix operator:
not x— Files not in x. Short form is! x.
These are the supported infix operators:
x and y— The intersection of files in x and y. Short form isx & y.x or y— The union of files in x and y. There are two alternative short forms:x | yandx + y.x - y— Files in x but not in y.
Predicates
The following predicates are supported:
added()— File that is added according tohg status.binary()— File that appears to be binary (contains NUL bytes).clean()— File that is clean according tohg status.copied()— File that is recorded as being copied.deleted()— Alias formissing().encoding(name)— File can be successfully decoded with the given character encoding. May not be useful for encodings other than ASCII and UTF-8.eol(style)— File contains newlines of the given style (dos,unix,mac). Binary files are excluded, files with mixed line endings match multiple styles.exec()— File that is marked as executable.grep(regex)— File contains the given regular expression.hgignore()— File that matches the active.hgignorepattern.ignored()— File that is ignored according tohg status.missing()— File that is missing according tohg status.modified()— File that is modified according tohg status.portable()— File that has a portable name. (This doesn't include filenames with case collisions.)removed()— File that is removed according tohg status.resolved()— File that is marked resolved according tohg resolve -l.revs(revs, pattern)— Evaluate set in the specified revisions. If the revset match multiple revs, this will return file matching pattern in any of the revision.size(expression)— File size matches the given expression. Examples:size('1k')- files from 1024 to 2047 bytessize('< 20k')- files less than 20480 bytessize('>= .5MB')- files at least 524288 bytessize('4k - 1MB')- files from 4096 bytes to 1048576 bytes
status(base, rev, pattern)— Evaluate predicate using status change between base and rev. Examples:status(3, 7, added())- matches files added from "3" to "7"
subrepo([pattern])— Subrepositories whose paths match the given pattern.symlink()— File that is marked as a symlink.tracked()— File that is under Mercurial control.unknown()— File that is unknown according tohg status.unresolved()— File that is marked unresolved according tohg resolve -l.
Examples
Some sample queries, because seeing it in action is the whole vibe:
- Show status of files that appear to be binary in the working directory:
hg status -A "set:binary()"- Forget files that are in
.hgignorebut are already tracked:
hg forget "set:hgignore() and not ignored()"- Find text files that contain a string:
hg files "set:grep(magic) and not binary()"- Find C files in a non-standard encoding:
hg files "set:**.c and not encoding('UTF-8')"- Revert copies of large binary files:
hg revert "set:copied() and binary() and size('>1M')"- Revert files that were added to the working directory:
hg revert "set:revs('wdir()', added())"- Remove files listed in
foo.lstthat contain the letter a or b:
hg remove "set: listfile:foo.lst and (**a* or **b*)"🚩 COMMAND-LINE FLAGS 🚩
Most Mercurial commands accept various flags. Obsessed tbh, flags are how you make a command do the thing you actually want.
Flag names
Flags for each command are listed in hg help for that command. Additionally, some flags, such as --repository, are global and can be used with any command — those are seen in hg help -v, and can be specified before or after the command.
Every flag has at least a long name, such as --repository. Some flags may also have a short one-letter name, such as the equivalent -R. Using the short or long name is equivalent and has the same effect. The long name may be abbreviated to any unambiguous prefix. For example, hg commit --amend can be abbreviated to hg commit --am.
Flags that have a short name can also be bundled together — for instance, to specify both --edit (short -e) and --interactive (short -i), one could use:
hg commit -eiIf any of the bundled flags takes a value (i.e. is not a boolean), it must be last, followed by the value:
hg commit -im 'Message'Flag types
Mercurial command-line flags can be strings, numbers, booleans, or lists of strings.
Specifying flag values
The following syntaxes are allowed, assuming a flag 'flagname' with short name 'f':
--flagname=foo
--flagname foo
-f foo
-ffooThis syntax applies to all non-boolean flags (strings, numbers or lists).
Specifying boolean flags
Boolean flags do not take a value parameter. To specify a boolean, use the flag name to set it to true, or the same name prefixed with no- to set it to false:
hg commit --interactive
hg commit --no-interactiveSpecifying list flags
List flags take multiple values. To specify them, pass the flag multiple times:
hg files --include mercurial --include testsSetting flag defaults
In order to set a default value for a flag in an hgrc file, it is recommended to use aliases:
[alias]
commit = commit --interactiveFor more information on hgrc files, see hg help config.
Overriding flags on the command line
If the same non-list flag is specified multiple times on the command line, the latest specification is used:
hg commit -m "Ignored value" -m "Used value"This includes the use of aliases — e.g., if one has:
[alias]
committemp = commit -m "Ignored value"then the following command will override that -m:
hg committemp -m "Used value"Overriding flag defaults
Every flag has a default value, and you may also set your own defaults in hgrc as described above. Except for list flags, defaults can be overridden on the command line simply by specifying the flag in that location.
Hidden flags
Some flags are not shown in a command's help by default — specifically, those that are deemed to be experimental, deprecated or advanced. To show all flags, add the --verbose flag for the help command:
hg help --verbose commit✨ GLOSSARY ✨
okay bestie, this is the vocab list 💖 it's long, it's iconic, and every single word here is something you're gonna see me say like it's nothing. so let's lock in 🔥
Ancestor
any changeset you can reach from a given changeset by walking an unbroken chain of parent changesets. more precisely, ancestors are defined by two properties: a parent of a changeset is an ancestor, and a parent of an ancestor is an ancestor. see also: 'Descendant'. 👑
Bookmark
bookmarks are pointers to certain commits that move when you commit. they're kinda like tags in that you can use bookmark names anywhere Mercurial expects a changeset ID — e.g. with hg update. but unlike tags, bookmarks move along when you make a commit. 🦋
bookmarks can be renamed, copied and deleted. bookmarks are local, unless they are explicitly pushed or pulled between repositories. pushing and pulling bookmarks lets you collaborate with others on a branch without creating a named branch. no cap, that's the whole appeal 💅
Branch
(Noun) a child changeset that's been created from a parent that is not a head. these are known as topological branches, see 'Branch, topological'. if a topological branch is named, it becomes a named branch. if it's not named, it becomes an anonymous branch. see 'Branch, anonymous' and 'Branch, named'.
branches may be created when changes are pulled from or pushed to a remote repository, since new heads may be created by these operations. also note that the term branch can be used informally to describe a development process in which certain development is done independently of other development — sometimes explicitly with a named branch, but it can also be done locally, using bookmarks or clones and anonymous branches.
example: "The experimental branch." 🌸
(Verb) the action of creating a child changeset which results in its parent having more than one child.
example: "I'm going to branch at X."
Branch, anonymous
every time a new child changeset is created from a parent that is not a head and the name of the branch is not changed, a new anonymous branch is created. periodt 💀
Branch, closed
a named branch whose branch heads have all been closed.
Branch, default
the branch assigned to a changeset when no name has previously been assigned. the default default, if you will ✨
Branch head
see 'Head, branch'.
Branch, inactive
if a named branch has no topological heads, it's considered to be inactive. for example, a feature branch becomes inactive when it's merged into the default branch. the hg branches command shows inactive branches by default, though they can be hidden with hg branches --active.
NOTE: this concept is deprecated because it's too implicit. branches should now be explicitly closed using hg commit --close-branch when they're no longer needed. 🙈
Branch, named
a collection of changesets which have the same branch name. by default, children of a changeset in a named branch belong to the same named branch. a child can be explicitly assigned to a different branch. see hg help branch, hg help branches and hg commit --close-branch for more info on managing branches.
named branches can be thought of as a kind of namespace, dividing the collection of changesets that make up the repository into a collection of disjoint subsets. a named branch is not necessarily a topological branch. if a new named branch is created from the head of another named branch, or the default branch, but no further changesets are added to that previous branch, then that previous branch will be a branch in name only. it's giving fake branch energy ngl 💅
Branch tip
see 'Tip, branch'.
Branch, topological
every time a new child changeset is created from a parent that is not a head, a new topological branch is created. if a topological branch is named, it becomes a named branch. if it's not named, it becomes an anonymous branch of the current, possibly default, branch. 🌈
Changelog
a record of the changesets in the order in which they were added to the repository. this includes details such as changeset id, author, commit message, date, and list of changed files. receipts, basically 🧾
Changeset
a snapshot of the state of the repository used to record a change. the main character of this whole operation, honestly 👑
Changeset, child
the converse of parent changeset: if P is a parent of C, then C is a child of P. there is no limit to the number of children that a changeset may have.
Changeset id
a SHA-1 hash that uniquely identifies a changeset. it may be represented as either a "long" 40 hexadecimal digit string, or a "short" 12 hexadecimal digit string. ✨
Changeset, merge
a changeset with two parents. this occurs when a merge is committed. two moms, one commit 🫶
Changeset, parent
a revision upon which a child changeset is based. specifically, a parent changeset of a changeset C is a changeset whose node immediately precedes C in the DAG. changesets have at most two parents.
Checkout
(Noun) the working directory being updated to a specific revision. this use should probably be avoided where possible, as changeset is much more appropriate than checkout in this context.
example: "I'm using checkout X."
(Verb) updating the working directory to a specific changeset. see hg help update.
example: "I'm going to check out changeset X."
Child changeset
see 'Changeset, child'.
Close changeset
see 'Head, closed branch'.
Closed branch
see 'Branch, closed'.
Clone
(Noun) an entire or partial copy of a repository. the partial clone must be in the form of a revision and its ancestors.
example: "Is your clone up to date?"
(Verb) the process of creating a clone, using hg clone.
example: "I'm going to clone the repository." 🦋
Closed branch head
see 'Head, closed branch'.
Commit
(Noun) a synonym for changeset.
example: "Is the bug fixed in your recent commit?"
(Verb) the act of recording changes to a repository. when files are committed in a working directory, Mercurial finds the differences between the committed files and their parent changeset, creating a new changeset in the repository.
example: "You should commit those changes now." 💖
Cset
a common abbreviation of the term changeset. iykyk ✨
DAG
the repository of changesets of a distributed version control system (DVCS) can be described as a directed acyclic graph (DAG), consisting of nodes and edges, where nodes correspond to changesets and edges imply a parent -> child relation. this graph can be visualized by graphical tools such as hg log --graph. in Mercurial, the DAG is limited by the requirement for children to have at most two parents.
Deprecated
feature removed from documentation, but not scheduled for removal. it's in its retirement era 💀
Default branch
see 'Branch, default'.
Descendant
any changeset that can be reached by a chain of child changesets from a given changeset. more precisely, the descendants of a changeset can be defined by two properties: the child of a changeset is a descendant, and the child of a descendant is a descendant. see also: 'Ancestor'. 🔥
Diff
(Noun) the difference between the contents and attributes of files in two changesets or a changeset and the current working directory. the difference is usually represented in a standard form called a "diff" or "patch". the "git diff" format is used when the changes include copies, renames, or changes to file attributes, none of which can be represented/handled by classic "diff" and "patch".
example: "Did you see my correction in the diff?"
(Verb) diffing two changesets is the action of creating a diff or patch.
example: "If you diff with changeset X, you will see what I mean." 👑
Directory, working
the working directory represents the state of the files tracked by Mercurial, that will be recorded in the next commit. the working directory initially corresponds to the snapshot at an existing changeset, known as the parent of the working directory. see 'Parent, working directory'. the state may be modified by changes to the files introduced manually or by a merge. the repository metadata exists in the .hg directory inside the working directory. 🎀
Draft
changesets in the draft phase have not been shared with publishing repositories and may thus be safely changed by history-modifying extensions. see hg help phases.
Experimental
feature that may change or be removed at a later date. living on the edge bestie ⚠️
Graph
see DAG and hg log --graph.
Head
the term 'head' may be used to refer to both a branch head or a repository head, depending on the context. see 'Head, branch' and 'Head, repository' for specific definitions.
heads are where development generally takes place and are the usual targets for update and merge operations. main character locations fr fr 👑
Head, branch
a changeset with no descendants on the same named branch.
Head, closed branch
a changeset that marks a head as no longer interesting. the closed head is no longer listed by hg heads. a branch is considered closed when all its heads are closed and consequently is not listed by hg branches.
closed heads can be re-opened by committing new changeset as the child of the changeset that marks a head as closed. it's giving "we're so back" 😭
Head, repository
a topological head which has not been closed.
Head, topological
a changeset with no children in the repository.
History, immutable
once committed, changesets cannot be altered. extensions which appear to change history actually create new changesets that replace existing ones, and then destroy the old changesets. doing so in public repositories can result in old changesets being reintroduced to the repository. 🫠
History, rewriting
the changesets in a repository are immutable. however, extensions to Mercurial can be used to alter the repository, usually in such a way as to preserve changeset contents.
Immutable history
see 'History, immutable'.
- Merge changeset — go see 'Changeset, merge' 💜
- Manifest — every changeset has one, and it's literally just the list of files that changeset is tracking. the receipts, basically 📋
- Merge — the move where you bring divergent branches of work back together 🫶. when you update to a changeset and then merge another changeset, you're bringing the history of that second changeset into your working directory. once conflicts are resolved (and marked, don't forget marked), this merge can be committed as a merge changeset, and boom — two branches are one in the DAG. iconic 🌈
- Named branch — see 'Branch, named'.
- Null changeset — the empty changeset, the void, the nothing-girl ✨. it's the parent state of freshly-initialized repositories, and of repositories with no checked out revision. so it's the parent of root changesets, and the effective ancestor whenever you merge unrelated changesets. you can summon it with the alias
nullor by the changeset ID000000000000. - Parent — see 'Changeset, parent'.
- Parent changeset — see 'Changeset, parent'.
- Parent, working directory — the working directory parent reflects a virtual revision, which is the child of the changeset (or of two changesets, if you've got an uncommitted merge) shown by
hg parents. this one changes when you runhg update. other commands that'll show you the working directory parent arehg summaryandhg id. you can point at it with the alias.👑 - Patch —
- (Noun) the product of a diff operation.
- Example: "I've sent you my patch."
- (Verb) the process of using a patch file to transform one changeset into another.
- Example: "You will need to patch that revision."
- (Noun) the product of a diff operation.
- Phase — a per-changeset state that tracks how the changeset has been (or should be) shared. see
hg help phases🌀 - Public — changesets in the public phase have been shared with publishing repositories, which means they're considered immutable. no take-backs. see
hg help phases. - Pull — an operation where changesets sitting in a remote repository that aren't in your local repository get brought into your local repository 🫳✨. heads up tho: this operation without special arguments only updates the repository — it does not update the files in your working directory. see
hg help pull. - Push — an operation where changesets in your local repository that aren't in a remote repository get sent off to the remote repository 📤. note that this only adds changesets you've committed locally to the remote. uncommitted changes? not sent, not ever. see
hg help push. - Repository — the metadata describing every recorded state of a collection of files. each recorded state is represented by a changeset. a repository is usually (but not always, bestie) found in the
.hgsubdirectory of a working directory. any recorded state can be recreated by "updating" a working directory to a specific changeset 💅 - Repository head — see 'Head, repository'.
- Revision — a state of the repository at some point in time ⏳. earlier revisions can be updated to by using
hg update. see also 'Revision number'; see also 'Changeset'. - Revision number — this integer uniquely identifies a changeset within one specific repository. it represents the order changesets were added to a repository, starting with revision number
0. big warning tho: the revision number may be different in each clone of a repository 😭. if you want to identify changesets uniquely between different clones, go see 'Changeset id'. - Revlog — the history storage mechanism Mercurial uses. it's a form of delta encoding, with an occasional full revision of data followed by a delta of each successive revision. it includes data and an index pointing to that data 📚
- Rewriting history — see 'History, rewriting'.
- Root — a changeset that has only the null changeset as its parent. most repositories have just a single root changeset 🌱
- Secret — changesets in the secret phase may not be shared via push, pull, or clone 🤫. see
hg help phases. - Tag — an alternative name given to a changeset. tags can be used in all the places where Mercurial expects a changeset ID, e.g., with
hg update. the creation of a tag is stored in the history, so it'll automatically be shared with others using push and pull 🏷️ - Tip — the changeset with the highest revision number. it's the changeset most recently added to a repository 👑
- Tip, branch — the head of a given branch with the highest revision number. when a branch name is used as a revision identifier, it refers to the branch tip. see also 'Branch, head'. note that because revision numbers may be different in different repository clones, the branch tip may be different in different cloned repositories 🙈
- Update —
- (Noun) another synonym of changeset.
- Example: "I've pushed an update."
- (Verb) this term is usually used to describe updating the state of the working directory to that of a specific changeset. see
hg help update.- Example: "You should update."
- (Noun) another synonym of changeset.
- Working directory — see 'Directory, working'.
- Working directory parent — see 'Parent, working directory'.
🌸 SYNTAX FOR MERCURIAL IGNORE FILES 🌸
🎀 Synopsis 🎀
the Mercurial system uses a file called .hgignore in the root directory of a repository to control its behavior when it searches for files that it isn't currently tracking 👀
💖 Description 💖
the working directory of a Mercurial repository will often contain files that should not be tracked by Mercurial. we're talking backup files created by editors, build products created by compilers, all that clutter 💀. these files can be ignored by listing them in a .hgignore file in the root of the working directory. the .hgignore file must be created manually — nobody's gonna make it for you, bestie. it's typically put under version control, so that the settings will propagate to other repositories with push and pull 🫶
an untracked file is ignored if its path relative to the repository root directory, or any prefix path of that path, is matched against any pattern in .hgignore.
for example, say we have an untracked file, file.c, at a/b/file.c inside our repository. Mercurial will ignore file.c if any pattern in .hgignore matches a/b/file.c, a/b or a.
in addition, a Mercurial configuration file can reference a set of per-user or global ignore files. see the ignore configuration key on the [ui] section of hg help config for details on how to configure these files.
to control Mercurial's handling of files that it manages, lots of commands support the -I and -X options; see hg help <command> and hg help patterns for details.
files that are already tracked are not affected by .hgignore, even if they appear in .hgignore — the vibes are immovable 🧚. an untracked file X can be explicitly added with hg add X, even if X would be excluded by a pattern in .hgignore.
✨ Syntax ✨
an ignore file is a plain text file consisting of a list of patterns, with one pattern per line. empty lines are skipped. the # character is treated as a comment character, and the \ character is treated as an escape character 🔤
Mercurial supports several pattern syntaxes. the default syntax used is Python/Perl-style regular expressions.
to change the syntax used, use a line of the following form:
syntax: NAMEwhere NAME is one of the following:
regexp— regular expression, Python/Perl syntax 🐍glob— shell-style glob 🌐rootglob— a variant of glob that is rooted (see below) 🌳
the chosen syntax stays in effect when parsing all patterns that follow, until another syntax is selected. periodt.
neither glob nor regexp patterns are rooted. a glob-syntax pattern of the form *.c will match a file ending in .c in any directory, and a regexp pattern of the form \.c$ will do the same. to root a regexp pattern, start it with ^. to get the same effect with glob-syntax, you have to use rootglob 💅
subdirectories can have their own .hgignore settings by adding subinclude:path/to/subdir/.hgignore to the root .hgignore. see hg help patterns for details on subinclude: and include:.
Note — patterns specified in other than.hgignoreare always rooted. please seehg help patternsfor details.
🍓 Example 🍓
here is an example ignore file, enjoy:
# use glob syntax.
syntax: glob
*.elc
*.pyc
*~
# switch to regexp syntax.
syntax: regexp
^\.pc/🔥 Debugging 🔥
use the debugignore command to see if and why a file is ignored, or to see the combined ignore pattern. see hg help debugignore for details 🕵️♀️
✨ CONFIGURING HGWEB ✨
Okay so Mercurial has its own lil internal web server called hgweb, and she's flexible bestie 💅 — she can serve one single repository OR a whole tree of repositories like a queen managing her kingdom 👑.
In that second case (the tree situation 🌳), repo paths and global options can be defined using a dedicated configuration file that's common to all of these:
hg servehgweb.wsgihgweb.cgihgweb.fcgi
This file uses the same syntax as other Mercurial configuration files, but bestie it only recognizes these sections, that's it, periodt:
webpathscollections
The web options are thoroughly described in hg help config. Go read that if you need the tea ☕
🌸 The paths section 🌸
So this section maps URL paths → paths of repositories in the filesystem. And important: hgweb will NOT expose the filesystem directly — no ma'am 🙅♀️. Only Mercurial repositories can be published, and only according to the configuration. It's giving ✨ security ✨.
- The left hand side is the path in the URL. Heads up bestie, hgweb reserves subpaths like
revorfile, so try using different names for nested repositories to avoid confusing effects 👀 - The right hand side is the path in the filesystem. If the specified path ends with
*or**the filesystem will be searched recursively for repositories below that point.- With
*it will not recurse into the repositories it finds (except for.hg/patches) - With
**it will also search inside repository working directories and possibly find subrepositories 👑
- With
In this example:
[paths]
/projects/a = /srv/tmprepos/a
/projects/b = c:/repos/b
/ = /srv/repos/*
/user/bob = /home/bob/repos/**- The first two entries make two repositories in different directories appear under the same directory in the web interface 💖
- The third entry will publish every Mercurial repository found in
/srv/repos/, for instance the repository/srv/repos/quux/will appear ashttp://server/quux/ - The fourth entry will publish both
http://server/user/bob/quux/andhttp://server/user/bob/quux/testsubrepo/
Thecollectionssection is deprecated and has been superseded bypaths. Bestie, usepaths, fr fr 🙏
🦋 URLs and Common Arguments 🦋
URLs under each repository have the form /{command}[/{arguments}] where {command} represents the name of a command or handler and {arguments} represents any number of additional URL parameters to that command. Slay, simple as that 💅
The web server has a default style associated with it. Styles map to a collection of named templates. Each template is used to render a specific piece of data, such as a changeset or diff.
The style for the current request can be overridden two ways:
- If
{command}contains a hyphen (-), the text before the hyphen defines the style. For example,/atom-logwill render thelogcommand handler with theatomstyle. - Set it with the
stylequery string argument. For example,/log?style=atom.
The hyphenated URL parameter is preferred ✨
Not all templates are available for all styles. Attempting to use a style that doesn't have all templates defined may result in an error rendering the page 😭 so be careful bestie.
Many commands take a {revision} URL parameter. This defines the changeset to operate on. This is commonly specified as the short, 12 digit hexadecimal abbreviation for the full 40 character unique revision identifier. However, any value described by hg help revisions typically works. iykyk 💜
🎀 Commands and URLs 🎀
The following web commands and their URLs are available:
👑 /annotate/{revision}/{path}
Show changeset information for each line in a file.
The ignorews, ignorewsamount, ignorewseol, and ignoreblanklines query string arguments have the same meaning as their [annotate] config equivalents. It uses the hgrc boolean parsing logic to interpret the value. e.g. 0 and false are false and 1 and true are true. If not defined, the server default settings are used.
The fileannotate template is rendered.
💖 /archive/{revision}.{format}[/{path}]
Obtain an archive of repository content.
The content and type of the archive is defined by a URL path parameter. format is the file extension of the archive type to be generated. e.g. zip or tar.bz2. Not all archive types may be allowed by your server configuration.
The optional path URL parameter controls content to include in the archive. If omitted, every file in the specified revision is present in the archive. If included, only the specified file or contents of the specified directory will be included in the archive.
No template is used for this handler. Raw, binary content is generated. Straight up bytes bestie 🔥
🦋 /bookmarks
Show information about bookmarks.
No arguments are accepted.
The bookmarks template is rendered.
🌸 /branches
Show information about branches.
All known branches are contained in the output, even closed branches.
No arguments are accepted.
The branches template is rendered.
✨ /changelog[/{revision}]
Show information about multiple changesets.
If the optional revision URL argument is absent, information about all changesets starting at tip will be rendered. If the revision argument is present, changesets will be shown starting from the specified revision.
If revision is absent, the rev query string argument may be defined. This will perform a search for changesets.
The argument for rev can be a single revision, a revision set, or a literal keyword to search for in changeset data (equivalent to hg log -k).
The revcount query string argument defines the maximum numbers of changesets to render.
For non-searches, the changelog template will be rendered.
💜 /changeset[/{revision}]
Show information about a single changeset.
A URL path argument is the changeset identifier to show. See hg help revisions for possible values. If not defined, the tip changeset will be shown.
The changeset template is rendered. Contents of the changesettag, changesetbookmark, filenodelink, filenolink, and the many templates related to diffs may all be used to produce the output. It's giving ✨ maximalist ✨ and we love that.
🔥 /comparison/{revision}/{path}
Show a comparison between the old and new versions of a file from changes made on a particular revision.
This is similar to the diff handler. However, this form features a split or side-by-side diff rather than a unified diff.
The context query string argument can be used to control the lines of context in the diff.
The filecomparison template is rendered.
🍓 /diff/{revision}/{path}
Show how a file changed in a particular commit.
The filediff template is rendered.
This handler is registered under both the /diff and /filediff paths. /diff is used in modern code.
🌈 /file/{revision}[/{path}]
Show information about a directory or file in the repository.
Info about the path given as a URL parameter will be rendered.
If path is a directory, information about the entries in that directory will be rendered. This form is equivalent to the manifest handler.
If path is a file, information about that file will be shown via the filerevision template.
If path is not defined, information about the root directory will be rendered.
🍓 /diff/{revision}/{path}
Show how a file changed in a particular commit.
The filediff template is rendered.
This handler is registered under both the /diff and /filediff paths. /diff is used in modern code.
(yes bestie it appears twice in the original, iconic behavior, we don't question it 💅)
🧚 /filelog/{revision}/{path}
Show information about the history of a file in the repository.
The revcount query string argument can be defined to control the maximum number of entries to show.
The filelog template will be rendered.
⭐ /graph[/{revision}]
Show information about the graphical topology of the repository.
Information rendered by this handler can be used to create visual representations of repository topology. So aesthetic 💖
The revision URL parameter controls the starting changeset. If it's absent, the default is tip.
The revcount query string argument can define the number of changesets to show information for.
The graphtop query string argument can specify the starting changeset for producing jsdata variable that is used for rendering graph in JavaScript. By default it has the same value as revision.
This handler will render the graph template.
🎀 /help[/{topic}]
Render help documentation.
This web command is roughly equivalent to hg help. If a topic is defined, that help topic will be rendered. If not, an index of available help topics will be rendered.
The help template will be rendered when requesting help for a topic. helptopics will be rendered for the index of help topics.
🌸 /log[/{revision}[/{path}]]
Show repository or file history.
For URLs of the form /log/{revision}, a list of changesets starting at the specified changeset identifier is shown. If {revision} is not defined, the default is tip. This form is equivalent to the changelog handler.
For URLs of the form /log/{revision}/{file}, the history for a specific file will be shown. This form is equivalent to the filelog handler.
💅 /manifest[/{revision}[/{path}]]
Show information about a directory.
If the URL path arguments are omitted, information about the root directory for the tip changeset will be shown.
Because this handler can only show information for directories, it is recommended to use the file handler instead, as it can handle both directories and files. Bestie, the file handler is the main character here 👑
The manifest template will be rendered for this handler.
💜 /changeset[/{revision}]
Show information about a single changeset.
A URL path argument is the changeset identifier to show. See hg help revisions for possible values. If not defined, the tip changeset will be shown.
The changeset template is rendered. Contents of the changesettag, changesetbookmark, filenodelink, filenolink, and the many templates related to diffs may all be used to produce the output.
🔥 /shortlog
Show basic information about a set of changesets.
This accepts the same parameters as the changelog handler. The only difference is the shortlog template will be rendered instead of the changelog template.
✨ /summary
Show a summary of repository state.
Information about the latest changesets, bookmarks, tags, and branches is captured by this handler. It's the little vibe check of your whole repo 🫶
The summary template is rendered.
🏷️ /tags
Show information about tags.
No arguments are accepted.
The tags template is rendered.
🧠 TECHNICAL IMPLEMENTATION TOPICS 🧠
okay bestie so hg has a whole secret library of deep-lore docs tucked inside it, and you unlock them one at a time like collectible stickers. To access a subtopic, use "hg help internals.{subtopic-name}" — you just swap in the name you want.
Here's the whole roster, no gatekeeping 💅:
bid-merge— Bid Merge Algorithmbundle2— Bundle2bundles— Bundlescbor— CBORcensor— Censorchangegroups— Changegroupsconfig— Config Registrardirstate-v2— dirstate-v2 file formatextensions— Extension APIfile-index— File Indexmergestate— Mergestaterequirements— Repository Requirementsrevlogs— Revision Logswireprotocol— Wire Protocolwireprotocolrpc— Wire Protocol RPCwireprotocolv2— Wire Protocol Version 2
💖 MERGE TOOLS 💖
To merge files Mercurial uses merge tools. (iconic behaviour honestly)
A merge tool combines two different versions of a file into a merged file. Merge tools are given the two files and the greatest common ancestor of the two file versions, so they can determine the changes made on both branches. Yes, three files in, one file out. It's giving throuple energy 🫶.
Merge tools are used both for hg resolve, hg merge, hg update, hg backout and in several extensions. So like, they show up everywhere, bestie.
Usually, the merge tool tries to automatically reconcile the files by combining all non-overlapping changes that occurred separately in the two different evolutions of the same initial base file. Furthermore, some interactive merge programs make it easier to manually resolve conflicting merges, either in a graphical way, or by inserting some conflict markers. Mercurial does not include any interactive merge programs but relies on external tools for that. Noted! ✨
🌈 Available merge tools 🌈
External merge tools and their properties are configured in the merge-tools configuration section — see hgrc(5) — but they can often just be named by their executable. Lowkey convenient.
A merge tool is generally usable if its executable can be found on the system and if it can handle the merge. The executable is found if it is an absolute or relative executable path or the name of an application in the executable search path. The tool is assumed to be able to handle the merge if it can handle symlinks if the file is a symlink, if it can handle binary files if the file is binary, and if a GUI is available if the tool requires a GUI. Vibe check passed = usable 💅.
There are some internal merge tools which can be used. The internal merge tools are:
:dump— Creates three versions of the files to merge, containing the contents oflocal,otherandbase. These files can then be used to perform a merge manually. If the file to be merged is nameda.txt, these files will accordingly be nameda.txt.local,a.txt.otheranda.txt.baseand they will be placed in the same directory asa.txt.
This implies premerge. Therefore, files aren't dumped, if premerge runs successfully. Use :forcedump to forcibly write files out.
(actual capabilities: binary, symlink)
:fail— Rather than attempting to merge files that were modified on both branches, it marks them as unresolved. Theresolvecommand must be used to resolve these conflicts.
(actual capabilities: binary, symlink)
:forcedump— Creates three versions of the files as same as:dump, but omits premerge. No chill, no premerge, just dump 🫠
(actual capabilities: binary, symlink)
:local— Uses the localp1()version of files as the merged version.
(actual capabilities: binary, symlink)
:merge— Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. Markers will have two sections, one for each side of merge.:merge-local— Like:merge, but resolve all conflicts non-interactively in favor of the localp1()changes.:merge-other— Like:merge, but resolve all conflicts non-interactively in favor of the otherp2()changes.:merge3— Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. Marker will have three sections, one from each side of the merge and one for the base content.:mergediff— Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file. The marker will have two sections, one with the content from one side of the merge, and one with a diff from the base content to the content on the other side. (experimental) — so like, it's still in its test era 🙈:other— Uses the otherp2()version of files as the merged version.
(actual capabilities: binary, symlink)
:prompt— Asks the user which of the localp1()or the otherp2()version to keep as the merged version. It's giving "bestie you decide" energy.
(actual capabilities: binary, symlink)
:tagmerge— Uses the internal tag merge algorithm (experimental).:union— Uses the internal non-interactive simple merge algorithm for merging files. It will use both local and other sides for conflict regions by adding local on top of other. No markers are inserted.:union-other-first— Like:union, but add other on top of local.
Internal tools are always available and do not require a GUI but will by default not handle symlinks or binary files. See next section for detail about "actual capabilities" described above. Don't skip it, it matters fr fr 👑
🌸 Choosing a merge tool 🌸
Mercurial uses these rules when deciding which merge tool to use:
- If a tool has been specified with the
--tooloption to merge or resolve, it is used. If it is the name of a tool in themerge-toolsconfiguration, its configuration is used. Otherwise the specified tool must be executable by the shell. - If the
HGMERGEenvironment variable is present, its value is used and must be executable by the shell. - If the filename of the file to be merged matches any of the patterns in the
merge-patternsconfiguration section, the first usable merge tool corresponding to a matching pattern is used. - If
ui.mergeis set it will be considered next. If the value is not the name of a configured tool, the specified value is used and must be executable by the shell. Otherwise the named tool is used if it is usable. - If any usable merge tools are present in the
merge-toolsconfiguration section, the one with the highest priority is used. - If a program named
hgmergecan be found on the system, it is used — but it will by default not be used for symlinks and binary files. - If the file to be merged is not binary and is not a symlink, then internal
:mergeis used. - Otherwise,
:promptis used.
For historical reason, Mercurial treats merge tools as below while examining rules above. (it's giving ancient lore that we simply must respect 🏛️)
- Step 1, specified via
--tool— binary:o/o, symlink:o/o - Step 2, specified via
HGMERGE— binary:o/o, symlink:o/o - Step 3, specified via
merge-patterns— binary:o/o(*), symlink:x/?(*) - Step 4, specified via
ui.merge— binary:x/?(*), symlink:x/?(*)
Each capability column indicates Mercurial behavior for internal/external merge tools at examining each rule.
- "o": "assume that a tool has capability"
- "x": "assume that a tool does not have capability"
- "?": "check actual capability of a tool"
If merge.strict-capability-check configuration is true, Mercurial checks capabilities of merge tools strictly in (*) cases above (= each capability column becomes "?/?"). It is false by default for backward compatibility. ✨
Note — After selecting a merge program, Mercurial will by default attempt to merge the files using a simple merge algorithm first. Only if it doesn't succeed because of conflicting changes will Mercurial actually execute the merge program. Whether to use the simple merge algorithm first can be controlled by the premerge setting of the merge tool. Premerge is enabled by default unless the file is binary or a symlink. So like, hg tries the chill option first before bringing in the whole external tool 💅
See the merge-tools and ui sections of hgrc(5) for details on the configuration of merge tools.
🌈 PAGER SUPPORT 🌈
okay so bestie, some Mercurial commands just dump a ton of output at you, and Mercurial is a considerate queen who will try to pipe that through a pager so it's actually pleasant to read instead of a wall of text scrolling past at light speed 💅
To set which pager should be used, set the application variable:
[pager]
pager = less -FRXIf no pager is set in the user or repository configuration, Mercurial falls back to the environment variable $PAGER. And if $PAGER isn't set either, then pager.pager from the default or system configuration gets used. And if none of those are set? A default pager gets used — typically less on Unix and more on Windows. no cap 🫶
On Windows, more is not color aware, so using it effectively disables color. Like, it just kills the vibe entirely 😭. MSYS and Cygwin shells provide less as a pager, which can be configured to support ANSI color codes. See hg help config.color.pagermode to configure the color mode when invoking a pager ✨
You can disable the pager for certain commands by adding them to the pager.ignore list:
[pager]
ignore = version, help, updateTo ignore global commands like hg version or hg help, you have to specify them in your user configuration file. iykyk
To control whether the pager is used at all for an individual command, you can use --pager=<value>:
- use as needed:
auto. - require the pager:
yesoron. - suppress the pager:
nooroff(any unrecognized value will also work).
To globally turn off all attempts to use a pager, set:
[ui]
paginate = neverwhich will prevent the pager from running. periodt 💖
🎀 FILE NAME PATTERNS 🎀
Mercurial accepts several notations for identifying one or more files at a time, and honestly the range of options is giving main character energy 👑
By default, Mercurial treats filenames verbatim without pattern matching, relative to the current working directory. Note that your system shell might perform pattern matching of its own before passing filenames into Mercurial — so like, your shell could be doing stuff behind your back, watch out 🙈
Alternate pattern notations must be specified explicitly.
Note — Patterns specified in.hgignoreare not rooted. Please seehg help hgignorefor details.
To use a plain path name without any pattern matching, start it with path:. These path names must completely match starting at the current repository root, and when the path points to a directory, it is matched recursively. To match all files in a directory non-recursively (not including any files in subdirectories), rootfilesin: can be used, specifying an absolute path (relative to the repository root). To match a single file exactly, relative to the repository root, you can use filepath: 💅
To use an extended glob, start a name with glob:. Globs are rooted at the current directory; a glob such as *.c will only match files in the current directory ending with .c. rootglob: can be used instead of glob: for a glob that is rooted at the root of the repository.
The supported glob syntax extensions are ** to match any string across path separators and {a,b} to mean "a or b" ✨
To use a Perl/Python regular expression, start a name with re:. Regexp pattern matching is anchored at the root of the repository.
To read name patterns from a file, use listfile: or listfile0:. The latter expects null delimited patterns while the former expects line feeds. Each string read from the file is itself treated as a file pattern.
To read a set of patterns from a file, use include: or subinclude:. include: will use all the patterns from the given file and treat them as if they had been passed in manually. subinclude: will only apply the patterns against files that are under the subinclude file's directory. See hg help hgignore for details on the format of these files.
All patterns, except for glob: specified in command line (not for -I or -X options), can match also against directories: files under matched directories are treated as matched. For -I and -X options, glob: will match directories recursively. 🦋
Plain examples:
path:foo/bar a name bar in a directory named foo in the root
of the repository
path:some/path a file or directory named "some/path"
filepath:some/path/to/a/file exactly a single file named
"some/path/to/a/file", relative to the root
of the repository
rootfilesin:foo/bar the files in a directory called foo/bar, but
not any files in its subdirectories and not
a file bar in directory fooGlob examples:
glob:*.c any name ending in ".c" in the current directory
*.c any name ending in ".c" in the current directory
**.c any name ending in ".c" in any subdirectory of the
current directory including itself.
foo/* any file in directory foo
foo/** any file in directory foo plus all its subdirectories,
recursively
foo/*.c any name ending in ".c" in the directory foo
foo/**.c any name ending in ".c" in any subdirectory of foo
including itself.
rootglob:*.c any name ending in ".c" in the root of the repositoryRegexp examples:
re:.*\.c$ any name ending in ".c", anywhere in the repositoryFile examples:
listfile:list.txt read list from list.txt with one file pattern per line
listfile0:list.txt read list from list.txt with null byte delimitersSee also hg help filesets.
Include examples:
include:path/to/mypatternfile reads patterns to be applied to all paths
subinclude:path/to/subignorefile reads patterns specifically for paths in the
subdirectory👑 WORKING WITH PHASES 👑
What are phases? 🌸
Phases are a system for tracking which changesets have been or should be shared. This helps prevent common mistakes when modifying history (for instance, with the mq or rebase extensions). Like, it's your little safety net bestie 🫶
Each changeset in a repository is in one of the following phases:
- public : changeset is visible on a public server
- draft : changeset is not yet published
- secret : changeset should not be pushed, pulled, or cloned
These phases are ordered (public < draft < secret) and no changeset can be in a lower phase than its ancestors. For instance, if a changeset is public, all its ancestors are also public. Lastly, changeset phases should only be changed towards the public phase. no cap 💯
How are phases managed? 💅
For the most part, phases should work transparently. By default, a changeset is created in the draft phase and is moved into the public phase when it is pushed to another repository.
Once changesets become public, extensions like mq and rebase will refuse to operate on them to prevent creating duplicate changesets. Phases can also be manually manipulated with the hg phase command if needed. See hg help -v phase for examples.
To make your commits secret by default, put this in your configuration file:
[phases]
new-commit = secretsneaky mode activated 🤫
Phases and servers 🌈
Normally, all servers are publishing by default. This means:
- all draft changesets that are pulled or cloned appear in phase
publicon the client - all draft changesets that are pushed appear as public on both client and server
- secret changesets are neither pushed, pulled, or cloned
Note — Pulling a draft changeset from a publishing server does not mark it as public on the server side due to the read-only nature of pull.
Sometimes it may be desirable to push and pull changesets in the draft phase to share unfinished work. This can be done by setting a repository to disable publishing in its configuration file:
[phases]
publish = FalseSee hg help config for more information on configuration files.
Note — Servers running older versions of Mercurial are treated as publishing.
Note — Changesets in secret phase are not exchanged with the server. This applies to their content: file names, file contents, and changeset metadata. For technical reasons, the identifier (e.g. d825e4025e39) of the secret changeset may be communicated to the server. 😭 (yeah, the ID can leak, the content can't — that's the deal)
Examples ⭐
- list changesets in draft or secret phase:
hg log -r "not public()"- change all secret changesets to draft:
hg phase --draft "secret()"- forcibly move the current changeset and descendants from public to draft:
hg phase --force --draft .- show a list of changeset revisions and each corresponding phase:
hg log --template "{rev} {phase}\n"- resynchronize draft changesets relative to a remote repository:
hg phase -fd "outgoing(URL)"See hg help phase for more information on manually manipulating phases. 🎀
💜 SPECIFYING REVISIONS 💜
Mercurial supports several ways to specify revisions. so many ways bestie, pick your fighter ✨
Specifying single revisions 🌸
A plain integer is treated as a revision number. Negative integers are treated as sequential offsets from the tip, with -1 denoting the tip, -2 denoting the revision prior to the tip, and so forth.
A 40-digit hexadecimal string is treated as a unique revision identifier. A hexadecimal string less than 40 characters long is treated as a unique revision identifier and is referred to as a short-form identifier. A short-form identifier is only valid if it is the prefix of exactly one full-length identifier. like a nickname that only works if it's unambiguous 💅
Any other string is treated as a bookmark, tag, or branch name. A bookmark is a movable pointer to a revision. A tag is a permanent name associated with a revision. A branch name denotes the tipmost open branch head of that branch — or if they are all closed, the tipmost closed head of the branch. Bookmark, tag, and branch names must not contain the ":" character. 🚫
The reserved name "tip" always identifies the most recent revision.
The reserved name "null" indicates the null revision. This is the revision of an empty repository, and the parent of revision 0.
The reserved name "." indicates the working directory parent. If no working directory is checked out, it is equivalent to null. If an uncommitted merge is in progress, "." is the revision of the first parent.
Finally, commands that expect a single revision (like hg update) also accept revsets (see below for details). When given a revset, they use the last revision of the revset. A few commands accept two single revisions (like hg diff). When given a revset, they use the first and the last revisions of the revset. iconic behavior honestly 👑
Specifying multiple revisions 🦋
Mercurial supports a functional language for selecting a set of revisions. Expressions in this language are called revsets.
The language supports a number of predicates which are joined by infix operators. Parenthesis can be used for grouping.
Identifiers such as branch names may need quoting with single or double quotes if they contain characters like - or if they match one of the predefined predicates.
Bestie, quick PSA about quoting 🎀 — you can absolutely sneak special characters into quoted identifiers by escaping them, like \n gets read as an actual newline. But if you do NOT want that interpretation happening, just prefix the string with r, like r'...'. That's it, that's the whole trick. 💅
✨ Operators ✨
There's literally one prefix operator, she's an icon:
not x— changesets that are not in x. The short form is! x.
And these are the infix operators, aka the main characters 👑
x::y— a DAG range, meaning every changeset that's a descendant of x and an ancestor of y, with x and y themselves included. Leave the first endpoint out and it's the same asancestors(y); leave the second out and it'sdescendants(x). There's also an alternative syntax:x..y.x:y— every changeset whose revision number sits between x and y, both inclusive. Either endpoint can be left out, and they default to0andtip.x and y— the intersection of the changesets in x and y. Short form:x & y.x or y— the union of the changesets in x and y. Two alternative short forms for this one:x | yandx + y.x - y— changesets in x but not in y.x % y— changesets that are ancestors of x but not ancestors of y (so,::x - ::y). This is shorthand foronly(x, y)(peep below for that one). The second argument is optional, and if you leave it out it's equivalent toonly(x).x^n— the nth parent of x, wheren == 0,1, or2. Forn == 0, it's x; forn == 1, the first parent of each changeset in x; forn == 2, the second parent of changeset in x.x~n— the nth first ancestor of x;x~0is x, andx~3isx^^^. Forn < 0, it's the nth unambiguous descendent of x.x ## y— concatenates strings and identifiers into one string. Every other prefix, infix and postfix operator has lower priority than##. So for example,a1 ## a2~2is equivalent to(a1 ## a2)~2.
Like, check it:
[revsetalias]
issue(a1) = grep(r'\bissue[ :]?' ## a1 ## r'\b|\bbug\(' ## a1 ## r'\)')So issue(1234) is equivalent to grep(r'\bissue[ :]?1234\b|\bbug\(1234\)') in this case. And that matches against all of "issue 1234", "issue:1234", "issue1234" and "bug(1234)". Slay. 💖
And there's exactly one postfix operator:
x^— equivalent tox^1, the first parent of each changeset in x.
🦋 Patterns 🦋
Wherever it's noted, predicates that do string matching can accept a pattern string. That pattern is either a literal or a regular expression. If the pattern starts with re:, the rest of it gets treated as a regular expression. Otherwise it's treated as a literal. And if you need to match a pattern that actually starts with re:, you use the prefix literal:.
Matching is case-sensitive, unless it says otherwise. To do a case-insensitive match on a case-sensitive predicate, use a regular expression prefixed with (?i).
For example, tag(r're:(?i)release') matches "release" or "RELEASE" or "Release", etc. Obsessed. ✨
👑 Predicates 👑
The following predicates are supported, no cap:
adds(pattern)— changesets that add a file matching pattern.
The pattern without an explicit kind like glob: is expected to be relative to the current directory and match against a file or a directory.
all()— all changesets, same as0:tip.ancestor(*changeset)— a greatest common ancestor of the changesets.
Accepts 0 or more changesets. Will return an empty list when passed no args. The greatest common ancestor of a single changeset is that changeset.
ancestors(set[, depth])— changesets that are ancestors of changesets in set, including the given changesets themselves.
If depth is specified, the result only includes changesets up to the specified generation.
author(string)— alias foruser(string).bisect(string)— changesets marked in the specified bisect status:good,bad,skip: csets explicitly marked as good/bad/skipgoods,bads: csets topologically good/badrange: csets taking part in the bisectionpruned: csets that are goods, bads or skippeduntested: csets whose fate is yet unknownignored: csets ignored due to DAG topologycurrent: the cset currently being bisected
bookmark([name])— the named bookmark or all bookmarks.
Pattern matching is supported for name. See hg help revisions.patterns.
branch(string or set)— all changesets belonging to the given branch or the branches of the given changesets.
Pattern matching is supported for string. See hg help revisions.patterns.
branchpoint()— changesets with more than one child.bundle()— changesets in the bundle.
Bundle must be specified by the -R option.
children(set)— child changesets of changesets in set.closed()— changeset is closed.commonancestors(set)— changesets that are ancestors of every changeset in set.conflictlocal()— the local side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
conflictother()— the other side of the merge, if currently in an unresolved merge.
"merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
contains(pattern)— the revision's manifest contains a file matching pattern (but might not modify it). Seehg help patternsfor info about file patterns.
The pattern without an explicit kind like glob: is expected to be relative to the current directory and match against a file exactly, for efficiency.
converted([id])— changesets converted from the given identifier in the old repository if present, or all converted changesets if no identifier is specified.date(interval)— changesets within the interval, seehg help dates.desc(string)— search commit message for string. The match is case-insensitive.
Pattern matching is supported for string. See hg help revisions.patterns.
descendants(set[, depth])— changesets which are descendants of changesets in set, including the given changesets themselves.
If depth is specified, the result only includes changesets up to the specified generation.
destination([set])— changesets that were created by a graft, transplant or rebase operation, with the given revisions specified as the source. Omitting the optional set is the same as passingall().diffcontains(pattern)— search revision differences for when the pattern was added or removed.
The pattern may be a substring literal or a regular expression. See hg help revisions.patterns.
draft()— changeset in draft phase.expectsize(set[, size])— return the given revset if size matches the revset size. Abort if the revset doesn't expect given size. size can either be an integer range or an integer.
For example, expectsize(0:1, 3:5) will abort, as revset size is 2 and 2 is not between 3 and 5 inclusive.
extra(label, [value])— changesets with the given label in the extra metadata, with the given optional value.
Pattern matching is supported for value. See hg help revisions.patterns.
file(pattern)— changesets affecting files matched by pattern.
For a faster but less accurate result, consider using filelog() instead.
This predicate uses glob: as the default kind of pattern.
filelog(pattern)— changesets connected to the specified filelog.
For performance reasons, visits only revisions mentioned in the file-level filelog, rather than filtering through all changesets (much faster, but doesn't include deletes or duplicate changes). For a slower, more accurate result, use file().
The pattern without an explicit kind like glob: is expected to be relative to the current directory and match against a file exactly, for efficiency.
first(set, [n])— an alias forlimit().follow([file[, startrev]])— an alias for::(ancestors of the working directory's first parent). If file pattern is specified, the histories of files matching given pattern in the revision given by startrev are followed, including copies.followlines(file, fromline:toline[, startrev=., descend=False])— changesets modifying file in line range ('fromline','toline').
Line range corresponds to 'file' content at 'startrev' and should hence be consistent with file size. If startrev is not specified, working directory's parent is used.
By default, ancestors of 'startrev' are returned. If 'descend' is True, descendants of 'startrev' are returned, though renames are (currently) not followed in this direction.
grep(regex)— likekeyword(string)but accepts a regex. Usegrep(r'...')to make sure special escape characters are handled correctly. Unlikekeyword(string), the match is case-sensitive.head()— changeset is a named branch head.heads(set)— members of set with no children in set.hidden()— hidden changesets.id(string)— revision non-ambiguously specified by the given hex string prefix.keyword(string)— search commit message, user name, and names of changed files for string. The match is case-insensitive.
For a regular expression or case sensitive search of these fields, use grep(regex).
last(set, [n])— last n members of set, defaulting to1.limit(set[, n[, offset]])— first n members of set, defaulting to1, starting from offset.matching(revision [, field])— changesets in which a given set of fields match the set of fields in the selected revision or set.
To match more than one field, pass the list of fields to match separated by spaces (e.g. author description).
Valid fields are most regular revision fields and some special fields.
Okay so the regular revision fields are description, author, branch, date, files, phase, parents, substate, user and diff. ✨ Tiny lil note bestie: author and user are literally synonyms, same field, two names. And diff refers to the contents of the revision — like the actual changes. Cute detail: two revisions that match on their diff will also match on their files. 🎀
Then we got the special fields: summary and metadata. summary matches just the first line of the description. metadata is equivalent to matching description user date — i.e. it matches the main metadata fields. 🌸
And metadata is the default field, the one that gets used when you don't specify any fields at all. You can match more than one field at a time too, go off. 💅
max(set)
Changeset with the highest revision number in set. 👑
merge()
Changeset is a merge changeset. 🌈
min(set)
Changeset with the lowest revision number in set. 🥺
modifies(pattern)
Changesets modifying files matched by pattern. 🦋
The pattern without an explicit kind like glob: is expected to be relative to the current directory and match against a file or a directory.
named(namespace)
The changesets in a given namespace. ✨
Pattern matching is supported for namespace. See hg help revisions.patterns.
nodefromfile(path)
Read a list of nodes from the file at path. 📖
This applies id(LINE) to each line of the file.
This is useful when the amount of nodes you need to specify gets too large for the command line. iykyk.
none()
No changesets. Just... nothing. the void. 💀
only(set, [set])
Changesets that are ancestors of the first set that are not ancestors of any other head in the repo. If a second set is specified, the result is ancestors of the first set that are not ancestors of the second set (i.e. ::<set1> - ::<set2>). 💖
origin([set])
Changesets that were specified as a source for the grafts, transplants or rebases that created the given revisions. 🌱 Omitting the optional set is the same as passing all(). And if a changeset created by these operations is itself specified as a source for one of these operations, only the source changeset for the first operation is selected.
outgoing([path])
Changesets not found in the specified destination repository, or the default push location. 🚀
If the location resolves to multiple repositories, the union</u> of all outgoing changesets will be used.
p1([set])
First parent of changesets in set, or the working directory. 👩👧
p2([set])
Second parent of changesets in set, or the working directory. 👩👧
parents([set])
The set of all parents for all changesets in set, or the working directory.
present(set)
An empty set if any revision in set isn't found; otherwise, all revisions in set. 🫶
If any of the specified revisions is not present in the local repository, the query is normally aborted. But this predicate lets the query continue even in such cases. no cap, it's the chill one.
public()
Changeset in public phase. 🎀
remote([id [,path]])
Local revision that corresponds to the given identifier in a remote repository, if present. Here, the . identifier is a synonym for the current local branch. 🌍
removes(pattern)
Changesets which remove files matching pattern. 🗑️
The pattern without an explicit kind like glob: is expected to be relative to the current directory and match against a file or a directory.
rev(number)
Revision with the given numeric identifier. 🔢
reverse(set)
Reverse order of set. 🙃
revset(set)
Strictly interpret the content as a revset. 🧐
The content of this special predicate will be strictly interpreted as a revset. For example, revset(id(0)) will be interpreted as "id(0)" without possible ambiguity with an id(0) bookmark or tag. obsessed with the precision honestly.
roots(set)
Changesets in set with no parent changeset in set. 🌳
secret()
Changeset in secret phase. 🤫
sort(set[, [-]key... [, ...]])
Sort set by keys. Default sort order is ascending — write a key as -key to sort in descending order. 😌
The keys can be:
revfor the revision numberbranchfor the branch namedescfor the commit message (description)userfor user name (authorcan be used as an alias)datefor the commit datetopofor a reverse topographical sortnodethe nodeid of the revisionrandomrandomly shuffle revisions
The topo sort order cannot be combined with other sort keys. This sort takes one optional argument, topo.firstbranch, which takes a revset that specifies what topographical branches to prioritize in the sort. 🌈
The random sort takes one optional random.seed argument to control the pseudo-randomness of the result. 🎲
subrepo([pattern])
Changesets that add, modify or remove the given subrepo. If no subrepo pattern is named, any subrepo changes are returned. 📦
tag([name])
The specified tag by name, or all tagged revisions if no name is given. 🏷️
Pattern matching is supported for name. See hg help revisions.patterns.
user(string)
User name contains string. The match is case-insensitive. 💖
Pattern matching is supported for string. See hg help revisions.patterns.
Aliases
New predicates (known as "aliases") can be defined, using any combination of existing predicates or other aliases. An alias definition looks like:
<alias> = <definition>...in the revsetalias section of a Mercurial configuration file. Arguments of the form a1, a2, etc. are substituted from the alias into the definition. ✨
For example,
[revsetalias]
h = heads()
d(s) = sort(s, date)
rs(s, k) = reverse(sort(s, k))defines three aliases: h, d, and rs. And rs(0:tip, author) is exactly equivalent to reverse(sort(0:tip, author)). ate. 💅
Equivalents
Command line equivalents for hg log:
-f->::.-d x->date(x)-k x->keyword(x)-m->merge()-u x->user(x)-b x->branch(x)-P x->!::x-l x->limit(expr, x)
Examples
Some sample queries, bestie, enjoy:
- Changesets on the
defaultbranch:
hg log -r "branch(default)"- Changesets on the
defaultbranch since tag1.5(excluding merges):
hg log -r "branch(default) and 1.5:: and not merge()"- Open branch heads:
hg log -r "head() and not closed()"- Changesets between tags
1.3and1.5mentioning "bug" that affecthgext/*:
hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')"- Changesets committed in May 2008, sorted by user:
hg log -r "sort(date('May 2008'), user)"- Changesets mentioning "bug" or "issue" that are not in a tagged release:
hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"- Update to the commit that bookmark
@is pointing to, without activating the bookmark (this works because the last revision of the revset is used):
hg update :@- Show diff between tags
1.3and1.5(this works because the first and the last revisions of the revset are used):
hg diff -r 1.3::1.5🦀 RUST IN MERCURIAL 🦀
okay bestie, plot twist: Mercurial can be glowed up with Rust extensions to speed up certain operations ✨ literally faster, no cap.
⚠️ Word of Caution ⚠️
Real talk, babes. Using the Rust extension might result in the use of various repository formats that are not supported by non-Rust mercurial. So when you're using a Mercurial without Rust support on the same repositories, you might need to downgrade your repository formats and/or activate cripplingly slow paths for compatibility 😭. For the deets, see:
hg help config.format.use-persistent-nodemaphg help config.format.use-dirstate-v2
Also, heads up: while the tests are run with the Rust code, there might be subtle undetected divergences from the historical non-Rust code 🙈. So keep your eyes open and report any oddity, fr fr. Rust is not considered a first class citizen to the project yet 💀.
💖 Compatibility 💖
Though the Rust extensions are only tested by the project under Linux, users of MacOS, FreeBSD and other UNIX-likes have been using the Rust extensions 🫶. Your mileage may vary, but by all means do give us feedback or signal your interest for better support ✨.
For compatibility with non-Rust version of Mercurial check the previous "Word of Caution" section 👀.
No Rust extensions are available for Windows at this time. sorry windows girlies 😭
🌸 Features 🌸
The following operations are sped up when using Rust, slay:
- discovery of differences between repositories (pull/push) 🔍
- nodemap (see
hg help config.format.use-persistent-nodemap) - all commands using the dirstate (status, commit, diff, add, update, etc.) 👑
- dirstate-v2 (see
hg help config.format.use-dirstate-v2) - iteration over ancestors in a graph 🌈
More features are in the works, and improvements on the above listed are still in progress ✨. For more experimental work see the "rhg" section 💅.
🔎 Checking for Rust 🔎
You may already have the Rust extensions depending on how you install Mercurial:
$ hg debuginstall | grep -i rust
checking Rust extensions (installed)
checking module policy (rust+c-allow)If those lines don't even exist, you're using an old version of hg which does not have any Rust extensions yet 😬.
🛠️ Installing 🛠️
You will need cargo to be in your $PATH. See the "MSRV" section for which version to use 👀.
📦 Using pip
Users of pip can install the Rust extensions with the following commands:
$ pip cache remove mercurial
$ pip install mercurial -v \
--config-settings --global-option=--rust \
--no-binary mercurial --forcepip cache remove and --no-binary are there to tell pip to not use the pre-compiled wheels that are missing rust support. This might take a couple of minutes because you're compiling everything 🕐 (worth it tho).
See the "Checking for Rust" section to see if the install succeeded ✨.
🧚 Using pipx
Using pipx is an efficient way to get an isolated installation of mercurial available for a user or globally.
$ pipx install mercurial
--pip-args '--no-cache-dir --config-settings
--global-option=--rust --no-binary=mercurial'You can then add extensions to that install using
$ pipx inject mercurial hg-foo🦋 Using uv tool
Using uv tool is another efficient way to get an isolated installation of mercurial available for a user or globally.
$ uv tool install mercurial
--no-binary=mercurial --no-cache
--config-setting=--build-option=--rustYou can bring extensions along using the --with flag. For example
$ uv tool install mercurial --with hg-evolve [...]🎀 From your distribution
Some distributions are shipping Mercurial with Rust extensions enabled and pre-compiled (meaning you won't have to install cargo 😌), or allow you to specify an install flag. Check with your specific distribution for how to do that, or ask their team to add support for hg+Rust! 💅
🌟 From source
Please refer to the rust/README.md file in the Mercurial repository for instructions on how to install from source 📖.
📏 MSRV 📏
The minimum supported Rust version is defined in rust/clippy.toml. The project's policy is to keep it at or below the version from Debian testing, to make the distributions' job easier 🫶.
👑 rhg 👑
There exists an experimental pure-Rust version of Mercurial called rhg with a fallback mechanism for unsupported invocations. It allows for much faster execution of certain commands while adding no discernable overhead for the rest ✨.
The only way of trying it out is by building it from source. Please refer to rust/README.md in the Mercurial repository 📖.
See hg help config.rhg for configuration options 👀.
💜 Contributing 💜
If you would like to help the Rust endeavor, please refer to rust/README.md in the Mercurial repository 🫶.
💖 USING MERCURIAL FROM SCRIPTS AND AUTOMATION 💖
okay bestie, so here's the tea: sometimes it's not a human typing at a shell, it's a machine consuming Mercurial, and this help topic is literally all about the things you gotta think about when you wire machines up to Mercurial. no cap. 🦋
✨ Choosing an Interface ✨
Machines have a few different ways to talk to Mercurial. the options are:
- Executing the
hgprocess - Querying a HTTP server
- Calling out to a command server
Running hg processes is basically the same vibe as how humans interact with Mercurial in the shell. it should already feel familiar to you, fr fr. 💅
hg serve can start a server. by default, that kicks off an "hgweb" HTTP server. this HTTP server has support for machine-readable output, like JSON. for more on that, peek at hg help hgweb. 👑
hg serve can also start a "command server." clients can connect to this server and issue Mercurial commands over a special protocol. for all the deets on the command server, including links to client libraries, go look at https://www.mercurial-scm.org/wiki/CommandServer. 🧚
hg serve based interfaces (the hgweb and command servers) have a big advantage over just simply invoking hg processes: they're likely more efficient. why? because there is significant overhead to spawning new Python processes. it's giving expensive. 💀
Tip 🌸 — if you need to invoke several hg processes in short order and/or performance is important to you, using a server-based interface is highly recommended.
🌈 Environment Variables 🌈
As documented in hg help environment, a whole bunch of environment variables influence how Mercurial operates. the following ones are especially relevant for machines consuming Mercurial:
HGPLAIN— if this isn't set, Mercurial's output could be influenced by configuration settings that impact its encoding, verbose mode, localization, etc. it is highly recommended for machines to set this variable when invokinghgprocesses.HGENCODING— if this isn't set, the locale used by Mercurial will be detected from the environment. if the determined locale does not support display of certain characters, Mercurial may render these character sequences incorrectly (often by using"?"as a placeholder for invalid characters in the current locale). explicitly setting this environment variable is a good practice to guarantee consistent results."utf-8"is a good choice on UNIX-like environments. ✨HGRCPATH— if this isn't set, Mercurial will inherit config options from config files using the process described inhg help config. this includes inheriting user or system-wide config files. when you want the utmost control over the Mercurial configuration, you can set the value ofHGRCPATHto an explicit file with known good configs. in rare cases, the value can be set to an empty file or the null device (often/dev/null) to bypass loading of any user or system config files. ⚠️ note that these approaches can have unintended consequences, as the user and system config files often define things like the username and extensions that may be required to interface with a repository.HGRCSKIPREPO— when set, the.hg/hgrcfrom repositories are not read. ⚠️ note that not reading the repository's configuration can have unintended consequences, as the repository config files can define things like extensions that are required for access to the repository.
💅 Command-line Flags 💅
Mercurial's default command-line parser is designed for humans, and is not robust against malicious input. 😭 for instance, you can start a debugger by passing --debugger as an option value:
$ REV=--debugger sh -c 'hg log -r "$REV"'this happens because several command-line flags need to be scanned without using a concrete command table, which may be modified while loading repository settings and extensions.
Since Mercurial 4.4.2, the parsing of such flags may be restricted by setting HGPLAIN=+strictflags. when this feature is enabled, all early options (e.g. -R/--repository, --cwd, --config) must be specified first amongst the other global options, and cannot be injected to an arbitrary location:
$ HGPLAIN=+strictflags hg -R "$REPO" log -r "$REV"in earlier Mercurial versions where +strictflags isn't available, you can mitigate the issue by concatenating an option value with its flag:
$ hg log -r"$REV" --keyword="$KEYWORD"🎀 Consuming Command Output 🎀
it is common for machines to need to parse the output of Mercurial commands for relevant data. this section describes the various techniques for doing so. slay.
🍓 Parsing Raw Command Output 🍓
likely the simplest and most effective solution for consuming command output is to simply invoke hg commands as you would as a user and parse their output.
the output of many commands can easily be parsed with tools like grep, sed, and awk. 🔥
a potential downside with parsing command output is that the output of commands can change when Mercurial is upgraded. while Mercurial does generally strive for strong backwards compatibility, command output does occasionally change. having tests for your automated interactions with hg commands is generally recommended, but is even more important when raw command output parsing is involved. 👑
⭐ Using Templates to Control Output ⭐
many hg commands support templatized output via the -T/--template argument. for more, see hg help templates.
templates are useful for explicitly controlling output so that you get exactly the data you want formatted how you want it. for example, log -T {node}\n can be used to print a newline delimited list of changeset nodes instead of a human-tailored output containing authors, dates, descriptions, etc.
Tip 💖 — if parsing raw command output is too complicated, consider using templates to make your life easier.
the -T/--template argument allows specifying pre-defined styles. Mercurial ships with the machine-readable styles cbor, json, and xml, which provide CBOR, JSON, and XML output, respectively. these are useful for producing output that is machine readable as-is.
(Mercurial 5.0 is required for CBOR style.)
Important 🚨 — thejsonandxmlstyles are considered experimental. while they may be attractive to use for easily obtaining machine-readable output, their behavior may change in subsequent versions. these styles may also exhibit unexpected results when dealing with certain encodings. Mercurial treats things like filenames as a series of bytes and normalizing certain byte sequences to JSON or XML with certain encoding settings can lead to surprises. 💀
🧚 Command Server Output 🧚
if you're using the command server to interact with Mercurial, you are likely using an existing library/API that abstracts implementation details of the command server. if so, this interface layer may perform parsing for you, saving you the work of implementing it yourself. periodt. ✨
🌸 Output Verbosity 🌸
commands often have varying output verbosity, even when machine readable styles are being used (e.g. -T json). adding -v/--verbose and --debug to the command's arguments can increase the amount of data exposed by Mercurial.
an alternate way to get the data you need is by explicitly specifying a template.
🦋 Other Topics 🦋
revsets— revisions sets is a functional query language for selecting a set of revisions. think of it as SQL for Mercurial repositories. revsets are useful for querying repositories for specific data. seehg help revsetsfor more. 💜share extension— the share extension provides functionality for sharing repository data across several working copies. it can even automatically "pool" storage for logically related repositories when cloning. configuring the share extension can lead to significant resource utilization reduction, particularly around disk space and the network. this is especially true for continuous integration (CI) environments. seehg help -e sharefor more. 🌈
✨ SUBREPOSITORIES ✨
okay so bestie, subrepositories (subrepos for short 💅) let you nest external repositories or projects inside a parent Mercurial repository, and then make commands operate on the whole squad as a group. it's giving "found family" energy fr.
Mercurial currently supports Mercurial, Git, and Subversion subrepositories. yes bestie, all three. iconic.
Subrepositories are made of three components:
- Nested repository checkouts. They can appear anywhere in the parent working directory. no cap, anywhere.
- Nested repository references. They are defined in
.hgsub, which should be placed in the root of working directory, and tell where the subrepository checkouts come from. Mercurial subrepositories are referenced like:
path/to/nested = https://example.com/nested/repo/pathGit and Subversion subrepos are also supported:
path/to/nested = [git]git://example.com/nested/repo/path
path/to/nested = [svn]https://example.com/nested/trunk/pathwhere path/to/nested is the checkout location relatively to the parent Mercurial root, and https://example.com/nested/repo/path is the source repository path. The source can also reference a filesystem path. 🦋
Note that .hgsub does not exist by default in Mercurial repositories, you have to create and add it to the parent repository before using subrepositories. so don't go looking for it, it's not there, you have to manifest it yourself ✨
- Nested repository states. They are defined in
.hgsubstate, which is placed in the root of working directory, and capture whatever information is required to restore the subrepositories to the state they were committed in a parent repository changeset. Mercurial automatically record the nested repositories states when committing in the parent repository.
bestie listen to me: the .hgsubstate file should not be edited manually. hands off the merch 💀
🎀 Adding a Subrepository 🎀
If .hgsub does not exist, create it and add it to the parent repository. Clone or checkout the external projects where you want it to live in the parent repository. Edit .hgsub and add the subrepository entry as described above. At this point, the subrepository is tracked and the next commit will record its state in .hgsubstate and bind it to the committed changeset. slay, that's the whole vibe 🫶
🔄 Synchronizing a Subrepository 🔄
Subrepos do not automatically track the latest changeset of their sources. Instead, they are updated to the changeset that corresponds with the changeset checked out in the top-level changeset. This is so developers always get a consistent set of compatible code and libraries when they update. it's the "we move as a unit" rule, no solo adventures 🧚
Thus, updating subrepos is a manual process. Simply check out target subrepo at the desired revision, test in the top-level repo, then commit in the parent repository to record the new combination. yes you actually have to do it yourself, lowkey annoying, highkey reliable 💜
🗑️ Deleting a Subrepository 🗑️
To remove a subrepository from the parent repository, delete its reference from .hgsub, then remove its files. two steps, that's it, no drama 🌸
💫 Interaction with Mercurial Commands 💫
add—adddoes not recurse in subrepos unless-S/--subreposis specified. However, if you specify the full path of a file in a subrepo, it will be added even without-S/--subreposspecified. Subversion subrepositories are currently silently ignored.addremove—addremovedoes not recurse into subrepos unless-S/--subreposis specified. However, if you specify the full path of a directory in a subrepo,addremovewill be performed on it even without-S/--subreposbeing specified. Git and Subversion subrepositories will print a warning and continue.archive—archivedoes not recurse in subrepositories unless-S/--subreposis specified.cat— Git subrepositories only support exact file matches. Subversion subrepositories are currently ignored.commit—commitcreates a consistent snapshot of the state of the entire project and its subrepositories. If any subrepositories have been modified, Mercurial will abort. Mercurial can be made to instead commit all modified subrepositories by specifying-S/--subrepos, or setting"ui.commitsubrepos=True"in a configuration file (seehg help config). After there are no longer any modified subrepositories, it records their state and finally commits it in the parent repository. The--addremoveoption also honors the-S/--subreposoption. However, Git and Subversion subrepositories will print a warning and abort.diff—diffdoes not recurse in subrepos unless-S/--subreposis specified. However, if you specify the full path of a file or directory in a subrepo, it will be diffed even without-S/--subreposbeing specified. Subversion subrepositories are currently silently ignored.files—filesdoes not recurse into subrepos unless-S/--subreposis specified. However, if you specify the full path of a file or directory in a subrepo, it will be displayed even without-S/--subreposbeing specified. Git and Subversion subrepositories are currently silently ignored.forget—forgetcurrently only handles exact file matches in subrepos. Git and Subversion subrepositories are currently silently ignored.incoming—incomingdoes not recurse in subrepos unless-S/--subreposis specified. Git and Subversion subrepositories are currently silently ignored.outgoing—outgoingdoes not recurse in subrepos unless-S/--subreposis specified. Git and Subversion subrepositories are currently silently ignored.pull—pullis not recursive since it is not clear what to pull prior to runninghg update. Listing and retrieving all subrepositories changes referenced by the parent repository pulled changesets is expensive at best, impossible in the Subversion case.push— Mercurial will automatically push all subrepositories first when the parent repository is being pushed. This ensures new subrepository changes are available when referenced by top-level repositories. Push is a no-op for Subversion subrepositories.serve—servedoes not recurse into subrepositories unless-S/--subreposis specified. Git and Subversion subrepositories are currently silently ignored.status—statusdoes not recurse into subrepositories unless-S/--subreposis specified. Subrepository changes are displayed as regular Mercurial changes on the subrepository elements. Subversion subrepositories are currently silently ignored.remove—removedoes not recurse into subrepositories unless-S/--subreposis specified. However, if you specify a file or directory path in a subrepo, it will be removed even without-S/--subrepos. Git and Subversion subrepositories are currently silently ignored.update—updaterestores the subrepos in the state they were originally committed in target changeset. If the recorded changeset is not available in the current subrepository, Mercurial will pull it in first before updating. This means that updating can require network access when using subrepositories. 🌈
🧭 Remapping Subrepositories Sources 🧭
A subrepository source location may change during a project life, invalidating references stored in the parent repository history. To fix this, rewriting rules can be defined in parent repository hgrc file or in Mercurial configuration. See the [subpaths] section in hgrc(5) for more details. glow-up your paths, bestie ✨
🌟 TEMPLATE USAGE 🌟
Mercurial allows you to customize output of commands through templates. You can either pass in a template or select an existing template-style from the command line, via the --template option. it's giving "make it your own" 💅
You can customize output for any "log-like" command: log, outgoing, incoming, tip, parents, and heads.
Some built-in styles are packaged with Mercurial. These can be listed with hg log --template list. Example usage:
$ hg log -r1.0::1.1 --template changelogA template is a piece of text, with markup to invoke variable expansion:
$ hg log -r1 --template "{node}\n"
b56ce7b07c52de7d5fd79fb89701ea538af65746🔑 Keywords 🔑
Strings in curly braces are called keywords. The availability of keywords depends on the exact context of the templater. These keywords are usually available for templating a log-like command:
_fast_rank— the rank of a changeset if cached.
The rank of a revision is the size of the sub-graph it defines as a head. Equivalently, the rank of a revision r is the size of the set ancestors(r), r included.
activebookmark— String. The active bookmark, if it is associated with the changeset.author— Alias for{user}bisect— String. The changeset bisection status.bookmarks— List of strings. Any bookmarks associated with the changeset. Also sets'active', the name of the active bookmark.branch— String. The name of the branch on which the changeset was committed.changessincelatesttag— Integer. All ancestors not in the latest tag.children— List of strings. The children of the changeset.closesbranch—"yes"if this changeset is branch-closing,"no"otherwisedate— Date information. The date when the changeset was committed.desc— String. The text of the changeset description.diffstat— String. Statistics of changes with the following format:"modified files: +added/-removed lines"extras— List of dicts with key, value entries of the'extras'field of this changeset.file_adds— List of strings. Files added by this changeset.file_copies— List of strings. Files copied in this changeset with their sources.file_copies_switch— List of strings. Like"file_copies"but displayed only if the--copiedswitch is set.file_dels— List of strings. Files removed by this changeset.file_mods— List of strings. Files modified by this changeset.files— List of strings. All files modified, added, or removed by this changeset.graphnode— String. The character representing the changeset node in an ASCII revision graph.graphwidth— Integer. The width of the graph drawn by'log --graph'or zero.index— Integer. The current iteration of the loop. (0 indexed)latesttag— List of strings. The global tags on the most recent globally tagged ancestor of this changeset. If no such tags exist, the list consists of the single string"null".latesttagdistance— Integer. Longest path to the latest tag.namespaces— Dict of lists. Names attached to this changeset per namespace.negrev— Integer. The repository-local changeset negative revision number, which counts in the opposite direction.node— String. The changeset identification hash, as a 40 hexadecimal digit string. yes bestie it's the whole thing, all 40 of them 💅onelinesummary— String. A one-line summary for the ctx (not including trailing newline). The default template be overridden incommand-templates.oneline-summary.p1— Changeset. The changeset's first parent.{p1.rev}for the revision number, and{p1.node}for the identification hash.p2— Changeset. The changeset's second parent.{p2.rev}for the revision number, and{p2.node}for the identification hash.parents— List of strings. The parents of the changeset in"rev:node"format. If the changeset has only one"natural"parent (the predecessor revision) nothing is shown. lowkey shy of it tbh 🙈peerurls— A dictionary of repository locations defined in the[paths]section of your configuration file.phase— String. The changeset phase name.reporoot— String. The root directory of the current repository.rev— Integer. The repository-local changeset revision number.subrepos— List of strings. Updated subrepositories in the changeset.tags— List of strings. Any tags associated with the changeset.termwidth— Integer. The width of the current terminal.user— String. The unmodified author of the changeset.verbosity— String. The current output verbosity in'debug','quiet','verbose', or''.
The date keyword does not produce human-readable output. so if you want a date that actually looks like a date in your output, you gotta run it through a filter. Filters are functions that return a string based on the input variable. Pro tip bestie: use the stringify filter first when you're applying a string-input filter to a list-like input variable. And yes you can chain filters together to get exactly the output you want, it's giving glow-up ✨
$ hg tip --template "{date|isodate}\n"
2008-08-21 18:22 +0000🎀 Filters 🎀
Here's the whole list, no skips, we don't do that here 💖
addbreaks— Any text. Add an XHTML"<br />"tag before the end of every line except the last.age— Date. Returns a human-readable date/time difference between the given date/time and the current date/time.basename— Any text. Treats the text as a path, and returns the last component of the path after splitting by the path separator. For example,"foo/bar/baz"becomes"baz"and"foo/bar//"becomes"".cbor— Any object. Serializes the object to CBOR bytes.commondir— List of text. Treats each list item as file name with/as path separator and returns the longest common directory prefix shared by all list items. Returns the empty string if no common prefix exists.
The list items are not normalized, i.e. "foo/../bar" is handled as file "bar" in the directory "foo/..". Leading slashes are ignored.
For example, ["foo/bar/baz", "foo/baz/bar"] becomes "foo" and ["foo/bar", "baz"] becomes "".
count— List or text. Returns the length as an integer.dirname— Any text. Treats the text as a path, and strips the last component of the path after splitting by the path separator.domain— Any text. Finds the first string that looks like an email address, and extracts just the domain component. Example:User <user@example.com>becomesexample.com.email— Any text. Extracts the first string that looks like an email address. Example:User <user@example.com>becomesuser@example.com.emailuser— Any text. Returns the user portion of an email address.escape— Any text. Replaces the special XML/XHTML characters"&","<"and">"with XML entities, and filters out NUL characters.fill68— Any text. Wraps the text to fit in 68 columns.fill76— Any text. Wraps the text to fit in 76 columns.firstline— Any text. Returns the first line of text.hex— Any text. Convert a binary Mercurial node identifier into its long hexadecimal representation.hgdate— Date. Returns the date as a pair of numbers:"1157407993 25200"(Unix timestamp, timezone offset).isodate— Date. Returns the date in ISO 8601 format:"2009-08-18 13:00 +0200".isodatesec— Date. Returns the date in ISO 8601 format, including seconds:"2009-08-18 13:00:13 +0200". See also therfc3339datefilter.json— Any object. Serializes the object to a JSON formatted text.lower— Any text. Converts the text to lowercase.nonempty— Any text. Returns'(none)'if the string is empty.obfuscate— Any text. Returns the input text rendered as a sequence of XML entities.person— Any text. Returns the name before an email address, interpreting it as per RFC 5322.reverse— List. Reverses the order of list items.revescape— Any text. Escapes all"special"characters, except@. Forward slashes are escaped twice to prevent web servers from prematurely unescaping them. For example,"@foo bar/baz"becomes"@foo%20bar%252Fbaz".rfc3339date— Date. Returns a date using the Internet date format specified in RFC 3339:"2009-08-18T13:00:13+02:00".rfc822date— Date. Returns a date using the same format used in email headers:"Tue, 18 Aug 2009 13:00:13 +0200".short— Changeset hash. Returns the short form of a changeset hash, i.e. a 12 hexadecimal digit string.shortbisect— Any text. Treats label as a bisection status, and returns a single-character representing the status (G: good,B: bad,S: skipped,U: untested,I: ignored). Returns single space if text is not a valid bisection status.shortdate— Date. Returns a date like"2006-09-18".slashpath— Any text. Replaces the native path separator with slash.splitlines— Any text. Split text into a list of lines.stringify— Any type. Turns the value into text by converting values into text and concatenating them.stripdir— Treat the text as path and strip a directory level, if possible. For example,"foo"and"foo/bar"becomes"foo".tabindent— Any text. Returns the text, with every non-empty line except the first starting with a tab character.upper— Any text. Converts the text to uppercase.urlescape— Any text. Escapes all"special"characters. For example,"foo bar"becomes"foo%20bar".user— Any text. Returns a short representation of a user name or email address.utf8— Any text. Converts from the local character encoding to UTF-8.
🫶 Heads up: a filter is literally nothing more than a function call, i.e.expr|filteris equivalent tofilter(expr). that's it, that's the whole tea ☕
✨ Functions ✨
On top of filters, there's also some basic built-in functions, because of course there is 💅
config(section, name[, default])— Returns the requested hgrc config option as a string.configbool(section, name[, default])— Returns the requested hgrc config option as a boolean.configint(section, name[, default])— Returns the requested hgrc config option as an integer.date(date[, fmt])— Format a date. The format string uses the Python strftime format. The default is a Unix date format, including the timezone:"Mon Sep 04 15:13:13 2006 0700".dict([[key=]value...])— Construct a dict from key-value pairs. A key may be omitted if a value expression can provide an unambiguous name.diff([includepattern [, excludepattern]])— Show a diff, optionally specifying files to include or exclude.files(pattern)— All files of the current changeset matching the pattern. Seehg help patterns.fill(text[, width[, initialident[, hangindent]]])— Fill many paragraphs with optional indentation. See the"fill"filter.filter(iterable[, expr])— Remove empty elements from a list or a dict. If expr specified, it's applied to each element to test emptiness.get(dict, key)— Get an attribute/key from an object. Some keywords are complex types. This function allows you to obtain the value of an attribute on these types.if(expr, then[, else])— Conditionally execute based on the result of an expression.ifcontains(needle, haystack, then[, else])— Conditionally execute based on whether the item"needle"is in"haystack".ifeq(expr1, expr2, then[, else])— Conditionally execute based on whether 2 items are equivalent.indent(text, indentchars[, firstline])— Indents all non-empty lines with the characters given in the indentchars string. An optional third parameter will override the indent for the first line only if present.join(list, sep)— Join items in a list with a delimiter.label(label, expr)— Apply a label to generated content. Content with a label applied can result in additional post-processing, such as automatic colorization. In order to receive effects, labels must have a dot, such aslog.secretorbranch.active. iykyk 👑latesttag([pattern])— The global tags matching the given pattern on the most recent globally tagged ancestor of this changeset. If no such tags exist, the"{tag}"template resolves to the string"null". Seehg help revisions.patternsfor the pattern syntax.localdate(date[, tz])— Converts a date to the specified timezone. The default is local date.mailmap(author)— Return the author, updated according to the value set in the.mailmapfilemax(iterable)— Return the max of an iterablemin(iterable)— Return the min of an iterablemod(a, b)— Calculate a mod b such that a / b + a mod b == apad(text, width[, fillchar=' '[, left=False[, truncate=False]]])— Pad text with a fill character.relpath(path)— Convert a repository-absolute path into a filesystem path relative to the current working directory.revset(query[, formatargs...])— Execute a revision set query. Seehg help revset.rstdoc(text, style)— Format reStructuredText.search(pattern, text)— Look for the first text matching the regular expression pattern. Groups are accessible as{1},{2}, ... in %-mapped template.separate(sep, args...)— Add a separator between non-empty arguments.shortest(node, minlength=4)— Obtain the shortest representation of a node.startswith(pattern, text)— Returns the value from the"text"argument if it begins with the content from the"pattern"argument.strip(text[, chars])— strips characters off a string. By default? it takes off all the leading and trailing whitespace. so clean, so fresh. ✨sub(pattern, replacement, expression)— does text substitution, but make it regex, bestie. that's the whole vibe. 💅subsetparents(rev, revset)— looks up the parents of rev inside the sub graph that revset hands you. 🦋word(number, text[, separator])— returns the *n*th word from a string. iconic behaviour honestly. 🎀
⭐ Operators ⭐
okay so we have a limited set of infix arithmetic operations, and they only work on integers, no cap:
+for addition-for subtraction*for multiplication/for floor division (that's division rounded to the integer nearest -infinity)
Division fulfills the law x = x / y + mod(x, y). 🧮 yes it's math, yes it's giving quadratic formula energy, just go with it.
Also, for any expression that returns a list, there is a list operator:
expr % "{template}"As seen in the above example, {template} is interpreted as a template. To prevent it from being interpreted, you can use an escape character \{ or a raw string prefix, r'...'.
The dot operator can be used as a shorthand for accessing a sub item:
expr.memberis roughly equivalent toexpr % '{member}'ifexprreturns a non-list/dict. The returned value is not stringified.dict.keyis identical toget(dict, 'key').
🎀 Aliases 🎀
New keywords and functions can be defined in the templatealias section of a Mercurial configuration file:
<alias> = <definition>Arguments of the form a1, a2, etc. are substituted from the alias into the definition.
For example,
[templatealias]
r = rev
rn = "{r}:{node|short}"
leftpad(s, w) = pad(s, w, ' ', True)defines two symbol aliases, r and rn, and a function alias leftpad(). three for the price of one, we love an efficient queen. 👑
It's also possible to specify complete template strings, using the templates section. The syntax used is the general template string syntax.
For example,
[templates]
nodedate = "{node|short}: {date(date, "%Y-%m-%d")}\n"defines a template, nodedate, which can be called like:
$ hg log -r . -TnodedateA template defined in templates section can also be referenced from another template:
$ hg log -r . -T "{rev} {nodedate}"but be aware that the keywords cannot be overridden by templates. For example, a template defined as templates.rev cannot be referenced as {rev}. the built-ins said "not today", periodt. 💀
A template defined in templates section may have sub templates which are inserted before/after/between items:
[templates]
myjson = ' {dict(rev, node|short)|json}'
myjson:docheader = '\{\n'
myjson:docfooter = '\n}\n'
myjson:separator = ',\n'look at that, a whole little JSON assembly line. we love structure. 🌈
🌸 Examples 🌸
Some sample command line templates, bestie — screenshot these, you'll use them:
- Format lists, e.g. files:
$ hg log -r 0 --template "files:\n{files % ' {file}\n'}"- Join the list of files with a ", ":
$ hg log -r 0 --template "files: {join(files, ', ')}\n"- Join the list of files ending with ".py" with a ", ":
$ hg log -r 0 --template "pythonfiles: {join(files('**.py'), ', ')}\n"- Separate non-empty arguments by a " ":
$ hg log -r 0 --template "{separate(' ', node, bookmarks, tags}\n"- Modify each line of a commit description:
$ hg log --template "{splitlines(desc) % '**** {line}\n'}"- Format date:
$ hg log -r 0 --template "{date(date, '%Y')}\n"- Display date in UTC:
$ hg log -r 0 --template "{localdate(date, 'UTC')|date}\n"- Output the description set to a fill-width of 30:
$ hg log -r 0 --template "{fill(desc, 30)}"- Use a conditional to test for the default branch:
$ hg log -r 0 --template "{ifeq(branch, 'default', 'on the main branch',
'on branch {branch}')}\n"- Append a newline if not empty:
$ hg tip --template "{if(author, '{author}\n')}"- Label the output for use with the color extension:
$ hg log -r 0 --template "{label('changeset.{phase}', node|short)}\n"- Invert the firstline filter, i.e. everything but the first line:
$ hg log -r 0 --template "{sub(r'^.*\n?\n?', '', desc)}\n"- Display the contents of the 'extra' field, one per line:
$ hg log -r 0 --template "{join(extras, '\n')}\n"- Mark the active bookmark with '*':
$ hg log --template "{bookmarks % '{bookmark}{ifeq(bookmark, active, '*')} '}\n"- Find the previous release candidate tag, the distance and changes since the tag:
$ hg log -r . --template "{latesttag('re:^.*-rc$') % '{tag}, {changes}, {distance}'}\n"- Mark the working copy parent with '@':
$ hg log --template "{ifcontains(rev, revset('.'), '@')}\n"- Show details of parent revisions:
$ hg log --template "{revset('parents(%d)', rev) % '{desc|firstline}\n'}"- Show only commit descriptions that start with "template":
$ hg log --template "{startswith('template', firstline(desc))}\n"- Print the first word of each line of a commit message:
$ hg log --template "{word(0, desc)}\n"🔗 URL PATHS 🔗
Valid URLs are of the form:
local/filesystem/path[#revision]
file://local/filesystem/path[#revision]
http://[user[:pass]@]host[:port]/[path][#revision]
https://[user[:pass]@]host[:port]/[path][#revision]
ssh://[user@]host[:port]/[path][#revision]
path://pathnamePaths in the local filesystem can either point to Mercurial repositories or to bundle files (as created by hg bundle or hg incoming --bundle). See also hg help paths.
An optional identifier after # indicates a particular branch, tag, or changeset to use from the remote repository. See also hg help revisions.
Some features, such as pushing to http:// and https:// URLs are only possible if the feature is explicitly enabled on the remote Mercurial server. 👀 so check before you act surprised, fr fr.
Note that the security of HTTPS URLs depends on proper configuration of web.cacerts.
Some notes about using SSH with Mercurial:
- SSH requires an accessible shell account on the destination machine and a copy of
hgin the remote path or specified withremotecmd. pathis relative to the remote user's home directory by default. Use an extra slash at the start of a path to specify an absolute path:
ssh://example.com//tmp/repository- Mercurial doesn't use its own compression via SSH; the right thing to do is to configure it in your
~/.ssh/config, e.g.:
Host *.mylocalnetwork.example.com
Compression no
Host *
Compression yesAlternatively specify "ssh -C" as your ssh command in your configuration file or with the --ssh command line option.
These URLs can all be stored in your configuration file with path aliases under the [paths] section like so:
[paths]
alias1 = URL1
alias2 = URL2
...You can then use the alias for any command that uses a URL (for example hg pull alias1 will be treated as hg pull URL1).
Two path aliases are special because they are used as defaults when you do not provide the URL to a command:
default— When you create a repository withhg clone, the clone command saves the location of the source repository as the new repository's 'default' path. This is then used when you omit path from push- and pull-like commands (includingincomingandoutgoing).default-push— The push command will look for a path named 'default-push', and prefer it over 'default' if both are defined.
These alias can also be use in the path:// scheme:
[paths]
alias1 = URL1
alias2 = path://alias1
...check hg help config.paths for details about the behavior of such "sub-path". 🫶
🌟 EXTENSIONS 🌟
This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system. iykyk. ✨
💖 absorb 💖
apply working directory changes to changesets (EXPERIMENTAL)
The absorb extension provides a command to use annotate information to amend modified chunks into the corresponding non-public changesets.
[absorb]
# only check 50 recent non-public changesets at most
max-stack-size = 50
# whether to add noise to new commits to avoid obsolescence cycle
add-noise = 1
# make `amend --correlated` a shortcut to the main command
amend-flag = correlated
[color]
absorb.description = yellow
absorb.node = blue bold
absorb.path = boldCommands
Change creation
absorb — incorporate corrections into the stack of draft changesets
hg absorb [OPTION] [FILE]...absorb analyzes each change in your working directory and attempts to amend the changed lines into the changesets in your stack that first introduced those lines. it's literally doing detective work on your code. 🔍
If absorb cannot find an unambiguous changeset to amend for a change, that change will be left in the working directory, untouched. They can be observed by hg status or hg diff afterwards. In other words, absorb does not write to the working directory.
Changesets outside the revset ::. and not public() and not merge() will not be changed.
Changesets that become empty after applying the changes will be deleted. 💀 gone, reduced to atoms.
By default, absorb will show what it plans to do and prompt for confirmation. If you are confident that the changes will be absorbed to the correct place, run hg absorb -a to apply the changes immediately.
Returns 0 on success, 1 if all chunks were ignored and nothing amended.
Options:
-a,--apply-changes— apply changes without prompting for confirmation-p,--print-changes— always print which changesets are modified by which changes-i,--interactive— interactively select which chunks to apply-e,--edit-lines— edit what lines belong to which changesets before commit (EXPERIMENTAL)-n,--dry-run— do not perform actions, just print output--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times
🔐 acl 🔐
hooks for controlling repository access
This hook makes it possible to allow or deny write access to given branches and paths of a repository when receiving incoming changesets via pretxnchangegroup and pretxncommit.
The authorization is matched based on the local user name on the system where the hook runs, and not the committer of the original changeset (since the latter is merely informative). okay so it's checking who you are on this machine, not who wrote the commit. important distinction, bestie. 👑
The acl hook is best used along with a restricted shell like hgsh, preventing authenticating users from doing anything other than pushing or pulling. The hook is not safe to use if users have interactive shell access, as they can then disable the hook. Nor is it safe if remote users share an account, because then there is no way to distinguish them.
🚨 real talk: if people can get an interactive shell, or if they share an account, this hook is not protecting you. do not build your whole security vibe on it.
The order in which access checks are performed is:
- Deny list for branches (section
acl.deny.branches) - Allow list for branches (section
acl.allow.branches) - Deny list for paths (section
acl.deny) - Allow list for paths (section
acl.allow)
The allow and deny sections take key-value pairs. That's the whole vibe 💅
Branch-based Access Control
Use the acl.deny.branches and acl.allow.branches sections to have branch-based access control. Keys in these sections can be either:
- a branch name, or
- an asterisk, to match any branch;
The corresponding values can be either:
- a comma-separated list containing users and groups, or
- an asterisk, to match anyone;
You can add the "!" prefix to a user or group name to invert the sense of the match. inverted matching, we love a plot twist ✨
Path-based Access Control
Use the acl.deny and acl.allow sections to have path-based access control. Keys in these sections accept a subtree pattern (with a glob syntax by default). The corresponding values follow the same syntax as the other sections above.
Bookmark-based Access Control
Use the acl.deny.bookmarks and acl.allow.bookmarks sections to have bookmark-based access control. Keys in these sections can be either:
- a bookmark name, or
- an asterisk, to match any bookmark;
The corresponding values can be either:
- a comma-separated list containing users and groups, or
- an asterisk, to match anyone;
You can add the "!" prefix to a user or group name to invert the sense of the match.
Note: for interactions between clients and servers using Mercurial 3.6+ a rejection will generally reject the entire push, for interactions involving older clients, the commit transactions will already be accepted, and only the bookmark movement will be rejected. so like, old clients get the "oops too late" treatment 💀
Groups
Group names must be prefixed with an @ symbol. Specifying a group name has the same effect as specifying all the users in that group.
You can define group members in the acl.groups section. If a group name is not defined there, and Mercurial is running under a Unix-like system, the list of users will be taken from the OS. Otherwise, an exception will be raised. no OS group? boom, exception, no cap 😭
Example Configuration
[hooks]
# Use this if you want to check access restrictions at commit time
pretxncommit.acl = python:hgext.acl.hook
# Use this if you want to check access restrictions for pull, push,
# bundle and serve.
pretxnchangegroup.acl = python:hgext.acl.hook
[acl]
# Allow or deny access for incoming changes only if their source is
# listed here, let them pass otherwise. Source is "serve" for all
# remote access (http or ssh), "push", "pull" or "bundle" when the
# related commands are run locally.
# Default: serve
sources = serve
[acl.deny.branches]
# Everyone is denied to the frozen branch:
frozen-branch = *
# A bad user is denied on all branches:
* = bad-user
[acl.allow.branches]
# A few users are allowed on branch-a:
branch-a = user-1, user-2, user-3
# Only one user is allowed on branch-b:
branch-b = user-1
# The super user is allowed on any branch:
* = super-user
# Everyone is allowed on branch-for-tests:
branch-for-tests = *
[acl.deny]
# This list is checked first. If a match is found, acl.allow is not
# checked. All users are granted access if acl.deny is not present.
# Format for both lists: glob pattern = user, ..., @group, ...
# To match everyone, use an asterisk for the user:
# my/glob/pattern = *
# user6 will not have write access to any file:
** = user6
# Group "hg-denied" will not have write access to any file:
** = @hg-denied
# Nobody will be able to change "DONT-TOUCH-THIS.txt", despite
# everyone being able to change all other files. See below.
src/main/resources/DONT-TOUCH-THIS.txt = *
[acl.allow]
# if acl.allow is not present, all users are allowed by default
# empty acl.allow = no users allowed
# User "doc_writer" has write access to any file under the "docs"
# folder:
docs/** = doc_writer
# User "jack" and group "designers" have write access to any file
# under the "images" folder:
images/** = jack, @designers
# Everyone (except for "user6" and "@hg-denied" - see acl.deny above)
# will have write access to any file under the "resources" folder
# (except for 1 file. See acl.deny):
src/main/resources/** = *
.hgtags = release_engineerDONT-TOUCH-THIS.txt is doing exactly what it says on the tin, bestie 🫶
Examples using the ! prefix
Suppose there's a branch that only a given user (or group) should be able to push to, and you don't want to restrict access to any other branch that may be created.
The "!" prefix allows you to prevent anyone except a given user or group to push changesets in a given branch or path.
In the examples below, we will: 1) Deny access to branch "ring" to anyone but user "gollum" 2) Deny access to branch "lake" to anyone but members of the group "hobbit" 3) Deny access to a file to anyone but user "gollum"
[acl.allow.branches]
# Empty
[acl.deny.branches]
# 1) only 'gollum' can commit to branch 'ring';
# 'gollum' and anyone else can still commit to any other branch.
ring = !gollum
# 2) only members of the group 'hobbit' can commit to branch 'lake';
# 'hobbit' members and anyone else can still commit to any other branch.
lake = !@hobbit
# You can also deny access based on file paths:
[acl.allow]
# Empty
[acl.deny]
# 3) only 'gollum' can change the file below;
# 'gollum' and anyone else can still change any other file.
/misty/mountains/cave/ring = !gollummy precious access control 🧚💜
🎀 amend 🎀
provide the amend command (EXPERIMENTAL)
This extension provides an amend command that is similar to commit --amend but does not prompt an editor. no editor jumpscare, we stan 🙈
Commands
Change creation
amend
amend the working copy parent with all or specified outstanding changes:
hg amend [OPTION]... [FILE]...Similar to hg commit --amend, but reuse the commit message without invoking editor, unless --edit was set.
See hg help commit for more details.
Options:
-A,--addremove— mark new/missing files as added/removed before committing-e,--edit— invoke editor on commit messages-i,--interactive— use interactive mode--close-branch— mark a branch as closed, hiding it from the branch list-s,--secret— use the secret phase for committing--draft— use the draft phase for committing-n,--note<VALUE> — store a note on the amend-I,--include<PATTERN[+]> — include names matching the given patterns-X,--exclude<PATTERN[+]> — exclude names matching the given patterns-m,--message<TEXT> — use text as commit message-l,--logfile<FILE> — read commit message from file-d,--date<DATE> — record the specified date as commit date-u,--user<USER> — record the specified user as committer-D,--currentdate— record the current date as commit date-U,--currentuser— record the current user as committer
[+] marked option can be specified multiple times. stack 'em like bracelets 💅
🦋 automv 🦋
check for unrecorded moves at commit time (EXPERIMENTAL)
This extension checks at commit/amend time if any of the committed files comes from an unrecorded mv.
The threshold at which a file is considered a move can be set with the automv.similarity config option. This option takes a percentage between 0 (disabled) and 100 (files must be identical), the default is 95. 95 is the sweet spot, fr fr ✨
🌸 beautifygraph 🌸
beautify log -G output by using Unicode characters (EXPERIMENTAL)
A terminal with UTF-8 support and monospace narrow text are required. no UTF-8? no pretty graph, sorry bestie 😭
🖤 blackbox 🖤
log repository events to a blackbox for debugging
Logs event information to .hg/blackbox.log to help debug and diagnose problems. The events that get logged can be configured via the blackbox.track and blackbox.ignore config keys.
Examples:
[blackbox]
track = *
ignore = pythonhook
# dirty is *EXPENSIVE* (slow);
# each log entry indicates `+` if the repository is dirty, like :hg:`id`.
dirty = True
# record the source of log messages
logsource = True
[blackbox]
track = command, commandfinish, commandexception, exthook, pythonhook
[blackbox]
track = incoming
[blackbox]
# limit the size of a log file
maxsize = 1.5 MB
# rotate up to N log files when the current one gets too big
maxfiles = 3
[blackbox]
# Include microseconds in log entries with %f (see Python function
# datetime.datetime.strftime)
date-format = %Y-%m-%d @ %H:%M:%S.%fdirty is EXPENSIVE — slow, bestie, like actually slow. Only turn it on if you mean it 🔥Commands
Repository maintenance
blackbox
view the recent repository events:
hg blackbox [OPTION]...view the recent repository events
Options:
-l,--limit<VALUE> — the number of events to show (default: 10)
🎀 bookflow 🎀
implements bookmark-based branching (EXPERIMENTAL)
- Disables creation of new branches (config:
enable_branches=False). - Requires an active bookmark on commit (config:
require_bookmark=True). - Doesn't move the active bookmark on update, only on commit.
- Requires
'--rev'for moving an existing bookmark. - Protects special bookmarks (config:
protect=@).
flow related commands
hg book NAME— create a new bookmarkhg book NAME -r REV— move bookmark to revision (fast-forward)hg up|co NAME— switch to bookmarkhg push -B .— push active bookmark
bookmarks as branches, main character energy only 👑
🐞 bugzilla 🐞
hooks for integrating with the Bugzilla bug tracker
This hook extension adds comments on bugs in Bugzilla when changesets that refer to bugs by Bugzilla ID are seen. The comment is formatted using the Mercurial template mechanism.
The bug references can optionally include an update for Bugzilla of the hours spent working on the bug. Bugs can also be marked fixed.
Four basic modes of access to Bugzilla are provided:
- Access via the Bugzilla REST-API. Requires bugzilla 5.0 or later.
- Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later.
- Check data via the Bugzilla XMLRPC interface and submit bug change via email to Bugzilla email interface. Requires Bugzilla 3.4 or later.
- Writing directly to the Bugzilla database. Only Bugzilla installations using MySQL are supported. Requires Python MySQLdb.
Writing straight into the database is susceptible to schema changes, bestie, and it lowkey relies on a Bugzilla contrib script to send out those bug change notification emails. That script runs as the user running Mercurial, has to be run on the host with the Bugzilla install, and needs permission to read Bugzilla configuration details plus the necessary MySQL user and password to have full access rights to the Bugzilla database. Which is… a lot. For these reasons this access mode is now considered deprecated, and will not be updated for new Bugzilla versions going forward. Only adding comments is supported in this access mode. That's it. That's the whole vibe. 💀
Access via XMLRPC needs a Bugzilla username and password specified in the configuration. Comments are added under that username. Since the configuration must be readable by all Mercurial users, it is recommended that the rights of that user are restricted in Bugzilla to the minimum necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and later.
Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends email to the Bugzilla email interface to submit comments to bugs. The From: address in the email is set to the email address of the Mercurial user, so the comment appears to come from the Mercurial user. In the event that the Mercurial user email is not recognized by Bugzilla as a Bugzilla user, the email associated with the Bugzilla username used to log into Bugzilla is used instead as the source of the comment. Marking bugs fixed works on all supported Bugzilla versions. slay ✨
Access via the REST-API needs either a Bugzilla username and password or an apikey specified in the configuration. Comments are made under the given username or the user associated with the apikey in Bugzilla.
Configuration items common to all access modes:
bugzilla.version— the access type to use. Values recognized are:restapi— Bugzilla REST-API, Bugzilla 5.0 and later.xmlrpc— Bugzilla XMLRPC interface.xmlrpc+email— Bugzilla XMLRPC and email interfaces.3.0— MySQL access, Bugzilla 3.0 and later.2.18— MySQL access, Bugzilla 2.18 and up to but not including 3.0.2.16— MySQL access, Bugzilla 2.16 and up to but not including 2.18.
bugzilla.regexp— regular expression to match bug IDs for update in changeset commit message. It must contain one"()"named group<ids>containing the bug IDs separated by non-digit characters. It may also contain a named group<hours>with a floating-point number giving the hours worked on the bug. If no named groups are present, the first"()"group is assumed to contain the bug IDs, and work time is not updated. The default expression matchesBug 1234,Bug no. 1234,Bug number 1234,Bugs 1234,5678,Bug 1234 and 5678and variations thereof, followed by an hours number prefixed byhorhours, e.g.hours 1.5. Matching is case insensitive.bugzilla.fixregexp— regular expression to match bug IDs for marking fixed in changeset commit message. This must contain a"()"named group<ids>containing the bug IDs separated by non-digit characters. It may also contain a named group<hours>with a floating-point number giving the hours worked on the bug. If no named groups are present, the first"()"group is assumed to contain the bug IDs, and work time is not updated. The default expression matchesFixes 1234,Fixes bug 1234,Fixes bugs 1234,5678,Fixes 1234 and 5678and variations thereof, followed by an hours number prefixed byhorhours, e.g.hours 1.5. Matching is case insensitive.bugzilla.fixstatus— the status to set a bug to when marking fixed. DefaultRESOLVED.bugzilla.fixresolution— the resolution to set a bug to when marking fixed. DefaultFIXED.bugzilla.style— the style file to use when formatting comments.bugzilla.template— template to use when formatting comments. Overrides style if specified. In addition to the usual Mercurial keywords, the extension specifies:{bug}— the Bugzilla bug ID.{root}— the full pathname of the Mercurial repository.{webroot}— stripped pathname of the Mercurial repository.{hgweb}— base URL for browsing Mercurial repositories.
Default: Changeset {node|short} in repo {root} refers to bug {bug}.\ndetails:\n\t{desc|tabindent}
bugzilla.strip— the number of path separator characters to strip from the front of the Mercurial repository path ({root}in templates) to produce{webroot}. For example, a repository with{root}/var/local/my-projectwith a strip of2gives a value for{webroot}ofmy-project. Default0.web.baseurl— base URL for browsing Mercurial repositories. Referenced from templates as{hgweb}.
Configuration items common to XMLRPC+email and MySQL access modes:
bugzilla.usermap— path of file containing Mercurial committer email to Bugzilla user email mappings. If specified, the file should contain one mapping per line:
committer = Bugzilla userSee also the [usermap] section.
The [usermap] section is used to specify mappings of Mercurial committer email to Bugzilla user email. See also bugzilla.usermap. Contains entries of the form committer = Bugzilla user.
XMLRPC and REST-API access mode configuration
bugzilla.bzurl— the base URL for the Bugzilla installation. Defaulthttp://localhost/bugzilla.bugzilla.user— the username to use to log into Bugzilla via XMLRPC. Defaultbugs.bugzilla.password— the password for Bugzilla login.
REST-API access mode uses the options listed above as well as:
bugzilla.apikey— an apikey generated on the Bugzilla instance for api access. Using an apikey removes the need to store the user and password options. 🔑
XMLRPC+email access mode uses the XMLRPC access mode configuration items, and also:
bugzilla.bzemail— the Bugzilla email address.
In addition, the Mercurial email settings must be configured. See the documentation in hgrc(5), sections [email] and [smtp].
MySQL access mode configuration
bugzilla.host— hostname of the MySQL server holding the Bugzilla database. Defaultlocalhost.bugzilla.db— name of the Bugzilla database in MySQL. Defaultbugs.bugzilla.user— username to use to access MySQL server. Defaultbugs.bugzilla.password— password to use to access MySQL server.bugzilla.timeout— database connection timeout (seconds). Default5.bugzilla.bzuser— fallback Bugzilla user name to record comments with, if changeset committer cannot be found as a Bugzilla user.bugzilla.bzdir— Bugzilla install directory. Used by default notify. Default/var/www/html/bugzilla.bugzilla.notify— the command to run to get Bugzilla to send bug change notification emails. Substitutes from a map with 3 keys,bzdir,id(bug id) anduser(committer bugzilla email). Default depends on version; from 2.18 it is"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)s".
Activating the extension 🎀
[extensions]
bugzilla =
[hooks]
# run bugzilla hook on every change pulled or pushed in here
incoming.bugzilla = python:hgext.bugzilla.hookExample configurations ✨
XMLRPC example configuration. This uses the Bugzilla at http://my-project.org/bugzilla, logging in as user bugmail@my-project.org with password plugh. It is used with a collection of Mercurial repositories in /var/local/hg/repos/, with a web interface at http://my-project.org/hg.
[bugzilla]
bzurl=http://my-project.org/bugzilla
user=bugmail@my-project.org
password=plugh
version=xmlrpc
template=Changeset {node|short} in {root|basename}.
{hgweb}/{webroot}/rev/{node|short}\n
{desc}\n
strip=5
[web]
baseurl=http://my-project.org/hgXMLRPC+email example configuration. This uses the Bugzilla at http://my-project.org/bugzilla, logging in as user bugmail@my-project.org with password plugh. It is used with a collection of Mercurial repositories in /var/local/hg/repos/, with a web interface at http://my-project.org/hg. Bug comments are sent to the Bugzilla email address bugzilla@my-project.org.
[bugzilla]
bzurl=http://my-project.org/bugzilla
user=bugmail@my-project.org
password=plugh
version=xmlrpc+email
bzemail=bugzilla@my-project.org
template=Changeset {node|short} in {root|basename}.
{hgweb}/{webroot}/rev/{node|short}\n
{desc}\n
strip=5
[web]
baseurl=http://my-project.org/hg
[usermap]
user@emaildomain.com=user.name@bugzilladomain.comMySQL example configuration. This has a local Bugzilla 3.2 installation in /opt/bugzilla-3.2. The MySQL database is on localhost, the Bugzilla database name is bugs and MySQL is accessed with MySQL username bugs password XYZZY. It is used with a collection of Mercurial repositories in /var/local/hg/repos/, with a web interface at http://my-project.org/hg.
[bugzilla]
host=localhost
password=XYZZY
version=3.0
bzuser=unknown@domain.com
bzdir=/opt/bugzilla-3.2
template=Changeset {node|short} in {root|basename}.
{hgweb}/{webroot}/rev/{node|short}\n
{desc}\n
strip=5
[web]
baseurl=http://my-project.org/hg
[usermap]
user@emaildomain.com=user.name@bugzilladomain.comAll the above add a comment to the Bugzilla bug record of the form:
Changeset 3b16791d6642 in repository-name.
http://my-project.org/hg/repository-name/rev/3b16791d6642
Changeset commit comment. Bug 1234.censor 🫣
erase file content at a given revision
The censor command instructs Mercurial to erase all content of a file at a given revision without updating the changeset hash. This allows existing history to remain valid while preventing future clones/pulls from receiving the erased data. Iconic, honestly — the past stays valid, the future stays clean. ✨
Typical uses for censor are due to security or legal requirements, including:
- Passwords, private keys, cryptographic material 🔐
- Licensed data/code/libraries for which the license has expired
- Personally Identifiable Information or other private data
Censored nodes can just derail mercurial's whole normal flow whenever the excised data actually needs to be materialized, bestie 😭. Some commands — hi hg cat / hg revert — straight up fail when you ask them for censored data. Others, like hg verify and hg update, have to be able to tolerate censored data to keep functioning in any meaningful way. Those commands only tolerate censored file As having a censored version in a checkout is impractical. The current head revisions of the repository get checked. If the revision you want to censor lives in any of them, the command aborts, no cap. You can configure this behavior using the following option:
censor.policy— controls how to react when accessing censored content. Accepted values:"abort","ignore". Defaults toabort.
A few informative commands, such as hg grep, will unconditionally ignore censored data and merely report that it was encountered. 👑
Commands
Repository maintenance
censor
hg censor -r REV [-t TEXT] [FILE]Options ✨:
-r,--rev <REV[+]>— censor file from specified revision--check-heads— check that repository heads are not affected (default:True)-t,--tombstone <TEXT>— replacement tombstone data
[+] marked option can be specified multiple times
children
command to display child changesets (DEPRECATED) 💀
This extension is deprecated. You should use hg log -r "children(REV)" instead.
Commands
Change navigation
children
show the children of the given or working directory revision:
hg children [-r REV] [FILE]Print the children of the working directory's revisions. If a revision is given via -r/--rev, the children of that revision will be printed. If a file argument is given, the revision in which the file was last changed (after the working directory revision, or the argument to --rev if one was given) is printed. 🦋
Please use hg log instead, fr fr:
hg children => hg log -r "children(.)"
hg children -r REV => hg log -r "children(REV)"See hg help log and hg help revsets.children.
Options 🌸:
-r,--rev <REV>— show children of the specified revision (default:.)--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template
churn
command to display statistics about repository history 📊
Commands
Repository maintenance
churn
histogram of changes to the repository:
hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]This command will display a histogram representing the number of changed lines or revisions, grouped according to the given template. The default template will group changes by author. The --dateformat option may be used to group the results by date instead.
Statistics are based on the number of changed lines, or alternatively the number of matching revisions if the --changesets option is specified.
Examples 💅:
# display count of changed lines for every committer
hg churn -T "{author|email}"
# display daily activity graph
hg churn -f "%H" -s -c
# display activity of developers by month
hg churn -f "%Y-%m" -s -c
# display count of lines changed in every year
hg churn -f "%Y" -s
# display count of lines changed in a time range
hg churn -d "2020-04 to 2020-09"It is possible to map alternate email addresses to a main address by providing a file using the following format:
<alias email> = <actual email>Such a file may be specified with the --aliases option, otherwise a .hgchurn file will be looked for in the working directory root. Aliases will be split from the rightmost "=". 🔥
Options ✨:
-r,--rev <REV[+]>— count rate for the specified revision or revset-d,--date <DATE>— count rate for revisions matching date spec-t,--oldtemplate <TEMPLATE>— template to group changesets (DEPRECATED)-T,--template <TEMPLATE>— template to group changesets (default:{author|email})-f,--dateformat <FORMAT>— strftime-compatible format for grouping by date-c,--changesets— count rate by number of changesets-s,--sort— sort by key (default: sort by count)--diffstat— display added/removed lines separately--aliases <FILE>— file with email aliases-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times
clonebundles
advertise pre-generated bundles to seed clones 🎀
clonebundles is a server-side extension used to advertise the existence of pre-generated, externally hosted bundle files to clients that are cloning, so that cloning can be faster, more reliable, and require less resources on the server. pullbundles is a related feature for sending pre-generated bundle files to clients as part of pull operations.
Cloning can be a CPU and I/O intensive operation on servers. Traditionally, the server, in response to a client's request to clone, dynamically generates a bundle containing the entire repository content and sends it to the client. There is no caching on the server, and the server will have to redundantly generate the same outgoing bundle in response to each clone request. For servers with large repositories or with high clone volume, the load from clones can make scaling the server challenging and costly. 😭
This extension provides server operators the ability to offload potentially expensive clone load to an external service. Pre-generated bundles also allow using more CPU intensive compression, reducing the effective bandwidth requirements.
Here's how clone bundles work, bestie:
- A server operator establishes a mechanism for making bundle files available on a hosting service where Mercurial clients can fetch them.
- A manifest file listing available bundle URLs and some optional metadata is added to the Mercurial repository on the server.
- A client initiates a clone against a clone bundles aware server.
- The client sees the server is advertising clone bundles and fetches the manifest listing available bundles.
- The client filters and sorts the available bundles based on what it supports and prefers.
- The client downloads and applies an available bundle from the server-specified URL.
- The client reconnects to the original server and performs the equivalent of
hg pullto retrieve all repository data not in the bundle. (The repository could have been updated between when the bundle was created and when the client started the clone.) This may use"pullbundles".
Instead of the server generating full repository bundles for every clone request, it generates full bundles once and they are subsequently reused to bootstrap new clones. The server may still transfer data at clone time. However, this is only data that has been added/changed since the bundle was created. For large, established repositories, this can reduce server load for clones to less than 1% of original. 🤯
Here's how pullbundles work:
- A manifest file listing available bundles and describing the revisions is added to the Mercurial repository on the server.
- A new-enough client informs the server that it supports partial pulls and initiates a pull.
- If the server has pull bundles enabled and sees the client advertising partial pulls, it checks for a matching pull bundle in the manifest. A bundle matches if the format is supported by the client, the client has the required revisions already and needs something from the bundle.
- If there is at least one matching bundle, the server sends it to the client.
- The client applies the bundle and notices that the server reply was incomplete. It initiates another pull.
To work, this extension requires the following of server operators:
- Generating bundle files of repository content (typically periodically, such as once per day).
- Clone bundles: A file server that clients have network access to and that Python knows how to talk to through its normal URL handling facility (typically an HTTP/HTTPS server).
- A process for keeping the bundles manifest in sync with available bundle files.
Strictly speaking, using a static file hosting server isn't required: a server operator could use a dynamic service for retrieving bundle data. However, static file hosting services are simple and scalable and should be sufficient for most needs. 💅
Bundle files can be generated with the hg bundle command. Typically hg bundle --all is used to produce a bundle of the entire repository.
The bundlespec option stream (see hg help bundlespec) can be used to produce a special streaming clonebundle, typically using hg bundle --all --type="none-streamv2". These are bundle files that are extremely efficient to produce and consume (read: fast). However, they are larger than traditional bundle formats and require that clients support the exact set of repository data store formats in use by the repository that created them. Typically, a newer server can serve data that is compatible with older clients. However, streaming clone bundles don't have this guarantee. Server operators need to be aware that newer versions of Mercurial may produce streaming clone bundles incompatible with older Mercurial versions. 💀
A server operator is responsible for creating a .hg/clonebundles.manifest file containing the list of available bundle files suitable for seeding clones. If this file does not exist, the repository will not advertise the existence of clone bundles when clients connect. For pull bundles, .hg/pullbundles.manifest is used.
The manifest file contains a newline (n) delimited list of entries.
Each line in this file defines an available bundle. Lines have the format:
<URL> [<key>=<value>[ <key>=<value>]]That is, a URL followed by an optional, space-delimited list of key=value pairs describing additional properties of this bundle. Both keys and values are URI encoded.
For pull bundles, the URL is a path under the .hg directory of the repository.
Keys in UPPERCASE are reserved for use by Mercurial and are defined below. All non-uppercase keys can be used by site installations. An example use for custom properties is to use the datacenter attribute to define which data center a file is hosted in. Clients could then prefer a server in the data center closest to them. 🌈
The following reserved keys are currently defined:
BUNDLESPEC— A "bundle specification" string that describes the type of the bundle.
These are string values that are accepted by the "--type" argument of hg bundle.
The values get parsed in strict mode, bestie, which means they have to be in the "<compression>-<type>" form, periodt. Wanna know more? Go read mercurial.exchange.parsebundlespec() 💅
hg debugbundle --spec is your girl for printing the bundle specification string of a bundle file. And here's the slay: the output of that command can be used verbatim as the value of BUNDLESPEC — it's already escaped, no extra work needed ✨
Clients will automatically filter out specs that are unknown or unsupported, so they don't waste time trying to download something that probably won't even apply. Iconic behaviour tbh.
The actual value doesn't impact client behavior beyond filtering — clients will still sniff the bundle type from the header of downloaded files. So it's vibes-based but in a controlled way.
Use of this key is highly recommended, because it lets clients easily skip unsupported bundles. If this key is not defined, an old client may attempt to apply a bundle that it is literally incapable of reading 😭
REQUIRESNI
Whether Server Name Indication (SNI) is required to connect to the URL. SNI lets servers use multiple certificates on the same IP — super common in CDNs and other hosting providers. Older Python versions do not support SNI. Defining this attribute enables clients with older Python versions to filter this entry without experiencing an opaque SSL failure at connection time 💀
If this is defined, it is important to advertise a non-SNI fallback URL, or clients running old Python releases may not be able to clone with the clonebundles facility. Not the vibe we want.
Value should be "true".
REQUIREDRAM
Value specifies expected memory requirements to decode the payload. Values can have suffixes for common bytes sizes, e.g. "64MB" 🍓
This key is often used with zstd-compressed bundles using a high compression level / window size, which can require 100+ MB of memory to decode. She's hungry.
heads
Used for pull bundles. This contains the ; separated changeset hashes of the heads of the bundle content.
bases
Used for pull bundles. This contains the ; separated changeset hashes of the roots of the bundle content. This can be skipped if the bundle was created without --base.
Manifests can contain multiple entries. Assuming metadata is defined, clients will filter entries from the manifest that they don't support. The remaining entries are optionally sorted by client preferences (the ui.clonebundleprefers config option). The client then attempts to fetch the bundle at the first URL in the remaining list. First come, first served, bestie 🫶
Errors when downloading a bundle will fail the entire clone operation: clients do not automatically fall back to a traditional clone. Why so harsh, you ask? Because if a server is using clone bundles, it is probably doing so because the feature is necessary to help it scale. In other words, there's an assumption that clone load will be offloaded to another service and that the Mercurial server isn't responsible for serving this clone load. If that other service experiences issues and clients start mass falling back to the original Mercurial server, the added clone load could overwhelm the server due to unexpected load and effectively take it offline 😭 Not having clients automatically fall back to cloning from the original server mitigates this scenario. It's giving self-preservation.
Because there is no automatic Mercurial server fallback on failure of the bundle hosting service, it is important for server operators to view the bundle hosting service as an extension of the Mercurial server in terms of availability and service level agreements: if the bundle hosting service goes down, so does the ability for clients to clone. Note: clients will see a message informing them how to bypass the clone bundles facility when a failure occurs. So server operators should prepare for some people to follow these instructions when a failure occurs, thus driving more load to the original Mercurial server when the bundle hosting service fails. Plan accordingly, no cap 🙈
🌸 inline clonebundles
It is possible to transmit clonebundles inline in case repositories are accessed over SSH. This avoids having to setup an external HTTPS server and results in the same access control as already present for the SSH setup. Chef's kiss.
Inline clonebundles should be placed into the .hg/bundle-cache directory. A clonebundle at .hg/bundle-cache/mybundle.bundle is referred to in the clonebundles.manifest file as peer-bundle-cache://mybundle.bundle. Memorize that path, it's important 💅
✨ auto-generation of clone bundles
It is possible to set Mercurial to automatically re-generate clone bundles when enough new content is available. Let the girlies work.
Mercurial will take care of the process asynchronously. The defined list of bundle-type will be generated, uploaded, and advertised. Older bundles will get decommissioned as newer ones replace them. Out with the old, in with the new 🦋
🎀 Bundles Generation:
The extension can generate multiple variants of the clone bundle. Each different variant will be defined by the "bundle-spec" they use:
[clone-bundles]
auto-generate.formats= zstd-v2, gzip-v2See hg help bundlespec for details about available options.
By default, new bundles are generated when 5% of the repository contents or at least 1000 revisions are not contained in the cached bundles. This option can be controlled by the clone-bundles.trigger.below-bundled-ratio option (default 0.95) and the clone-bundles.trigger.revs option (default 1000):
[clone-bundles]
trigger.below-bundled-ratio=0.95
trigger.revs=1000This logic can be manually triggered using the admin::clone-bundles-refresh command, or automatically on each repository change if clone-bundles.auto-generate.on-change is set to yes:
[clone-bundles]
auto-generate.on-change=yes
auto-generate.formats= zstd-v2, gzip-v2💜 Automatic Inline serving
The simplest way to serve the generated bundle is through the Mercurial protocol. However it is not the most efficient, as request will still be served by that main server. It is useful in case where authentication is complexe or when an efficient mirror system is already in use anyway. See the inline clonebundles section above for details about inline clonebundles.
To automatically serve generated bundle through inline clonebundle, simply set the following option:
auto-generate.serve-inline=yesEnabling this option disable the managed upload and serving explained below. Pick your fighter, bestie.
🔥 Bundles Upload and Serving:
This is the most efficient way to serve automatically generated clone bundles, but requires some setup. Worth it though.
The generated bundles need to be made available to users through a "public" URL. This should be donne through clone-bundles.upload-command configuration. The value of this command should be a shell command. It will have access to the bundle file path through the $HGCB_BUNDLE_PATH variable. And the expected basename in the "public" URL is accessible at:
[clone-bundles]
upload-command=sftp put $HGCB_BUNDLE_PATH sftp://bundles.host/clone-bundles/$HGCB_BUNDLE_BASENAMEIf the file was already uploaded, the command must still succeed. No tantrums allowed.
After upload, the file should be available at an url defined by clone-bundles.url-template.
[clone-bundles]
url-template=https://bundles.host/cache/clone-bundles/{basename}🌈 Old bundles cleanup:
When new bundles are generated, the older ones are no longer necessary and can be removed from storage. This is done through the clone-bundles.delete-command configuration. The command is given the url of the artifact to delete through the $HGCB_BUNDLE_URL environment variable.
[clone-bundles] delete-command=sftp rm sftp://bundles.host/clone-bundles/$HGCB_BUNDLE_BASENAMEIf the file was already deleted, the command must still succeed. Same energy as before 💅
🦋 Commands
🦋 Uncategorized commands
admin::clone-bundles-clear
remove existing clone bundle caches:
hg admin::clone-bundles-clearSee hg help admin::clone-bundles-refresh for details on how to regenerate them.
This command will only affect bundles currently available, it will not affect bundles being asynchronously generated. So don't panic if stuff is still cooking in the background.
admin::clone-bundles-refresh
generate clone bundles according to the configuration:
hg admin::clone-bundles-refreshThis runs the logic for automatic generation, removing outdated bundles and generating new ones if necessary. See hg help -e clone-bundles for details about how to configure this feature.
Options:
--background— start bundle generation in the background
🎀 closehead
close arbitrary heads without checking them out first
Commands
Change manipulation
close-head
close the given head revisions:
hg close-head [OPTION]... [REV]...This is equivalent to checking out each revision in a clean tree and running hg commit --close-branch, except that it doesn't change the working directory. Your cwd stays unbothered, as it should ✨
The commit message must be specified with -l or -m.
Options:
-m,--message<TEXT>— use text as commit message-l,--logfile<FILE>— read commit message from file-d,--date<DATE>— record the specified date as commit date-u,--user<USER>— record the specified user as committer-r,--rev<REV[+]>— revision to check
[+] marked option can be specified multiple times
aliases: close-heads
💅 commitextras
adds a new flag extras to commit (ADVANCED)
🌸 convert
import revisions from foreign VCS repositories into Mercurial
Commands
Uncategorized commands
convert
convert a foreign SCM repository to a Mercurial one.:
hg convert [OPTION]... SOURCE [DEST [REVMAP]]Accepted source formats [identifiers]:
- Mercurial [
hg] - CVS [
cvs] - Darcs [
darcs] - git [
git] - Subversion [
svn] - Monotone [
mtn] - GNU Arch [
gnuarch] - Bazaar [
bzr] - Perforce [
p4]
Accepted destination formats [identifiers]:
- Mercurial [
hg] - Subversion [
svn] (history on branches is not preserved)
If no revision is given, all revisions will be converted. Otherwise, convert will only import up to the named revision (given in a format understood by the source).
If no destination directory name is specified, it defaults to the basename of the source with -hg appended. If the destination repository doesn't exist, it will be created. She builds herself 💅
By default, all sources except Mercurial will use --branchsort. Mercurial uses --sourcesort to preserve original revision numbers order. Sort modes have the following effects:
--branchsort
convert from parent to child revision when possible, which means branches are usually converted one after the other. It generates more compact repositories.
--datesort— sorts revisions by date. Bestie, the converted repos get gorgeous changelogs this way, but they're often an order of magnitude larger than the same ones made with--branchsort. So like, pretty but chunky. 💅--sourcesort— tries to keep the source revisions in order. Only Mercurial sources support this one, no cap.--closesort— tries to move closed revisions as close as possible to their parent branches. Again, Mercurial sources only, bestie. 🎀
If REVMAP isn't given, it gets dropped in a default location (<dest>/.hg/shamap by default). The REVMAP is just a lil plain text file that maps every source commit ID to the destination ID for that revision, like this:
<source ID> <destination ID>If the file isn't there, it literally just creates itself. And it updates every time a commit gets copied, so hg convert can be interrupted and re-run over and over to scoop up new commits. Resilient queen behavior. ✨
The authormap is a simple text file that maps each source commit author to a destination commit author. It's so handy for source SCMs that use unix logins to identify authors (think: CVS, the ancient one). One line per author mapping, and the line format is:
source author = destination authorEmpty lines and lines starting with a # are ignored. Periodt. 🙈
The filemap is a file that lets you filter and remap files and directories. Each line can hold one of these directives:
include path/to/file-or-dir
exclude path/to/file-or-dir
rename path/to/source path/to/destinationComment lines start with #. A specified path matches if it equals the full relative name of a file or one of its parent directories. The include or exclude directive with the longest matching path wins, so line order does not matter at all. Slay.
The include directive causes a file, or all files under a directory, to be included in the destination repository. The default, if there are no include statements, is to include everything. If there are any include statements, nothing else gets included. The exclude directive causes files or directories to be omitted. The rename directive renames a file or directory if it is converted. To rename from a subdirectory into the root of the repository, use . as the path to rename to. 🦋
--full will make sure the converted changesets contain exactly the right files with the right content. It does a full conversion of all files, not just the ones that changed. Files that are already correct will not be changed. This can be used to apply filemap changes when converting incrementally. This is currently only supported for Mercurial and Subversion. 💖
The splicemap is a file that allows insertion of synthetic history, letting you specify the parents of a revision. This is useful if you want to, like, give a Subversion merge two parents, or graft two disconnected series of history together. Each entry contains a key, followed by a space, followed by one or two comma-separated values:
key parent1, parent2The key is the revision ID in the source revision control system whose parents should be modified (same format as a key in .hg/shamap). The values are the revision IDs (in either the source or destination revision control system) that should be used as the new parents for that node. For example, if you've merged "release-1.0" into "trunk", then you should specify the revision on "trunk" as the first parent and the one on the "release-1.0" branch as the second. 🫶
The branchmap is a file that lets you rename a branch when it's being brought in from whatever external repository. When used together with a splicemap, it's a powerful combo that helps fix even the most badly mismanaged repositories and turn them into nicely structured Mercurial repositories. The branchmap contains lines of the form:
original_branch_name new_branch_namewhere "original_branch_name" is the name of the branch in the source repository, and "new_branch_name" is the name of the branch in the destination repository. No whitespace is allowed in the new branch name, bestie, don't even try it. This can be used to (for instance) move code in one repository from "default" to a named branch. 💜
🧚 Mercurial Source 🧚
The Mercurial source recognizes the following configuration options, which you can set on the command line with --config:
convert.hg.ignoreerrors— ignore integrity errors when reading. Use it to fix Mercurial repositories with missing revlogs, by converting from and to Mercurial. Default isFalse.convert.hg.saverev— store the original revision ID in the changeset (which forces target IDs to change, fyi). It takes a boolean argument and defaults toFalse.convert.hg.startrev— specify the initial Mercurial revision. The default is0.convert.hg.revs— revset specifying the source revisions to convert.
🌸 Bazaar Source 🌸
The following options can be used with --config:
convert.bzr.saverev— whether to store the original Bazaar commit ID in the metadata of the destination commit. The default isTrue.
💀 CVS Source 💀
CVS source will use a sandbox (i.e. a checked-out copy) from CVS to indicate the starting point of what's gonna be converted. Direct access to the repository files is not needed, unless of course the repository is :local:. The conversion uses the top level directory in the sandbox to find the CVS repository, and then uses CVS rlog commands to find files to convert. This means that unless a filemap is given, all files under the starting directory will be converted, and that any directory reorganization in the CVS sandbox is ignored. 🫠
The following options can be used with --config:
convert.cvsps.cache— set toFalseto disable remote log caching, for testing and debugging purposes. Default isTrue.convert.cvsps.fuzz— specify the maximum time (in seconds) that's allowed between commits with identical user and log message in a single changeset. When very large files were checked in as part of a changeset, then the default may not be long enough. The default is60.convert.cvsps.logencoding— specify encoding name to be used for transcoding CVS log messages. Multiple encoding names can be specified as a list (seehg help config.Syntax), but only the first acceptable encoding in the list is used per CVS log entries. This transcoding is executed before thecvsloghook below.convert.cvsps.mergeto— specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will insert a dummy revision merging the branch on which this log message occurs to the branch indicated in the regex. Default is{{mergetobranch ([-\w]+)}}.convert.cvsps.mergefrom— specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will add the most recent revision on the branch indicated in the regex as the second parent of the changeset. Default is{{mergefrombranch ([-\w]+)}}.convert.localtimezone— use local time (as determined by theTZenvironment variable) for changeset date/times. The default isFalse(use UTC).hooks.cvslog— specify a Python function to be called at the end of gathering the CVS log. The function is passed a list with the log entries, and can modify the entries in-place, or add or delete them.hooks.cvschangesets— specify a Python function to be called after the changesets are calculated from the CVS log. The function is passed a list with the changeset entries, and can modify the changesets in-place, or add or delete them.
An additional "debugcvsps" Mercurial command lets the builtin changeset merging code run without doing a conversion. Its parameters and output are similar to that of cvsps 2.1. Please see the command help for more details. 👑
🌈 Subversion Source 🌈
Subversion source detects classical trunk/branches/tags layouts. By default, the supplied svn://repo/path/ source URL is converted as a single branch. If svn://repo/path/trunk exists it replaces the default branch. If svn://repo/path/branches exists, its subdirectories are listed as possible branches. If svn://repo/path/tags exists, it's looked for tags referencing converted branches. Default trunk, branches and tags values can be overridden with the following options. Set them to paths relative to the source URL, or leave them blank to disable auto detection. 🎀
The following options can be set with --config:
convert.svn.branches— specify the directory containing branches. The default isbranches.convert.svn.tags— specify the directory containing tags. The default istags.convert.svn.trunk— specify the name of the trunk branch. The default istrunk.convert.localtimezone— use local time (as determined by theTZenvironment variable) for changeset date/times. The default isFalse(use UTC).
Source history can be retrieved starting at a specific revision, instead of being integrally converted. Only single branch conversions are supported, bestie, don't get cute. 💅
convert.svn.startrev— specify start Subversion revision number. The default is0.
⭐ Git Source ⭐
The Git importer converts commits from all reachable branches (refs in refs/heads) and remotes (refs in refs/remotes) to Mercurial. Branches are converted to bookmarks with the same name, with the leading 'refs/heads' stripped. Git submodules are converted to Git subrepos in Mercurial. 🦋
The following options can be set with --config:
convert.git.similarity— specify how similar files modified in a commit must be to be imported as renames or copies, as a percentage between0(disabled) and100(files must be identical). For example,90means that a delete/add pair will be imported as a rename if more than 90% of the file hasn't changed. The default is50.convert.git.findcopiesharder— while detecting copies, look at all files in the working copy instead of just changed ones. This is very expensive for large projects, and is only effective whenconvert.git.similarityis greater than0. The default isFalse.convert.git.renamelimit— perform rename and copy detection up to this many changed files in a commit. Increasing this will make rename and copy detection more accurate but will significantly slow down computation on large projects. The option is only relevant ifconvert.git.similarityis greater than0. The default is400.convert.git.committeractions— list of actions to take when processing author and committer values.
So Git commits are extra like that 💅 they've got a separate author (the person who wrote the commit) and a separate committer (the person who actually applied it). Not every destination supports having both fields as separate things (Mercurial is one of the ones that doesn't 🙈). This config option is the boss of what happens to those author and committer fields while you're converting.
- A value of
messagedifferentwill append acommitter: ...line to the commit message if the Git committer is different from the author. The prefix of that line can be specified using the syntaxmessagedifferent=<prefix>. e.g.messagedifferent=git-committer:. When a prefix is specified, a space will always be inserted between the prefix and the value. messagealwaysbehaves likemessagedifferentexcept it will always result in acommitter: ...line being appended to the commit message. This value is mutually exclusive withmessagedifferent.dropcommitterwill remove references to the committer. Only references to the author will remain. Actions that add references to the committer will have no effect when this is set.replaceauthorwill replace the value of the author field with the committer. Other actions that add references to the committer will still take effect when this is set.
The default is messagedifferent. 💖
convert.git.extrakeys— list of extra keys from commit metadata to copy to the destination. Some Git repositories store extra metadata in commits. By default, this non-default metadata will be lost during conversion. Setting this config option can retain that metadata. Some built-in keys such asparentandbranchare not allowed to be copied.convert.git.remoteprefix— remote refs are converted as bookmarks withconvert.git.remoteprefixas a prefix followed by a/. The default is'remote'.convert.git.saverev— whether to store the original Git commit ID in the metadata of the destination commit. The default isTrue.convert.git.skipsubmodules— does not convert root level.gitmodulesfiles or files with160000mode indicating a submodule. Default isFalse.
🐧 Perforce Source
The Perforce (P4) importer can be handed a p4 depot path or a client specification as its source. It will convert all the files in the source into a flat Mercurial repository, ignoring labels, branches and integrations, no cap. 🫶
Heads up bestie: when a depot path is given you then usually should specify a target directory, because otherwise the target may be named ...-hg. 😭
The following options can be set with --config:
convert.p4.encoding— specify the encoding to use when decoding standard output of the Perforce command line tool. The default is default system encoding.convert.p4.startrev— specify initial Perforce revision (a Perforce changelist number).
💜 Mercurial Destination
The Mercurial destination will recognize Mercurial subrepositories in the destination directory, and update the .hgsubstate file automatically if the destination subrepositories contain the <dest>/<sub>/.hg/shamap file. Converting a repository with subrepositories requires converting a single repository at a time, from the bottom up. ✨
An example showing how to convert a repository with subrepositories:
# so convert knows the type when it sees a non empty destination
$ hg init converted
$ hg convert orig/sub1 converted/sub1
$ hg convert orig/sub2 converted/sub2
$ hg convert orig convertedThe following options are supported:
convert.hg.clonebranches— dispatch source branches in separate clones. The default isFalse.convert.hg.tagsbranch— branch name for tag revisions, defaults todefault.convert.hg.usebranchnames— preserve branch names. The default isTrue.convert.hg.sourcename— records the given string as a'convert_source'extra value on each commit made in the target repository. The default isNone.convert.hg.preserve-hash— only works with mercurial sources. Make convert prevent performance improvement to the list of modified files in commits when such an improvement would cause the hash of a commit to change. The default isFalse.
🌈 All Destinations
All destination types accept the following options:
convert.skiptags— does not convert tags from the source repo to the target repo. The default isFalse.
🦋 Subversion Destination
Original commit dates are not preserved by default. (I know. Rude.)
convert.svn.dangerous-set-commit-dates— preserve original commit dates, forcefully settingsvn:daterevision properties. This option is DANGEROUS and may break some subversion functionality for the resulting repository (e.g. filtering revisions with date ranges insvn log), as original commit dates are not guaranteed to be monotonically increasing.
For commit dates setting to work destination repository must havepre-revprop-changehook configured to allow setting ofsvn:daterevision properties. See Subversion documentation for more details.
Options:
--authors<FILE>— username mapping filename (DEPRECATED) (use--authormapinstead)-s,--source-type<TYPE>— source repository type-d,--dest-type<TYPE>— destination repository type-r,--rev<REV[+]>— import up to source revision REV-A,--authormap<FILE>— remap usernames using this file--filemap<FILE>— remap file names using contents of file--full— apply filemap changes by converting all files again--splicemap<FILE>— splice synthesized history into place--branchmap<FILE>— change branch names while converting--branchsort— try to sort changesets by branches--datesort— try to sort changesets by date--sourcesort— preserve source changesets order--closesort— try to reorder closed revisions
[+] marked option can be specified multiple times
🌸 eol 🌸
automatically manage newlines in repository files
This extension lets you be the main character of your line endings (CRLF or LF) — the ones used in the repository and in the local working directory. That way you can get CRLF line endings on Windows and LF on Unix/Mac, which means everybody gets to use their OS's native line endings. Obsessed. 💖
The extension reads its configuration from a versioned .hgeol configuration file found in the root of the working directory. The .hgeol file uses the same syntax as all other Mercurial configuration files. It uses two sections, [patterns] and [repository].
The [patterns] section specifies how line endings should be converted between the working directory and the repository. The format is specified by a file pattern. The first match is used, so put more specific patterns first. The available line endings are LF, CRLF, and BIN.
Files with the declared format of CRLF or LF are always checked out and stored in the repository in that format and files declared to be binary (BIN) are left unchanged. Additionally, native is an alias for checking out in the platform's default line ending: LF on Unix (including Mac OS X) and CRLF on Windows. Note that BIN (do nothing to line endings) is Mercurial's default behavior; it is only needed if you need to override a later, more general pattern.
The optional [repository] section specifies the line endings to use for files stored in the repository. It has a single setting, native, which determines the storage line endings for files declared as native in the [patterns] section. It can be set to LF or CRLF. The default is LF. For example, this means that on Windows, files configured as native (CRLF by default) will be converted to LF when stored in the repository. Files declared as LF, CRLF, or BIN in the [patterns] section are always stored as-is in the repository.
Example versioned .hgeol file:
[patterns]
**.py = native
**.vcproj = CRLF
**.txt = native
Makefile = LF
**.jpg = BIN
[repository]
native = LFNote The rules will first apply when files are touched in the working directory, e.g. by updating tonulland back totipto touch all files.
The extension uses an optional [eol] section read from both the normal Mercurial configuration files and the .hgeol file, with the latter overriding the former. You can use that section to control the overall behavior. There are three settings:
eol.native(defaultos.linesep) can be set toLForCRLFto override the default interpretation ofnativefor checkout. This can be used withhg archiveon Unix, say, to generate an archive where files have line endings for Windows.eol.only-consistent(defaultTrue) can be set toFalseto make the extension convert files with inconsistent EOLs. Inconsistent means that there is bothCRLFandLFpresent in the file. Such files are normally not touched under the assumption that they have mixed EOLs on purpose.eol.fix-trailing-newline(defaultFalse) can be set toTrueto ensure that converted files end with a EOL character (either\nor\r\nas per the configured patterns).
The extension provides cleverencode: and cleverdecode: filters like the deprecated win32text extension does. This means that you can disable win32text and enable eol and your filters will still work. You only need to these filters until you have prepared a .hgeol file.
The win32text.forbid* hooks provided by the win32text extension have been unified into a single hook named eol.checkheadshook. The hook will lookup the expected line endings from the .hgeol file, which means you must migrate to a .hgeol file first before using the hook. eol.checkheadshook only checks heads, intermediate invalid revisions will be pushed. To forbid them completely, use the eol.checkallhook hook. These hooks are best used as pretxnchangegroup hooks.
See hg help patterns for more information about the glob patterns used.
🎀 extdiff 🎀
command to allow external programs to compare revisions
The extdiff Mercurial extension allows you to use external programs to compare revisions, or revision with working directory. The external diff programs are called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare. 🔥
If there is more than one file being compared and the "child" revision is the working directory, any modifications made in the external diff program will be copied back to the working directory from the temporary directory. ✨
The extdiff extension also lets you set up brand new diff commands so you're not out here typing hg extdiff -p kdiff3 literally every single time like it's your whole personality. Configure it once, live your life 💅
[extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode
cdiff = gdiff -Nprc5
## or the old way:
#cmd.cdiff = gdiff
#opts.cdiff = -Nprc5
# add new command called meld, runs meld (no need to name twice). If
# the meld executable is not available, the meld tool in [merge-tools]
# will be used, if available
meld =
# add new command called vimdiff, runs gvimdiff with DirDiff plugin
# (see http://www.vim.org/scripts/script.php?script_id=102) Non
# English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
# your .vimrc
vimdiff = gvim -f "+next" \
"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"Okay so tool arguments can have variables in them that get expanded at runtime, which is giving main character energy fr:
$parent1,$plabel1— filename and descriptive label of the first parent$child,$clabel— filename and descriptive label of the child revision$parent2,$plabel2— filename and descriptive label of the second parent$root— the repository root$parentis an alias for$parent1, bestie, they're the same thing 🫶
The extdiff extension will go looking in your [diff-tools] and [merge-tools] sections for diff tool arguments whenever none are specified in [extdiff]. So like:
[extdiff]
kdiff3 =
[diff-tools]
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $childIf a program has a graphical interface, it might be interesting to tell Mercurial about it. Why, you ask? Two reasons, and they're both iconic:
- It stops the program from being mistakenly used in a terminal-only environment (think an SSH terminal session, where a GUI would just... not show up 😭).
- It makes
hg extdiff --per-fileopen multiple file diffs at once instead of one by one. (And if you still want them one by one? Use the--confirmoption, no biggie.)
You declare that a tool has a graphical interface with the gui flag, right next to where the diffargs are specified:
[diff-tools]
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
kdiff3.gui = trueYou can use -I/-X and a list of file or directory names just like the normal hg diff command. And here's the slay part: the extdiff extension makes snapshots of only the needed files, so running the external diff program will actually be pretty fast (at least faster than having to compare the entire tree, which is giving pain).
✨ Commands ✨
🎀 File content management 🎀
extdiff
use an external program to diff a repository (or selected files), periodt:
hg extdiff [OPT]... [FILE]...Show differences between revisions for the specified files, using an external program. The default program used is diff, with default options "-Npru". Yes bestie, diff is the default, no cap.
To select a different program, use the -p/--program option. The program gets passed the names of two directories to compare, unless the --per-file option is specified (more on that below, keep reading 👀). To pass extra options to the program, use -o/--option. These get passed before the names of the directories or files to compare.
The --from, --to, and --change options work the exact same way they do for hg diff.
The --per-file option runs the external program repeatedly on each file to diff, instead of once on two directories. By default this happens one by one — meaning the next file diff opens in the external program only once the previous external program (for the previous file diff) has exited. If the external program has a graphical interface though, it can open all the file diffs at once instead of one by one. See hg help -e extdiff for info on how to tell Mercurial that a given program has a graphical interface.
The --confirm option prompts the user before each invocation of the external program. It is ignored if --per-file isn't specified — so don't come crying if it does nothing, it literally told you.
Options:
-p,--program<CMD>— comparison program to run-o,--option<OPT[+]>— pass option to comparison program-r,--rev<REV[+]>— revision (DEPRECATED, we've moved on bestie)--from<REV1>— revision to diff from--to<REV2>— revision to diff to-c,--change<REV>— change made by revision--per-file— compare each file instead of revision snapshots--confirm— prompt user before each external program invocation--patch— compare patches for two revisions-I,--include<PATTERN[+]>— include names matching the given patterns-X,--exclude<PATTERN[+]>— exclude names matching the given patterns-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times — stack 'em up, queen 👑
factotum
http authentication with factotum, and yes the name is a whole vibe:
This extension allows the factotum(4) facility on Plan 9 from Bell Labs platforms to provide authentication information for HTTP access. Configuration entries specified in the auth section as well as authentication information provided in the repository URL are fully supported. If no prefix is specified, a value of "*" will be assumed. Slay.
By default, keys are specified as:
proto=pass service=hg prefix=<prefix> user=<username> !password=<password>If the factotum extension is unable to read the required key, one will be requested interactively — so it'll just ask you, nbd.
A configuration section is available to customize runtime behavior. By default, these entries are:
[factotum]
executable = /bin/auth/factotum
mountpoint = /mnt/factotum
service = hgThe executable entry defines the full path to the factotum binary. The mountpoint entry defines the path to the factotum file service. And lastly, the service entry controls the service name used when reading keys. Three settings, three jobs, all iconic ✨
fastannotate
yet another annotate implementation that might be faster (EXPERIMENTAL) — okay so it's experimental, tread lightly bestie, we don't fully know her yet:
The fastannotate extension provides a 'fastannotate' command that makes use of the linelog data structure as a cache layer and is expected to be faster than the vanilla 'annotate' if the cache is present.
In most cases, fastannotate requires a setup where mainbranch is some pointer that always moves forward, to be most efficient.
Using fastannotate together with linkrevcache would speed up building the annotate cache greatly. Run "debugbuildlinkrevcache" before "debugbuildannotatecache" — order matters, don't @ me.
[fastannotate]
# specify the main branch head. the internal linelog will only contain
# the linear (ignoring p2) "mainbranch". since linelog cannot move
# backwards without a rebuild, this should be something that always moves
# forward, usually it is "master" or "@".
mainbranch = master
# fastannotate supports different modes to expose its feature.
# a list of combination:
# - fastannotate: expose the feature via the "fastannotate" command which
# deals with everything in a most efficient way, and provides extra
# features like --deleted etc.
# - fctx: replace fctx.annotate implementation. note:
# a. it is less efficient than the "fastannotate" command
# b. it will make it practically impossible to access the old (disk
# side-effect free) annotate implementation
# c. it implies "hgweb".
# - hgweb: replace hgweb's annotate implementation. conflict with "fctx".
# (default: fastannotate)
modes = fastannotate
# default format when no format flags are used (default: number)
defaultformat = changeset, user, date
# serve the annotate cache via wire protocol (default: False)
# tip: the .hg/fastannotate directory is portable - can be rsynced
server = True
# build annotate cache on demand for every client request (default: True)
# disabling it could make server response faster, useful when there is a
# cronjob building the cache.
serverbuildondemand = True
# update local annotate cache from remote on demand
client = False
# path to use when connecting to the remote server (default: default)
remotepath = default
# minimal length of the history of a file required to fetch linelog from
# the server. (default: 10)
clientfetchthreshold = 10
# for "fctx" mode, always follow renames regardless of command line option.
# this is a BC with the original command but will reduced the space needed
# for annotate cache, and is useful for client-server setup since the
# server will only provide annotate cache with default options (i.e. with
# follow). do not affect "fastannotate" mode. (default: True)
forcefollow = True
# for "fctx" mode, always treat file as text files, to skip the "isbinary"
# check. this is consistent with the "fastannotate" command and could help
# to avoid a file fetch if remotefilelog is used. (default: True)
forcetext = True
# use unfiltered repo for better performance.
unfilteredrepo = True
# sacrifice correctness in some corner cases for performance. it does not
# affect the correctness of the annotate cache being built. the option
# is experimental and may disappear in the future (default: False)
perfhack = TrueHeads up bestie:modescan conflict (fctxandhgwebdo NOT get along),perfhacksacrifices correctness in some corner cases for performance and is experimental and may disappear in the future, andfctxmode will make it practically impossible to access the old (disk side-effect free) annotate implementation. Choose wisely 💀
✨ Commands ✨
fastexport
export repositories as git fast-import stream — okay werk:
✨ Commands ✨
🎀 Change import/export 🎀
fastexport
export repository as git fast-import stream:
hg fastexport [OPTION]... [REV]...This command lets you dump a repository as a human-readable text stream. It can be piped into corresponding import routines like "git fast-import". Incremental dumps can be created by using marks files. Cute AND functional, we love to see it 💖
Options:
-r,--rev<REV[+]>— revisions to export-i,--import-marks<FILE>— old marks file to read-e,--export-marks<FILE>— new marks file to write-A,--authormap<FILE>— remap usernames using this file
[+] marked option can be specified multiple times ✨
fetch
pull, update and merge in one command (DEPRECATED) — she's retired, bestie, but we still remember her fondly 🙈
✨ Commands ✨
🎀 Remote repository management 🎀
fetch
pull changes from a remote repository, merge new changes if needed.:
hg fetch [SOURCE]This finds all changes from the repository at the specified path or URL and adds them to the local repository.
If the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes.
When a merge is needed, the working directory is first updated to the newly pulled changes. Local changes are then merged into the pulled changes. To switch the merge order, use --switch-parent.
See hg help dates for a list of formats valid for -d/--date.
Returns 0 on success. 🎉
Options:
-r,--rev<REV[+]>— a specific revision you would like to pull--edit— invoke editor on commit messages--force-editor— edit commit message (DEPRECATED)--switch-parent— switch parents when merging-m,--message<TEXT>— use text as commit message-l,--logfile<FILE>— read commit message from file-d,--date<DATE>— record the specified date as commit date-u,--user<USER>— record the specified user as committer-e,--sshCMD — tells hg which ssh command to use, bestie--remotecmdCMD — thehgcommand to run on the other side, on the remote--insecure— do not verify the server certificate (this is ignoring theweb.cacertsconfig, so like… be careful, okay?)- [+] marked option can be specified multiple times 💅
✨ fix ✨
rewrite file content in changesets or working copy (EXPERIMENTAL)
Okay so this one is literally so cool. It gives you a command that runs your configured tools on the contents of modified files, and then writes back any fixes to the working copy — or replaces changesets. Iconic.
Fixer tools run in the repository's root directory. Why does that matter? Because it lets them read config files from the working copy, or even write to the working copy. Note: the working copy is not updated to match the revision being fixed. In fact, several revisions may be fixed in parallel, bestie. Writes to the working copy are not amended into the revision being fixed. So fixer tools MUST always read the content to be fixed from stdin, and write the fixed file content back to stdout. No exceptions. Periodt.
Here's an example config that makes hg fix apply automatic formatting fixes to modified lines in C++ code:
[fix]
clang-format:command=clang-format --assume-filename={rootpath}
clang-format:linerange=--lines={first}:{last}
clang-format:pattern=set:**.cpp or **.hppThe :command suboption forms the first part of the shell command that'll be used to fix a file. The content of the file gets passed on standard input, and the fixed file content is expected on standard output. Any output on standard error will be displayed as a warning. If the exit status is not zero, the file will not be affected. A placeholder warning is displayed if there's a non-zero exit status but no standard error output. Some values may be substituted into the command:
{rootpath}— The path of the file being fixed, relative to the repo root{basename}— The name of the file being fixed, without the directory path
If the :linerange suboption is set, the tool will only be run if there are changed lines in a file. The value of this suboption gets appended to the shell command once for every range of changed lines in the file. Some values may be substituted into the command:
{first}— The 1-based line number of the first line in the modified range{last}— The 1-based line number of the last line in the modified range
Deleted sections of a file will be ignored by :linerange, because there's no corresponding line range in the version being fixed. Makes sense, right? 💅
By default, tools that set :linerange will only be executed if there's at least one changed line range. This is meant to prevent accidents like running a code formatter in such a way that it unexpectedly reformats the whole file. 🫣 If such a tool needs to operate on unchanged files, it should set the :skipclean suboption to false.
The :pattern suboption determines which files will be passed through each configured tool. See hg help patterns for possible values. However, all patterns are relative to the repo root, even if that text says they're relative to the current working directory. If there are file arguments to hg fix, the intersection of these patterns is used.
There's also a configurable limit for the maximum size of file that will be processed by hg fix:
[fix]
maxfilesize = 2MBNormally, execution of configured tools will continue after a failure (indicated by a non-zero exit status). It can also be configured to abort after the first such failure, so that no files will be affected if any tool fails. This abort will also cause hg fix to exit with a non-zero status:
[fix]
failure = abortWhen multiple tools are configured to affect a file, they execute in an order defined by the :priority suboption. The :priority suboption has a default value of zero for each tool. Tools are executed in order of descending priority. The execution order of tools with equal priority is unspecified. For example, you could use the 'sort' and 'head' utilities to keep only the 10 smallest numbers in a text file by ensuring that 'sort' runs before 'head':
[fix]
sort:command = sort -n
head:command = head -n 10
sort:pattern = numbers.txt
head:pattern = numbers.txt
sort:priority = 2
head:priority = 1To account for changes made by each tool, the line numbers used for incremental formatting are recomputed before executing the next tool. So each tool may see different values for the arguments added by the :linerange suboption. Slay, honestly.
Each fixer tool is allowed to return some metadata in addition to the fixed file content. The metadata must be placed before the file content on stdout, separated from the file content by a zero byte. The metadata is parsed as a JSON value (so, it should be UTF-8 encoded and contain no zero bytes). A fixer tool is expected to produce this metadata encoding if and only if the :metadata suboption is true:
[fix]
tool:command = tool --prepend-json-metadata
tool:metadata = trueThe metadata values are passed to hooks, which can be used to print summaries or perform other post-fixing work. The supported hooks are:
"postfixfile"— Run once for each file in each revision where any fixer tools made changes to the file content. Provides"$HG_REV"and"$HG_PATH"to identify the file, and"$HG_METADATA"with a map of fixer names to metadata values from fixer tools that affected the file. Fixer tools that didn't affect the file have a value ofNone. Only fixer tools that executed are present in the metadata."postfix"— Run once after all files and revisions have been handled. Provides"$HG_REPLACEMENTS"with information about what revisions were created and made obsolete. Provides a boolean"$HG_WDIRWRITTEN"to indicate whether any files in the working copy were updated. Provides a list"$HG_METADATA"mapping fixer tool names to lists of metadata values returned from executions that modified a file. This aggregates the same metadata previously passed to the"postfixfile"hook.
You can specify a list of directories to search the tool command in using the fix.extra-bin-paths configuration.
💬 Commands 💬
🗂️ File content management 🗂️
🔧 fix 🔧
rewrite file content in changesets or working directory:
hg fix [OPTION]... [FILE]...Runs any configured tools to fix the content of files. (See hg help -e fix for details about configuring tools.) Only affects files with changes, unless file arguments are provided. Only affects changed lines of files, unless the --whole flag is used. Some tools may always affect the whole file regardless of --whole. 🙃
If --working-dir is used, files with uncommitted changes in the working copy will be fixed.
Note that no backup are made. Like, none. Zero. Be so for real before you run this.
If revisions are specified with --source, those revisions and their descendants will be checked, and they may be replaced with new revisions that have fixed file content. By automatically including the descendants, no merging, rebasing, or evolution will be required. If an ancestor of the working copy is included, then the working copy itself will also be fixed, and the working copy will be updated to the fixed parent. ✨
When determining what lines of each file to fix at each revision, the whole set of revisions being fixed is considered, so that fixes to earlier revisions are not forgotten in later ones. The --base flag can be used to override this default behavior, though it is not usually desirable to do so.
Options:
--all— fix all non-public non-obsolete revisions--base<REV[+]>— revisions to diff against (overrides automatic selection, and applies to every revision being fixed)-r,--rev<REV[+]>— revisions to fix (ADVANCED)-s,--source<REV[+]>— fix the specified revisions and their descendants-w,--working-dir— fix the working directory--whole— always fix every line of a file- [+] marked option can be specified multiple times 💅
👀 fsmonitor 👀
Faster status operations with the Watchman file monitor (EXPERIMENTAL)
Integrates the file-watching program Watchman with Mercurial to produce faster status results. Literally the glow-up your status needed. ✨
On a particular Linux system, for a real-world repository with over 400,000 files hosted on ext4, vanilla hg status takes 1.3 seconds. On the same system, with fsmonitor it takes about 0.3 seconds. THE MATH IS MATHING. 🔥
fsmonitor requires no configuration — it will tell Watchman about your repository as necessary. You'll need to install Watchman from https://facebook.github.io/watchman/ and make sure it's in your PATH.
fsmonitor is incompatible with thelargefilesandeolextensions, and will disable itself if any of those are active. Not me watching them beef 😭
The following configuration options exist:
[fsmonitor]
mode = {off, on, paranoid}When mode = off, fsmonitor will disable itself (similar to not loading the extension at all). When mode = on, fsmonitor will be enabled (the default). When mode = paranoid, fsmonitor will query both Watchman and the filesystem, and ensure that the results are consistent.
[fsmonitor]
timeout = (float)A value, in seconds, that determines how long fsmonitor will wait for Watchman to return results. Defaults to 2.0.
[fsmonitor]
blacklistusers = (list of userids)A list of usernames for which fsmonitor will disable itself altogether.
[fsmonitor]
walk_on_invalidate = (boolean)Whether or not to walk the whole repo ourselves when our cached state has been invalidated, for example when Watchman has been restarted or .hgignore rules have been changed. Walking the repo in that case can result in competing for I/O with Watchman. For large repos it is recommended to set this value to false. You may wish to set this to true if you have a very fast filesystem that can outpace the IPC overhead of getting the result data for the full repo from Watchman. Defaults to false.
[fsmonitor]
warn_when_unused = (boolean)Whether to print a warning during certain operations when fsmonitor would be beneficial to performance but isn't enabled. Like a lil "bestie you could be going faster rn" note. 🫶
[fsmonitor]
warn_update_file_count = (integer)
# or when mercurial is built with rust support
warn_update_file_count_rust = (integer)If warn_when_unused is set and fsmonitor isn't enabled, a warning will be printed during working directory updates if this many files will be created.
🐙 git 🐙
grant Mercurial the ability to operate on Git repositories. (EXPERIMENTAL)
This is currently super experimental. It probably will consume your firstborn a la Rumpelstiltskin, etc. 💀 (this is a direct quote, I'm not even kidding)
🆘 githelp 🆘
try mapping git commands to Mercurial commands
Tries to map a given git command to a Mercurial command:
$ hg githelp -- git checkout master hg update masterIf an unknown command or parameter combination is detected, an error is produced.
💬 Commands 💬
🧚 Help 🧚
🆘 githelp 🆘
suggests the Mercurial equivalent of the given git command:
hg githelp
Usage: hg githelp -- <git command>
aliases: gitgpg</p> 🎀
commands to sign and verify changesets — yes bestie, real cryptographic receipts for your commits ✨
Commands
Signing changes (GPG)
sigcheck
verify all the signatures there may be for a particular revision:
hg sigcheck REVverify all the signatures there may be for a particular revision 💅
sign
add a signature for the current or given revision:
hg sign [OPTION]... [REV]...If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. (so it just grabs whatever you're standing on, no cap)
The gpg.cmd config setting can be used to specify the command to run. A default key can be specified with gpg.key.
See hg help dates for a list of formats valid for -d/--date.
Options:
-l,--local— make the signature local-f,--force— sign even if the sigfile is modified--no-commit— do not commit the sigfile after signing-k,--key <ID>— the key id to sign with-m,--message <TEXT>— use text as commit message-e,--edit— invoke editor on commit messages-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer
sigs
list signed changesets:
hg sigslist signed changesets 🫶
graphlog 🌈
command to view revision graphs from a shell (DEPRECATED)
bestie listen — the functionality of this extension has been included in core Mercurial since version 2.3. Please use hg log -G ... instead. it's giving retired icon 💀
This extension adds a --graph option to the incoming, outgoing and log commands. When this option is given, an ASCII representation of the revision graph is also shown.
Commands
Change navigation
glog
show revision history alongside an ASCII revision graph:
hg glog [OPTION]... [FILE]Print a revision history alongside a revision graph drawn with ASCII characters. it's literally art, we love a diagram girlie
Nodes printed as an @ character are parents of the working directory.
This is an alias to hg log -G.
Options:
-f,--follow— follow changeset history, or file history across copies and renames--follow-first— only follow the first parent of merge changesets (DEPRECATED)-d,--date <DATE>— show revisions matching date spec-C,--copies— show copied files-k,--keyword <TEXT[+]>— do case-insensitive search for a given text-r,--rev <REV[+]>— show the specified revision or revset--removed— include revisions where files were removed-m,--only-merges— show only merges (DEPRECATED)-u,--user <USER[+]>— revisions committed by user--only-branch <BRANCH[+]>— show only changesets within the given named branch (DEPRECATED)-b,--branch <BRANCH[+]>— show changesets within the given named branch-P,--prune <REV[+]>— do not display revision or any of its ancestors-p,--patch— show patch-g,--git— use git extended diff format-l,--limit <NUM>— limit number of changes displayed-M,--no-merges— do not show merges--stat— output diffstat-style summary of changes-G,--graph— show the revision DAG--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times 💅
hgk 🖼️
browse the repository in a graphical way
The hgk extension allows browsing the history of a repository in a graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not distributed with Mercurial.) so you gotta bring your own, bestie 🙈
hgk consists of two parts: a Tcl script that does the displaying and querying of information, and an extension to Mercurial named hgk.py, which provides hooks for hgk to get information. hgk can be found in the contrib directory, and the extension is shipped in the hgext repository, and needs to be enabled.
The hg view command will launch the hgk Tcl script. For this command to work, hgk must be in your search path. Alternately, you can specify the path to hgk in your configuration file:
[hgk]
path = /location/of/hgkhgk can make use of the extdiff extension to visualize revisions. Assuming you had already configured extdiff vdiff command, just add:
[hgk]
vdiff=vdiffRevisions context menu will now display additional entries to fire vdiff on hovered and selected revisions. right-click, slay 💅
Commands
Change navigation
view
start interactive history viewer:
hg view [-l LIMIT] [REVRANGE]start interactive history viewer
Options:
-l,--limit <NUM>— limit number of changes displayed
highlight 🌈
syntax highlighting for hgweb (requires Pygments)
It depends on the Pygments syntax highlighting library: http://pygments.org/
There are the following configuration options:
[web]
pygments_style = <style> (default: colorful)
highlightfiles = <fileset> (default: size('<5M'))
highlightonlymatchfilename = <bool> (default False)highlightonlymatchfilename will only highlight files if their type could be identified by their filename. When this is not enabled (the default), Pygments will try very hard to identify the file type from content and any match (even matches with a low confidence score) will be used. she's trying her best okay 😭
histedit 🎀
interactive history editing
With this extension installed, Mercurial gains one new command: histedit. Usage is as follows, assuming the following history:
@ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42
| Add delta
|
o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42
| Add beta
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alphaIf you were to run hg histedit c561b4e977df, you would see the following file open in your editor:
pick c561b4e977df Add beta
pick 030b686bedc4 Add gamma
pick 7c2fd3b9020c Add delta
# Edit history between c561b4e977df and 7c2fd3b9020c
#
# Commits are listed from least to most recent
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but allow edits before making new commit
# f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
# b, base = checkout changeset and apply further changesets from there
#In this file, lines beginning with # are ignored. You must specify a rule for each revision in your history. For example, if you had meant to add gamma before beta, and then wanted to add delta in the same revision as beta, you would reorganize the file to look like this:
pick 030b686bedc4 Add gamma
pick c561b4e977df Add beta
fold 7c2fd3b9020c Add delta
# Edit history between c561b4e977df and 7c2fd3b9020c
#
# Commits are listed from least to most recent
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but allow edits before making new commit
# f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
# b, base = checkout changeset and apply further changesets from there
#At which point you close the editor and histedit starts working. When you specify a fold operation, histedit will open an editor when it folds those revisions together, offering you a chance to clean up the commit message:
Add beta
***
Add deltaEdit the commit message to your liking, then close the editor. The date used for the commit will be the later of the two commits' dates. For this example, let's assume that the commit message was changed to Add beta and delta. After histedit has run and had a chance to remove any old or temporary revisions it needed, the history looks like this:
@ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42
| Add beta and delta.
|
o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alphaNote that histedit does not remove any revisions (even its own temporary ones) until after it has completed all the editing operations, so it will probably perform several strip operations when it's done. For the above example, it had to run strip twice. Strip can be slow depending on a variety of factors, so you might need to be a little patient. she's working on it, give her a sec 🫶 You can choose to keep the original revisions by passing the --keep flag.
The edit operation will drop you back to a command prompt, allowing you to edit files freely, or even use hg record to commit some changes as a separate commit. When you're done, any remaining uncommitted changes will be committed as well. When done, run hg histedit --continue to finish this step. If there are uncommitted changes, you'll be prompted for a new commit message, but the default commit message will be the original message for the edited revision, and the date of the original commit will be preserved.
The message operation will give you a chance to revise a commit message without changing the contents. It's a shortcut for doing edit immediately followed by hg histedit --continue.
If histedit encounters a conflict when moving a revision (while handling pick or fold), it'll stop in a similar manner to edit with the difference that it won't prompt you for a commit message when done. If you decide at this point that you don't like how much work it will be to rearrange history, or that you made a mistake, you can use hg histedit --abort to abandon the new changes you have made and return to the state before you attempted to edit your history. the undo button of your dreams honestly ✨
If we clone the histedit-ed example repository above and add four more changes, such that we have the following history:
@ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan
| Add theta
|
o 5 140988835471 2009-04-27 18:04 -0500 stefan
| Add eta
|
o 4 122930637314 2009-04-27 18:04 -0500 stefan
| Add zeta
|
o 3 836302820282 2009-04-27 18:04 -0500 stefan
| Add epsilon
|
o 2 989b4d060121 2009-04-27 18:04 -0500 durin42
| Add beta and delta.
|
o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alphaokay so if you run hg histedit --outgoing on the clone, bestie, it does the exact same thing as running hg histedit 836302820282. Like, identical. No cap. 💅
And if you're planning to push to a repo that Mercurial cannot detect as related to the source repo? You can just add a --force option. That's the whole vibe check. ✨
Config ⚙️
Histedit rule lines get truncated at 80 characters by default. Fr fr. You can customize this behavior by setting a different length in your configuration file:
[histedit]
linelen = 120 # truncate rule lines at 120 charactersThe summary of a change can be customized as well, and honestly? iconic:
[histedit]
summary-template = '{rev} {bookmarks} {desc|firstline}'Keep that customized summary short enough that rule lines will fit in the configured line length. See above if that requires customization. It's giving "read the room". 🎀
hg histedit attempts to automatically choose an appropriate base revision to use. To change which base revision is used, define a revset in your configuration file:
[histedit]
defaultrev = only(.) & draft()By default each edited revision needs to be present in histedit commands. To remove a revision you need to use the drop operation. You can configure the drop to be implicit for missing commits by adding:
[histedit]
dropmissing = TrueBy default, histedit will close the transaction after each action. For performance purposes, you can configure histedit to use a single transaction across the entire histedit.
WARNING: This setting introduces a significant risk of losing the work you've done in a histedit if the histedit aborts unexpectedly. Like... 😭 genuinely do not play with this one:
[histedit]
singletransaction = TrueCommands 📜
Change manipulation 🫶
histedit
interactively edit changeset history. Obsessed. 💖
hg histedit [OPTIONS] ([ANCESTOR] | --outgoing [URL])This command lets you edit a linear series of changesets (up to and including the working directory, which should be clean). You can:
pickto [re]order a changesetdropto omit changesetmessto reword the changeset commit messagefoldto combine it with the preceding changeset (using the later date)rolllikefold, but discarding this commit's description and dateeditto edit this changeset (preserving date)baseto checkout changeset and apply further changesets from there
There are a number of ways to select the root changeset, bestie:
- Specify ANCESTOR directly
- Use
--outgoing— it will be the first linear changeset not included in destination. (Seehg help config.paths.default-push) - Otherwise, the value from the
"histedit.defaultrev"config option is used as a revset to select the base revision when ANCESTOR is not specified. The first revision returned by the revset is used. By default, this selects the editable history that is unique to the ancestry of the working directory.
If you use --outgoing, this command will abort if there are ambiguous outgoing revisions. For example, if there are multiple branches containing outgoing revisions. 😳
Use "min(outgoing() and ::.)" or similar revset specification instead of --outgoing to specify the edit target revision exactly in such ambiguous situations. See hg help revsets for detail about selecting revisions. iykyk 💅
Examples:
- A number of changes have been made. Revision 3 is no longer needed.
Start history editing from revision 3:
hg histedit -r 3An editor opens, containing the list of revisions, with specific actions specified:
pick 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 0a9639fcda9d 5 Morgify the cromulancyAdditional information about the possible actions to take appears below the list of revisions.
To remove revision 3 from the history, its action (at the beginning of the relevant line) is changed to 'drop':
drop 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 0a9639fcda9d 5 Morgify the cromulancy- A number of changes have been made. Revision 2 and 4 need to be swapped.
Start history editing from revision 2:
hg histedit -r 2An editor opens, containing the list of revisions, with specific actions specified:
pick 252a1af424ad 2 Blorb a morgwazzle
pick 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlogTo swap revision 2 and 4, its lines are swapped in the editor:
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 5339bf82f0ca 3 Zworgle the foobar
pick 252a1af424ad 2 Blorb a morgwazzleReturns 0 on success, 1 if user intervention is required (not only for intentional "edit" command, but also for resolving unexpected conflicts). 🙈
Options:
--commands <FILE>— read history edits from the specified file-c,--continue— continue an edit already in progress--edit-plan— edit remaining actions list-k,--keep— don't strip old nodes after edit is complete--abort— abort an edit in progress-o,--outgoing— changesets not found in destination-f,--force— force outgoing even for unrelated repositories-r,--rev <REV[+]>— first revision to be edited-T,--template <TEMPLATE>— display with template
[+] marked option can be specified multiple times.
hooklib
collection of simple hooks for common tasks (EXPERIMENTAL) 🧪
This extension provides a number of simple hooks to handle issues commonly found in repositories with many contributors:
- email notification when changesets move from draft to public phase
- email notification when changesets are obsoleted
- enforcement of draft phase for all incoming changesets
- enforcement of a no-branch-merge policy
- enforcement of a no-multiple-heads policy
The implementation of the hooks is subject to change, e.g. whether to implement them as individual hooks or merge them into the notify extension as option. The functionality itself is planned to be supported long-term. ✨
journal
track previous positions of bookmarks (EXPERIMENTAL) 📓
This extension adds a new command: hg journal, which shows you where bookmarks were previously located. Cute, right? 🎀
Commands 📜
Change organization 🦋
journal
show the previous position of bookmarks and the working copy:
hg journal [OPTION]... [BOOKMARKNAME]The journal is used to see the previous commits that bookmarks and the working copy pointed to. By default the previous locations for the working copy. Passing a bookmark name will show all the previous positions of that bookmark. Use the --all switch to show previous locations for all bookmarks and the working copy; each line will then include the bookmark name, or '.' for the working copy, as well. 👑
If name starts with re:, the remainder of the name is treated as a regular expression. To match a name that actually starts with re:, use the prefix literal:.
By default hg journal only shows the commit hash and the command that was running at that time. -v/--verbose will show the prior hash, the user, and the time at which it happened. 🕐
Use -c/--commits to output log information on each commit hash; at this point you can use the usual --patch, --git, --stat and --template switches to alter the log output for these.
hg journal -T json can be used to produce machine readable output. 🤖
Options:
--all— show history for all names-c,--commits— show commit metadata-p,--patch— show patch-g,--git— use git extended diff format-l,--limit <NUM>— limit number of changes displayed--stat— output diffstat-style summary of changes--style <STYLE>— display using template map file (DEPRECATED)-T,--template <TEMPLATE>— display with template
keyword
expand keywords in tracked files 🔑
This extension expands RCS/CVS-like or self-customized $Keywords$ in tracked text files selected by your configuration.
Keywords are only expanded in local repositories and not stored in the change history. The mechanism can be regarded as a convenience for the current user or for archive distribution.
Keywords expand to the changeset data pertaining to the latest change relative to the working directory parent of each file.
Configuration is done in the [keyword], [keywordset] and [keywordmaps] sections of hgrc files.
Example:
[keyword]
# expand keywords in every python file except those matching "x*"
**.py =
x* = ignore
[keywordset]
# prefer svn- over cvs-like default keywordmaps
svn = TrueNote: The more specific you are in your filename patterns the less you lose speed in huge repositories. fr fr, be precise. 💅
For [keywordmaps] template mapping and expansion demonstration and control run hg kwdemo. See hg help templates for a list of available templates and filters.
Three additional date template filters are provided:
utcdate—"2006/09/18 15:13:13"svnutcdate—"2006-09-18 15:13:13Z"svnisodate—"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)"
The default template mappings (view with hg kwdemo -d) can be replaced with customized keywords and templates. Again, run hg kwdemo to control the results of your configuration changes. 🌈
Before changing/disabling active keywords, you must run hg kwshrink to avoid storing expanded keywords in the change history. ⚠️
To force expansion after enabling it, or a configuration change, run hg kwexpand.
Expansions spanning more than one line and incremental expansions, like CVS' $Log$, are not supported. A keyword template map "Log = {desc}" expands to the first line of the changeset description.
Commands 📜
Uncategorized commands 🧺
kwdemo
print [keywordmaps] configuration and an expansion example:
hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...Show current, custom, or default keyword template maps and their expansions.
Extend the current configuration by specifying maps as arguments and using -f/--rcfile to source an external hgrc file.
Use -d/--default to disable current configuration.
See hg help templates for information on templates and filters.
Options:
-d,--default— show the default keyword template maps 💅-f,--rcfile<FILE>— read maps from an rcfile instead 🎀
kwexpand ✨
okay so this one expands keywords in the working directory:
hg kwexpand [OPTION]... [FILE]...Run it after you (re)enable keyword expansion, bestie — that's the whole vibe.
heads up: kwexpand refuses to run if the files you gave it contain local changes 😭 like it will just not.
Options:
-I,--include<PATTERN[+]>— include names matching the given patterns 🌸-X,--exclude<PATTERN[+]>— exclude names matching the given patterns 🦋
[+] marked option can be specified multiple times 💫kwfiles 💖
shows files configured for keyword expansion:
hg kwfiles [OPTION]... [FILE]...It lists which files in the working directory get matched by the [keyword] configuration patterns. super useful for preventing inadvertent keyword expansion and for speeding up execution, because you're only including files that are actual candidates for expansion 👑
See hg help keyword for how to construct patterns — both for inclusion and exclusion of files, iykyk.
With -A/--all and -v/--verbose, the codes used to show the status of files are:
K= keyword expansion candidate ✨k= keyword expansion candidate (not tracked) 🙈I= ignored 💀i= ignored (not tracked) 🫠
Options:
-A,--all— show keyword status flags of all files 🌈-i,--ignore— show files excluded from expansion 🚫-u,--unknown— only show unknown (not tracked) files 👀-I,--include<PATTERN[+]>— include names matching the given patterns 🌸-X,--exclude<PATTERN[+]>— exclude names matching the given patterns 🦋
[+] marked option can be specified multiple times 💫kwshrink 🎀
reverts expanded keywords in the working directory:
hg kwshrink [OPTION]... [FILE]...Must be run before changing or disabling active keywords. like, non-negotiable, fr fr.
And same energy as its sibling: kwshrink refuses to run if the files you hand it contain local changes 😤
Options:
-I,--include<PATTERN[+]>— include names matching the given patterns 🌸-X,--exclude<PATTERN[+]>— exclude names matching the given patterns 🦋
[+] marked option can be specified multiple times 💫largefiles 🔥
track large binary files
okay bestie, real talk. Large binary files are not very compressible, not very diffable, and not at all mergeable. Such files are not handled efficiently by Mercurial's storage format (revlog), which is based on compressed binary deltas. Storing large binary files as regular Mercurial files wastes bandwidth and disk space and increases Mercurial's memory usage. 💀
The largefiles extension addresses these problems by adding a centralized client-server layer on top of Mercurial: largefiles live in a central store out on the network somewhere, and you only fetch the revisions that you need when you need them. iconic behavior, honestly.
largefiles works by maintaining a "standin file" in .hglf/ for each largefile. The standins are small (41 bytes: an SHA-1 hash plus newline) and are tracked by Mercurial. Largefile revisions are identified by the SHA-1 hash of their contents, which is written to the standin. largefiles uses that revision ID to get/put largefile revisions from/to the central store. This saves both disk space and bandwidth, since you don't need to retrieve all historical revisions of large files when you clone or pull. ✨
To start a new repository or add new large binary files, just add --large to your hg add command. For example:
$ dd if=/dev/urandom of=randomdata count=2000
$ hg add --large randomdata
$ hg commit -m "add randomdata as a largefile"When you push a changeset that adds/modifies largefiles to a remote repository, its largefile revisions will be uploaded along with it. Note that the remote Mercurial must also have the largefiles extension enabled for this to work.
When you pull a changeset that affects largefiles from a remote repository, the largefiles for the changeset will by default not be pulled down. However, when you update to such a revision, any largefiles needed by that revision are downloaded and cached (if they have never been downloaded before). One way to pull largefiles when pulling is thus to use --update, which will update your working copy to the latest pulled revision (and thereby downloading any new largefiles). 💅
If you want to pull largefiles you don't need for update yet, then you can use pull with the --lfrev option or the hg lfpull command. 👑
If you know you are pulling from a non-default location and want to download all the largefiles that correspond to the new changesets at the same time, then you can pull with --lfrev "pulled()". 🌸
If you just want to ensure that you will have the largefiles needed to merge or rebase with new heads that you are pulling, then you can pull with --lfrev "head(pulled())" flag to pre-emptively download any largefiles that are new in the heads you are pulling. 🦋
Keep in mind that network access may now be required to update to changesets that you have not previously updated to. The nature of the largefiles extension means that updating is no longer guaranteed to be a local-only operation. 😭
If you already have large files tracked by Mercurial without the largefiles extension, you will need to convert your repository in order to benefit from largefiles. This is done with the hg lfconvert command:
$ hg lfconvert --size 10 oldrepo newrepoIn repositories that already have largefiles in them, any new file over 10MB will automatically be added as a largefile. To change this threshold, set largefiles.minsize in your Mercurial config file to the minimum size in megabytes to track as a largefile, or use the --lfsize option to the add command (also in megabytes):
[largefiles]
minsize = 2$ hg add --lfsize 2The largefiles.patterns config option allows you to specify a list of filename patterns (see hg help patterns) that should always be tracked as largefiles:
[largefiles]
patterns =
*.jpg
re:.*\.(png|bmp)$
library.zip
content/audio/*Files that match one of these patterns will be added as largefiles regardless of their size. 🌈
Thelargefiles.minsizeandlargefiles.patternsconfig options will be ignored for any repositories not already containing a largefile. To add the first largefile to a repository, you must explicitly do so with the--largeflag passed to thehg addcommand. no shortcuts, bestie.
Commands
Uncategorized commands
lfconvert
convert a normal repository to a largefiles repository:
hg lfconvert SOURCE DEST [FILE ...]Convert repository SOURCE to a new repository DEST, identical to SOURCE except that certain files will be converted as largefiles: specifically, any file that matches any PATTERN or whose size is above the minimum size threshold is converted as a largefile. The size used to determine whether or not to track a file as a largefile is the size of the first version of the file. The minimum size can be specified either with --size or in configuration as largefiles.size. ✨
After running this command you will need to make sure that largefiles is enabled anywhere you intend to push the new repository. 👑
Use --to-normal to convert largefiles back to normal files; after this, the DEST repository can be used without largefiles at all. 🎀
Options:
-s,--size<SIZE>— minimum size (MB) for files to be converted as largefiles 🌸--to-normal— convert from a largefiles repo to a normal repo 🦋
lfpull
pull largefiles for the specified revisions from the specified source:
hg lfpull -r REV... [-e CMD] [--remotecmd CMD] [SOURCE]Pull largefiles that are referenced from local changesets but missing locally, pulling from a remote repository to the local cache. 💖
If SOURCE is omitted, the 'default' path will be used. See hg help urls for more information. 🌈
Some examples:
- pull largefiles for all branch heads:
hg lfpull -r "head() and not closed()"- pull largefiles on the default branch:
hg lfpull -r "branch(default)"Options:
-r,--rev<VALUE[+]>— pull largefiles for these revisions 🔥-e,--ssh<CMD>— specify ssh command to use 🧚--remotecmd<CMD>— specify hg command to run on the remote side 👑--insecure— do not verify server certificate (ignoringweb.cacertsconfig) 💀
[+] marked option can be specified multiple times 💫lfs
lfs - large file support (EXPERIMENTAL) 🧪
This extension allows large files to be tracked outside of the normal repository storage and stored on a centralized server, similar to the largefiles extension. The git-lfs protocol is used when communicating with the server, so existing git infrastructure can be harnessed. Even though the files are stored outside of the repository, they are still integrity checked in the same manner as normal files. ✨
The files stored outside of the repository are downloaded on demand, which reduces the time to clone, and possibly the local disk usage. This changes fundamental workflows in a DVCS, so careful thought should be given before deploying it. hg convert can be used to convert LFS repositories to normal repositories that no longer require this extension, and do so without changing the commit hashes. This allows the extension to be disabled if the centralized workflow becomes burdensome. However, the pre and post convert clones will not be able to communicate with each other unless the extension is enabled on both. 😭
To start a new repository, or to add LFS files to an existing one, just create an .hglfs file as described below in the root directory of the repository. Typically, this file should be put under version control, so that the settings will propagate to other repositories with push and pull. During any commit, Mercurial will consult this file to determine if an added or modified file should be stored externally. The type of storage depends on the characteristics of the file at each commit. A file that is near a size threshold may switch back and forth between LFS and normal storage, as needed. 💅
Alternately, both normal repositories and largefile controlled repositories can be converted to LFS by using hg convert and the lfs.track config option described below. The .hglfs file should then be created and added, to control subsequent LFS selection. The hashes are also unchanged in this case. The LFS and non-LFS repositories can be distinguished because the LFS repository will abort any command if this extension is disabled. 👑
Committed LFS files are held locally, until the repository is pushed. 💾 Before the normal repository data goes anywhere, the LFS files tracked by the outgoing commits get auto-uploaded to the configured central server. No cap. But heads up bestie: no LFS files are transferred on hg pull or hg clone. Instead, the files are downloaded on demand as they need to be read, if a cached copy cannot be found locally. Both committing and downloading an LFS file will link the file to a usercache, to speed up future access. See the usercache config setting described below. 👑
The extension reads its configuration from a versioned .hglfs configuration file found in the root of the working directory. The .hglfs file uses the same syntax as all other Mercurial configuration files. It uses a single section, [track].
The [track] section specifies which files are stored as LFS (or not). Each line is keyed by a file pattern, with a predicate value. The first file pattern match is used, so put more specific patterns first. 🎯 The available predicates are all(), none(), and size(). See hg help filesets.size for the latter.
Example versioned .hglfs file:
[track]
# No Makefile or python file, anywhere, will be LFS
**Makefile = none()
**.py = none()
**.zip = all()
**.exe = size(">1MB")
# Catchall for everything not matched above
** = size(">10MB")✨ Configs ✨
[lfs]
# Remote endpoint. Multiple protocols are supported:
# - http(s)://user:pass@example.com/path
# git-lfs endpoint
# - file:///tmp/path
# local filesystem, usually for testing
# if unset, lfs will assume the remote repository also handles blob storage
# for http(s) URLs. Otherwise, lfs will prompt to set this when it must
# use this value.
# (default: unset)
url = https://example.com/repo.git/info/lfs
# Which files to track in LFS. Path tests are "**.extname" for file
# extensions, and "path:under/some/directory" for path prefix. Both
# are relative to the repository root.
# File size can be tested with the "size()" fileset, and tests can be
# joined with fileset operators. (See "hg help filesets.operators".)
#
# Some examples:
# - all() # everything
# - none() # nothing
# - size(">20MB") # larger than 20MB
# - !**.txt # anything not a *.txt file
# - **.zip | **.tar.gz | **.7z # some types of compressed files
# - path:bin # files under "bin" in the project root
# - (**.php & size(">2MB")) | (**.js & size(">5MB")) | **.tar.gz
# | (path:bin & !path:/bin/README) | size(">1GB")
# (default: none())
#
# This is ignored if there is a tracked '.hglfs' file, and this setting
# will eventually be deprecated and removed.
track = size(">10M")
# how many times to retry before giving up on transferring an object
retry = 5
# the local directory to store lfs files for sharing across local clones.
# If not set, the cache is located in an OS specific cache location.
usercache = /path/to/global/cache🛠️ Commands 💖
🌟 logtoprocess
send ui.log() data to a subprocess (EXPERIMENTAL)
This extension lets you specify a shell command per ui.log() event, sending all remaining arguments to as environment variables to that command. 📤
Positional arguments construct a log message, which is passed in the MSG1 environment variables. Each keyword argument is set as a OPT_UPPERCASE_KEY variable (so the key is uppercased, and prefixed with OPT_). The original event name is passed in the EVENT environment variable, and the process ID of mercurial is given in HGPID. 🧠
So given a call ui.log('foo', 'bar %s ', 'baz', spam='eggs'), a script configured for the `foo event can expect an environment with MSG1=bar baz, and OPT_SPAM=eggs.
Scripts are configured in the [logtoprocess] section, each key an event name. For example:
[logtoprocess]
commandexception = echo "$MSG1" > /var/log/mercurial_exceptions.logwould log the warning message and traceback of any failed command dispatch.
Scripts are run asynchronously as detached daemon processes; mercurial will not ensure that they exit cleanly. 😬
🧵 mq
manage a stack of patches
This extension lets you work with a stack of patches in a Mercurial repository. It manages two stacks of patches — all known patches, and applied patches (subset of known patches). 🎀
Known patches are represented as patch files in the .hg/patches directory. Applied patches are both patch files and changesets.
Common tasks (use hg help COMMAND for more details):
create new patch qnew
import existing patch qimport
print patch series qseries
print applied patches qapplied
add known patch to applied stack qpush
remove patch from applied stack qpop
refresh contents of top applied patch qrefreshBy default, mq will automatically use git patches when required to avoid losing file mode changes, copy records, binary files or empty files creations or deletions. This behavior can be configured with:
[mq]
git = auto/keep/yes/noIf set to 'keep', mq will obey the [diff] section configuration while preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq will override the [diff] section and always generate git or regular patches, possibly losing data in the second case. 💀
It may be desirable for mq changesets to be kept in the secret phase (see hg help phases), which can be enabled with the following setting:
[mq]
secret = TrueYou will by default be managing a patch queue named "patches". You can create other, independent patch queues with the hg qqueue command. 🌈
If the working directory contains uncommitted files, qpush, qpop and qgoto abort immediately. If -f/--force is used, the changes are discarded. Setting:
[mq]
keepchanges = Truemake them behave as if --keep-changes were passed, and non-conflicting local changes will be tolerated and preserved. If incompatible options such as -f/--force or --exact are passed, this setting is ignored.
This extension used to provide astripcommand. This command now lives in thestripextension. ✂️ (iykyk)
📦 Commands
🏗️ Repository creation
qclone
clone main and patch repository at same time:
hg qclone [OPTION]... SOURCE [DEST]If source is local, destination will have no patches applied. If source is remote, this command can not check if patches are applied in source, so cannot guarantee that patches are not applied in destination. If you clone remote repository, be sure before that it has no patches applied. 🙈
Source patch repository is looked for in <src>/.hg/patches by default. Use -p <url> to change.
The patch directory must be a nested Mercurial repository, as would be created by hg init --mq.
Return 0 on success. ✅
Options:
--pull— use pull protocol to copy metadata-U,--noupdate— do not update the new working directories--uncompressed— use uncompressed transfer (fast over LAN)-p,--patches<REPO>— location of source patch repository-e,--ssh<CMD>— specify ssh command to use--remotecmd<CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
qinit
init a new queue repository (DEPRECATED):
hg qinit [-c]The queue repository is unversioned by default. If -c/--create-repo is specified, qinit will create a separate nested repository for patches (qinit -c may also be run later to convert an unversioned patch repository into a versioned one). You can use qcommit to commit changes to this queue repository. 🗂️
This command is deprecated. Without-c, it's implied by other relevant commands. With-c, usehg init --mqinstead. ⚠️
Options:
-c,--create-repo— create queue repository
✍️ Change creation
qcommit
commit changes in the queue repository (DEPRECATED):
hg qcommit [OPTION]... [FILE]...This command is deprecated; use hg commit --mq instead. 🙅
Options:
-A,--addremove— mark new/missing files as added/removed before committing--close-branch— mark a branch head as closed--amend— amend the parent of the working directory-s,--secret— use the secret phase for committing--draft— use the draft phase for committing-e,--edit— invoke editor on commit messages--force-close-branch— forcibly close branch from a non-head changeset (ADVANCED)-i,--interactive— use interactive mode-I,--include<PATTERN[+]>— include names matching the given patterns-X,--exclude<PATTERN[+]>— exclude names matching the given patterns-m,--message<TEXT>— use text as commit message-l,--logfile<FILE>— read commit message from file-d,--date<DATE>— record the specified date as commit date-u,--user<USER>— record the specified user as committer-S,--subrepos— recurse into subrepositories
[+] marked option can be specified multiple times
aliases: qci
qnew
create a new patch:
hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...qnew creates a new patch on top of the currently-applied patch (if any). The patch will be initialized with any outstanding changes in the working directory. You may also use -I/--include, -X/--exclude, and/or a list of files after the patch name to add only changes to matching files to the new patch, leaving the rest as uncommitted modifications. ✨
-u/--user and -d/--date can be used to set the (given) user and date, respectively. -U/--currentuser and -D/--currentdate set user to current user and date to current date.
-e/--edit, -m/--message or -l/--logfile set the patch header as well as the commit message. If none is specified, the header is empty and the commit message is '[mq]: PATCH'. 📝
Use the -g/--git option to keep the patch in the git extended diff format. Read the diffs help topic for more information on why this is important for preserving permission changes and copy/rename information. 🔐
Returns 0 on successful creation of a new patch. ✅
Options:
-e,--edit— invoke editor on commit messages-f,--force— import uncommitted changes (DEPRECATED)-g,--git— use git extended diff format-U,--currentuser— add"From: <current user>"to patch-u,--user<USER>— add"From: <USER>"to patch-D,--currentdate— add"Date: <current date>"to patch-d,--date<DATE>— add"Date: <DATE>"to patch-I,--include <PATTERN[+]>— only let in names that match the patterns you hand over 💖-X,--exclude <PATTERN[+]>— block out names matching those patterns, begone 🚫-m,--message <TEXT>— use TEXT as the commit message, quick and easy ✨-l,--logfile <FILE>— read the commit message out of a file instead 📄
[+] marked option can be specified multiple times
🦋 qrefresh
update the current patch, bestie:
hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...If you pass any file patterns, the refreshed patch will contain only the modifications matching those patterns — everything else stays chilling in the working directory 🫶
If -s/--short is specified, files that are already in the patch get refreshed just like matched files and stay in the patch. iconic behaviour, no notes 💅
If -e/--edit is specified, Mercurial will fire up your configured editor so you can type a message. And in case qrefresh fails, you'll find a backup of your message in .hg/last-message.txt — your words are safe, periodt 😭
hg add/remove/copy/rename work as usual, though you might wanna use git-style patches (-g/--git or [diff] git=1) to track copies and renames. See the diffs help topic for more info on the git diff format 📚
Returns 0 on success.
Options:
-e,--edit— invoke editor on commit messages ✍️-g,--git— use git extended diff format 🌈-s,--short— refresh only files already in the patch and specified files-U,--currentuser— add/update author field in patch with current user 🙋♀️-u,--user <USER>— add/update author field in patch with given user-D,--currentdate— add/update date field in patch with current date 📅-d,--date <DATE>— add/update date field in patch with given date-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file
[+] marked option can be specified multiple times
🌸 Change manipulation
qfold
fold the named patches into the current patch, like a lil patch sandwich 🥪:
hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...Patches must not be applied yet, okay? Each patch gets successively applied to the current patch in the order given. If all of them apply successfully, the current patch will be refreshed with the new cumulative patch, and the folded patches will be deleted ✨ With -k/--keep, the folded patch files will not be removed afterwards.
The header for each folded patch will be concatenated with the current patch header, separated by a line of * * *.
Returns 0 on success.
Options:
-e,--edit— invoke editor on commit messages-k,--keep— keep folded patch files 🫶-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file
🎀 Change organization
qapplied
print the patches already applied:
hg qapplied [-1] [-s] [PATCH]Returns 0 on success.
Options:
-1,--last— show only the preceding applied patch-s,--summary— print first line of patch header
qdelete
remove patches from queue, bye bye 👋:
hg qdelete [-k] [PATCH]...The patches must not be applied, and at least one patch is required — exact patch identifiers must be given. With -k/--keep, the patch files are preserved in the patch directory.
To stop managing a patch and move it into permanent history, use the hg qfinish command.
Options:
-k,--keep— keep patch file-r,--rev <REV[+]>— stop managing a revision (DEPRECATED) ⚠️
[+] marked option can be specified multiple times
aliases: qremove qrm
qfinish
move applied patches into repository history:
hg qfinish [-a] [REV]...Finishes the specified revisions (corresponding to applied patches) by moving them out of mq control into regular repository history 💫
Accepts a revision range or the -a/--applied option. If --applied is specified, all applied mq revisions are removed from mq control. Otherwise, the given revisions must be at the base of the stack of applied patches.
This can be especially useful if your changes have been applied to an upstream repository, or if you are about to push your changes to upstream 🚀
Returns 0 on success.
Options:
-a,--applied— finish all applied changesets
qgoto
push or pop patches until named patch is at top of stack:
hg qgoto [OPTION]... PATCHReturns 0 on success.
Options:
--keep-changes— tolerate non-conflicting local changes-f,--force— overwrite any local changes 🔥--no-backup— do not save backup copies of files
qguard
set or print guards for a patch:
hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]Guards control whether a patch can be pushed 👑 A patch with no guards is always pushed. A patch with a positive guard (+foo) is pushed only if the hg qselect command has activated it. A patch with a negative guard (-foo) is never pushed if the hg qselect command has activated it.
With no arguments, print the currently active guards. With arguments, set guards for the named patch.
Note — Specifying negative guards now requires --.
To set guards on another patch:
hg qguard other.patch -- +2.6.17 -stableReturns 0 on success.
Options:
-l,--list— list all patches and guards-n,--none— drop all guards
qheader
print the header of the topmost or specified patch:
hg qheader [PATCH]Returns 0 on success.
qnext
print the name of the next pushable patch:
hg qnext [-s]Returns 0 on success.
Options:
-s,--summary— print first line of patch header
qpop
pop the current patch off the stack:
hg qpop [-a] [-f] [PATCH | INDEX]Without argument, pops off the top of the patch stack. If given a patch name, keeps popping off patches until the named patch is at the top of the stack 🫧
By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and discard changes made to such files 💀
Return 0 on success.
Options:
-a,--all— pop all patches-n,--name <NAME>— queue name to pop (DEPRECATED) ⚠️--keep-changes— tolerate non-conflicting local changes-f,--force— forget any local changes to patched files--no-backup— do not save backup copies of files
qprev
print the name of the preceding applied patch:
hg qprev [-s]Returns 0 on success.
Options:
-s,--summary— print first line of patch header
qpush
push the next patch onto the stack:
hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and patch over uncommitted changes 😤
Return 0 on success.
Options:
--keep-changes— tolerate non-conflicting local changes-f,--force— apply on top of local changes-e,--exact— apply the target patch to its recorded parent-l,--list— list patch name in commit text-a,--all— apply all patches-m,--merge— merge from another queue (DEPRECATED) ⚠️-n,--name <NAME>— merge queue name (DEPRECATED) ⚠️--move— reorder patch series and apply only the patch--no-backup— do not save backup copies of files
qqueue
manage multiple patch queues:
hg qqueue [OPTION] [QUEUE]Supports switching between different patch queues, plus creating new patch queues and deleting existing ones 🎁
Omitting a queue name or specifying -l/--list will show you the registered queues — by default the "normal" patches queue is registered. The currently active queue will be marked with "(active)". Specifying --active will print only the name of the active queue 👑
To create a new queue, use -c/--create. The queue is automatically made active, except in the case where there are applied patches from the currently active queue in the repository. Then the queue will only be created and switching will fail 😭
To delete an existing queue, use --delete. You cannot delete the currently active queue.
Returns 0 on success.
Options:
-l,--list— list all available queues--active— print name of active queue-c,--create— create new queue--rename— rename active queue--delete— delete reference to queue--purge— delete queue, and remove patch dir 🧹
qrename
rename a patch:
hg qrename PATCH1 [PATCH2]With one argument, renames the current patch to PATCH1. With two arguments, renames PATCH1 to PATCH2.
Returns 0 on success.
aliases: qmv
qrestore
restore the queue state saved by a revision (DEPRECATED) ⚠️:
hg qrestore [-d] [-u] REVThis command is deprecated, use hg rebase instead.
Options:
-d,--delete— delete save entry-u,--update— update queue working directory
qsave
save current queue state (DEPRECATED) ⚠️:
hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]This command is deprecated, use hg rebase instead.
Options:
-c,--copy— copy patch directory-n,--name <NAME>— copy directory name-e,--empty— clear queue status file-f,--force— force copy-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file
qselect
set or print guarded patches to push:
hg qselect [OPTION]... [GUARD]...Use the hg qguard command to set or print guards on patch, then use qselect to tell mq which guards to use 🎯 A patch will be pushed if it has no guards or any positive guards match the currently selected guard, but will not be pushed if any negative guards match the current guard. For example:
qguard foo.patch -- -stable (negative guard)
qguard bar.patch +stable (positive guard)
qselect stableThis activates the "stable" guard. mq will skip foo.patch (because it has a negative match) but push bar.patch (because it has a positive match) ✨
With no arguments, prints the currently active guards. With one argument, sets the active guard.
Use -n/--none to deactivate guards (no other arguments needed). When no guards are active, patches with positive guards get skipped and patches with negative guards get pushed. 💅
qselect can change the guards on applied patches. It does not pop guarded patches by default, bestie — that's just not its vibe. Use --pop to pop back to the last applied patch that is not guarded. Use --reapply (which implies --pop) to push back to the current patch afterwards, but skip guarded patches.
Use -s/--series to print a list of all guards in the series file (no other arguments needed). Use -v for more information.
Returns 0 on success. ✨
Options:
-n,--none— disable all guards-s,--series— list all guards in series file--pop— pop to before first guarded applied patch--reapply— pop, then reapply patches
🌸 qseries 🌸
print the entire series file:
hg qseries [-ms]Returns 0 on success.
Options:
-m,--missing— print patches not in series-s,--summary— print first line of patch header
🎀 qtop 🎀
print the name of the current patch:
hg qtop [-s]Returns 0 on success.
Options:
-s,--summary— print first line of patch header
🦋 qunapplied 🦋
print the patches not yet applied:
hg qunapplied [-1] [-s] [PATCH]Returns 0 on success.
Options:
-1,--first— show only the first patch-s,--summary— print first line of patch header
📂 File content management 📂
🍓 qdiff 🍓
diff of the current patch and subsequent modifications:
hg qdiff [OPTION]... [FILE]...Shows a diff which includes the current patch as well as any changes which have been made in the working directory since the last refresh (so basically it's showing what the current patch would become after a qrefresh). 💖
Use hg diff if you only want to see the changes made since the last qrefresh, or hg export qtip if you want to see changes made by the current patch without including changes made since the qrefresh. Different vibes, pick your fighter.
Returns 0 on success.
Options:
-a,--text— treat all files as text-g,--git— use git extended diff format (DEFAULT:diff.git)--binary— generate binary diffs in git mode (default)--nodates— omit dates from diff headers--noprefix— omita/andb/prefixes from filenames-p,--show-function— show which function each change is in (DEFAULT:diff.showfunc)--reverse— produce a diff that undoes the changes-w,--ignore-all-space— ignore white space when comparing lines-b,--ignore-space-change— ignore changes in the amount of white space-B,--ignore-blank-lines— ignore changes whose lines are all blank-Z,--ignore-space-at-eol— ignore changes in whitespace at EOL-U,--unified <NUM>— number of lines of context to show--stat— output diffstat-style summary of changes--root <DIR>— produce diffs relative to subdirectory-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times 🔁📥 Change import/export 📤
🌈 qimport 🌈
import a patch or existing changeset:
hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...The patch gets inserted into the series after the last applied patch. If no patches have been applied, qimport prepends the patch to the series. ✨
The patch will have the same name as its source file unless you give it a new one with -n/--name.
You can register an existing patch inside the patch directory with the -e/--existing flag.
With -f/--force, an existing patch of the same name will be overwritten (no take-backs).
An existing changeset may be placed under mq control with -r/--rev (e.g. qimport --rev . -n patch will place the current revision under mq control). With -g/--git, patches imported with --rev will use the git diff format. See the diffs help topic for information on why this is important for preserving rename/copy information and permission changes. Use hg qfinish to remove changesets from mq control.
To import a patch from standard input, pass - as the patch file. When importing from standard input, a patch name must be specified using the --name flag.
To import an existing patch while renaming it:
hg qimport -e existing-patch -n new-nameReturns 0 if import succeeded.
Options:
-e,--existing— import file in patch directory-n,--name <NAME>— name of patch file-f,--force— overwrite existing files-r,--rev <REV[+]>— place existing revisions undermqcontrol-g,--git— use git extended diff format-P,--push—qpushafter importing
[+] marked option can be specified multiple times 🔁👑 narrow 👑
create clones which fetch history data for subsets of files (EXPERIMENTAL) 🧪
Only the server holds the full store: narrow clones will have the full history of fewer files in their store. So like, main character server energy, and your clone just gets the little slice it asked for.
🧠 Concepts 🧠
The narrow extension introduces a number of concepts that are detailed below. Sit down, bestie, we're doing lore. 📖
🧚 Shape (experimental) 🧚
A shape is used to define a set of paths to consider for clients of the narrow server. And it does so through the entire history, regardless of the state of these files in the heads of the repository (deleted, for example). It does not care. It remembers everything. 💀
As of Mercurial 7.2, only a limited scope of all planned shape-related features have been implemented. Shapes are only directly interacted with by server administrators. They can be used to generate narrowspecs (used by clients) and to create narrow streaming clonebundles.
This means that as of Mercurial 7.2, clients have no knowledge of shapes and must be given the set of narrow patterns by server administrators in order to use a streaming clonebundle for a given shape:
$ hg clone server --narrow --narrowspec NARROW_SPEC_FILE🔍 Fingerprint 🔍
Every shape corresponds to a normalized and minimal set of included and excluded paths in a repository's store. This normalization ensures that we can derive a fingerprint, meaning that two shapes with the same fingerprint mean they match the same set of paths. Matching fingerprints, matching paths — slay. ✨
Checking the fingerprint of a narrow clone can be done by running:
$ hg admin::narrow-client --store-fingerprintFor now, we guarantee no stability of the fingerprints. Before we take shapes out of experimental, we will have a fingerprint versioning scheme, to allow for future changes with no confusion. (i.e. don't build anything on top of these yet, bestie, they're gonna move. 🙈)
🧩 Shards 🧩
Shards are used server-side to slice the store. Each shard is defined as a set of paths it contains: files or directories matching each path will be included in that shard. Moreover shards are mutually exclusive, meaning that a given file can only ever be in one shard and one shard only. No double-dipping. When a shard's path matches a directory, the shard contains all files in that directory's tree, except for those matched by a more deeply nested shard.
🌳 Example 🌳
Given the following store, representing all files ever known to the repository:
.
├── file1
├── file2
└── foo
└── bar
├── baz
│ ├── file1
│ └── file2
└── confidential
├── confidential-file1
└── confidential-file2One could define the following shards:
foo, that includesfoofoo.confidential, that includesfoo/bar/confidential
This would mean that shard foo contains:
foo/bar/baz/file1foo/bar/baz/file2
And shard foo.confidential contains:
foo/bar/confidential/confidential-file1foo/bar/confidential/confidential-file2
In this example, file1 and file2 are not contained in any explicitly defined shard. As a result, they are contained by the implicit base shard. 🫶
It is important to note that adding a new shard (e.g. that includes file1 and file2) would remove its paths from any shard that previously contained them (in this case, only base).
Server-side, shards are used to define shapes, which are sets of shards. Each shape defines the shards it includes, hence excluding the contents of all other shards.
To simplify the creation of shapes, we can compose shards together by defining explicit dependencies between shards. In our above example, we could define a foo.full (that does not itself have to define any paths), but requires both foo and foo.confidential, giving us a shard with the full foo store subtree.
Note that the set of paths in the current working copy may only be a subset of the the store. In our example, we can imagine that foo/bar/confidential-module has been split into the files in foo/bar/confidential and removed from the working copy.
In addition to the implicit base shard, there is also the implicit .hg-files shard, which contains special paths used by Mercurial:
.hgignore.hgtags.hgsub.hgsubstate
This shard will be automatically included in every Shape to make sure Mercurial has the data it needs to operate on each revision.
🕰️ Narrowspec (legacy) 🕰️
Note: the narrowspec in its current form will be phased out in favor of the Shape system within the next few versions of Mercurial, as of Mercurial 7.2. See the Shapes vs narrowspec section below. 💀
The narrowspec is a client-side configuration that consists of expressions to match remote files and/or directories that should be pulled into a client. The narrowspec has include and exclude expressions, with excludes always trumping includes: that is, if a file matches an exclude expression, it will be excluded even if it also matches an include expression. Excluding files that were never included has no effect. (Exclude is the queen here, she always wins. 👑)
Each included or excluded entry is in the format described by hg help patterns, but can only use path: or rootfilesin:, except when using Shard and Shape where you can only use path:.
⚖️ Shapes vs narrowspec ⚖️
The narrowspec was introduced alongside the experimental narrow extension back in 2018. It enabled the client to chose exactly what it cares about from the server, with the server merely cooperating with the patterns that the client asks for.
Unless this flexibility becomes really important for someone in the future, the current direction is to deprecate the narrowspec usage and remove its support entirely in later versions in favor of store shapes.
Here the advantages of store shapes:
- We can define clonebundles for usual patterns
- We can nest and generally compose includes and excludes
- We can generate a fingerprint for equivalent patterns
- We can require that the server and the client agree on patterns
- Client are made aware of changes on the server, invalidating their patterns
- A solid permissions system could be built on top of store shapes
- Some legacy problems (e.g. CLI parsing) will be solved
Some of these points could be (and have been) bolted on top of the original implementation, but we would not go very far.
✨ Usage ✨
🖥️ Server configuration
For Mercurial 7.2, the .hg/store/server-shapes file is a TOML file, to be created and modified directly by the narrow server's administrators. 💅
Warning: using dedicated hg command to modify the shapes config will become mandatory in future releases, once such a command exists, as changing shapes can lead to (sometimes surprising) client breakage. 😭 like pls be careful bestie.
The current (experimental!) format is the following:
version(required): its value must be0shards(required): a list of<shardconfig><shardconfig>:name(required): canonical name for this shard.paths(optional): A list of UTF8 paths that this shard concerns, relative to the repo root.requires(optional): A list of the names of the shards that this shard depends on.shape(optional): Iftrue, this as a user-accessible shape.
Constraints: 🚧 (yes they're real, no cap)
- Shard names must be unique within the config
- Shard names must only contain bytes that are either lowercase alphanumeric ascii, dot or hyphen
full,baseand.hg-filesare reserved shard names- Each
<shardconfig>must define one ofrequiresorpaths, or both - Shard requirements cannot form a cycle
- A given path cannot be in more than one shard
pathsmust be a list of UTF8 paths. Support for non-UTF8 paths will be added in an upcoming version, via anencoded_pathsfieldpathsmust be a list of syntactically valid paths relative to the repository root (no\n,\ror\x00, no consecutive slash, no slashes at the start or end, etc.)
Example:
version = 0
[[shards]]
name = "foo"
paths = ["foo", "bar.txt", "baz/nested"]
shape = true
[[shards]]
name = "subproject1"
paths = ["subproject1", "utils/only-this-dir"]
[[shards]]
name = "backend"
paths = ["subproject2"]
requires = ["subproject1"]
shape = true
[[shards]]
name = "full-stack"
requires = ["backend", "foo"]
shape = true📦 Bundle generation
Server administrators manually (and likely frequently) create streaming clonebundles for every shape and expose them in the server clonebundle manifest with their fingerprint. In future versions, non-streaming clonebundles will be supported and their generations more automated. 👑
You may generate the bundles with the following:
$ hg bundle --all --type"none-v2;stream-v2;shape=my-shape" ../bundle.hg
$ bundlespec="$(hg debugbundle --spec ../bundle.hg)"
$ # [move bundle to static server or to `.hg/bundle-cache` for inline serving]
$ bundleentry="https://static.com/bundle.hg BUNDLESPEC=$bundlespec"
$ # [or use inline SSH clonebundles]
$ bundleentry="peer-bundle-cache://bundle.hg BUNDLESPEC=$bundlespec"
$ echo $bundleentry >> .hg/clonebundles.manifestYou can export the includes and exclude patterns for every shape and give them manually to clients:
$ hg admin::narrow-server --shape-narrow-patterns my-shape
[exclude]
path:foo
path:barClients can then use said patterns when doing a narrow stream clone, which matches the fingerprint from the patterns with that of the server clonebundles:
$ hg clone --narrow --narrowspec $NARROWSPECFILE🧍 Client
TODO explain current client-side config and how it might evolve (storing the shape, fingerprint, etc.). 🙈 (yes this is literally still a TODO, we're all waiting)
🛠️ Commands 🛠️
🧹 Repository maintenance
tracked — show or change the current narrowspec 💖
hg tracked [OPTIONS]... [REMOTE]With no argument, shows the current narrowspec entries, one per line. Each line will be prefixed with 'I' or 'X' for included or excluded patterns, respectively. ✨
The narrowspec is comprised of expressions to match remote files and/or directories that should be pulled into your client. The narrowspec has include and exclude expressions, with excludes always trumping includes: that is, if a file matches an exclude expression, it will be excluded even if it also matches an include expression. Excluding files that were never included has no effect. 🫶
Each included or excluded entry is in the format described by 'hg help patterns'.
The options allow you to add or remove included and excluded expressions.
If --clear is specified, then all previous includes and excludes are DROPPED and replaced by the new ones specified to --addinclude and --addexclude. If --clear is specified without any further options, the narrowspec will be empty and will not match any files. 💀
If --auto-remove-includes is specified, then those includes that don't match any files modified by currently visible local commits (those not shared by the remote) will be added to the set of explicitly specified includes to remove.
--import-rules accepts a path to a file containing rules, allowing you to add --addinclude, --addexclude rules in bulk. Like the other include and exclude switches, the changes are applied immediately.
Options:
--addinclude <VALUE[+]>— new paths to include--removeinclude <VALUE[+]>— old paths to no longer include--auto-remove-includes— automatically choose unused includes to remove--addexclude <VALUE[+]>— new paths to exclude--import-rules <VALUE>— import narrowspecs from a file--removeexclude <VALUE[+]>— old paths to no longer exclude--clear— whether to replace the existing narrowspec--force-delete-local-changes— forces deletion of local changes when narrowing--backup— back up local changes when narrowing (default:True)--update-working-copy— update working copy when the store has changed-e,--ssh <CMD>— specify ssh command to use--remotecmd <CMD>— specifyhgcommand to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times
🔔 notify 🔔
hooks for sending email push notifications 📧✨
This extension implements hooks to send email notifications when changesets are sent from or received by the local repository.
First, enable the extension as explained in hg help extensions, and register the hook you want to run. incoming and changegroup hooks are run when changesets are received, while outgoing hooks are for changesets sent to another repository:
[hooks]
# one email for each incoming changeset
incoming.notify = python:hgext.notify.hook
# one email for all incoming changesets
changegroup.notify = python:hgext.notify.hook
# one email for all outgoing changesets
outgoing.notify = python:hgext.notify.hookThis registers the hooks. To enable notification, subscribers must be assigned to repositories. The [usersubs] section maps multiple repositories to a given recipient. The [reposubs] section maps multiple recipients to a single repository:
[usersubs]
# key is subscriber email, value is a comma-separated list of repo patterns
user@host = pattern
[reposubs]
# key is repo pattern, value is a comma-separated list of subscriber emails
pattern = user@hostA pattern is a glob matching the absolute path to a repository, optionally combined with a revset expression. A revset expression, if present, is separated from the glob by a hash. Example:
[reposubs]
*/widgets#branch(release) = qa-team@example.comThis sends to qa-team@example.com whenever a changeset on the release branch triggers a notification in any repository ending in widgets. 🌈
In order to place them under direct user management, [usersubs] and [reposubs] sections may be placed in a separate hgrc file and incorporated by reference:
[notify]
config = /path/to/subscriptionsfileNotifications will not be sent until the notify.test value is set to False; see below. 🙈
Notifications content can be tweaked with the following configuration entries:
notify.test— IfTrue, print messages to stdout instead of sending them. Default:True.notify.sources— Space-separated list of change sources. Notifications are activated only when a changeset's source is in this list. Sources may be:serve— changesets received via http or sshpull— changesets received viahg pullunbundle— changesets received viahg unbundlepush— changesets sent or received viahg pushbundle— changesets sent viahg unbundle- Default:
serve.
notify.strip— Number of leading slashes to strip from url paths. By default, notifications reference repositories with their absolute path.notify.striplets you turn them into relative paths. For example,notify.strip=3will change/long/path/repositoryintorepository. Default:0.notify.domain— Default email domain for sender or recipients with no explicit domain. It is also used for the domain part of theMessage-Idwhen usingnotify.messageidseed.notify.messageidseed— Create deterministicMessage-Idheaders for the mails based on the seed and the revision identifier of the first commit in the changeset.notify.style— Style file to use when formatting emails.notify.template— Template to use when formatting emails.notify.incoming— Template to use when run as an incoming hook, overridingnotify.template.notify.outgoing— Template to use when run as an outgoing hook, overridingnotify.template.notify.changegroup— Template to use when running as a changegroup hook, overridingnotify.template.notify.maxdiff— Maximum number of diff lines to include in notification email. Set to0to disable the diff, or-1to include all of it. Default:300.notify.maxdiffstat— Maximum number of diffstat lines to include in notification email. Set to-1to include all of it. Default:-1.notify.maxsubject— Maximum number of characters in email's subject line. Default:67.
notify.diffstat 💅
Set to True to include a diffstat before the diff content. Default: True.
notify.showfunc
If set, override diff.showfunc for the diff content. Default: None.
notify.merge
If True, send notifications for merge changesets. Default: True.
notify.mbox
If set, append mails to this mbox file instead of sending. Default: None.
notify.fromauthor
If set, use the committer of the first changeset in a changegroup for the "From" field of the notification mail. If not set, take the user from the pushing repo. Default: False.
notify.reply-to-predecessor (EXPERIMENTAL) ✨
If set and the changeset has a predecessor in the repository, try to thread the notification mail with the predecessor. This adds the "In-Reply-To" header to the notification mail with a reference to the predecessor with the smallest revision number. Mail threads can still be torn, especially when changesets are folded. 😭
This option must be used in combination with notify.messageidseed.
If set, the following entries will also be used to customize the notifications:
email.from
Email From address to use if none can be found in the generated email content.
web.baseurl
Root repository URL to combine with repository paths when making references. See also notify.strip.
pager 🎀
browse command output with an external pager (DEPRECATED)
Forcibly enable paging for individual commands that don't typically request pagination with the attend-<command> option. This setting takes precedence over ignore options and defaults:
[pager]
attend-cat = falsepatchbomb 💌
command to send changesets as (a series of) patch emails
The series is started off with a "[PATCH 0 of N]" introduction, which describes the series as a whole.
Each patch email has a Subject line of "[PATCH M of N] ...", using the first line of the changeset description as the subject text. The message contains two or three body parts:
- The changeset description.
- [Optional] The result of running diffstat on the patch.
- The patch itself, as generated by
hg export.
Each message refers to the first in the series using the In-Reply-To and References headers, so they will show up as a sequence in threaded mail and news readers, and in mail archives. 📬
To configure other defaults, add a section like this to your configuration file:
[email]
from = My Name <my@email>
to = recipient1, recipient2, ...
cc = cc1, cc2, ...
bcc = bcc1, bcc2, ...
reply-to = address1, address2, ...Use [patchbomb] as configuration section name if you need to override global [email] address settings.
Then you can use the hg email command to mail a series of changesets as a patchbomb.
You can also either configure the method option in the email section to be a sendmail compatible mailer or fill out the [smtp] section so that the patchbomb extension can automatically send patchbombs directly from the commandline. See the [email] and [smtp] sections in hgrc(5) for details.
By default, hg email will prompt for a To or CC header if you do not supply one via configuration or the command line. You can override this to never prompt by configuring an empty value:
[email]
cc =You can control the default inclusion of an introduction message with the patchbomb.intro configuration option. The configuration is always overwritten by command line flags like --intro and --desc:
[patchbomb]
intro=auto # include introduction message if more than 1 patch (default)
intro=never # never include an introduction message
intro=always # always include an introduction messageYou can specify a template for flags to be added in subject prefixes. Flags specified by --flag option are exported as {flags} keyword:
[patchbomb]
flagtemplate = "{separate(' ',
ifeq(branch, 'default', '', branch|upper),
flags)}"You can set patchbomb to always ask for confirmation by setting patchbomb.confirm to true.
Commands 👑
Change import/export
email
send changesets by email:
hg email [OPTION]... [DEST]...By default, diffs are sent in the format generated by hg export, one per message. The series starts with a "[PATCH 0 of N]" introduction, which describes the series as a whole.
Each patch email has a Subject line of "[PATCH M of N] ...", using the first line of the changeset description as the subject text. The message contains two or three parts. First, the changeset description.
With the -d/--diffstat option, if the diffstat program is installed, the result of running diffstat on the patch is inserted.
Finally, the patch itself, as generated by hg export.
With the -d/--diffstat or --confirm options, you will be presented with a final summary of all messages and asked for confirmation before the messages are sent.
By default the patch is included as text in the email body for easy reviewing. Using the -a/--attach option will instead create an attachment for the patch. With -i/--inline an inline attachment will be created. You can include a patch both as text in the email body and as a regular or an inline attachment by combining the -a/--attach or -i/--inline with the --body option.
With -B/--bookmark changesets reachable by the given bookmark are selected.
With -o/--outgoing, emails will be generated for patches not found in the destination repository (or only those which are ancestors of the specified revisions if any are provided)
With -b/--bundle, changesets are selected as for --outgoing, but a single email containing a binary Mercurial bundle as an attachment will be sent. Use the patchbomb.bundletype config option to control the bundle type as with hg bundle --type.
With -m/--mbox, instead of previewing each patchbomb message in a pager or sending the messages directly, it will create a UNIX mailbox file with the patch emails. This mailbox file can be previewed with any mail user agent which supports UNIX mbox files.
With -n/--test, all steps will run, but mail will not be sent. You will be prompted for an email recipient address, a subject and an introductory message describing the patches of your patchbomb. Then when all is done, patchbomb messages are displayed.
In case email sending fails, you will find a backup of your series introductory message in .hg/last-email.txt. 🫶
The default behavior of this command can be customized through configuration. (See hg help patchbomb for details)
Examples:
hg email -r 3000 # send patch 3000 only
hg email -r 3000 -r 3001 # send patches 3000 and 3001
hg email -r 3000:3005 # send patches 3000 through 3005
hg email 3000 # send patch 3000 (deprecated)
hg email -o # send all patches not in default
hg email -o DEST # send all patches not in DEST
hg email -o -r 3000 # send all ancestors of 3000 not in default
hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST
hg email -B feature # send all ancestors of feature bookmark
hg email -b # send bundle of all patches not in default
hg email -b DEST # send bundle of all patches not in DEST
hg email -b -r 3000 # bundle of all ancestors of 3000 not in default
hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST
hg email -o -m mbox && # generate an mbox file...
mutt -R -f mbox # ... and view it with mutt
hg email -o -m mbox && # generate an mbox file ...
formail -s sendmail \ # ... and use formail to send from the mbox
-bm -t < mbox # ... using sendmailBefore using this command, you will need to enable email in your hgrc. See the [email] section in hgrc(5) for details.
Options:
-g,--git— use git extended diff format--plain— omit hg patch header-o,--outgoing— send changes not found in the target repository-b,--bundle— send changes not in target as a binary bundle-B,--bookmark<BOOKMARK>— send changes only reachable by given bookmark--bundlename<NAME>— name of the bundle attachment file (default:bundle)-r,--rev<REV[+]>— a revision to send--force— run even when remote repository is unrelated (with-b/--bundle)--base<REV[+]>— a base changeset to specify instead of a destination (with-b/--bundle)--intro— send an introduction email for a single patch--body— send patches as inline message text (default)-a,--attach— send patches as attachments-i,--inline— send patches as inline attachments--bcc<EMAIL[+]>— email addresses of blind carbon copy recipients-c,--cc<EMAIL[+]>— email addresses of copy recipients--confirm— ask for confirmation before sending-d,--diffstat— add diffstat output to messages--date<DATE>— use the given date as the sending date--desc<FILE>— use the given file as the series description-f,--from<EMAIL>— email address of sender-n,--test— print messages that would be sent-m,--mbox<FILE>— write messages to mbox file instead of sending them--reply-to<EMAIL[+]>— email addresses replies should be sent to-s,--subject<TEXT>— subject of first message (intro or single patch)--in-reply-to<MSGID>— message identifier to reply to--flag<FLAG[+]>— flags to add in subject prefixes-t,--to<EMAIL[+]>— email addresses of recipients-e,--ssh<CMD>— specify ssh command to use--remotecmd<CMD>— specify hg command to run on the remote side--insecure— do not verify server certificate (ignoringweb.cacertsconfig)
[+] marked option can be specified multiple times
phabricator 🦋
simple Phabricator integration (EXPERIMENTAL)
This extension provides a phabsend command which sends a stack of changesets to Phabricator, and a phabread command which prints a stack of revisions in a format suitable for hg import, and a phabupdate command to update statuses in batch.
A "phabstatus" view for hg show is also provided; it displays status information of Phabricator differentials associated with unfinished changesets.
By default, Phabricator requires Test Plan which might prevent some changeset from being sent. The requirement could be disabled by changing differential.require-test-plan-field config server side.
Config:
[phabricator]
# Phabricator URL
url = https://phab.example.com/
# Repo callsign. If a repo has a URL https://$HOST/diffusion/FOO, then its
# callsign is "FOO".
callsign = FOO
# curl command to use. If not set (default), use builtin HTTP library to
# communicate. If set, use the specified curl command. This could be useful
# if you need to specify advanced options that is not easily supported by
# the internal library.
curlcmd = curl --connect-timeout 2 --retry 3 --silent
# retry failed command N time (default 0). Useful when using the extension
# over flakly connection.
#
# We wait `retry.interval` between each retry, in seconds.
# (default 1 second).
retry = 3
retry.interval = 10
# the retry option can combine well with the http.timeout one.
#
# For example to give up on http request after 20 seconds:
[http]
timeout=20
[auth]
example.schemes = https
example.prefix = phab.example.com
# API token. Get it from https://$HOST/conduit/login/
example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxxokay bestie, let's actually read that config together because it's giving setup-tutorial energy 💅
url— where your Phabricator lives. that's it, that's the whole job.callsign— the repo's callsign. if a repo's URL ishttps://$HOST/diffusion/FOO, then its callsign isFOO. iykyk 🎀curlcmd— leave it unset (the default) and Mercurial uses its own builtin HTTP library to talk to the server. set it and you're handing things over to whatever curl command you typed. this is the move when you need fancy advanced options the internal library can't easily do. she said "i'll do it myself" 🫶retry— how many times to retry a failed command, default0. genuinely useful when you're using the extension over a flaky connection (the manpage says "flakly", and honestly? iconic typo, we keep her 💀).retry.interval— we wait this long between each retry, in seconds. default1second.retrypairs so well withhttp.timeoutbtw — the example shows giving up on an http request after 20 seconds via[http]+timeout=20. no cap. 🔥- then the
[auth]section:example.schemes = https,example.prefix = phab.example.com, andexample.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx— that token is your API token, and you go grab it fromhttps://$HOST/conduit/login/. go get it girl 👑
✨ Commands ✨
Change import/export — this is the whole lil crew that moves patches in and out of Phabricator 🦋
phabimport 🍓
import patches from Phabricator for the specified Differential Revisions:
hg phabimport DREVSPEC... [OPTIONS]the patches get read and applied starting at the parent of the working directory. yes, the parent. not the working dir itself. noted 📌
for how to spell out DREVSPEC, go read hg help phabread (it's literally the next one down, keep scrolling bestie).
Options:
--stack— import dependencies as well 💞--test-vcr<VALUE>— Path to a vcr file. If nonexistent, will record a new vcr transcript, otherwise will mock all http requests using the specified vcr file. (ADVANCED)
phabread 🌈
print patches from Phabricator suitable for importing:
hg phabread DREVSPEC... [OPTIONS]now here's the DREVSPEC lore, and it's lowkey powerful:
DREVSPEC could be a Differential Revision identity, like D123, or just the number 123. it could also have common operators like +, -, &, (, ) for complex queries. a prefix : could be used to select a stack. if multiple DREVSPEC values are given, the result is the union of each individually evaluated value. and ngl, no attempt is currently made to reorder the values to run from parent to child — so don't expect her to sort your life out 🙈
abandoned, accepted, closed, needsreview, needsrevision could be used to filter patches by status. for performance reason, they only represent a subset of non-status selections and cannot be used alone. periodt. 💅
for example, :D6+8-(2+D4) selects a stack up to D6, plus D8 and exclude D2 and D4. and :D9 & needsreview selects "Needs Review" revisions in a stack up to D9. math class but make it git-adjacent ✨
if --stack is given, follow dependencies information and read all patches. it is equivalent to the : operator.
Options:
--stack— read dependencies 🔗--test-vcr<VALUE>— Path to a vcr file. If nonexistent, will record a new vcr transcript, otherwise will mock all http requests using the specified vcr file. (ADVANCED)
phabsend 👑
upload changesets to Phabricator:
hg phabsend REV [OPTIONS]if there are multiple revisions specified, they will be send as a stack with a linear dependencies relationship using the order specified by the revset. main character energy, one stack at a time 🫶
first time uploading changesets? local tags get created to maintain the association. after the first time, phabsend will check obsstore and tags information so it can figure out whether to update an existing Differential Revision, or create a new one. she remembers. she always remembers 💜
if --amend is set, update commit messages so they have the Differential Revision URL, remove related tags. this is similar to what arcanist will do, and is more desired in author-push workflows. otherwise, use local tags to record the Differential Revision association.
the --confirm option lets you confirm changesets before sending them. you can also add the following to your configuration file to make it default behaviour:
[phabsend]
confirm = trueby default, a separate review will be created for each commit that is selected, and will have the same parent/child relationship in Phabricator. if --fold is set, multiple commits are rolled up into a single review as if diffed from the parent of the first revision to the last. the commit messages are concatenated in the summary field on Phabricator. folding like laundry but somehow more fun 🧚
phabsend will check obsstore and the above association to decide whether to update an existing Differential Revision, or create a new one.
Options:
-r,--rev<REV[+]>— revisions to send 📤--amend— update commit messages (default: True)--reviewer<VALUE[+]>— specify reviewers--blocker<VALUE[+]>— specify blocking reviewers-m,--comment<VALUE>— add a comment to Revisions with new/updated Diffs--confirm— ask for confirmation before sending--fold— combine the revisions into one review--test-vcr<VALUE>— Path to a vcr file. If nonexistent, will record a new vcr transcript, otherwise will mock all http requests using the specified vcr file. (ADVANCED)
[+] marked option can be specified multiple times — stack 'em up bestie ✨phabupdate 💫
update Differential Revision in batch:
hg phabupdate [DREVSPEC...| -r REV...] [OPTIONS]DREVSPEC selects revisions. see hg help phabread for its usage.
Options:
--accept— accept revisions ✅--reject— reject revisions ❌--request-review— request review on revisions--abandon— abandon revisions--reclaim— reclaim revisions--close— close revisions--reopen— reopen revisions--plan-changes— plan changes for revisions--resign— resign as a reviewer from revisions--commandeer— commandeer revisions-m,--comment<VALUE>— comment on the last revision-r,--rev<REV>— local revision to update--test-vcr<VALUE>— Path to a vcr file. If nonexistent, will record a new vcr transcript, otherwise will mock all http requests using the specified vcr file. (ADVANCED)
purge 🧹
command to delete untracked files from the working directory (DEPRECATED)
⚠️ okay important one, bestie — the functionality of this extension has been included in core Mercurial since version5.7. please usehg purge ...instead.hg purge --confirmis now the default, unless the extension is enabled for backward compatibility. so like… she's retired but still shows up to the group chat 😭
rebase 🦋
command to move sets of revisions to a different ancestor
this extension lets you rebase changesets in an existing Mercurial repository.
for more information: https://mercurial-scm.org/wiki/RebaseExtension
✨ Commands ✨
Change manipulation
rebase 🔥
move changeset (and descendants) to a different branch:
hg rebase [[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). this can be useful for linearizing local changes relative to a master development tree. it's giving ✨tidy✨
Published commits cannot be rebased (see hg help phases). to copy commits, see hg help graft. like, she will not touch published commits, don't even ask 🙅
if you don't specify a destination changeset (-d/--dest), rebase will use the same logic as hg merge to pick a destination. if the current branch contains exactly one other head, the other head is merged with by default. otherwise, an explicit revision with which to merge with must be provided. (destination changeset is not modified by rebasing, but new changesets are added as its descendants.) okay so the destination stays cute and untouched, the new commits just show up as her descendants. nepo babies but for commits 💅
here are the ways to select changesets:
- Explicitly select them using
--rev. - Use
--sourceto select a root changeset and include all of its descendants. - Use
--baseto select a changeset; rebase will find ancestors and their descendants which are not also ancestors of the destination. - If you do not specify any of
--rev,--source, or--base, rebase will use--base .as above.
if --source or --rev is used, special names SRC and ALLSRC can be used in --dest. destination would be calculated per source revision with SRC substituted by that single source revision and ALLSRC substituted by all source revisions. fancy ✨
rebase will destroy original changesets unless you use --keep. it will also move your bookmarks (even if you do). yeah. even if you do. 😭
some changesets may be dropped if they do not contribute changes (e.g. merges from the destination branch).
unlike merge, rebase will do nothing if you are at the branch tip of a named branch with two heads. you will need to explicitly specify source and/or destination. no she will not guess, be specific bestie 🎀
if you need to use a tool to automate merge/conflict decisions, you can specify one with --tool, see hg help merge-tools. as a caveat: the tool will not be used to mediate when a file was deleted, there is no hook presently available for this.
if a rebase is interrupted to manually resolve a conflict, it can be continued with --continue/-c, aborted with --abort/-a, or stopped with --stop. she's got options, she's got range 💜
Examples:
- move "local changes" (current commit back to branching point) to the current branch tip after a pull:
hg rebase- move a single changeset to the stable branch:
hg rebase -r 5f493448 -d stable- splice a commit and all its descendants onto another part of history:
hg rebase --source c0c3 --dest 4cf9- rebase everything on a branch marked by a bookmark onto the default branch:
hg rebase --base myfeature --dest default- collapse a sequence of changes into a single commit:
hg rebase --collapse -r 1520:1525 -d .- move a named branch while preserving its name:
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches- stabilize orphaned changesets so history looks linear:
hg rebase -r 'orphan()-obsolete()' -d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) + max(::((roots(ALLSRC) & ::SRC)^)-obsolete()))'(yes that last one is real. she contains multitudes. do not ask me to pronounce it 🫠)
Configuration Options:
you can make rebase require a destination if you set the following config option:
[commands]
rebase.requiredest = Trueby default, rebase will close the transaction after each commit. for performance purposes, you can configure rebase to use a single transaction across the entire rebase. WARNING: this setting introduces a significant risk of losing the work you've done in a rebase if the rebase aborts unexpectedly:
[rebase]
singletransaction = Trueby default, rebase writes to the working copy, but you can configure it to run in-memory for better performance. when the rebase is not moving the parent(s) of the working copy (AKA the "currently checked out changesets"), this may also allow it to run even if the working copy is dirty:
[rebase]
experimental.inmemory = TrueReturn Values:
returns 0 on success, 1 if nothing to rebase or there are unresolved conflicts. cute lil numbers, very honest of her 🎀
✨ Options ✨
okay the flag list for rebase is right here and it is long, so buckle up bestie —
-s,--source <REV[+]>— rebases the changesets you name plus every descendant of theirs, bestie 🌱-b,--base <REV[+]>— rebases literally everything from the branching point of the changeset you name-r,--rev <REV[+]>— rebases these revisions, the ones you pick 🎯-d,--dest <REV>— rebase onto the changeset you point at, that's the destination fr--collapse— collapse the rebased changesets into one, squish squish 💅-m,--message <TEXT>— use text as the collapse commit message-e,--edit— invoke editor on commit messages-l,--logfile <FILE>— read the collapse commit message from file-k,--keep— keep original changesets (no deleting, we hoard 🫶)--keepbranches— keep original branch names-D,--detach— (DEPRECATED)-i,--interactive— (DEPRECATED)-t,--tool <VALUE>— specify merge tool--stop— stop an interrupted rebase ✋-c,--continue— continue an interrupted rebase-a,--abort— abort an interrupted rebase--auto-orphans <VALUE>— automatically rebase orphan revisions in the specified revset (EXPERIMENTAL)-n,--dry-run— do not perform actions, just print output (a little preview moment ✨)-T,--template <TEMPLATE>— display with template--confirm— ask before applying actions[+]marked option can be specified multiple times
record 🎀
commands to interactively select changes for commit/qrefresh (DEPRECATED)
The feature provided by this extension has been moved into core Mercurial as hg commit --interactive. It's giving "we promoted it to the main cast" energy, periodt.
Commands
Change creation
qrecord
interactively record a new patch:
hg qrecord [OPTION]... PATCH [FILE]...See hg help qnew & hg help record for more information and usage.
record
interactively select changes to commit:
hg record [OPTION]... [FILE]...If a list of files is omitted, all changes reported by hg status will be candidates for recording.
See hg help dates for a list of formats valid for -d/--date.
If using the text interface (see hg help config), you will be prompted for whether to record changes to each modified file, and for files with multiple changes, for each change to use. For each query, the following responses are possible:
y - record this change
n - skip this change
e - edit this change manually
s - skip remaining changes to this file
f - record remaining changes to this file
d - done, skip remaining changes and files
a - record all changes to all remaining files
q - quit, recording no changes
? - display helpThis command is not available when committing a merge. 🚫
Options:
-A,--addremove— mark new/missing files as added/removed before committing--close-branch— mark a branch head as closed--amend— amend the parent of the working directory-s,--secret— use the secret phase for committing 🤫--draft— use the draft phase for committing-e,--edit— invoke editor on commit messages--force-close-branch— forcibly close branch from a non-head changeset (ADVANCED)-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer-S,--subrepos— recurse into subrepositories-w,--ignore-all-space— ignore white space when comparing lines-b,--ignore-space-change— ignore changes in the amount of white space-B,--ignore-blank-lines— ignore changes whose lines are all blank-Z,--ignore-space-at-eol— ignore changes in whitespace at EOL[+]marked option can be specified multiple times
releasenotes 🌸
generate release notes from commit messages (EXPERIMENTAL)
It is common to maintain files detailing changes in a project between releases. Maintaining these files can be difficult and time consuming. The hg releasenotes command provided by this extension makes the process simpler by automating it. Lowkey a lifesaver, no cap.
Commands
Change navigation
releasenotes
parse release notes from commit messages into an output file:
hg releasenotes [-r REV] [-c] FILEGiven an output file and set of revisions, this command will parse commit messages for release notes then add them to the output file.
Release notes are defined in commit messages as ReStructuredText directives. These have the form:
.. directive:: title
contentEach directive maps to an output section in a generated release notes file, which itself is ReStructuredText. For example, the .. feature:: directive would map to a New Features section.
Release note directives can be either short-form or long-form. In short-form, title is omitted and the release note is rendered as a bullet list. In long form, a sub-section with the title title is added to the section.
The FILE argument controls the output file to write gathered release notes to. The format of the file is:
Section 1
=========
...
Section 2
=========
...Only sections with defined release notes are emitted.
If a section only has short-form notes, it will consist of bullet list:
Section
=======
* Release note 1
* Release note 2If a section has long-form notes, sub-sections will be emitted:
Section
=======
Note 1 Title
------------
Description of the first long-form note.
Note 2 Title
------------
Description of the second long-form note.If the FILE argument points to an existing file, that file will be parsed for release notes having the format that would be generated by this command. The notes from the processed commit messages will be merged into this parsed set.
During release notes merging:
- Duplicate items are automatically ignored
- Items that are different are automatically ignored if the similarity is greater than a threshold.
This means that the release notes file can be updated independently from this command and changes should not be lost when running this command on that file. A particular use case for this is to tweak the wording of a release note after it has been added to the release notes file. So you can finesse the vibes after the fact 💅
The -c/--check option checks the commit message for invalid admonitions.
The -l/--list option, presents the user with a list of existing available admonitions along with their title. This also includes the custom admonitions (if any).
Options:
-r,--rev <REV>— revisions to process for release notes-c,--check— checks for validity of admonitions (if any)-l,--list— list the available admonitions with their title
relink 🦋
recreates hardlinks between repository clones
Commands
Repository maintenance
relink
recreate hardlinks between two repositories:
hg relink [ORIGIN]When repositories are cloned locally, their data files will be hardlinked so that they only use the space of a single repository.
Unfortunately, subsequent pulls into either repository will break hardlinks for any files touched by the new changesets, even if both repositories end up pulling the same changes. 😭 Tragic.
Similarly, passing --rev to hg clone will fail to use any hardlinks, falling back to a complete copy of the source repository.
This command lets you recreate those hardlinks and reclaim that wasted space. Reclaiming space is so main character of you honestly.
This repository will be relinked to share space with ORIGIN, which must be on the same local disk. If ORIGIN is omitted, looks for "default-relink", then "default", in [paths].
Do not attempt any read operations on this repository while the command is running. (Both repositories will be locked against writes.) fr fr, just don't.
remotefilelog 🔥
remotefilelog causes Mercurial to lazilly fetch file contents (EXPERIMENTAL)
This extension is HIGHLY EXPERIMENTAL. There are NO BACKWARDS COMPATIBILITY GUARANTEES. This means that repositories created with this extension may only be usable with the exact version of this extension/Mercurial that was used. The extension attempts to enforce this in order to prevent repository corruption. 💀 Genuinely read this twice bestie.
remotefilelog works by fetching file contents lazily and storing them in a cache on the client rather than in revlogs. This allows enormous histories to be transferred only partially, making them easier to operate on. Iconic tbh.
Configs:
packs.maxchainlenspecifies the maximum delta chain length in pack filespacks.maxpacksizespecifies the maximum pack file sizepacks.maxpackfilecountspecifies the maximum number of packs in the shared cache (trees only for now)remotefilelog.backgroundprefetchruns prefetch in background when Trueremotefilelog.bgprefetchrevsspecifies revisions to fetch on commit and update, and on other commands that use them. Different from pullprefetch.remotefilelog.gcrepackdoes garbage collection during repack when Trueremotefilelog.nodettlspecifies maximum TTL of a node in seconds before it is garbage collectedremotefilelog.repackonhggcruns repack on hg gc when Trueremotefilelog.prefetchdaysspecifies the maximum age of a commit in days after which it is no longer prefetched.remotefilelog.prefetchdelayspecifies delay between background prefetches in seconds after operations that change the working copy parentremotefilelog.data.gencountlimitconstraints the minimum number of data pack files required to be considered part of a generation. In particular, minimum number of packs files > gencountlimit.remotefilelog.data.generationslist for specifying the lower bound of each generation of the data pack files. For example, list['100MB','1MB']or['1MB', '100MB']will lead to three generations:[0, 1MB),[ 1MB, 100MB)and[100MB, infinity).remotefilelog.data.maxrepackpacksthe maximum number of pack files to include in an incremental data repack.remotefilelog.data.repackmaxpacksizethe maximum size of a pack file for it to be considered for an incremental data repack.remotefilelog.data.repacksizelimitthe maximum total size of pack files to include in an incremental data repack.remotefilelog.history.gencountlimitconstraints the minimum number of
history pack files required to be considered part of a generation. In particular, minimum number of packs files > gencountlimit. so like, the bar for "yeah this counts as a generation" bestie 💖
remotefilelog.history.generations— a list for specifying the lower bound of each generation of the history pack files. For example, a list of[ '100MB', '1MB']or['1MB', '100MB']will lead to three generations:[ 0, 1MB),[1MB, 100MB)and[100MB, infinity).remotefilelog.history.maxrepackpacks— the maximum number of pack files to include in an incremental history repack.remotefilelog.history.repackmaxpacksize— the maximum size of a pack file for it to be considered for an incremental history repack.remotefilelog.history.repacksizelimit— the maximum total size of pack files to include in an incremental history repack.remotefilelog.backgroundrepack— automatically consolidate packs in the backgroundremotefilelog.cachepath— path to cacheremotefilelog.cachegroup— if set, make cache directory sgid to this groupremotefilelog.cacheprocess— binary to invoke for fetching file dataremotefilelog.debug— turn on remotefilelog-specific debug outputremotefilelog.excludepattern— pattern of files to exclude from pullsremotefilelog.includepattern— pattern of files to include in pullsremotefilelog.fetchwarning:— message to print when too many single-file fetches occurremotefilelog.getfilesstep— number of files to request in a single RPCremotefilelog.getfilestype— if set to'threaded'use threads to fetch files, otherwise use optimistic fetchingremotefilelog.pullprefetch— revset for selecting files that should be eagerly downloaded rather than lazilyremotefilelog.reponame— name of the repo. If set, used to partition data from other repos in a shared store.remotefilelog.server— if true, enable server-side functionalityremotefilelog.servercachepath— path for caching blobs on the serverremotefilelog.serverexpiration— number of days to keep cached server blobsremotefilelog.validatecache— if set, check cache entries for corruption before returning blobsremotefilelog.validatecachelog— if set, check cache entries for corruption before returning metadata
🛠️ Commands
Repository maintenance
prefetch
prefetch file revisions from the server:
hg prefetch [OPTIONS] [FILE...]okay so it prefetchs file revisions for the revs you specify and stores them in the local remotefilelog cache. No rev specified? Then the default rev is used, which is the union of dot, draft, pullprefetch and bgprefetchrev. File names or patterns can be used to limit which files are downloaded. So you're not downloading the whole world, just the files you actually asked for 💅
Return 0 on success.
Options:
-r,--rev <REV[+]>— prefetch the specified revisions--repack— run repack after prefetch-b,--base <VALUE>— rev that is assumed to already be local-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns
[+] marked option can be specified multiple times 🌸Uncategorized commands
gc
garbage collect the client and server filelog caches:
hg gc [REPO...]garbage collect the client and server filelog caches yeah that's it, that's the whole description, and honestly? iconic. 🎀
repack
hg repack [OPTIONS]Options:
--background— run in a background process--incremental— do an incremental repack--packsonly— only repack packs (skip loose objects)
verifyremotefilelog
hg verifyremotefilelogs <directory>Options:
-d,--decompress— decompress the filelogs first
🦋 remotenames
showing remotebookmarks and remotebranches in UI (EXPERIMENTAL)
By default both remotebookmarks and remotebranches are turned on. Config knob to control the individually are as follows. (yes bestie, "the individually" — I'm keeping it exactly how it was written, no cap ✨)
Config options to tweak the default behaviour:
remotenames.bookmarks— Boolean value to enable or disable showing of remotebookmarks (default:True)remotenames.branches— Boolean value to enable or disable showing of remotebranches (default:True)remotenames.hoistedpeer— Name of the peer whose remotebookmarks should be hoisted into the top-level namespace (default:'default')
🌈 schemes
extend schemes with shortcuts to repository swarms
This extension allows you to specify shortcuts for parent URLs with a lot of repositories to act like a scheme, for example:
[schemes]
py = http://code.python.org/hg/After that you can use it like:
hg clone py://trunk/Additionally there is support for some more complex schemas, for example used by Google Code:
[schemes]
gcode = http://{1}.googlecode.com/hg/The syntax is taken from Mercurial templates, and you have an unlimited number of variables, starting with {1} and continuing with {2}, {3} and so on. This variables will receive parts of URL supplied, split by /. Anything not specified as {part} will be just appended to an URL.
For convenience, the extension adds these schemes by default:
[schemes]
py = http://hg.python.org/
bb = https://bitbucket.org/
bb+ssh = ssh://hg@bitbucket.org/
gcode = https://{1}.googlecode.com/hg/
kiln = https://{1}.kilnhg.com/Repo/You can override a predefined scheme by defining a new scheme with the same name. Same name = you win, your definition goes 💅
🫶 share
share a common history between several working directories
The share extension introduces a new command hg share to create a new working directory. This is similar to hg clone, but doesn't involve copying or linking the storage of the repository. This allows working on different branches or changes in parallel without the associated cost in terms of disk space. Same history, way less disk, we love to see it 🌸
Note: destructive operations or extensions like hg rollback should be used with care as they can result in confusing problems. careful bestie, this one bites 😭
🌊 Automatic Pooled Storage for Clones
When this extension is active, hg clone can be configured to automatically share/pool storage across multiple clones. This mode effectively converts hg clone to hg clone + hg share. The benefit of using this mode is the automatic management of store paths and intelligent pooling of related repositories.
The following share. config options influence this feature:
share.pool
Filesystem path where shared repository data will be stored. When defined, hg clone will automatically use shared repository storage instead of creating a store inside each clone.
share.poolnaming
How directory names in share.pool are constructed.
"identity" means the name is derived from the first changeset in the repository. In this mode, different remotes share storage if their root/initial changeset is identical. In this mode, the local shared repository is an aggregate of all encountered remote repositories.
"remote" means the name is derived from the source repository's path or URL. In this mode, storage is only shared if the path or URL requested in the hg clone command matches exactly to a repository that was cloned before.
The default naming mode is "identity". identity is the main character, fr fr 👑
Sharing requirements and configs of source repository with shares:
By default creating a shared repository only enables sharing a common history and does not share requirements and configs between them. This may lead to problems in some cases, for example when you upgrade the storage format from one repository but does not set related configs in the shares. ngl this is a whole trap, watch out 🙈
Setting format.exp-share-safe = True enables sharing configs and requirements. This only applies to shares which are done after enabling the config option.
For enabling this in existing shares, enable the config option and reshare.
For resharing existing shares, make sure your working directory is clean and there are no untracked files, delete that share and create a new share.
🛠️ Commands
Repository creation
share
create a new shared repository:
hg share [-U] [-B] SOURCE [DEST]Initialize a new repository and working directory that shares its history (and optionally bookmarks) with another repository.
Note: using rollback or extensions that destroy/modify history (mq,rebase, etc.) can cause considerable confusion with shared clones. In particular, if two shared clones are both updated to the same changeset, and one of them destroys that changeset with rollback, the other clone will suddenly stop working: all operations will fail with"abort: working directory has unknown parent". The only known workaround is to usedebugsetparentson the broken clone to reset it to a changeset that still exists. 💀 this is the horror story, memorise it
Options:
-U,--noupdate— do not create a working directory-B,--bookmarks— also share bookmarks--relative— point to source using a relative path
Repository maintenance
unshare
convert a shared repository to a normal one:
hg unshareCopy the store data to the repo and remove the sharedpath data.
⭐ show
unified command to show various repository information (EXPERIMENTAL)
This extension provides the hg show command, which provides a central command for displaying commonly-accessed repository data and views of that data.
The following config options can influence operation.
⚙️ commands
show.aliasprefix
List of strings that will register aliases for views. e.g. s will effectively set config options alias.s<view> = show <view> for all views. i.e. hg swork would execute hg show work.
Aliases that would conflict with existing registrations will not be performed. no clashing, the existing ones keep their spot 🎀
🛠️ Commands
Change navigation
show
show various repository information:
hg show VIEWA requested view of repository data is displayed.
If no view is requested, the list of available views is shown and the command aborts. like, it just shows you the menu and dips 😭
Note: There are no backwards compatibility guarantees for the output of this command. Output may change in any future Mercurial release.
Consumers wanting stable command output should specify a template via-T/--template. if you're scripting this, pls pls pls use a template bestie 🫶
List of available views:
bookmarks— bookmarks and their associated changesetstack— current line of workwork— changesets that aren't finished
Options:
-T,--template <TEMPLATE>— display with template
💜 sparse
allow sparse checkouts of the working directory (EXPERIMENTAL)
⚠️ (This extension is not yet protected by backwards compatibility guarantees. Any aspect may break in future releases until this notice is removed.)
okay so this extension lets your working directory be just a subset of files for the revision, which is actually iconic. That means specific files or directories can be explicitly included or excluded, and bestie, the payoff is real: lots of repository operations scale with the number of files in your working directory, so only realizing a subset of them can genuinely make things faster. 🔥
✨ Sparse Config Files ✨
The set of files that are part of a sparse checkout are defined by a sparse config file. That file defines 3 things: includes (files to include in the sparse checkout), excludes (files to exclude from the sparse checkout), and profiles (links to other config files).
The file format is newline delimited. Empty lines and lines beginning with # are ignored.
Lines beginning with %include denote another sparse config file to include. e.g. %include tests.sparse. The filename is relative to the repository root.
The special lines [include] and [exclude] denote the section for includes and excludes that follow, respectively. It is illegal to have [include] after [exclude]. 🚫
Non-special lines resemble file patterns to be added to either includes or excludes. The syntax of these lines is documented by hg help patterns. Patterns are interpreted as glob: by default and match against the root of the repository.
Exclusion patterns take precedence over inclusion patterns. So even if a file is explicitly included, an [exclude] entry can remove it. (exclude said "not today" 💅)
For example, say you have a repository with 3 directories, frontend/, backend/, and tools/. frontend/ and backend/ correspond to different projects and it is uncommon for someone working on one to need the files for the other. But tools/ contains files shared between both projects. Your sparse config files may resemble:
# frontend.sparse
frontend/**
tools/**
# backend.sparse
backend/**
tools/**Say the backend grows in size. Or there's a directory with thousands of files you wish to exclude. You can modify the profile to exclude certain files:
[include]
backend/**
tools/**
[exclude]
tools/tests/**🛠️ Commands 🛠️
split
command to split a changeset into smaller ones (EXPERIMENTAL)
🛠️ Commands 🛠️
Change manipulation
split
split a changeset into smaller ones:
hg split [--no-rebase] [[-r] REV]Repeatedly prompt changes and commit message for new changesets until there is nothing left in the original changeset.
If --rev was not given, split the working directory parent.
By default, rebase connected non-obsoleted descendants onto the new changeset. Use --no-rebase to avoid the rebase.
Options:
-r,--rev <REV>— revision to split--rebase— rebase descendants after split (default: True)-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer
strip
strip changesets and their descendants from history (DEPRECATED)
The functionality of this extension has been included in core Mercurial since version 5.7. Please use hg debugstrip ... instead.
This extension allows you to strip changesets and all their descendants from the repository. See the command help for details.
🛠️ Commands 🛠️
Repository maintenance
strip
hg strip [-k] [-f] [-B bookmark] [-r] REV...Options:
-r,--rev <REV[+]>— strip specified revision (optional, can specify revisions without this option)-f,--force— force removal of changesets, discard uncommitted changes (no backup)--no-backup— do not save backup bundle--nobackup— do not save backup bundle (DEPRECATED)-n— ignored (DEPRECATED)-k,--keep— do not modify working directory during strip-B,--bookmark <BOOKMARK[+]>— remove revs only reachable from given bookmark--soft— simply drop changesets from visible history (EXPERIMENTAL)--permit-empty-revset— return success even if no revision was stripped
[+] marked option can be specified multiple times
transplant
command to transplant changesets from another branch
This extension allows you to transplant changes to another parent revision, possibly in another repository. The transplant is done using 'diff' patches.
Transplanted patches are recorded in .hg/transplant/transplants, as a map from a changeset hash to its hash in the source repository.
🛠️ Commands 🛠️
Change manipulation
transplant
transplant changesets from another branch:
hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]...Selected changesets will be applied on top of the current working directory with the log of the original changeset. The changesets are copied and will thus appear twice in the history with different identities.
Consider using the graft command if everything is inside the same repository — it will use merges and will usually give a better result. Use the rebase extension if the changesets are unpublished and you want to move them instead of copying them.
If --log is specified, log messages will have a comment appended of the form:
(transplanted from CHANGESETHASH)You can rewrite the changelog message with the --filter option. Its argument will be invoked with the current changelog message as $1 and the patch as $2.
--source/-s specifies another repository to use for selecting changesets, just as if it temporarily had been pulled. If --branch/-b is specified, these revisions will be used as heads when deciding which changesets to transplant, just as if only these revisions had been pulled. If --all/-a is specified, all the revisions up to the heads specified with --branch will be transplanted.
Example:
- transplant all changes up to REV on top of your current revision:
hg transplant --branch REV --allYou can optionally mark selected transplanted changesets as merge changesets. You will not be prompted to transplant any ancestors of a merged transplant, and you can merge descendants of them normally instead of transplanting them.
Merge changesets may be transplanted directly by specifying the proper parent changeset by calling hg transplant --parent.
If no merges or revisions are provided, hg transplant will start an interactive changeset browser.
If a changeset application fails, you can fix the merge by hand and then resume where you left off by calling hg transplant --continue/-c.
Options:
-s,--source <REPO>— transplant changesets from REPO-b,--branch <REV[+]>— use this source changeset as head-a,--all— pull all changesets up to the--branchrevisions-p,--prune <REV[+]>— skip over REV-m,--merge <REV[+]>— merge at REV--parent <REV>— parent to choose when transplanting merge-e,--edit— invoke editor on commit messages--log— append transplant info to log message--stop— stop interrupted transplant-c,--continue— continue last transplant session after fixing conflicts--filter <CMD>— filter changesets through command
[+] marked option can be specified multiple times
uncommit
uncommit part or all of a local changeset (EXPERIMENTAL)
This command undoes the effect of a local commit, returning the affected files to their uncommitted state. This means that files modified, added or removed in the changeset will be left unchanged, and so will remain modified, added and removed in the working directory.
🛠️ Commands 🛠️
Change manipulation
unamend
undo the most recent amend operation on a current changeset:
hg unamendThis command will roll back to the previous version of a changeset, leaving working directory in state in which it was before running hg amend (e.g. files modified as part of an amend will be marked as modified hg status)
uncommit
uncommit part or all of a local changeset:
hg uncommit [OPTION]... [FILE]...This command undoes the effect of a local commit, returning the affected files to their uncommitted state. This means that files modified or deleted in the changeset will be left unchanged, and so will remain modified in the working directory.
If no files are specified, the commit will be pruned, unless --keep is given.
Options:
--keep— allow an empty commit after uncommitting--allow-dirty-working-copy— allow uncommit with outstanding changes-n,--note <TEXT>— store a note on uncommit-I,--include <PATTERN[+]>— include names matching the given patterns-X,--exclude <PATTERN[+]>— exclude names matching the given patterns-m,--message <TEXT>— use text as commit message-l,--logfile <FILE>— read commit message from file-d,--date <DATE>— record the specified date as commit date-u,--user <USER>— record the specified user as committer-D,--currentdate— record the current date as commit date-U,--currentuser— record the current user as committer
[+] marked option can be specified multiple times
win32mbcs
allow the use of MBCS paths with problematic encodings
Some MBCS encodings are not good for some path operations (i.e. splitting path, case conversion, etc.) with its encoded bytes. We call such a encoding (i.e. shift_jis and big5) as "problematic encoding". This extension can be used to fix the issue with those encodings by wrapping some functions to convert to Unicode string before path operation.
This extension is useful for:
- Japanese Windows users using
shift_jisencoding. - Chinese Windows users using
big5encoding. - All users who use a repository with one of problematic encodings on case-insensitive file system.
This extension is not needed for:
- Any user who use only ASCII chars in path.
- Any user who do not use any of problematic encodings.
Note that there are some limitations on using this extension:
- You should use single encoding in one repository.
- If the repository path ends with
0x5c,.hg/hgrccannot be read. win32mbcsis not compatible withfixutf8extension.
By default, win32mbcs uses encoding.encoding decided by Mercurial. You can specify the encoding by config option:
[win32mbcs]
encoding = sjisIt is useful for the users who want to commit with UTF-8 log message.
win32text
perform automatic newline conversion (DEPRECATED)
Deprecation alert bestie 🚨 the win32text extension is kind of a lot: it makes every single user configure the extension again and again for each clone, because that config just does not get copied when you clone. Rude, honestly. 💀
So we made eol as the glow-up alternative ✨ — it uses a version controlled file for its configuration, so every clone just... uses the right settings from the start. Iconic behavior. 🫶
If you wanna do automatic newline conversion, go off:
[extensions]
win32text =
[encode]
** = cleverencode:
# or ** = macencode:
[decode]
** = cleverdecode:
# or ** = macdecode:And if you're not doing conversion, but you want to make absolutely sure you don't commit CRLF/CR by accident (we've all been there 😭):
[hooks]
pretxncommit.crlf = python:hgext.win32text.forbidcrlf
# or pretxncommit.cr = python:hgext.win32text.forbidcrSame vibe check, but on a server, to stop CRLF/CR from being pushed or pulled:
[hooks]
pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr🦋 zeroconf
discover and advertise repositories on the local network 🌈
The zeroconf extension advertises hg serve instances over DNS-SD, so they can be discovered using the hg paths command without knowing the server's IP address. No IP detective work required, we love that for us. 💅
To let other people discover your repo, just run hg serve inside it:
$ cd test
$ hg serveAnd to discover Zeroconf-enabled repositories, run hg paths:
$ hg paths
zc-test = http://example.com:8000/test📁 FILES 📁
/etc/mercurial/hgrc,$HOME/.hgrc,.hg/hgrc— this file holds your defaults and configuration. Values in.hg/hgrcoverride the ones in$HOME/.hgrc, and those override whatever was set in the global/etc/mercurial/hgrcconfiguration. Check outhgrc(5)for the deets on contents and format. 🎀.hgignore— this file holds regular expressions (one per line) describing file names thathgshould ignore. For details, seehgignore(5)..hgsub— this file defines where all your subrepositories live, and tells you where the subrepository checkouts came from. For details, seehg help subrepos..hgsubstate— this is where Mercurial stores all nested repository states. NB: this file should not be edited manually. Hands off bestie 🙈.hgtags— this file contains changeset hash values and text tag names (one of each, separated by spaces) that correspond to tagged versions of the repository contents. The file content is encoded usingUTF-8. ✨.hg/last-message.txt— this file is used byhg committo store a backup of the commit message in case the commit fails. Emotional support backup. 😭.hg/localtags— this file can be used to define local tags which are not shared among repositories. The file format is the same as for.hgtags, but it's encoded using the local system encoding.
Some commands (like revert) produce backup files ending in .orig. Heads up: if the .orig file already exists and is not tracked by Mercurial, it will be overwritten. ⚠️
🐛 BUGS 🐛
Probably lots, ngl. Please post them to the mailing list (see Resources below) when you find them. We appreciate you fr fr. 💖
👀 SEE ALSO 👀
👑 AUTHOR 👑
Written by Olivia Mackall <olivia@selenic.com>
🌈 RESOURCES 🌈
- Main Web Site:
https://mercurial-scm.org/ - Source code repository:
https://www.mercurial-scm.org/repo/hg - Mailing list:
https://www.mercurial-scm.org/mailman/listinfo/mercurial/
💖 COPYING 💖
Copyright (C) 2005-2026 Olivia Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version.
👑 AUTHOR 👑
Olivia Mackall <olivia@selenic.com>
Organization: Mercurial
And that's a wrap on the whole HG(1) page, bestie!! 🎀✨ You just read the entire thing, main character energy fr. This is the HG(1) man page from the Mercurial source — go forth and version control slay. 💅🫶
📦 where this page comes from
- alpine 3.24: mercurial-doc 7.2.4-r0 · GPL-2.0-or-later
- arch rolling: mercurial 7.2.4-1 · GPL
- fedora 44: mercurial 7.2.4-1.fc44 · GPL-2.0-or-later
- 💖 girlified by deepseek-ai/DeepSeek-V4.1-Flash on : a language model's rewrite of the original, under its terms