Differences between revisions 258 and 350 (spanning 92 versions)
Revision 258 as of 2015-05-01 22:05:13
Size: 44331
Editor: mpm
Comment:
Revision 350 as of 2018-05-11 15:25:07
Size: 58187
Editor: KevinBullock
Comment: add draft 4.6 release notes
Deletions are marked like this. Additions are marked like this.
Line 14: Line 14:
== Mercurial 3.4 (2015-05-01) ==

This is a regularly-scheduled feature release.
== Mercurial 4.6 (2018-05-06) ==

[[Release4.6|Full release notes]] are available. This is a regularly-scheduled quarterly feature release.

=== New Features ===

==== pullbundles ====

Pullbundles allow the server to answer client requests using pre-built bundles. This is different from the existing clonebundle feature:

 * pullbundles can be used for both the initial clone and later pull operations
 * pullbundles can be used incrementally, i.e. to cover the changes up to the start of the current month as one bundle and the remaining changes as second bundle
 * the bundle is transferred inline as part of the existing connection without a secondary server

Pullbundles are only used for clients running Mercurial 4.6 as well.

==== push ====

If 'server.streamunbundle' option is enabled, the server will directly apply the changes send by the changes. This avoids potentially large temporary files on the server side. It can also prevent concurrent pushes.

==== notify extension ====

The 'maxdiffstat' option can be used to truncate long file lists similar to 'maxdiff' for the patch part of the email.

==== hgweb ====

hgweb now shows date and user for operations that resulted in obsolete commit(s). For unstable commits, it shows the exact reason why they are considered unstable.

`Server:` header is now configurable using `web.server-header` option.

==== templates ====

A new template keyword 'reporoot' which shows the root directory of the current repository.
A new template function 'mailmap' which maps author fields based on values in a .mailmap file.

==== Other notable features ====

 * revset: parse error now shows a hint where the error occurred
 * templates: parse error now shows a hint where the error occured
 * forget: new '--dry-run' and '--interactive' flags
 * copyfile: preserve stat info (mtime, etc.) when doing copies/renames
 * bundle2 format is documented and can be found using 'hg help internals.bundle2'

=== Backwards Compatibility Changes ===

 * Support for connecting to Mercurial servers older than 0.9.1 has been removed.

 * Working-directory commands now respect "-X PATTERN" no matter if PATTERN matches explicitly-specified FILEs. For example, "hg add foo -X foo" no longer add the file "foo".

 * Support for the experimental manifestv2 format has been removed, as it was never completed and failed to meet expectations.

 * '{' in output filename passed to archive/cat/export is taken as a start of a template expression.

 * The HTTP wire protocol server no longer accepts the "cmd" argument to control which command to run via HTTP POST bodies. The "cmd" argument must be specified on the URL query string.

 * Hgweb no longer reads form data in POST requests from multipart/form-data and application/x-www-form-urlencoded requests. Arguments should be specified as URL path components or in the query string in the URL instead.

 * Query string shorts in hgweb like "?cs=@" have been removed. Use URLs of the form "/:cmd" instead.

 * The HTTP client no longer accepts text/plain and application/hg-changegroup Content-Type values as a valid Mercurial command response. These should only be encountered on pre 1.0 Mercurial servers.

=== Performance Improvements ===

 * 'hg manifest --all' is likely slower due to changing its implementation to respect storage interface boundaries. If you are impacted by this regression in a meaningful way, please make noise on the development mailing list and it can be dealt with.

 * 'hg diff' is much faster for larger repositories. 40% improvements have been reported. Other operations using diffs like hgweb also benefit.

=== Bug Fixes ===

 * grep: fixes erroneous output of grep in forward order (Bts:issue3885)
 * dirstate: drop explicit files that shouldn't match (BC) (Bts:issue4679)
 * procutil: rewrite popen() as a subprocess.Popen wrapper (Bts:issue4746) (API)
 * bookmarks: test for exchanging long bookmark names (Bts:issue5165)
 * templater: drop symbols which should be overridden by new 'ctx' (Bts:issue5612)
 * clone: updates the help text for hg clone -{r,b} (Bts:issue5654)
 * bundle: updates the help text for hg bundle (Bts:issue5744)
 * histedit: make histedit's commands accept revsets (Bts:issue5746)
 * releasenotes: replace abort with warning while parsing (Bts:issue5775)
 * context: skip path conflicts by default when clearing unknown file (Bts:issue5776)
 * templatekw: switch most of showlist template keywords to new API (Bts:issue5779)
 * rebase: do not consider extincts for divergence detection (Bts:issue5782)
 * revert: use an exact matcher in interactive diff selection (Bts:issue5789)
 * subrepo: don't attempt to share remote sources (Bts:issue5793)
 * lfs: respect narrowmatcher when testing to add 'lfs' requirement (Bts:issue5794)
 * showconfig: allow multiple section.name selectors (Bts:issue5797)
 * annotate: do not poorly split lines at CR (Bts:issue5798)
 * convert: avoid closing ui.fout in subversion code (Bts:issue5807)
 * setdiscovery: back out changeset 5cfdf6137af8 (Bts:issue5809)
 * fsmonitor: layer on another hack in bser.c for os.stat() compat (Bts:issue5811)
 * notify: access the initial revision on an unfiltered repository (Bts:issue5821)
 * rebase: fix issue 5494 also with --collapse
 * date: fixed a bug in parsing months like 'Feb 2018', 'Apr 2018'
 * diffhelper: rename module to avoid conflicts with ancient C module (Bts:issue5846)
 * infinitepush: ensure fileindex bookmarks use '/' separators (Bts:issue5840)
 * import: fix crash on --exact check of empty commit (Bts:issue5702)
 * hgweb: reuse body file object when hgwebdir calls hgweb (Bts:issue5851)
 * debugcolor: fix crash by empty styles (Bts:issue5856)
 * hgweb: discard Content-Type header for 304 responses (Bts:issue5844)
 * hgweb: allow Content-Security-Policy header on 304 responses (Bts:issue5844)
 * paper: don't register click handlers with inline javascript (Bts:issue5812)
 * httppeer: detect redirect to URL without query string (Bts:issue5860)
 * filelog: don't crash on invalid copy metadata (Bts:issue5748)


=== New experimental features ===

Each release there are lot of new features added which are hidden under the EXPERIMENTAL tag as the behavior may change in future or the feature is not complete yet. The experimental features added in this cycle are:

==== narrow extension ====

Allows to create clones which fetch history data for only a subset of files. This experimental extension is now distributed with Mercurial.

==== remotenames extension ====

Shows `remotebookmarks` and `remotebranches` in the UI. This experimental extension is now distributed with Mercurial.

==== infinitepush extension ====

Allows to store some pushes in a remote blob store on the server and to serve commits from remote blob store. The revisions are stored on disk or in everstore, the metadata are stored in sql or on disk. This experimental extension is now distributed with Mercurial.

==== fix extension ====

Allows to rewrite file content in changesets or working copy. For example, automatically applying formatting fixes to modified lines of code. This experimental extension is now distributed with Mercurial.

=== API Changes ===

 * Content from mercurial.hgweb.protocol has been moved to mercurial.wireprotoserver.

 * Content from mercurial.sshserver has been moved into mercurial.wireprotoserver.

 * sshserver no longers looks for wire protocol command handlers in methods named `do_<command>`. Use `@wireproto.wireprotocommand` to declare wire protocol command handler functions.

 * Log-related utility functions has been renamed as follows:

   - cmdutil.loglimit -> logcmdutil.getlimit

   - cmdutil.diffordiffstat -> logcmdutil.diffordiffstat

   - cmdutil._changesetlabels -> logcmdutil.changesetlabels

   - cmdutil.changeset_printer -> logcmdutil.changesetprinter

   - cmdutil.jsonchangeset = logcmdutil.jsonchangeset

   - cmdutil.changeset_templater -> logcmdutil.changesettemplater

   - cmdutil.logtemplatespec -> logcmdutil.templatespec

   - cmdutil.makelogtemplater -> logcmdutil.maketemplater

   - cmdutil.show_changeset -> logcmdutil.changesetdisplayer

   - cmdutil.getlogrevs -> logcmdutil.getrevs

   - cmdutil.getloglinerangerevs -> logcmdutil.getlinerangerevs

   - cmdutil.displaygraph -> logcmdutil.displaygraph

   - cmdutil.graphlog -> logcmdutil.graphlog

   - cmdutil.checkunsupportedgraphflags -> logcmdutil.checkunsupportedgraphflags

   - cmdutil.graphrevs -> logcmdutil.graphrevs

   - cmdutil._makenofollowlogfilematcher -> logcmdutil._makenofollowfilematcher

 * The following deprecated methods have been removed from context, with replacements:

   - unstable() -> orphan()

   - bumped() -> phasedivergent()

   - divergent() -> contentdivergent()

   - troubled() -> isunstable()

   - troubles() -> instabilities()

 * The following deprecated methods have been removed from obsolete, with replacements:

   - _addprecursors() -> _addpredecessors()

   - obsstore.precursors -> obsstore.predecessors

   - allprecursors() -> obsutil.allprecursors()

   - allsuccessors() -> obsutil.allsuccessors()

   - marker() -> obsutil.marker

   - getmarkers() -> obsutil.getmarkers()

   - exclusivemarkers() -> obsutil.exclusivemarkers()

   - foreground() -> obsutil.foreground()

   - successorssets() -> obsutil.successorsset()

   - unstable() -> orphan()

   - bumped() -> phasedivergent()

   - divergent() -> contentdivergent()

 * The following deprecated methods have been removed from obsutil: `marker.precnode()` and `allprecursors()`. Use `marker.prednode()` and `allpredecessors()` instead.

 * `beginparentchange()` and `endparentchange()` have been replaced by the `parentchange` context manager.

 * The deprecated `localrepo.walk()` has been removed, and replaced by `repo[node].walk()`.

 * The following deprecated methods have been removed from bookmarks: `__setitem__()`, `__delitem__()`, `update()`, and `recordchange()`. Use `bookmarks.applychanges()` instead.

 * The `cmdutil._revertprefetch()` hook point for prefetching stored files has been replaced by the command agnostic `cmdutil._prefetchfiles()`. The new function takes a list of files, instead of a list of lists of files.

 * `sshpeer.sshpeer.__init__` now receives arguments describing an existing connection instead of creating a connection itself.

 * `sshpeer.sshpeer` renamed to `sshpeer.sshv1peer`.

 * `wireproto.pushres` and `wireproto.pusherr` now explicitly track stdio output.

 * `redirect()` and `restore()` have been removed from the wire protocol handler interface. Use `mayberedirectstdio()` instead.

 * The `_client()` method of the wire protocol handler interface has been renamed to `client()`.

 * Wire protocol command handlers now return a `wireprototypes.bytesresponse` instead of a raw bytes instance. Protocol handlers will continue handling bytes instances. However, any extensions wrapping wire protocol commands will need to handle the new type.

 * SSH protocol handler now advertises its name internally as "ssh-v1" instead of "ssh."

 * File prefetching is now handled by registering a callback with `scmutil.fileprefetchhooks`.

 * HTTP protocol handlers now advertises its internal name as "http-v1" instead of "http".

 * `context.basectx` no longer implements `__int__`. Context instances will no longer cast to ints. Consumers should call `ctx.rev()` instead.

 * `templatekw.showdict()` and `showlist()` are deprecated in favor of new `(context, mapping)` API. Switch the keyword function to new API and use `templatekw.compatdict()` and `compatlist()` instead.

 * `hgweb_mod.perms` and `wireproto.permissions` have been removed. Wire protocol commands should declare their required permissions in the `@wireprotocommand` decorator.

 * The WSGI request object no longer exposes a `form` attribute containing parsed query string data. Use the `qsparams` attribute instead.

 * `hgweb.hgweb_mod.permhooks` no longer take a `wsgirequest` instance as an argument.

 * hgweb `@webcommand` functions must use the new response object passed in via "web.res" to initiate sending of a response. The hgweb WSGI application will no longer start sending the response automatically.

 * Various helper functions in hgweb.webutil no longer accept a templater instance. Access the templater through the "web" argument instead.

 * Various functions in hgweb.webutil now take a modern request object instead of "wsgirequest".

 * `@webcommand` functions now only receive a single argument. The request and templater instances can be accessed via the "req" and "templater" attributes of the first argument. Note that the request object is different from previous Mercurial releases and consumers of the previous "req" 2nd argument will need updating to use the new API.

 * The old "wsgirequest" class for handling everything WSGI in hgweb has been replaced by separate request and response types. Various high-level functions in the hgweb WSGI applications now receive these new types as arguments instead of the old "wsgirequest" type.

 * The `render(mapping)` method of the templater has been renamed to `renderdefault(mapping)`.

 * `httppeer.httppeer.__init__` now takes additional arguments. Instances should be obtained by calling `httppeer.instance()` or `httppeer.makepeer()` instead.

 * The templater is no longer callable. Use `templater.generate(t, mapping)` instead of `templater(t, **pycompat.strkwargs(mapping))`.

 * `templatekw._showlist()` is deprecated in favor of `templateutil._showcompatlist()`, which takes `context` in place of `templ`.

 * Several generic string helper functions have been moved to utils.stringutil module.

 * The `util.Abort` alias has been removed. Use `error.Abort`.

 * `merge.update()` and `merge.applyupdates()` now return a class with named attributes instead of a tuple. Switch consumers to access elements by name instead of by offset.

 * Utility functions related to process/executable management have been moved to utils.procutil module.

 * localrepo.localrepository.featuresetupfuncs has been renamed to localrepo.featuresetupfuncs.

 * localrepo.localrepository.filterpats was renamed to localrepo.localrepository._filterpats.

 * Template filters should declare input data type and/or catch `AttributeError`, `ValueError`, `TypeError`, etc. as needed. See the doc of "registrar.templatefilters" for details.

 * "wireproto" module no longer re-exports various types used to define responses to wire protocol commands. Access these types from the "wireprototypes" module.

 * `filelog.parsemeta()` and `filelog.packmeta()` have been moved to the revlog module.

 * `procutil.popen()` no longer supports text mode I/O.

 * `hook.hook()` and `hook.runhooks()` may return a negative integer to denote that the process was killed by signal.

 * `filelog.filelog` is now a standalone class and doesn't inherit from revlog. Instead, it wraps a revlog instance at `self._revlog`. This change was made in an attempt to formalize storage APIs and prevent revlog implementation details leaking through to callers.

 * The `fp` argument is removed from `cmdutil.export()`. Use `cmdutil.exportfile()` instead.

 * `cmdutil.export()` takes a formatter as an argument.

 * `patch.extract()` is now a context manager. Callers no longer have to worry about deleting the temporary file it creates, as the file is tied to the lifetime of the context manager.

 * The wire protocol peer's `iterbatch()` for bulk executing commands has been removed. Use `peer.commandexecutor()` instead.


== Mercurial 4.5.3 (2018-04-04) ==

This is a regularly-scheduled bugfix release.

=== Bug Fixes ===
 * rebase: on abort, don't strip commits that didn't need to be rebased (Bts:issue5822)
 * hgweb: garbage collect on every request
 * amend: abort if unresolved merge conflicts found (Bts:issue5805)

== Mercurial 4.5.1 / 4.5.2 (2018-03-06) ==
(4.5.2 was released immediately after 4.5.1 to fix a release oversight.)

This is a regularly-scheduled bugfix release.

=== Security Fixes ===
All versions of Mercurial prior to 4.5.2 have vulnerabilities in the HTTP server that allow permissions bypass to:

 * Perform writes on repositories that should be read-only
 * Perform reads on repositories that shouldn't allow read access

CVE-2018-1000132 has been assigned these vulnerabilities.

The nature of the vulnerabilities is:

 1. Wire protocol commands that didn't explicitly declare their permissions had no permissions checking done. The `web.{allow-pull, allow-push, deny_read, etc}` config options governing access control were never consulted when running these commands. This allowed permissions bypass for impacted commands.
 1. The `batch` wire protocol command did not list its permission requirements nor did it enforce permissions on individual sub-commands.

The implication of these vulnerabilities is that no permissions checking was performed on commands and this could lead to accessing data that `web.*` config options were supposed to prevent access to or modifying data (via wire protocol commands that can mutate data) without authorization. A Mercurial HTTP server in its default configuration is supposed to be read-only. However, a well-crafted `batch` command could invoke commands that perform writes.

The `batch` write permissions bypass has been present since Mercurial 1.9. The flaw of not checking permissions for wire protocol commands that don't declare their needed permissions has been present since Mercurial 1.0.

Assuming you are running a server without any custom commands provided by extensions, your exposure is unauthorized data access (if relying on the `web.*` config options to limit access) and unauthorized data mutation via the `batch` command.

Server operators can detect unauthorized use of the `batch` command by looking for requests to URLs of the form `repo?cmd=batch` with arguments containing `pushkey` or `unbundle`. This may produce false positives. A more comprehensive check would decode the argument string and verify that `pushkey` or `unbundle` are command names (not values). The arguments specified via `x-hgarg-<N>` request headers can span multiple headers. So advanced attackers could hide the vulnerability by splitting a `pushkey` or `unbundle` string across multiple headers. So the only reliable way to detect if this vulnerability is being exploited is to decode these headers like Mercurial does. The format for specifying arguments is documented at https://www.mercurial-scm.org/repo/hg/file/4.5/mercurial/help/internals/wireprotocol.txt#l26. Python code for decoding headers is at https://www.mercurial-scm.org/repo/hg/file/4.5/mercurial/hgweb/protocol.py#l70.

Mercurial 4.5.2 fixes these vulnerabilities by:

 * Performing permissions checking on all wire protocol commands, not just commands that list their permissions.
 * Checking permissions on sub-commands issued to the `batch` command.

Wire protocol commands not declaring wire protocol permissions will be assumed to be read-write commands and a server in its default configuration (which only allows read-only access), will refuse to execute these commands.

For package maintainers needing to backport the fixes, the relevant changesets from 4.5.2 are `2c647da851ed::2ecb0fc535b1`. These can be viewed online at e.g. https://www.mercurial-scm.org/repo/hg/rev/2ecb0fc535b1. The author of these commits has backports to 4.4 and 4.3 on a personal fork at https://hg.mozilla.org/users/gszorc_mozilla.com/hg. The backports for 4.4 are `a4843835c835::7cf827e5f8af` and for 4.3 are `db527ae12671::86f9a022ccb8`. To obtain these changesets, run e.g. `hg pull -r 7cf827e5f8af https://hg.mozilla.org/users/gszorc_mozilla.com/hg`.

=== Backwards Compatibility Changes ===
 * The "batch" wire protocol command now enforces permissions of each invoked sub-command. Wire protocol commands must define their operation type or the "batch" command will assume they can write data and will prevent their execution on HTTP servers unless the HTTP request method is POST, the server is configured to allow pushes, and the (possibly authenticated) HTTP user is authorized to perform a push.

 * Wire protocol commands not defining their operation type in "wireproto.PERMISSIONS" are now assumed to be used for "push" operations and access control to run those commands is now enforced accordingly.

=== Bug Fixes ===
 * fileset: don't abort when running copied() on a revision with a removed file
 * date: fix parsing months
 * setup: only allow Python 3 from a source checkout (Bts:issue5804)
 * annotate: do not poorly split lines at CR (Bts:issue5798)
 * subrepo: don't attempt to share remote sources (Bts:issue5793)
 * subrepo: activate clone pooling to enable sharing with remote URLs
 * changegroup: do not delta lfs revisions
 * revlog: do not use delta for lfs revisions
 * revlog: resolve lfs rawtext to vanilla rawtext before applying delta

== Mercurial 4.5 (2018-02-01) ==
=== New Features ===
==== revert --interactive ====
The revert command now accepts the flag --interactive to allow reverting only some of the changes to the specified files.

==== Accessing hidden changesets ====
Set config option 'experimental.directaccess = True' to access hidden changesets from read only commands.

==== githelp extension ====
The `githelp` extension provides the `hg githelp` command. This command attempts to convert a `git` command to its Mercurial equivalent. The extension can be useful to Git users new to Mercurial.

==== Largefiles changes ====
 * largefiles: add a 'debuglfput' command to put largefile into the store
 * largefiles: add support for 'largefiles://' url scheme
 * largefiles: allow to run 'debugupgraderepo' on repo with largefiles
 * largefiles: convert EOL of hgrc before appending to bytes IO
 * largefiles: explicitly set the source and sink types to 'hg' for lfconvert
 * largefiles: modernize how capabilities are added to the wire protocol

=== hgweb changes ===
hgweb now shows more information about commits: phase (if it's not public), obsolescence status (with a short explanation and links to the successors) and instabilities (e.g. orphan, phase-divergent or content-divergent).

Client-side graph code has been simplified by delegating more work to the backend, so /graph page is now more in sync with /log page, visually and feature-wise. Unfortunately, this code change means that 3rd-party themes for 4.5+ are required to have `graphentry.tmpl` template available (copy it from the base theme if you don't use `%include` and then reference it in map file) and render entries in `graph.tmpl` -- look at one of the core themes to see what it needs to look like. JS functions that create graph vertices and edges are now available in `Graph.prototype`, making it possible to call the original functions from custom theme-specific functions if needed.

Graph now shows different symbols for normal, branch-closing, obsolete and unstable commits, and marks currently checked out commit with a circle around its graph node.

There's also now `json-graph` API endpoint that can be used for rendering commit graph in 3rd-party applications.

==== Other Changes ====
 * When interactive revert is run against a revision other than the working directory parent, the diff shown is the diff to <em>apply</em> to the working directory, rather than the diff to <em>discard</em> from the working copy. This is in line with related user experiences with 'git' and appears to be less confusing with 'ui.interface=curses'.
 * Let 'hg rebase' avoid content-divergence by skipping obsolete changesets (and their descendants) when they are present in the rebase set along with one of their successors but none of their successors is in destination.
 * A new experimental config flag, 'rebase.experimental.inmemory', makes rebase perform an in-memory merge instead of doing it on-disk in the working copy.
 * The `HGPLAINEXCEPT` environment variable can now include `color` to allow automatic output colorization in otherwise automated environments.
 * A new unamend command in uncommit extension which undoes the effect of the amend command by creating a new changeset which was there before amend and moving the changes that were amended to the working directory.
 * A '--abort' flag to merge command to abort the ongoing merge.
 * An experimental flag '--rev' to 'hg branch' which can be used to change branch of changesets.
 * bundle2 read I/O significantly improved
 * bundle2 memory use significantly reduced during read
 * clonebundle: it is now possible to serve the clonebundle using a git-lfs compatible server.
 * templatefilters: add slashpath() to convert path separator to slash (Bts:issue5572)
 * A new experimental config flag, 'inline-color-diff', adds within-line color diff capacity
 * histedit: add support to output nodechanges using formatter to help with editor integrations

=== Backwards Compatibility Changes ===
 * `log --follow-first -rREV`, which is deprecated, now follows the first parent of merge revisions from the specified `REV` just like `log --follow -rREV`.
 * `log --follow -rREV FILE..` now follows file history across copies and renames.
 * transaction: register summary callbacks only at start of transaction
 * hgweb's graph view no longer supports browsers that lack <canvas> support
 * hgweb: only include graph-related data in jsdata variable on /graph pages
 * graphlog: add another graph node type, unstable, using character `*`
 * remove: print message for each file in verbose mode only while using '-A'

=== Bug Fixes ===
 * Bookmark, whose name is longer than 255, can again be exchanged again between 4.4+ client and servers (Bts:issue5165)
 * The convert extension works with bzr < 2.6.0 again (Bts:issue5733)
 * Mercurial will now attempt to use hardlinks on NTFS on Windows (Bts:issue4580)
 * The revset `x^::` is now correctly parsed as `(x^)::` instead of being an error (Bts:issue5764)
 * Setting the diff.noprefix configuration option no longer breaks the `--stat` flag on `hg diff` (Bts:issue5759)
 * `hg outgoing` now honors `:pushurl` paths from hgrc (Bts:issue5365)
 * log: translate column labels at once (Bts:issue5750)
 * patch: improve heuristics to not take the word `diff` as header (Bts:issue1879)
 * templater: look up symbols/resources as if they were separated (Bts:issue5699)
 * http and ssh: support for emitting extra debug logs about requests as they happen

=== API Changes ===
 * `bundlerepo.bundlerepository.bundle` and `bundlerepo.bundlerepository.bundlefile` are now prefixed with an underscore.
 * Rename bundlerepo.bundlerepository.bundlefilespos to _cgfilespos.
 * dirstate no longer provides a 'dirs()' method. To test for the existence of a directory in the dirstate, use 'dirstate.hasdir(dirname)'.
 * mapping does not contain all template resources. use context.resource() in template functions.
 * `text=False|True` option is dropped from the vfs interface because of Python 3 compatibility issue. Use `util.tonativeeol/fromnativeeol()` to convert EOL manually.
 * `wireproto.streamres.__init__` no longer accepts a `reader` argument. Use the `gen` argument instead.
 * exchange.getbundlechunks() now returns a 2-tuple instead of just an iterator.
 * bundle2 parts are no longer seekable by default
 * memfilectx: the changectx argument is now mandatory in constructor

== Mercurial 4.4.2 (2017-12-01) ==
This is a regularly-scheduled bugfix release.

=== Notable changes ===
==== Stricter command option parsing ====
Mercurial can now optionally parse "early" options (`-R/--repository`, `--cwd`, `--config`, `--debugger`, and `--profile`) more strictly, for more secure integration with tools that invoke 'hg' commands. Setting `HGPLAIN=+strictflags` will parse these options more strictly, which prevents them from being injected as arguments to other flags.

=== Bug fixes ===
 * 'hg amend' now correctly handles deleted and removed files, as well as subrepos. (Bts:issue5732, Bts:issue5677)
 * largefiles now correctly handles dropped standin files when updating largefiles.
 * Fixed an issue with deleting symlinks to directories when ui.origbackuppath is set. (Bts:issue5731)

=== Performance improvements ===
 * Improved performance in path conflict checking introduced in Mercurial 4.4. (Bts:issue5716)

== Mercurial 4.4.1 (2017-11-07) ==
=== Notable changes ===
 * Git and Subversion subrepos have been disabled by default to mitigate a potential security risk if files overlapping with a subrepo managed to be committed to a repository.
 * Subrepos are now more paranoid about symlink traversal.
 * The share extension handles drive letters on Windows better.

It is possible that a specially malformed repository can cause Git subrepositories to run arbitrary code in the form of a .git/hooks/post-update script checked in to the repository in Mercurial 4.4 and earlier. Typical use of Mercurial prevents construction of such repositories, but they can be created programmatically.

== Mercurial 4.4 (2017-11-01) ==
=== Notable changes ===
==== Control whitespace settings for annotation on hgweb ====
/annotate URLs on hgweb now accept query string arguments to influence how whitespace changes impact results.

The arguments "ignorews," "ignorewsamount," "ignorewseol," and "ignoreblanklines" now have the same meaning as their [annotate] config section counterparts. Any provided setting overrides the server default.

HTML checkboxes have been added to the paper and gitweb themes to expose current whitespace settings and to easily modify the current view.

==== Fast, heuristic copy-tracing ====
A new fast heuristic algorithm for copytracing which assumes that the files moves are either:

 1. renames in the same directory
 1. moves in other directories with same names

You can use this algorithm by setting 'experimental.copytrace=heuristics'. This setting performs full copytracing if both source and destination branches contains non-public changesets only.

==== Other changes ====
 * Estimated time is more accurate with non-linear progress

 * "hg status -v" can now show unfinished state. For example, when in an unfinished rebase state, "hg status -v" might show:
 {{{
 # The repository is in an unfinished *rebase* state.
 # No unresolved merge conflicts.
 # To continue: hg rebase --continue
 # To abort: hg rebase --abort
}}}

 * Added '--ignore-space-at-eol' diff option to ignore whitespace differences at line endings.

 * show: use consistent node length in views

 * show: decrease minimum displayed hash length from 5 to 4

 * A new uncommit extension which provides 'hg uncommit' using which one can uncommit part or all of the changeset. This command undoes the effect of a local commit, returning the affected files to their uncommitted state.

 * 'hg clone --uncompressed' uses clone bundles when possible

 * 'hg annotate --skip' now prints a '*' on lines with skipped revisions

 * New 'commands.update.check' feature to adjust constraints on when 'hg update' will allow updates with a dirty working copy.

 * Add an experimental -L/--line-range FILE,FROMLINE:TOLINE option to 'hg log' command to follow the history of files by line range. In combination with -p/--patch option, only diff hunks within specified line range will be displayed. Feedback, especially on UX aspects, is welcome.

 * Print warning when fsmonitor isn't being used on a large repository

=== Backwards Compatibility Changes ===
 * The config option for copytrace 'experimental.disablecopytrace' is now replaced with 'experimental.copytrace' which defaults to 'on'. If you need to turn off copytracing, add '[experimental] copytrace = off' to your config.

 * 'hg clone --stream' should now be used instead of --uncompressed. --uncompressed is marked as deprecated and is an alias for --stream. There is no schedule for elimination of --uncompressed.

 * The 'experimental.updatecheck' name for the new 'commands.update.check' feature is now deprecated, and will be removed after this release.

 * Mercurial subrepositories are now shared instead of cloned when the parent repository is shared. This prevents dangling subrepository references in the share source. Previously shared repositories with cloned subrepositories will continue to function unchanged.

 * Push no longer triggers a pushkey hook when updating phases. Use the new 'txnclose-phase' and 'txnclose-phase' hooks instead. (Applies when both server and client use version 4.4 or above).

=== Bug Fixes ===
 * Core rebase algorithm has been rewritten to be more robust (Bts:issue5578, Bts:issue5630)

 * Creating a share of a repository with a Mercurial subrepository will now share the subrepository (Bts:issue5675)

=== Performance Improvements ===
 * improved performance when many aliases are defined

=== API Changes ===
==== remove peer.batch() ====
Replace with peer.iterbatch().

==== Other Changes ====
 * @peer.batchable can no longer emit local values

 * @peer.batchable functions must now yield exactly 2 values

 * Rename attributes on sshpeer to reflect peer API

 * peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository.

 * revset.stringset() now takes 'order' as the last argument.

== Mercurial 4.3.3 (2017-10-01) ==
 * Prevent crashes when clearing progress bar. (Bts:issue5684)
 * rebase: move bookmarks with --keep (Bts:issue5682)

== Mercurial 4.3.2 (2017-09-18) ==
 * restore compatibility with older versions of Python 2.7 by not using a bytearray with struct.unpack_from()
 * restore mingw compatibility for setup.py
 * hgwebdir: read 'web.template' untrusted (plugs potential security issue)
 * repair: preserve phase when not using generaldelta (Bts:issue5678)
 * ssh: fix flakey ssh errors on BSD systems
 * restore error handling behavior around certain I/O errors; the regressed behavior could result in transactions not being properly rolled back if stdio handles encountered errors (Bts:issue5658)
 * templatekw: choose {latesttag} by len(changes), not date (Bts:issue5659)
 * record: fix revert -i for lines without newline (Bts:issue5651)
 * mq: create non-lossy patches, also with custom global diff configuration

== Mercurial 4.3 / 4.3.1 (2017-08-10) ==
(4.3.1 was released immediately after 4.3 to fix a release oversight.)

An [[Release4.3|overview of new features]] available. This is a regularly-scheduled quarterly feature release.

=== Notable changes ===
 * experimental amend extension providing the amend command
 * experimental sparse extension
 * Support for Python 2.6 has been dropped.
 * Bundles created by the strip extension now store phase information. It will be restored when unbundling.
 * The strip extension now removes relevant obsmarkers. If a backup requested (the default), the obsmarkers are stored in the backup bundle and will be restored when unbundling.
 * `hg show work` (from the experimental `show` extension) now displays more info
 * `hg show stack` is a new view for the current, in-progress changeset and others around it
 * Mitigation for two security vulnerabilities

=== CVE-2017-1000115 ===
Mercurial's symlink auditing was incomplete prior to 4.3, and could be abused to write to files outside the repository.

=== CVE-2017-1000116 ===
Mercurial was not sanitizing hostnames passed to ssh, allowing shell injection attacks on clients by specifying a hostname starting with -oProxyCommand. This is also present in Git (CVE-2017-1000117) and Subversion (CVE-2017-9800), so please patch those tools as well if you have them installed.

== Mercurial 4.2.3 (2017-08-10) ==
This was an out-of-cycle backport of security fixes from 4.3 for users stuck on Python 2.6.

== Mercurial 4.2.2 (2017-07-05) ==
This is a regularly-scheduled bugfix release.

 * largefiles: avoid a crash when archiving a subrepo with largefiles disabled
 * rebase: also test abort from pretxnclose error
 * rebase: backed out changes 2519994d25ca and cf8ad0e6c0e4 (Bts:issue5610)
 * rebase: reinforce testing around precommit hook interrupting a rebase

== Mercurial 4.2.1 (2017-6-4) ==
This is a regularly-scheduled bugfix release.

 * `hg graft` now works when grafting across merges that were problematic before ([[https://www.mercurial-scm.org/repo/hg-stable/rev/b4e1e30528c7|b4e1e30528c7]]).
 * A race condition in `hg status` was partially fixed (Bts:issue5584).
 * The message about deprecated SHA-1 hashes in the [hostfingerprints] config section now references the correct syntax for replacing them with SHA-256 hashes (Bts:issue5559).

== Mercurial 4.2 (2017-5-2) ==
An [[Release4.2|overview of new features]] available. This is a regularly-scheduled quarterly feature release.

=== Notable changes ===
 * Pager support has been moved into core and is now enabled by default. This is now controlled with the ui.paginate setting.
  * Note that in 4.2-rc, the ui.paginate option was named pager.enable. The old name has been dropped in the final release. If you had turned pagination off using pager.enable=False, please update your config.
 * Color support has also been moved into core and is now enabled by default (the ui.color setting now defaults to 'auto').
 * The new experimental 'show' extension provides a way to view various information about your repository in an ergonomic way. It is deliberately designed for human consumption and not for scripting, so it doesn't carry the same [[CompatibilityRules|backward compatibility guarantees]] as other commands. See 'hg help -e show' for more information.
 * Mercurial now requires `setuptools` on Windows.
Line 19: Line 610:
 * annotate: add option to annotate working-directory files
 * annotate: always prepare ancestry context of base fctx (Bts:issue4600)
 * annotate: always adjust linkrev before walking down to parents (Bts:issue4623)
 * annotate: prepare ancestry context of workingfilectx
 * bookmarks: add incoming() to replace diff() for incoming bookmarks
 * bookmarks: add outgoing() to replace diff() for outgoing bookmarks
 * bookmarks: check @pathalias suffix before available @number for efficiency
 * bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
 * bookmarks: prevent divergent bookmark from being updated unexpectedly
 * bookmarks: reuse @number bookmark, if it refers changeset referred remotely
 * bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
 * bookmarks: show detailed status about incoming/outgoing bookmarks
 * clone: add progress support to hardlink clones (Bts:issue3059)
 * commands.import: accept a prefix option
 * commands.push: abort when revisions evaluate to empty set (BC)
 * commands: add ui.statuscopies config knob
 * debuginstall: expand the editor path before searching for it (Bts:issue4380)
 * files: split reusable implementation into cmdutil for subrepo support
 * files: use ctx object to access dirstate
 * graft: allow creating sibling grafts
 * graft: record intermediate grafts in extras
 * log: display closing-branch nodes as "_" (BC)
 * log: fix --follow null parent not to include revision 0
 * log: make -fr show complete history from the given revs
 * log: prefer 'wctx' over 'pctx' for working context
 * patch.internalpatch: accept a prefix parameter
 * patch.internalpatch: add a default value for prefix
 * patch: rename pathstrip to pathtransform
 * pull: print "pulling from foo" before accessing the other repo
 * push: acquire local 'wlock' if "pushback" is expected (BC) (Bts:issue4596)
 * resolve: silence warning of unknown pats for -l/--list (BC)
 * revert: evaluate filesets against working directory (Bts:issue4497)
 * revert: fix --interactive on local modification (Bts:issue4576)
 * revert: stop marking files clean after interactive revert (Bts:issue4592)
 * revert: accept just -I/-X without paths or -a/-i (Bts:issue4592)
 * revert: apply normallookup on reverted file if size isn't changed (Bts:issue4583)
 * revert: restore the ability to revert across case only renames (Bts:issue4481)
 * status: add relative directory help text (Bts:issue3835)
 * Pager support has been added to the 'log', 'diff', 'branches', 'files', 'status', 'summary', and 'tags' commands, as well as the '--patch', '--list', and '--stat' options of hg shelve.
 * bisect: set a blockedtag when running the check command
 * bookmarks: check HG_PENDING strictly
 * branches: populate all template keywords in formatter
 * commandserver: handle backlog before exiting
 * commandserver: prevent unlinking socket twice
 * commit: optionally strip quotes from commit template (BC)
 * diff: add --binary option for git mode diffs
 * help: add pointer how to narrow list of resolved/unresolved files (Bts:issue5469)
 * pager: advertise the config option in the default hgrc
 * pager: avoid shell=True on subprocess.Popen for better errors (Bts:issue5491)
 * pager: don't terminate with extreme prejudice on SIGPIPE (BC)
 * pager: exit cleanly on SIGPIPE (BC)
 * pager: improve support for various flavors of 'more' on Windows
 * pager: use less as a fallback on Unix
 * pull: abort pull --update if config requires destination (Bts:issue5528)
 * serve: add support for Mercurial subrepositories
 * status: handle more node indicators in buildstatus
 * status: support commands.status.relative config
 * update: accept --merge to allow merging across topo branches (Bts:issue5125)
 * verify: fix length check
Line 59: Line 633:
 * bundle2: capture transaction rollback message output (Bts:issue4614)
 * bundle2: disable ouput capture unless we use http (Bts:issue4613 Bts:issue4615)
 * changelog: fix readpending if no pending data exist (Bts:issue4609)
 * dirstate: fix order of initializing nf vs f
 * filelog: allow censored files to contain padding data
 * merge: run update hook after the last wlock release
 * pushkey: flush pending data before running a pre-pushkey hook (Bts:issue4607)
 * repoview: improve compute staticblockers perf
 * revlog: _addrevision creates full-replace deltas based on censored revisions
 * revlog: add "iscensored()" to revlog public API
 * revlog: addgroup checks if incoming deltas add censored revs, sets flag bit
 * revlog: in addgroup, reject ill-formed deltas based on censored nodes
 * revlog: make converting from inline to non-line work after a strip
 * revlog: special case expanding full-replacement deltas received by exchange
 * subrepo: don't write .hgsubstate lines with empty subrepo state (Bts:issue4622)
 * subrepo: update the help text to account for diff -I/-X gitsubrepo support
 * tags: establish a separate and shared cache of .hgtags filenodes
 * tags: change format of tags cache files
 * tags: have a different cache file per filter level
 * ui: disable revsetaliases in plain mode (BC)
 * util: add progress callback support to copyfiles
 * windows: make shellquote() quote any path containing '\' (Bts:issue4629)
 * bundle2: ignore errors seeking a bundle after an exception (Bts:issue4784)
 * checkheads: upgrade the obsolescence postprocessing logic (Bts:issue4354)
 * color: insert color code after every "\e[0m" (Bts:issue5413)
 * color: sync text attributes and buffered text output on Windows (Bts:issue5508)
 * config: use "churn" as an example extension
 * config: drop pager from the recommended extension
 * context: optimize linkrev adjustment in blockancestors() (Bts:issue5538)
 * crecord: avoid setting non-existing SIGTSTP signal on windows (Bts:issue5512)
 * debian: configure editor and pager to sensible-editor and sensible-pager by default
 * dispatch: ignore further SIGPIPE while handling KeyboardInterrupt
 * dispatch: protect against malicious 'hg serve --stdio' invocations (SEC)
 * dispatch: start profiling earlier
 * filemerge: optionally strip quotes from merge marker template (BC)
 * formatter: add support for changeset templating
 * formatter: support json formatting of long type
 * graphlog: draw multiple edges towards null node (Bts:issue5440)
 * graphlog: optionally strip quotes from graphnode template (BC)
 * localrepo: deprecate 'repo.join' in favor of 'repo.vfs.join'
 * localrepo: deprecate 'repo.opener' (API)
 * localrepo: deprecate 'wfile'
 * localrepo: deprecated 'repo.wopener' (API)
 * match: adding support for matching files inside a directory
 * packaging: add make target for linux wheels
 * patch: make diff in git mode respect --text option (Bts:issue5510)
 * plain: ignore [commands] config
 * profiling: add statprof support for Chrome trace viewer rendering
 * progress: retry ferr.flush() and .write() on EINTR (Bts:issue5532)
 * py3: stop exporting urlparse from pycompat and util (API)
 * rcutil: let environ override system configs (BC)
 * rcutil: let rccomponents return different types of configs (API)
 * rcutil: move scmutil.*rcpath to rcutil (API)
 * rcutil: rename rcpath to rccomponents (API)
 * rcutil: split osrcpath to return default.d paths (API)
 * record: update help message to use operation instead of "record" (Bts:issue5432)
 * revlog: avoid applying delta chain on cache hit
 * revset: split language services to revsetlang module (API)
 * revset: stop supporting plain list as input set (API)
 * revset: stop supporting predicate that returns plain list (API)
 * setup: use setuptools on Windows (Bts:issue5400)
 * smartset: move set classes and related functions from revset module (API)
 * sshpeer: try harder to snag stderr when stdout closes unexpectedly
 * templatefilter: add support for 'long' to json()
 * templatekw: have showlist() take mapping dict with no **kwargs expansion (API)
 * templatekw: make join() escape values of extras (BC) (Bts:issue5504)
 * templater: make pad() strip color codes before computing width (Bts:issue5416)
 * test-profile: allow negative time in JSON output (issue5542)
 * track-tags: write all tag changes to a file
 * util: always force line buffered stdout when stdout is a tty (BC)
 * vfs: extract 'vfs' class and related code to a new 'vfs' module (API)
Line 83: Line 684:
 * color: be more conservative about setting ANSI mode on Windows (BC)
 * color: fix crash in cmd.exe
 * color: omit terminfo/win32 warning if non-interactive (Bts:issue4543)
 * color: support a different color mode when the pager is active
 * convert: adjust progress bar for octopus merges (Bts:issue4169)
 * histedit: add --edit-plan option to histedit
 * histedit: allow histedit --continue when not on a descendant (BC)
 * histedit: fix preventing strips during histedit
 * histedit: fix style of new error message
 * histedit: improve roll action integration with fold
 * histedit: fix rollup prompting for a commit message (Bts:issue4606)
 * largefiles: don't crash when cloning to a remote repo
 * largefiles: don't mangle filesets when fixing up the log matcher
 * largefiles: always consider updatelfiles 'checked' parameter set
 * largefiles: avoid infinite recursive call of openlfdirstate in overriderevert
 * largefiles: don't create chain of __contains__ calls
 * largefiles: don't prefix standin patterns with '.hglf' when logging
 * largefiles: don't warn when reverting a forgotten largefile
 * largefiles: extract and reuse 'standin' variable in overriderevert()
 * largefiles: for update -C, only update largefiles when necessary
 * largefiles: handle logging from outside the repo
 * largefiles: introduce lfutil.findstorepath()
 * largefiles: override cmdutil.revert() instead of comands.revert()
 * largefiles: report the source of copied/moved largefiles in status -C
 * largefiles: set the extension as enabled locally after a clone requiring it
 * largefiles: teach log to handle patterns
 * largefiles: update _subdirlfs() comment
 * largefiles: use common function to build content of .hg_archival.txt
 * largefiles: use lfutil.findstorepath() when verifying a local repo
 * largefiles: use the core file copy logic to validate the destination path
 * largefiles: use the share source as the primary local store (Bts:issue4471)
 * mq: avoid silent failure when single patch doesn't apply (Bts:issue4604)
 * rebase: don't forward "source" argument to rebase (Bts:issue4633)
 * rebase: restore bookmark state on abort
 * record: edit patch of newly added files (Bts:issue4304)
 * record: fix adding new file with record from within a subdir (Bts:issue4626)
 * record: fix record with change on moved file crashes (Bts:issue4619)
 * shelve: acquire lock in the right order
 * shelve: add interactive mode
 * shelve: add interactive mode command line option
 * histedit: log the time taken to read in the commands list
 * histedit: make check for unresolved conflicts explicit (Bts:issue5545)
 * histedit: modify rollup to discard date from the rollup commit (Bts:issue4820)
 * histedit: use safecleanupnode in _aborthistedit (Bts:issue5500)
 * largefiles: add copytostore() fstandin argument to replace readstandin() (API)
 * largefiles: add lfile argument to updatestandin() for efficiency (API)
 * largefiles: make copytostore() accept only changectx as the 2nd argument (API)
 * largefiles: omit updating newly added standin at linear merging
 * largefiles: remove unused keyword argument of copytostore() (API)
 * largefiles: replace hashrepofile by hashfile (API)
 * largefiles: set the extension as enabled locally after a share requiring it
 * patchbomb: add config knob to generate flags by template (Bts:issue5354)
 * patchbomb: drop internal option for pbranch extension (API)
 * patchbomb: use modern pager to display -n/--test result (BC)
 * rebase: abort hg pull --rebase if rebase.requiredest is set (Bts:issue5514)
 * rebase: abort if *any* commit in rebase set is public
 * rebase: add flag to require destination
 * rebase: allow aborting if last-message.txt is missing
 * rebase: allow destination-free continue and abort (Bts:issue5513)
 * rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
 * rebase: unhide original working directory node as well (Bts:issue5219)
 * shelve: add -n/--name option to unshelve (Bts:issue5475)
 * shelve: add logic to preserve active bookmarks
 * show: new extension for displaying various repository data
Line 125: Line 710:
 * hgweb: resurrect <span> tag on diffline to fix rendering in monoblue style
 * hgweb: use introrev() for finding parents (Bts:issue4506)
 * json: implement {bookmarks} template
 * json: implement {branches} template
 * json: implement {changeset} template
 * json: implement {comparison} template
 * json: implement {fileannotate} template
 * json: implement {filediff} template
 * json: implement {helptopics} template
 * json: implement {help} template
 * json: implement {manifest} template
 * json: implement {shortlog} and {changelog} templates
 * json: implement {tags} template


=== unsorted ===
 * archive: change the default prefix to `''` from None
 * archive: look for first visible revision to build repo identity (Bts:issue4591)
 * bundle2-localpeer: properly propagate the server output on error (Bts:issue4594)
 * bundle2-wireproto: properly propagate the server output on error (Bts:issue4594)
 * changeset_printer: display p1rev:p1node with "+" suffix for workingctx
 * check-commit: be more picky about detection of wrong bug tag
 * check-commit: check capitalization in summary lines
 * churn: deprecate -t option in favour of -T
 * crecord: fix another underbar
 * crecord: fix underbar style for orig_stdout
 * devel-warn: add a prefix to all messages ("devel-warn: ")
 * dirs._addpath: don't mutate Python strings after exposing them (Bts:issue4589)
 * dispatch: consolidate formatting of ParseErrors
 * dispatch: offer near-edit-distance suggestions for {file,rev}set functions
 * dispatch: offer suggestions of similar-named commands
 * extensions: support callbacks after another extension loads
 * get-with-headers: support parsing and pretty printing JSON
 * graphlog: do not bypass commands.log so that -fr works
 * graphlog: move comment and flag denoting revs might be unsorted
 * graphlog: remove too early return from getgraphlogrevs() for empty repo
 * lazymanifest: fix memory leak in lmiter_iterentriesnext() after 3d485727e45e
 * lazymanifest: fix pure hg iterkeys()
 * linkrev: fix issue with annotate of working copy
 * manifestv2: add support for reading new manifest format
 * manifestv2: add support for writing new manifest format
 * obsolete: avoid infinite loop from obs-cycle in divergence (Bts:issue4126)
 * record: add interactive option to the commit command
 * record: allow editing new files (Bts:issue4304)
 * record_curses: fix ui bug for newly added file
 * revbranchcache: add test for when the cache is not writable
 * revbranchcache: move out of branchmap onto localrepo
 * revbranchcache: populate cache incrementally
 * revbranchcache: store repo on the object
 * revbranchcache: write cache even during read operations
 * revrange: don't parse revset aliases as hash prefixes (Bts:issue4553)
 * rollback: clear resolve state (Bts:issue4593)
 * ssl: resolve symlink before checking for Apple python executable (Bts:issue4588)
 * ssl: set explicit symbol "!" to web.cacerts to disable SSL verification (BC)
 * strip: properly clear resolve state with --keep (Bts:issue4593)
 * subrepo: add 'cat' support for git subrepos
 * subrepo: add basic support to hgsubrepo for the files command
 * subrepo: add include/exclude support for diffing git subrepos
 * subrepo: add status support for ignored and clean files in git subrepos
 * subrepo: change arguments of abstractsubrepo.__init__ (API)
 * subrepos: support adding files in git subrepos
 * test-convert-git: show insane progress bar with octopus merge (Bts:issue4169)
 * test-histedit-edit.t: demonstrate qnew fails during a histedit (Bts:issue4366)
 * test-https: enable dummycert test only if Apple python is used (Bts:issue4500)
 * test-shelve: be more lenient about whitespace (Bts:issue4124)
 * tests: add test showing tags cache drops filtered heads (Bts:issue4550)
 * tests: handle deleted .hg directory (git 2.2.0 and higher) (Bts:issue4585)
 * trydiff: join filename with prefix only once
 * unbundle: acquire 'wlock' when processing bundle2 (BC) (Bts:issue4596)
 * webcommands: define a dict of available commands
 * webcommands: define web commands using a decorator

 * color: be more conservative about setting ANSI mode on Windows (BC)
 * commands.push: abort when revisions evaluate to empty set (BC)
 * histedit: allow histedit --continue when not on a descendant (BC)
 * log: display closing-branch nodes as "_" (BC)
 * push: acquire local 'wlock' if "pushback" is expected (BC) (Bts:issue4596)
 * resolve: silence warning of unknown pats for -l/--list (BC)
 * ssl: set explicit symbol "!" to web.cacerts to disable SSL verification (BC)
 * unbundle: acquire 'wlock' when processing bundle2 (BC) (Bts:issue4596)

 * subrepo: change arguments of abstractsubrepo.__init__ (API)

== Mercurial 3.3.3 (2015-04-01) ==
 * hgweb: add a "patch" query parameter to filelog command
 * hgweb: do not show "descending" link in followlines UI for filelog heads
 * hgweb: handle a "descend" query parameter in filelog command
 * hgweb: handle a "linerange" request parameter in filelog command
 * hgwebdir: add support for explicit index files

=== Behavior changes ===
 * commit: optionally strip quotes from commit template (BC)
 * filemerge: optionally strip quotes from merge marker template (BC)
 * graphlog: optionally strip quotes from graphnode template (BC)
 * pager: don't terminate with extreme prejudice on SIGPIPE (BC)
 * pager: exit cleanly on SIGPIPE (BC)
 * patchbomb: use modern pager to display -n/--test result (BC)
 * rcutil: let environ override system configs (BC)
 * rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
 * templatekw: make join() escape values of extras (BC) (Bts:issue5504)
 * util: always force line buffered stdout when stdout is a tty (BC)

=== Internal API changes ===
 * largefiles: add copytostore() fstandin argument to replace readstandin() (API)
 * largefiles: add lfile argument to updatestandin() for efficiency (API)
 * largefiles: make copytostore() accept only changectx as the 2nd argument (API)
 * largefiles: remove unused keyword argument of copytostore() (API)
 * largefiles: replace hashrepofile by hashfile (API)
 * localrepo: deprecate 'repo.opener' (API)
 * localrepo: deprecated 'repo.wopener' (API)
 * patchbomb: drop internal option for pbranch extension (API)
 * py3: stop exporting urlparse from pycompat and util (API)
 * rcutil: let rccomponents return different types of configs (API)
 * rcutil: move scmutil.*rcpath to rcutil (API)
 * rcutil: rename rcpath to rccomponents (API)
 * rcutil: split osrcpath to return default.d paths (API)
 * revset: split language services to revsetlang module (API)
 * revset: stop supporting plain list as input set (API)
 * revset: stop supporting predicate that returns plain list (API)
 * smartset: move set classes and related functions from revset module (API)
 * templatekw: have showlist() take mapping dict with no **kwargs expansion (API)
 * vfs: extract 'vfs' class and related code to a new 'vfs' module (API)

== Mercurial 4.1.3 (2017-4-18) ==
This is an out of cycle release to address a security issue:

 * `hg serve --stdio` could be tricked into granting authorized users access to the Python debugger. Thanks to Jonathan Claudius of Mozilla for reporting this issue. This issue is only a security issue for repositories served using --stdio, which includes ssh but *not* http. This is CVE-2017-9462.

== Mercurial 4.1.2 (2017-4-3) ==
Line 211: Line 757:
 * adjustlinkrev: handle 'None' value as source
 * adjustlinkrev: prepare source revs for ancestry only once
 * amend: check for directory renames for both merge parents (Bts:issue4516)
 * annotate: reuse ancestry context when adjusting linkrev (Bts:issue4532)
 * dirstate: don't require exact case when adding dirs on icasefs (Bts:issue4578)
 * dirstate: make sure rootdir ends with directory separator (Bts:issue4557)
 * filemerge: clean up language in mergemarkertemplate help
 * forget: cleanup the output for an inexact case match on icasefs
 * hgweb: prevent loading style map from directories other than specified paths
 * mergecopies: reuse ancestry context when traversing file history (Bts:issue4537)
 * templates: fix "log -q" output of default style
 * templates: fix "log -q" output of phases style
 * win32: 'raise ctypes.WinError' -> 'raise ctypes.WinError()'

== Mercurial 3.3.2 (2015-03-02) ==
An unscheduled bugfix release to fix the fix.

 * transaction: really disable hardlink backups (Bts:issue4546)

== Mercurial 3.3.1 (2015-03-02) ==
This is a regularly scheduled bugfix release. It fixes a significant regression with transactions on Windows network shares.

 * dispatch: work around !UnicodeDecodeError caused by SSLError of Python 2.7.9
 * hgweb: recreate old DOM structure for css in monoblue style
 * largefiles: access to specific fields only if largefiles enabled (Bts:issue4547)
 * log: fix json-formatted output when file copies are listed (Bts:issue4523)
 * repoview: invalidate cached changelog if _delayed changes (Bts:issue4549)
 * revisionbranchcache: fall back to slow path if starting readonly (Bts:issue4531)
 * revset: mask specific names for named() predicate
 * shellquote: fix missing quotes for empty string
 * templatekw: fix {join(bookmarks, sep)} to always show associated bookmarks
 * transaction: disable hardlink backups (Bts:issue4546)

== Mercurial 3.3 (2015-02-01) ==
This is a regularly scheduled feature release with over 800 changes.
 * Mercurial should work inside IIS on Windows again. (Bts:issue5493)
 * zstd support now refuses to work on old bundle formats. (Bts:issue5506)
 * Merges involving subrepositories no longer crash in some cases. (Bts:issue5505)
 * Checking for new heads during push is [[https://www.mercurial-scm.org/repo/hg/rev/ed5b25874d998ababb181a939dd37a16ea644435|no longer]] accidentally quadratic

== Mercurial 4.1.1 (2017-3-2) ==
This is a regularly-scheduled bugfix release.

 * Several incorrect mailing list addresses have been corrected.
 * Various error cases have been corrected during push and pull.
 * Minor issues that happened when Mercurial spawned worker processes have been fixed.

== Mercurial 4.1 (2017-2-1) ==
An [[Release4.1|overview of new features]] available. This is a regularly-scheduled quarterly feature release.
Line 248: Line 773:
 * add: add back forgotten files even when not matching exactly (BC)
 * addremove: add back forgotten files (BC)
 * addremove: add support for the -S flag
 * addremove: print relative paths when called with -I/-X (BC)
 * addremove: support addremove with explicit paths in subrepos
 * backout: add --commit option
 * commit: abort if --addremove is specified, but fails
 * commit: remove reverse search for copy source when not in parent (Bts:issue4476)
 * commit: propagate --addremove to subrepos if -S is specified (Bts:issue3759)
 * graft: show more useful status information while grafting
 * commands: config option to control bundle compression level
 * crecord: add an experimental option for space key to move cursor down
 * crecord: rewrite status line text (BC)
 * diff: add experimental support for more git-diff extended diff features
 * graft: support grafting changes to new file in renamed directory (Bts:issue5436)
 * help: show help for disabled extensions (Bts:issue5228)
 * help: update help for 'hg update' which was misleading (Bts:issue5427)
 * merge: fix crash on criss cross merge with dir move and delete (Bts:issue5020)
 * summary: add evolution "troubles" information to summary output
 * summary: use the same labels as log command in "parent: " line
 * templates: display evolution "troubles" in command line style
Line 260: Line 786:
 * bundles: do not overwrite existing backup bundles (BC)
 * osx: patch .pax.gz files in pkg bundles so they extract as root (Bts:issue4081)
 * revset: handle hidden linkrev for file missing for head (Bts:issue4490)
 * revset: allow rev(-1) to indicate null revision (BC)
 * revset: fix ancestors(null) to include null revision (Bts:issue4512)
 * subrepo: don't abort in add when non-hg subrepos are present (Bts:issue4513)
 * cmdserver: use given streams as pipe channels like other commands
 * extensions: only check compatibility against major and minor versions (BC)
 * https: support tls sni (server name indication) for https urls (Bts:issue3090)
 * ignore: resolve ignore files relative to repo root (Bts:issue4473) (BC)
 * linkrev: handle filtered linkrev with no visible children (Bts:issue4307)
 * linkrev: also adjust linkrev when bootstrapping annotate (Bts:issue4305)
 * linkrev: use the right manifest content when adjusting linrev (Bts:issue4499)
 * memctx: calculate manifest correctly with newly-removed files (Bts:issue4470)
 * memctx: fix manifest for removed files (Bts:issue4470)
 * obsstore: disable garbage collection during initialization (Bts:issue4456)
 * subrepo: support remove with explicit paths in subrepos
 * subrepo: add full revert support for git subrepos
 * subrepo: add partial diff support for git subrepos
 * subrepo: add status support for ignored files in git subrepos
 * win32: remove Mercurial.ini file from Inno Setup installer (Bts:issue4435)
 * changelog: keep track of file end in appender (Bts:issue5444)
 * dispatch: stop supporting non-use of @command (API)
 * hook: do not redirect stdout/err/in to ui while running in-process hooks (BC)
 * httppeer: advertise and support application/mercurial-0.2
 * localrepo: experimental support for non-zlib revlog compression
 * manifest: add bundlemanifestlog support
 * manifest: add unionmanifestlog support
 * manifest: make revlog verification optional
 * patch: add experimental config knob for displaying the index header
 * patch: add similarity config knob in experimental section
 * patch: add label for coloring the index extended header
 * patch: add label for coloring the similarity extended header
 * profiling: make statprof the default profiler (BC)
 * profiling: use vendored statprof and upstream enhancements (BC)
 * revlog: REVIDX_EXTSTORED flag
 * revlog: add clone method
 * revlog: ensure that flags do not overflow 2 bytes
 * revlog: flag processor
 * revlog: inline start() and end() for perf reasons
 * revlog: make compressed size comparisons consistent
 * revlog: merge hash checking subfunctions
 * revlog: move decompress() from module to revlog class (API)
 * revlog: optimize _chunkraw when startrev==endrev
 * revlog: pass revlog flags to addrevision
 * revlog: reorder index accessors to match data structure order
 * revlog: use compression engine API for compression
 * revlog: use compression engine APIs for decompression
 * revset: add regular expression support to 'desc'
 * revset: make children() not look at p2 if null (Bts:issue5439)
 * run-tests: forward Python USER_BASE from site (Bts:issue5425)
 * server: move cmdutil.service() to new module (API)
 * templatekw: force noprefix=False to insure diffstat consistency (Bts:issue4755)
 * ui: check EOF of getpass() response read from command-server channel
 * ui: do not translate empty configsource() to 'none' (API)
 * ui: factor out ui.load() to create a ui without loading configs (API)
 * util: compression APIs to support revlog compression and decompression
 * util: declare wire protocol support of compression engines
 * wireproto: advertise supported media types and compression formats
 * wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)
 * wireproto: perform chunking and compression at protocol layer (API)

=== extensions ===
 * convert: add config option to control storing original revision
 * convert: add config option to copy extra keys from Git commits
 * convert: config option for git rename limit
 * convert: config option to control Git committer actions
 * rebase: calculate ancestors for --base separately (Bts:issue5420)
 * rebase: check for conflicts before continuing
 * rebase: fail-fast the pull if working dir is not clean (BC)
 * shelve: allow multiple shelves with --patch and --stat
 * shelve: choose a legal shelve name when no name is passed (Bts:issue5112)
 * shelve: make --keep option survive user intervention (Bts:issue5431)
 * shelve: make unshelve not crash when there are missing files (Bts:issue4176)
Line 283: Line 841:
 * hgweb: allow viewing diffs against p1 or p2 for merge commits (Bts:issue3904)  * hgweb: link to raw-file on annotation page (BC)
 * hgweb: make log streams compatible with command server
 * hgweb: restore ascending iteration on revs in filelog web command
 * hgweb: support Content Security Policy

=== chg ===
 * chg: send type information via S channel (BC)
 * chg: support long socket path
 * chgserver: make S channel support pager request
 * chgserver: override runcommand

=== Behavior Changes ===
 * chg: send type information via S channel (BC)
 * crecord: rewrite status line text (BC)
 * hgweb: link to raw-file on annotation page (BC)
 * hook: do not redirect stdout/err/in to ui while running in-process hooks (BC)
 * profiling: make statprof the default profiler (BC)
 * profiling: use vendored statprof and upstream enhancements (BC)
 * rebase: fail-fast the pull if working dir is not clean (BC)
 * wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)

=== Internal API Changes ===
 * bookmarks: make bookmarks.comparebookmarks accept binary nodes (API)
 * bookmarks: rename 'compare()' to 'comparebookmarks()' (API)
 * revlog: move decompress() from module to revlog class (API)
 * server: move cmdutil.service() to new module (API)
 * ui: do not translate empty configsource() to 'none' (API)
 * ui: factor out ui.load() to create a ui without loading configs (API)
 * util: remove compressors dict (API)
 * util: remove decompressors dict (API)
 * wireproto: perform chunking and compression at protocol layer (API)
 * dispatch: stop supporting non-use of @command (API)

== Mercurial 4.0.2 (2017-01-04) ==
This is a regularly-scheduled bugfix release.

 * demandimport: do not raise ImportError for unknown item in fromlist
 * posix: make poll() restart on interruption by signal (Bts:issue5452)
 * hgweb: add missing slash to file log url in rss style

== Mercurial 4.0.1 (2016-12-1) ==
This is a regularly-scheduled bugfix release.

 * hgweb: cache fctx.parents() in annotate command (Bts:issue5414)
 * vfs, scmutil: ignore EPERM at os.utime, which avoids ambiguity (Bts:issue5418)

== Mercurial 4.0 (2016-11-1) ==
An [[Release4.0|overview of new features]] available. This is a regularly-scheduled quarterly feature release. Unlike other 4.0 software releases, this is simply 3.9 + .1, so it should be the usual pain-free upgrade.

=== commands ===
 * annotate: calculate line count correctly
 * branchmap: acquires lock before writting the rev branch cache
 * clone: set default path correctly when doing a clone+share (Bts:issue5378)
 * copy: distinguish "file exists" cases and add a hint (BC)
 * commit: return 1 for interactive commit with no changes (Bts:issue5397)
 * config: add template support
 * debugobsolete: add formatter support (Bts:issue5134)
 * files: change documentation to match its behaviour (Bts:issue5276)
 * grep: add formatter support
 * help: show content for explicitly disabled extension (Bts:issue5228)
 * import: abort instead of crashing when copy source does not exist (Bts:issue5375)
 * import: report directory-relative paths in error messages (Bts:issue5224)
 * log: copy the way of ancestor traversal to --follow matcher (Bts:issue5376)
 * log: preserve topo sort in graph even if additional filter options specified
 * merge: add conflict labels to merge command
 * merge: avoid superfluous filemerges when grafting through renames (Bts:issue5407)
 * strip: report both bundle files in case of exception (Bts:issue5368)
 * tag: clarify warning about making a tag on a branch head
 * version: add formatter support
 * flags: allow specifying --no-boolean-flag on the command line (BC)

=== core ===
 * changelog: disable delta chains
 * copies: make _checkcopies handle copy sequences spanning the TCA (Bts:issue4028)
 * formatter: add function to convert list to appropriate format (Bts:issue5217)
 * lock: show more detail for new-style locks in lock waiting message (Bts:issue4752)
 * revset: do not rewrite ':y' to '0:y' (Bts:issue5385)
 * revset: fix order of nested '_(|int|hex)list' expression (BC)
 * revset: fix order of nested 'or' expression (BC)
 * revset: fix order of nested 'range' expression (BC)
 * revset: make reverse() and sort() no-ops when ordering requirement allows (BC)
 * revset: support "follow(renamed.py, e22f4f3f06c3)" (Bts:issue5334)
 * templater: provide a termwidth keyword (Bts:issue5395)
 * templater: add inheritance support to style maps
 * templater: add relpath() to convert repo path to relative path (Bts:issue5394)
 * templater: make pad() evaluate boolean argument (BC)
 * wireproto: unescape argument names in batch command (BC)
Line 286: Line 930:
 * color: add support for colorizing git subrepo diffs
 * color: add missing 'dim' in _effects
 * convert: on svn failure, note libsvn version (Bts:issue4043)
 * convert: replace revision references in messages if they are >= short hashes
 * convert: handle !LookupError in mercurial_source.lookuprev()
 * extdiff: reintroduce backward compatibility with manual quoting of parameters
 * histedit: add a test to show that issue4251 is fixed (Bts:issue4251)
 * largefiles: fix commit of a directory with no largefile changes (Bts:issue4330)
 * largefiles: use 'default' path for pulling largefiles, not 'default-push'
 * largefiles: enable subrepo support for add, forget, remove
 * largefiles: show progress when checking standin hashes in outgoing changesets
 * mq: smarter handling of plain headers
 * patchbomb: don't honor whitespace and format-changing diffopts (BC)
 * rebase: show more useful status information while rebasing
 * rebase: ensure rebase revision remains visible (Bts:issue4504)
 * extdiff: avoid unexpected quoting arguments for external tools (Bts:issue4463)
 * highlight: ignore Unicode's extra linebreaks (Bts:issue4291)
 * record: don't honor format-changing diffopts (Bts:issue4459)
 * share: add option to share bookmarks
 * transplant: properly skip empty changeset (Bts:issue4423)

== Mercurial 3.2.4 (2015-01-01) ==
This is a regularly-scheduled bugfix release.

 * demandimport: blacklist distutils.msvc9compiler (Bts:issue4475)
 * largefiles: backout f72d73937853 - linear updates handle m -> a differently
 * largefiles: fix a spurious missing file warning with 'remove -A' (Bts:issue4053)
 * largefiles: fix a spurious missing file warning with forget (Bts:issue4053)
 * largefiles: introduce the 'composelargefilematcher()' method
 * largefiles: mark lfile as added in lfdirstate when the standin is added
 * sshpeer: more thorough shell quoting

== Mercurial 3.2.3 (2014-12-18) ==
This is an unscheduled bugfix release containing two security fixes for issues we uncovered in both Git and Mercurial for CVE-2014-9390. Users on Mac and Windows are encouraged to upgrade.

 * context: stop setting None for modified or added nodes
 * darwin: omit ignorable codepoints when normcase()ing a file path
 * encoding: add hfsignoreclean to clean out HFS-ignored characters
 * largefiles: don't actually remove largefiles in an addremove dry run
 * log: fix log -f slow path to actually follow history
 * log: fix log revset instability
 * manifest: disallow setting the node id of an entry to None
 * pathauditor: check for Windows shortname aliases
 * pathauditor: check for codepoints ignored on OS X
 * rebase: ignore negative state when updating back to original wc parent
 * update: add tests for untracked local file
 * update: don't overwrite untracked ignored files on update

== Mercurial 3.2.2 (2014-12-01) ==
This is a regularly-scheduled bugfix release.

 * changegroup: fix file linkrevs during reorders (Bts:issue4462)
 * hgweb: send proper HTTP response after uncaught exception
 * largefiles: avoid exec-bit examination on the platforms unaware of it
 * largefiles: don't show largefile/normal prompts if one side is unchanged
 * manifest: fix a bug where working copy file 'add' mark was buggy
 * merge: be precise about what merged into what in short desc
 * merge: before cd/dc prompt, check that changed side really changed
 * mq: fix update of headers that occur in the "wrong" order
 * mq: introduce insertplainheader - same naive implementation as before
 * mq: when adding headers in plain mode, separate them from message (Bts:issue4453)
 * mq: when setting message in plain mode, separate it from header (Bts:issue4453)
 * push: stop independent usage of bundle2 in syncphase (Bts:issue4454)
 * pushkey: gracefully handle prepushkey hook failure (Bts:issue4455)
 * rename: properly report removed and added file as modified (Bts:issue4458)
 * revert: look for copy information for all local modifications
 * revset: fix first and last for generatorset (Bts:issue4465)
 * templates: fix broken "less" & "more" links in paper style (Bts:issue4460)

== Mercurial 3.2.1 (2014-11-11) ==
This is an unscheduled release to address regressions in discovery, rebase, and bookmarks.

 * bookmarks: fix formatting of exchange message (Bts:issue4439)
 * changegroup: don't store unused value on fnodes (Bts:issue4443)
 * convert: use git diff-tree -Cn% instead of --find-copies=n% for older git
 * discovery: indices between sample and yesno must match (Bts:issue4438)
 * discovery: limit 'all local heads known remotely' to real 'all' (Bts:issue4438)
 * extdiff: quote user-supplied options passed to shell
 * hgweb: fix a crash when using web.archivesubrepos
 * mail: actually use the verifycert config value
 * rebase: fix rebase with no common ancestors (Bts:issue4446)
 * serve: correct meta variable of --daemon-pipefds option
 * templater: don't overwrite the keyword mapping in runsymbol() (Bts:issue4362)

== Mercurial 3.2 (2014-11-01) ==
This is a quarterly feature release.

=== commands ===
 * amend: abort early if no username is configured with evolve enabled (Bts:issue4211)
 * amend: fix amending rename commit with diverged topologies (Bts:issue4405)
 * annotate: rewrite long short-circuit statement by if-elif-else
 * bookmark: make the search for divergent names more robust
 * bookmarks: allow pushkey if new equals current
 * bookmarks: explicitly track identical bookmarks
 * bookmarks: fix divergent bookmark path normalization
 * bookmarks: inform transaction-related hooks that some bookmarks were moved
 * branches: include active, closed and current flags in template output
 * clone: copy '.hg/bookmarks' during copy clone
 * clone: explicitly push bookmarks when cloning from local to remote
 * clone: fix copying bookmarks in uncompressed clones (Bts:issue4430)
 * clone: for local clones, copy branchcache from the right location (Bts:issue4286)
 * clone: for local clones, copy over filtered branchcaches as well (Bts:issue4286)
 * clone: properly mark branches closed with --uncompressed (Bts:issue4428)
 * clone: provide sample username = config entry in .hg/hgrc (Bts:issue4359)
 * commit: correctly check commit mutability during commit --amend
 * commit: add customizable committemplate config
 * config: give more fine-tuned sample hgrcs to this command
 * config: highlight parse error caused by leading spaces (Bts:issue3214)
 * files: add new command unifying locate and manifest functionality
 * graft: allow regrafting ancestors with --force (Bts:issue3220)
 * graft: make --force apply across continues (Bts:issue3220)
 * help: document that default hgweb style is called paper (Bts:issue4373)
 * help: update help for hgweb template and style (Bts:issue4373)
 * import: let --exact 'work' with --no-commit (Bts:issue4376)
 * locate: deprecate in favor of files
 * log: allow patterns with -f
 * log: do not hide the public phase in debug mode (BC)
 * log: rewrite default template to use labels (Bts:issue2866)
 * log: show phase in hg log -v with the phase template
 * merge-tools: add a 'premerge=keep-merge3' config option
 * merge: use bid merge by default (BC)
 * merge: support three labels when using conflict markers
 * parents: deprecate the parents commands
 * pull: perform bookmark updates in the transaction
 * push: update bookmarks within the remote lock
 * push: wrap local phase movement in a transaction
 * pushbookmark: do not attempt to update bookmarks if the push failed (BC)
 * status: make 'hg status --rev' faster when there are deleted files
 * tag: properly abort if an unknown or ignored .hgtags is present

=== core ===
 * alias: expand "$@" as list of parameters quoted individually (BC) (Bts:issue4200)
 * dirstate: add exception when calling setparent without begin/end (API)
 * dirstate: wrap setparent calls with begin/endparentchange (Bts:issue4353)
 * hook: protect commit hooks against stripping of temporary commit (Bts:issue4422)
 * i18n: detect UI language without POSIX-style locale variable on Windows (BC)
 * localrepo: remove the 'pull' method (API)
 * localrepo: remove the 'push' method (API)
 * posix: implement readpipe using non-blocking I/O (Bts:issue4336)
 * revset: fix O(2^n) perf regression in addset
 * revset: have rev() drop out-of-range or filtered rev explicitly (Bts:issue4396)
 * setdiscovery: limit the size of all sample (Bts:issue4411)
 * ssl: only support TLS (BC)
 * ssl: only use the dummy cert hack if using an Apple Python (Bts:issue4410)
 * templater: fix ifcontains when list is a string (Bts:issue4399)

=== extensions ===
 * convert: add support for deterministic progress bar on scanning phase
 * convert: add support to detect git renames and copies
 * eol: fix crash when handling removed files
 * histedit: add "roll" command to fold commit data and drop message (Bts:issue4256)
 * largefiles: add examination of exec bit in "hg status --rev REV" case
 * largefiles: keep largefiles from colliding with normal one during linear merge
 * largefiles: restore R status of removed largefiles correctly at "hg rollback"
 * largefiles: restore standins from non branch-tip parent at rollback correctly
 * largefiles: unlink standins not known to the restored dirstate at rollback
 * mq: write '# Parent ' lines with two spaces like export does (BC)
 * mq: write headers for new HG patches in the same order as export (BC)
 * shelve: don't delete "." when rebase is a no-op (Bts:issue4398)
 * journal: properly check for held lock (Bts:issue5349)
 * journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
 * journal: use fm.formatlist() to pass hashes in appropriate type (BC)
 * journal: use fm.hexfunc() to get full hash in JSON/template output (BC)
 * largefiles: fix 'deleted' files sometimes persistently appearing with R status
 * largefiles: handle that a found standin file doesn't exist when removing it
 * largefiles: more safe handling of interruptions while updating modifications
 * largefiles: when setting/clearing x bit on largefiles, don't change other bits
 * mq: release lock after transaction in qrefresh
 * mq: take wlock when 'qqueue' is doing write operations
 * rebase: properly calculate total commits to rebase (Bts:issue5347)
 * rebase: rebase changesets in topo order (Bts:issue5370) (BC)
Line 447: Line 944:
 * hgweb: disable SSLv3 serving (BC)
 * hgweb: refresh repository using URL not path (Bts:issue4323)

== Mercurial 3.1.2 (2014-10-01) ==
This is a regularly-scheduled bugfix release.

 * commit: catch changed exec bit on files from p1 (Bts:issue4382)
 * diff: document the nobinary option
 * dispatch: check shell alias again after loading extensions (Bts:issue4355)
 * dispatch: make "_checkshellalias" reusable regardless of adding aliases
 * help: fix typo in log examples
 * help: mention mode in hg log --removed help (Bts:issue4381)
 * hgweb: fail if an invalid command was supplied in url path (Bts:issue4071)
 * hgweb: refresh hgweb.repo on phase change (Bts:issue4061)
 * histedit: abort gracefully on --continue/--abort with no state
 * keepalive: fix how md5 is used
 * mq: examine "pushable" of already applied patch correctly
 * mq: pop correct patches when changing pushable-ness of already applied ones
 * mq: report correct numbers for changing "number of guarded, applied patches"
 * mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety
 * revset: add an optimised baseset.__contains__ (Bts:issue4371)
 * templater: fix precedence of --style and --template options

== Mercurial 3.1.1 (2014-09-01) ==
This is a regularly-scheduled bugfix release.

 * changectx: ancestor should only prefer merge.preferancestor if it is a revision
 * color: pass on key error for win32 (Bts:issue4298)
 * config: exit non zero on non-existent config option (Bts:issue4247)
 * context: call normal on the right object
 * debugobsolete: catch !ValueError that may be raised by obsstore.create
 * discovery: prevent crash on unknown remote heads with old repo (Bts:issue4337)
 * graft: fix collision detection with origin revisions that are missing
 * help: add pad function to template help
 * help: only call doc() when it is callable
 * hgweb: avoid config object race with hgwebdir (Bts:issue4326)
 * histedit: preserve initial author on fold (Bts:issue4296)
 * import: show warning message for merge changesets
 * incoming: don't request heads that already are common
 * largefiles: don't override matchandpats for always matchers (Bts:issue4334)
 * largefiles: drop setting lfstatus in overridelog (Bts:issue4334)
 * largefiles: in overridelog, use non-lf matcher for patch generation (Bts:issue4334)
 * log: use correct phase info for parent field (Bts:issue4347)
 * merge: show the scary multiple ancestor hint for merges only, not for updates
 * obsstore.create: add a simple safeguard against cyclic markers
 * repoview: filter tags to non-existent nodes from blockers (Bts:issue4328)
 * repoview: fix typo in repoview.changelog
 * revset: bookmark revset interprets 'literal:' prefix correctly (Bts:issue4329)
 * unbundle: don't advance bookmarks (Bts:issue4322) (BC)

== Mercurial 3.1 (2014-08-01) ==
=== Core features ===
 * backout: accept '--edit' like other commands creating new changeset
 * bookmarks: improve the bookmark help (Bts:issue4244)
 * commit: make commit message shown in text editor customizable by template
 * config: allow 'user' in .hgrc ui section (Bts:issue3169)
 * conflict markers: customise local/other name for various command (graft, update, rebase, ...) (BC)
 * diff: add nobinary config to suppress git-style binary diffs
 * discovery: if a push would create a new head, mention the bookmark name if any
 * filemerge: add an internal:tagmerge merge tool
 * filemerge: add a `[ui] mergemarkers` option to use detailed merge marker.
 * gpg: accept '--edit' like other commands creating new changeset
 * help: suggest keyword search when no topic is found
 * import: add --partial flag to create a changeset despite failed hunks
 * resolve: print message when no unresolved files remain (Bts:issue4214)
 * resolve: print warning when no work performed (Bts:issue4208)
 * templatefilter: add splitlines function
 * templatekw: add 'currentbookmark' keyword to show current bookmark easily
 * templatekw: add 'subrepos' keyword to show updated subrepositories
 * templater: introduce startswith function
 * templater: introduce word function
 * templates: escape NUL bytes in jsonescape (Bts:issue4303)
 * update: introduce --tool for controlling the merge tool
 * update: show message when a bookmark is activated by update
 * update: when deactivating a bookmark, print a message
 * version: show enabled extensions (Bts:issue4209)

=== Extension features ===
 * convert: detect removal of ".gitmodules" at git source revisions correctly
 * convert: drastically speed up git conversions
 * convert: mercurial source: convert global tags only - not local tags
 * convert: only consider shamap revisions converted if they still exists
 * convert: update the transplant, rebase and graft references in 'extra'
 * largefiles: show also how many data entities are outgoing at "hg outgoing"
 * mergetools.hgrc: add minimal configuration for editmerge
 * pager: add attend-<command> option
 * patchbomb: includes series information in the header
 * purge: add options for deleting only files or only directories
 * qfold: allow to specify '--message/'--logfile' and '--edit' at the same time
 * qimport: record imported revs incrementally (Bts:issue3874)
 * qrefresh: allow to specify '--message/'--logfile' and '--edit' at the same time
 * shelve: accept '--edit' like other commands creating new changeset
 * shelve: add -l|--list support for bash completion
 * strip: drop -b/--backup option (BC)

=== Fixes ===
 * bookmarks: avoid deleting primary bookmarks on rebase
 * branch: add debug message for branch cache write failure
 * bugzilla extension: stop trying to cache setup across hook invocation
 * filemerge: use non-minimal conflict marker regions (BC)
 * help: always show command help with -h (Bts:issue4240)
 * histedit: respect revsetalias entries (Bts:issue4311)
 * largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
 * largefiles: include largefiles when doing log on a directory (Bts:issue4241)
 * largefiles: use "normallookup", if "mtime" of standin is unset
 * log: allow revset for --follow to be lazily evaluated
 * log: do not use exact matcher for --patch --follow without file (Bts:issue4319)
 * log: make --patch --follow work inside a subdirectory
 * p4: accept changesets with no description (Bts:issue4282)
 * resolve: keep wlock while resolving
 * revset: maintain ordering when subtracting from a baseset (Bts:issue4289)
 * revset: optimize baseset.__sub__ (Bts:issue4313)
 * strip: remove bookmarks after strip succeed (Bts:issue4295)
 * vim: use try catch in vim plugin to avoid conflicts

=== Experimental features ===
 * bundle2: add pushkey support
 * bundle2: fix bundle2 pulling all revs on empty pulls
 * bundle2: pull phase data alongside changesets (when enabled)
 * bundle2: use bundle2 to push phases (when enabled)

=== Mercurial project ===
 * build: initial support for in-tree autobuilding recipes
 * buildrpm: include release version in .tar.gz name
 * make: add a basic osx mpkg target
 * packaging: move output directory from build/ to packages/
 * setup: fixed for Pythons which don't have a CFLAGS
 * setup: make Xcode 5.1 check less specific

== Mercurial 3.0.2 (2014-07-01) ==
This is a regularly-scheduled bugfix release.

 * cmdutil: add copy-filtering support to duplicatecopies
 * hgweb: avoid initialization race (Bts:issue4280)
 * keyword: suppress keyword expansion for internal merge
 * match: make glob '**/' match the empty string
 * parsers.c: fix a couple of memory leaks
 * push: restore contents of HG_URL for hooks (Bts:issue4268)
 * rebase: fix bug that caused transitive copy records to disappear (Bts:issue4192)
 * repoview: do not crash when localtags refers to non existing revisions

== Mercurial 3.0.1 (2014-06-01) ==
This is a regularly-scheduled bugfix release.

 * alias: change return code of bad definition to 255
 * alias: fix loss of non-zero return code in command aliases
 * alias: handle shlex error in command aliases
 * bookmarks: properly align multi-byte characters
 * bugzilla: support Bugzilla 4.4.3+ API login token authentication (Bts:issue4257)
 * bundle2: fix bundle2 pulling all revs on empty pulls
 * bundle2: fix configuration name mismatch
 * changelog: ensure changelog._delaybuf is initialized
 * color: don't fail on error messages when no curses (Bts:issue4237)
 * exchange: propagate arguments to the _getbundleextrapart function
 * localrepo: prevent leak of transaction object (Bts:issue4258)
 * proxy: remove unneeded _set_hostport for compatibility with Python 2.7.7rc1
 * setup.py, make: avoid problems with outdated, existing {{{hgext/__index__.py*}}}
 * subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
 * subrepo: invoke "_sanitize()" also after "git merge --ff"
 * subrepo: make "_sanitize()" take absolute path to the root of subrepo
 * subrepo: make "_sanitize()" work
 * subrepo: normalize path in the specific way for problematic encodings
 * templates: fix ifcontains against sets with length > 1 (Bts:issue4259)
 * win32: backout 1a9ebc83a74c

== Mercurial 3.0 (2014-05-01) ==
This is a regularly-scheduled quarterly feature release. Unlike other 3.0 software releases, this is simply 2.9 + .1, so it should be the usual pain-free upgrade.

=== Core features ===
 * cat: support explicit paths in subrepos
 * cmdserver: allow starting server without repository
 * clone: abort if default destination has no meaningful name (BC)
 * clone: put streaming clones in a transaction
 * color: add debugcolor command (Bts:issue4094)
 * color: allow color keywords to be used directly in template
 * commands: add -T as alternative to --template
 * commands: hg debuginstall checks missing templates (Bts:issue4151)
 * commit: --edit/-e allows editing commit message supplied through other means
 * config: add initial implementation of --edit (with --global and --local flags)
 * debuginstall: add Python information to debuginstall output (Bts:issue4128)
 * demandimport: support HGDEMANDIMPORT=disable to disable demandimport
 * hgweb: add metadata to atom and rss feed entries
 * http: reuse authentication info after the first failed request (Bts:issue3567)
 * log: change implementation to use graphlog code
 * push: provide a hint when no paths are configured (Bts:issue3692)
 * require: provide a link to a wiki page as well as suggesting upgrade
 * revset: new implementation with incremental evaluation
 * revset: try to handle hyphenated symbols if lookup callback is available
 * revset: add 'only()' revset
 * sshpeer: only print out 'running ssh' messages in debug mode (BC)
 * template: add ifcontains template function
 * template: add pad function for padding output
 * template: add revset() template function
 * template: add shortest(node) template function
 * template: add flexible -T option
 * win32: improve the performance of win32.unlink() over CIFS

=== Extension features ===
 * blackbox: log events related to branch cache
 * convert: avoid updating tags when there is nothing new
 * convert: compare tags from all heads instead of just one
 * convert: replace old sha1s in the description
 * extensions: mark win32text deprecated
 * extensions: remove interhg
 * extensions: remove the inotify extension (BC)
 * histedit: select the lowest rev when looking for a root in a revset (BC)
 * journal: report parsing errors on recover/rollback (Bts:issue4172)
 * qimport: allow importing URLs

=== Fixes ===
 * backout: don't limit ancestry check to a single ancestor
 * backout: improve confusing 'cannot backout change on a different branch' abort
 * caches: invalidate store caches when lock is taken
 * cmdserver: forcibly use L channel to read password input (Bts:issue3161)
 * cmdserver: reload mq on each runcommand request to avoid corruption
 * diff: use second filename for --stat reporting on git patches (Bts:issue4221)
 * dirstate: report bad subdirectories as match.bad, not just a warning (BC)
 * extensions: use normpath to allow trailing '\' on Windows (Bts:issue4187)
 * fncache: clean up fncache during strips
 * largefiles: changed overridelog to work with graphlog
 * largefiles: don't prompt when one side of merge was changed but didn't change
 * largefiles: remove directories emptied after their files are moved (Bts:issue3515)
 * parsers: fail fast if Python has wrong minor version (Bts:issue4110)
 * phases: apply publishing enforcement for "serve" source
 * revlog: deal with chunk ranges over 2G on Windows (Bts:issue4215)
 * setup.py: fix C extension compilation issue with OS X 10.9 and Xcode 5.1
 * subrepo: check return code for git push (Bts:issue4223)

=== Experimental features ===
 * bundle2: experimental support for bundle2
 * merge: experimental implementation of bid merge
 * merge: tell when .ancestor picks one of multiple common ancestors heads

== Mercurial 2.9.2 (2014-04-01) ==
This is a regularly-scheduled bugfix release.

 * amend: save commit message into ".hg/last-message.txt"
 * backout: correct commit status of no changes made (BC) (Bts:issue4190)
 * backout: document return code of merge conflict
 * commit: create new amend changeset as secret correctly for "--secret" option
 * commit: propagate --secret option to subrepos (Bts:issue4182)
 * convert: more clear documentation of the 'include' default of a 'include .'
 * dispatch: only do __import__(debugger) when a debugger is requested
 * log: solves bug regarding hg log -r 0:null (Bts:issue4039)
 * hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (Bts:issue4109)
 * hg: use "os.path.join()" to join path components which may be empty (Bts:issue4203)
 * histedit: save manually edited commit message into ".hg/last-message.txt"
 * localrepo: save manually edited commit message as soon as possible
 * merge: fix lack of "%s" in format string causing !TypeError at runtime
 * paper: overlapping of section title on help pages (Bts:issue4051)
 * phase: say "Returns 0" instead of "Return 0" like other command help
 * qfold: save manually edited commit message into ".hg/last-message.txt"
 * qnew: save manually edited commit message into ".hg/last-message.txt"
 * rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse"
 * revset: document the regular expression support for tag(name)
 * subrepo: add trailing newlines to warnings
 * subrepo: convert matched string to integer before comparing Git version
 * subrepo: only retrieve the first two components of the Git version
 * tag: save manually edited commit message into ".hg/last-message.txt"
 * templater: apply "stringify()" on sub expression to get string correctly
 * templater: avoid recursive evaluation of string literals completely
 * templater: make strings in template expressions be "string-escape"-ed correctly
 * templater: raise error for unknown function

== Mercurial 2.9.1 (2014-03-01) ==
This is a regularly-scheduled bugfix release.

 * coal: hgweb style adds extra blank line in file view (Bts:issue4136)
 * hg.openpath: use url.islocal to tell if the path is local (Bts:issue3624)
 * hgweb: hack around mimetypes encoding thinko (Bts:issue4160)
 * hooks: only disable/re-enable demandimport when it's already enabled
 * merge: add "other" file node in the merge state file
 * merge: audit the right destination file when merging with dir rename
 * merge: don't overwrite file untracked after remove, abort with 'untracked files'
 * merge: record the "other" node in merge state
 * pathencode: eliminate signed integer warnings
 * pull: close peer repo on completion (Bts:issue2491) (Bts:issue2797)
 * purge: avoid duplicate output for --print (Bts:issue4092)
 * rebase: do not try to reactivate deleted divergent bookmark
 * resolve: use "other" changeset from merge state (Bts:issue4163)
 * verify: do not prevent verify repository containing hidden changesets

== Mercurial 2.9 (2014-02-01) ==
This is a regularly-scheduled feature release.

=== Core features ===
 * backout: add a message after backout that need manual commit
 * bash_completion: add global support for -B|--bookmark
 * bash_completion: add global support for -b|--branch
 * bookmarks: allow push -B to create a new remote head (Bts:issue2372)
 * date: allow %z in format (Bts:issue4040)
 * hgweb: infinite scroll support for coal, gitweb, and monoblue styles
 * patch: add support for git delta hunks
 * url: added authuri when login information is requested (Bts:issue3209)

=== Performance improvement ===
 * backout: avoid update on simple case
 * branchmap: cache open/closed branch head information
 * cat: increase perf when catting single files
 * changectx: increase perf of walk function
 * strip: add faster revlog strip computation

=== Extension features ===
 * bash_completion: add completion for deleting a shelve
 * convert: use branchmap to change default branch in destination (Bts:issue3469)
 * record: --user/-u now works with record when ui.username not set (Bts:issue3857)
 * subrepo: check phase of state in each subrepositories before committing

=== Fixes ===
 * aliases: make "_checkshellalias()" invoke "findcmd()" with "strict=True"
 * bisect: --command without --noupdate should flag the parent rev it tested
 * clone: do not turn hidden changeset public on publishing clone (Bts:issue3935)
 * diff: search beyond ancestor when detecting renames
 * push: properly move phase boundary when no changeset are exchanged (Bts:issue3786)
 * rebase: abort cleanly when we encounter a damaged rebasestate (Bts:issue4155)
 * rebase: do not crash in panic when cwd disapear in the process (Bts:issue4121)
 * record: re-enable whitespace-ignoring options
 * relink: abort earlier when on different devices (Bts:issue3916)
 * subrepo: make it possible to update to hidden subrepo revisions
 * templater: selecting a style with no templates does not crash (Bts:issue4140)
 * update: consider successor changesets for a bare update
 * update: consider successor changesets when moving active bookmark
 * hgweb: avoid line wrap between revision and annotate-info (Bts:issue5398)
 * hgweb: config option to control zlib compression level

Release Notes

Features and bugfixes in our latest releases. Please see the Download page for links to source and binaries.

Note that Mercurial follows a time-based release plan with major releases every three months and minor (bugfix) releases on the first of every month (see TimeBasedReleasePlan).

{i} Be sure to read the upgrade notes when upgrading.

(See the archive for older versions)

1. Mercurial 4.6 (2018-05-06)

Full release notes are available. This is a regularly-scheduled quarterly feature release.

1.1. New Features

1.1.1. pullbundles

Pullbundles allow the server to answer client requests using pre-built bundles. This is different from the existing clonebundle feature:

  • pullbundles can be used for both the initial clone and later pull operations
  • pullbundles can be used incrementally, i.e. to cover the changes up to the start of the current month as one bundle and the remaining changes as second bundle
  • the bundle is transferred inline as part of the existing connection without a secondary server

Pullbundles are only used for clients running Mercurial 4.6 as well.

1.1.2. push

If 'server.streamunbundle' option is enabled, the server will directly apply the changes send by the changes. This avoids potentially large temporary files on the server side. It can also prevent concurrent pushes.

1.1.3. notify extension

The 'maxdiffstat' option can be used to truncate long file lists similar to 'maxdiff' for the patch part of the email.

1.1.4. hgweb

hgweb now shows date and user for operations that resulted in obsolete commit(s). For unstable commits, it shows the exact reason why they are considered unstable.

Server: header is now configurable using web.server-header option.

1.1.5. templates

A new template keyword 'reporoot' which shows the root directory of the current repository. A new template function 'mailmap' which maps author fields based on values in a .mailmap file.

1.1.6. Other notable features

  • revset: parse error now shows a hint where the error occurred
  • templates: parse error now shows a hint where the error occured
  • forget: new '--dry-run' and '--interactive' flags
  • copyfile: preserve stat info (mtime, etc.) when doing copies/renames
  • bundle2 format is documented and can be found using 'hg help internals.bundle2'

1.2. Backwards Compatibility Changes

  • Support for connecting to Mercurial servers older than 0.9.1 has been removed.
  • Working-directory commands now respect "-X PATTERN" no matter if PATTERN matches explicitly-specified FILEs. For example, "hg add foo -X foo" no longer add the file "foo".
  • Support for the experimental manifestv2 format has been removed, as it was never completed and failed to meet expectations.
  • '{' in output filename passed to archive/cat/export is taken as a start of a template expression.
  • The HTTP wire protocol server no longer accepts the "cmd" argument to control which command to run via HTTP POST bodies. The "cmd" argument must be specified on the URL query string.
  • Hgweb no longer reads form data in POST requests from multipart/form-data and application/x-www-form-urlencoded requests. Arguments should be specified as URL path components or in the query string in the URL instead.
  • Query string shorts in hgweb like "?cs=@" have been removed. Use URLs of the form "/:cmd" instead.
  • The HTTP client no longer accepts text/plain and application/hg-changegroup Content-Type values as a valid Mercurial command response. These should only be encountered on pre 1.0 Mercurial servers.

1.3. Performance Improvements

  • 'hg manifest --all' is likely slower due to changing its implementation to respect storage interface boundaries. If you are impacted by this regression in a meaningful way, please make noise on the development mailing list and it can be dealt with.
  • 'hg diff' is much faster for larger repositories. 40% improvements have been reported. Other operations using diffs like hgweb also benefit.

1.4. Bug Fixes

  • grep: fixes erroneous output of grep in forward order (issue3885)

  • dirstate: drop explicit files that shouldn't match (BC) (issue4679)

  • procutil: rewrite popen() as a subprocess.Popen wrapper (issue4746) (API)

  • bookmarks: test for exchanging long bookmark names (issue5165)

  • templater: drop symbols which should be overridden by new 'ctx' (issue5612)

  • clone: updates the help text for hg clone -{r,b} (issue5654)

  • bundle: updates the help text for hg bundle (issue5744)

  • histedit: make histedit's commands accept revsets (issue5746)

  • releasenotes: replace abort with warning while parsing (issue5775)

  • context: skip path conflicts by default when clearing unknown file (issue5776)

  • templatekw: switch most of showlist template keywords to new API (issue5779)

  • rebase: do not consider extincts for divergence detection (issue5782)

  • revert: use an exact matcher in interactive diff selection (issue5789)

  • subrepo: don't attempt to share remote sources (issue5793)

  • lfs: respect narrowmatcher when testing to add 'lfs' requirement (issue5794)

  • showconfig: allow multiple section.name selectors (issue5797)

  • annotate: do not poorly split lines at CR (issue5798)

  • convert: avoid closing ui.fout in subversion code (issue5807)

  • setdiscovery: back out changeset 5cfdf6137af8 (issue5809)

  • fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811)

  • notify: access the initial revision on an unfiltered repository (issue5821)

  • rebase: fix issue 5494 also with --collapse
  • date: fixed a bug in parsing months like 'Feb 2018', 'Apr 2018'
  • diffhelper: rename module to avoid conflicts with ancient C module (issue5846)

  • infinitepush: ensure fileindex bookmarks use '/' separators (issue5840)

  • import: fix crash on --exact check of empty commit (issue5702)

  • hgweb: reuse body file object when hgwebdir calls hgweb (issue5851)

  • debugcolor: fix crash by empty styles (issue5856)

  • hgweb: discard Content-Type header for 304 responses (issue5844)

  • hgweb: allow Content-Security-Policy header on 304 responses (issue5844)

  • paper: don't register click handlers with inline javascript (issue5812)

  • httppeer: detect redirect to URL without query string (issue5860)

  • filelog: don't crash on invalid copy metadata (issue5748)

1.5. New experimental features

Each release there are lot of new features added which are hidden under the EXPERIMENTAL tag as the behavior may change in future or the feature is not complete yet. The experimental features added in this cycle are:

1.5.1. narrow extension

Allows to create clones which fetch history data for only a subset of files. This experimental extension is now distributed with Mercurial.

1.5.2. remotenames extension

Shows remotebookmarks and remotebranches in the UI. This experimental extension is now distributed with Mercurial.

1.5.3. infinitepush extension

Allows to store some pushes in a remote blob store on the server and to serve commits from remote blob store. The revisions are stored on disk or in everstore, the metadata are stored in sql or on disk. This experimental extension is now distributed with Mercurial.

1.5.4. fix extension

Allows to rewrite file content in changesets or working copy. For example, automatically applying formatting fixes to modified lines of code. This experimental extension is now distributed with Mercurial.

1.6. API Changes

  • Content from mercurial.hgweb.protocol has been moved to mercurial.wireprotoserver.
  • Content from mercurial.sshserver has been moved into mercurial.wireprotoserver.
  • sshserver no longers looks for wire protocol command handlers in methods named do_<command>. Use @wireproto.wireprotocommand to declare wire protocol command handler functions.

  • Log-related utility functions has been renamed as follows:
    • - cmdutil.loglimit -> logcmdutil.getlimit

      - cmdutil.diffordiffstat -> logcmdutil.diffordiffstat

      - cmdutil._changesetlabels -> logcmdutil.changesetlabels

      - cmdutil.changeset_printer -> logcmdutil.changesetprinter - cmdutil.jsonchangeset = logcmdutil.jsonchangeset

      - cmdutil.changeset_templater -> logcmdutil.changesettemplater

      - cmdutil.logtemplatespec -> logcmdutil.templatespec

      - cmdutil.makelogtemplater -> logcmdutil.maketemplater

      - cmdutil.show_changeset -> logcmdutil.changesetdisplayer

      - cmdutil.getlogrevs -> logcmdutil.getrevs

      - cmdutil.getloglinerangerevs -> logcmdutil.getlinerangerevs

      - cmdutil.displaygraph -> logcmdutil.displaygraph

      - cmdutil.graphlog -> logcmdutil.graphlog

      - cmdutil.checkunsupportedgraphflags -> logcmdutil.checkunsupportedgraphflags

      - cmdutil.graphrevs -> logcmdutil.graphrevs

      - cmdutil._makenofollowlogfilematcher -> logcmdutil._makenofollowfilematcher

  • The following deprecated methods have been removed from context, with replacements:
    • - unstable() -> orphan()

      - bumped() -> phasedivergent()

      - divergent() -> contentdivergent()

      - troubled() -> isunstable()

      - troubles() -> instabilities()

  • The following deprecated methods have been removed from obsolete, with replacements:
    • - _addprecursors() -> _addpredecessors()

      - obsstore.precursors -> obsstore.predecessors

      - allprecursors() -> obsutil.allprecursors()

      - allsuccessors() -> obsutil.allsuccessors()

      - marker() -> obsutil.marker

      - getmarkers() -> obsutil.getmarkers()

      - exclusivemarkers() -> obsutil.exclusivemarkers()

      - foreground() -> obsutil.foreground()

      - successorssets() -> obsutil.successorsset()

      - unstable() -> orphan()

      - bumped() -> phasedivergent()

      - divergent() -> contentdivergent()

  • The following deprecated methods have been removed from obsutil: marker.precnode() and allprecursors(). Use marker.prednode() and allpredecessors() instead.

  • beginparentchange() and endparentchange() have been replaced by the parentchange context manager.

  • The deprecated localrepo.walk() has been removed, and replaced by repo[node].walk().

  • The following deprecated methods have been removed from bookmarks: __setitem__(), __delitem__(), update(), and recordchange(). Use bookmarks.applychanges() instead.

  • The cmdutil._revertprefetch() hook point for prefetching stored files has been replaced by the command agnostic cmdutil._prefetchfiles(). The new function takes a list of files, instead of a list of lists of files.

  • sshpeer.sshpeer.__init__ now receives arguments describing an existing connection instead of creating a connection itself.

  • sshpeer.sshpeer renamed to sshpeer.sshv1peer.

  • wireproto.pushres and wireproto.pusherr now explicitly track stdio output.

  • redirect() and restore() have been removed from the wire protocol handler interface. Use mayberedirectstdio() instead.

  • The _client() method of the wire protocol handler interface has been renamed to client().

  • Wire protocol command handlers now return a wireprototypes.bytesresponse instead of a raw bytes instance. Protocol handlers will continue handling bytes instances. However, any extensions wrapping wire protocol commands will need to handle the new type.

  • SSH protocol handler now advertises its name internally as "ssh-v1" instead of "ssh."
  • File prefetching is now handled by registering a callback with scmutil.fileprefetchhooks.

  • HTTP protocol handlers now advertises its internal name as "http-v1" instead of "http".
  • context.basectx no longer implements __int__. Context instances will no longer cast to ints. Consumers should call ctx.rev() instead.

  • templatekw.showdict() and showlist() are deprecated in favor of new (context, mapping) API. Switch the keyword function to new API and use templatekw.compatdict() and compatlist() instead.

  • hgweb_mod.perms and wireproto.permissions have been removed. Wire protocol commands should declare their required permissions in the @wireprotocommand decorator.

  • The WSGI request object no longer exposes a form attribute containing parsed query string data. Use the qsparams attribute instead.

  • hgweb.hgweb_mod.permhooks no longer take a wsgirequest instance as an argument.

  • hgweb @webcommand functions must use the new response object passed in via "web.res" to initiate sending of a response. The hgweb WSGI application will no longer start sending the response automatically.

  • Various helper functions in hgweb.webutil no longer accept a templater instance. Access the templater through the "web" argument instead.
  • Various functions in hgweb.webutil now take a modern request object instead of "wsgirequest".
  • @webcommand functions now only receive a single argument. The request and templater instances can be accessed via the "req" and "templater" attributes of the first argument. Note that the request object is different from previous Mercurial releases and consumers of the previous "req" 2nd argument will need updating to use the new API.

  • The old "wsgirequest" class for handling everything WSGI in hgweb has been replaced by separate request and response types. Various high-level functions in the hgweb WSGI applications now receive these new types as arguments instead of the old "wsgirequest" type.
  • The render(mapping) method of the templater has been renamed to renderdefault(mapping).

  • httppeer.httppeer.__init__ now takes additional arguments. Instances should be obtained by calling httppeer.instance() or httppeer.makepeer() instead.

  • The templater is no longer callable. Use templater.generate(t, mapping) instead of templater(t, **pycompat.strkwargs(mapping)).

  • templatekw._showlist() is deprecated in favor of templateutil._showcompatlist(), which takes context in place of templ.

  • Several generic string helper functions have been moved to utils.stringutil module.
  • The util.Abort alias has been removed. Use error.Abort.

  • merge.update() and merge.applyupdates() now return a class with named attributes instead of a tuple. Switch consumers to access elements by name instead of by offset.

  • Utility functions related to process/executable management have been moved to utils.procutil module.
  • localrepo.localrepository.featuresetupfuncs has been renamed to localrepo.featuresetupfuncs.
  • localrepo.localrepository.filterpats was renamed to localrepo.localrepository._filterpats.
  • Template filters should declare input data type and/or catch AttributeError, ValueError, TypeError, etc. as needed. See the doc of "registrar.templatefilters" for details.

  • "wireproto" module no longer re-exports various types used to define responses to wire protocol commands. Access these types from the "wireprototypes" module.
  • filelog.parsemeta() and filelog.packmeta() have been moved to the revlog module.

  • procutil.popen() no longer supports text mode I/O.

  • hook.hook() and hook.runhooks() may return a negative integer to denote that the process was killed by signal.

  • filelog.filelog is now a standalone class and doesn't inherit from revlog. Instead, it wraps a revlog instance at self._revlog. This change was made in an attempt to formalize storage APIs and prevent revlog implementation details leaking through to callers.

  • The fp argument is removed from cmdutil.export(). Use cmdutil.exportfile() instead.

  • cmdutil.export() takes a formatter as an argument.

  • patch.extract() is now a context manager. Callers no longer have to worry about deleting the temporary file it creates, as the file is tied to the lifetime of the context manager.

  • The wire protocol peer's iterbatch() for bulk executing commands has been removed. Use peer.commandexecutor() instead.

2. Mercurial 4.5.3 (2018-04-04)

This is a regularly-scheduled bugfix release.

2.1. Bug Fixes

  • rebase: on abort, don't strip commits that didn't need to be rebased (issue5822)

  • hgweb: garbage collect on every request
  • amend: abort if unresolved merge conflicts found (issue5805)

3. Mercurial 4.5.1 / 4.5.2 (2018-03-06)

(4.5.2 was released immediately after 4.5.1 to fix a release oversight.)

This is a regularly-scheduled bugfix release.

3.1. Security Fixes

All versions of Mercurial prior to 4.5.2 have vulnerabilities in the HTTP server that allow permissions bypass to:

  • Perform writes on repositories that should be read-only
  • Perform reads on repositories that shouldn't allow read access

CVE-2018-1000132 has been assigned these vulnerabilities.

The nature of the vulnerabilities is:

  1. Wire protocol commands that didn't explicitly declare their permissions had no permissions checking done. The web.{allow-pull, allow-push, deny_read, etc} config options governing access control were never consulted when running these commands. This allowed permissions bypass for impacted commands.

  2. The batch wire protocol command did not list its permission requirements nor did it enforce permissions on individual sub-commands.

The implication of these vulnerabilities is that no permissions checking was performed on commands and this could lead to accessing data that web.* config options were supposed to prevent access to or modifying data (via wire protocol commands that can mutate data) without authorization. A Mercurial HTTP server in its default configuration is supposed to be read-only. However, a well-crafted batch command could invoke commands that perform writes.

The batch write permissions bypass has been present since Mercurial 1.9. The flaw of not checking permissions for wire protocol commands that don't declare their needed permissions has been present since Mercurial 1.0.

Assuming you are running a server without any custom commands provided by extensions, your exposure is unauthorized data access (if relying on the web.* config options to limit access) and unauthorized data mutation via the batch command.

Server operators can detect unauthorized use of the batch command by looking for requests to URLs of the form repo?cmd=batch with arguments containing pushkey or unbundle. This may produce false positives. A more comprehensive check would decode the argument string and verify that pushkey or unbundle are command names (not values). The arguments specified via x-hgarg-<N> request headers can span multiple headers. So advanced attackers could hide the vulnerability by splitting a pushkey or unbundle string across multiple headers. So the only reliable way to detect if this vulnerability is being exploited is to decode these headers like Mercurial does. The format for specifying arguments is documented at https://www.mercurial-scm.org/repo/hg/file/4.5/mercurial/help/internals/wireprotocol.txt#l26. Python code for decoding headers is at https://www.mercurial-scm.org/repo/hg/file/4.5/mercurial/hgweb/protocol.py#l70.

Mercurial 4.5.2 fixes these vulnerabilities by:

  • Performing permissions checking on all wire protocol commands, not just commands that list their permissions.
  • Checking permissions on sub-commands issued to the batch command.

Wire protocol commands not declaring wire protocol permissions will be assumed to be read-write commands and a server in its default configuration (which only allows read-only access), will refuse to execute these commands.

For package maintainers needing to backport the fixes, the relevant changesets from 4.5.2 are 2c647da851ed::2ecb0fc535b1. These can be viewed online at e.g. https://www.mercurial-scm.org/repo/hg/rev/2ecb0fc535b1. The author of these commits has backports to 4.4 and 4.3 on a personal fork at https://hg.mozilla.org/users/gszorc_mozilla.com/hg. The backports for 4.4 are a4843835c835::7cf827e5f8af and for 4.3 are db527ae12671::86f9a022ccb8. To obtain these changesets, run e.g. hg pull -r 7cf827e5f8af https://hg.mozilla.org/users/gszorc_mozilla.com/hg.

3.2. Backwards Compatibility Changes

  • The "batch" wire protocol command now enforces permissions of each invoked sub-command. Wire protocol commands must define their operation type or the "batch" command will assume they can write data and will prevent their execution on HTTP servers unless the HTTP request method is POST, the server is configured to allow pushes, and the (possibly authenticated) HTTP user is authorized to perform a push.
  • Wire protocol commands not defining their operation type in "wireproto.PERMISSIONS" are now assumed to be used for "push" operations and access control to run those commands is now enforced accordingly.

3.3. Bug Fixes

  • fileset: don't abort when running copied() on a revision with a removed file
  • date: fix parsing months
  • setup: only allow Python 3 from a source checkout (issue5804)

  • annotate: do not poorly split lines at CR (issue5798)

  • subrepo: don't attempt to share remote sources (issue5793)

  • subrepo: activate clone pooling to enable sharing with remote URLs
  • changegroup: do not delta lfs revisions
  • revlog: do not use delta for lfs revisions
  • revlog: resolve lfs rawtext to vanilla rawtext before applying delta

4. Mercurial 4.5 (2018-02-01)

4.1. New Features

4.1.1. revert --interactive

The revert command now accepts the flag --interactive to allow reverting only some of the changes to the specified files.

4.1.2. Accessing hidden changesets

Set config option 'experimental.directaccess = True' to access hidden changesets from read only commands.

4.1.3. githelp extension

The githelp extension provides the hg githelp command. This command attempts to convert a git command to its Mercurial equivalent. The extension can be useful to Git users new to Mercurial.

4.1.4. Largefiles changes

  • largefiles: add a 'debuglfput' command to put largefile into the store
  • largefiles: add support for 'largefiles://' url scheme
  • largefiles: allow to run 'debugupgraderepo' on repo with largefiles
  • largefiles: convert EOL of hgrc before appending to bytes IO
  • largefiles: explicitly set the source and sink types to 'hg' for lfconvert
  • largefiles: modernize how capabilities are added to the wire protocol

4.2. hgweb changes

hgweb now shows more information about commits: phase (if it's not public), obsolescence status (with a short explanation and links to the successors) and instabilities (e.g. orphan, phase-divergent or content-divergent).

Client-side graph code has been simplified by delegating more work to the backend, so /graph page is now more in sync with /log page, visually and feature-wise. Unfortunately, this code change means that 3rd-party themes for 4.5+ are required to have graphentry.tmpl template available (copy it from the base theme if you don't use %include and then reference it in map file) and render entries in graph.tmpl -- look at one of the core themes to see what it needs to look like. JS functions that create graph vertices and edges are now available in Graph.prototype, making it possible to call the original functions from custom theme-specific functions if needed.

Graph now shows different symbols for normal, branch-closing, obsolete and unstable commits, and marks currently checked out commit with a circle around its graph node.

There's also now json-graph API endpoint that can be used for rendering commit graph in 3rd-party applications.

4.2.1. Other Changes

  • When interactive revert is run against a revision other than the working directory parent, the diff shown is the diff to <em>apply</em> to the working directory, rather than the diff to <em>discard</em> from the working copy. This is in line with related user experiences with 'git' and appears to be less confusing with 'ui.interface=curses'.

  • Let 'hg rebase' avoid content-divergence by skipping obsolete changesets (and their descendants) when they are present in the rebase set along with one of their successors but none of their successors is in destination.
  • A new experimental config flag, 'rebase.experimental.inmemory', makes rebase perform an in-memory merge instead of doing it on-disk in the working copy.
  • The HGPLAINEXCEPT environment variable can now include color to allow automatic output colorization in otherwise automated environments.

  • A new unamend command in uncommit extension which undoes the effect of the amend command by creating a new changeset which was there before amend and moving the changes that were amended to the working directory.
  • A '--abort' flag to merge command to abort the ongoing merge.
  • An experimental flag '--rev' to 'hg branch' which can be used to change branch of changesets.
  • bundle2 read I/O significantly improved
  • bundle2 memory use significantly reduced during read
  • clonebundle: it is now possible to serve the clonebundle using a git-lfs compatible server.
  • templatefilters: add slashpath() to convert path separator to slash (issue5572)

  • A new experimental config flag, 'inline-color-diff', adds within-line color diff capacity
  • histedit: add support to output nodechanges using formatter to help with editor integrations

4.3. Backwards Compatibility Changes

  • log --follow-first -rREV, which is deprecated, now follows the first parent of merge revisions from the specified REV just like log --follow -rREV.

  • log --follow -rREV FILE.. now follows file history across copies and renames.

  • transaction: register summary callbacks only at start of transaction
  • hgweb's graph view no longer supports browsers that lack <canvas> support

  • hgweb: only include graph-related data in jsdata variable on /graph pages
  • graphlog: add another graph node type, unstable, using character *

  • remove: print message for each file in verbose mode only while using '-A'

4.4. Bug Fixes

  • Bookmark, whose name is longer than 255, can again be exchanged again between 4.4+ client and servers (issue5165)

  • The convert extension works with bzr < 2.6.0 again (issue5733)

  • Mercurial will now attempt to use hardlinks on NTFS on Windows (issue4580)

  • The revset x^:: is now correctly parsed as (x^):: instead of being an error (issue5764)

  • Setting the diff.noprefix configuration option no longer breaks the --stat flag on hg diff (issue5759)

  • hg outgoing now honors :pushurl paths from hgrc (issue5365)

  • log: translate column labels at once (issue5750)

  • patch: improve heuristics to not take the word diff as header (issue1879)

  • templater: look up symbols/resources as if they were separated (issue5699)

  • http and ssh: support for emitting extra debug logs about requests as they happen

4.5. API Changes

  • bundlerepo.bundlerepository.bundle and bundlerepo.bundlerepository.bundlefile are now prefixed with an underscore.

  • Rename bundlerepo.bundlerepository.bundlefilespos to _cgfilespos.
  • dirstate no longer provides a 'dirs()' method. To test for the existence of a directory in the dirstate, use 'dirstate.hasdir(dirname)'.
  • mapping does not contain all template resources. use context.resource() in template functions.
  • text=False|True option is dropped from the vfs interface because of Python 3 compatibility issue. Use util.tonativeeol/fromnativeeol() to convert EOL manually.

  • wireproto.streamres.__init__ no longer accepts a reader argument. Use the gen argument instead.

  • exchange.getbundlechunks() now returns a 2-tuple instead of just an iterator.
  • bundle2 parts are no longer seekable by default
  • memfilectx: the changectx argument is now mandatory in constructor

5. Mercurial 4.4.2 (2017-12-01)

This is a regularly-scheduled bugfix release.

5.1. Notable changes

5.1.1. Stricter command option parsing

Mercurial can now optionally parse "early" options (-R/--repository, --cwd, --config, --debugger, and --profile) more strictly, for more secure integration with tools that invoke 'hg' commands. Setting HGPLAIN=+strictflags will parse these options more strictly, which prevents them from being injected as arguments to other flags.

5.2. Bug fixes

  • 'hg amend' now correctly handles deleted and removed files, as well as subrepos. (issue5732, issue5677)

  • largefiles now correctly handles dropped standin files when updating largefiles.
  • Fixed an issue with deleting symlinks to directories when ui.origbackuppath is set. (issue5731)

5.3. Performance improvements

  • Improved performance in path conflict checking introduced in Mercurial 4.4. (issue5716)

6. Mercurial 4.4.1 (2017-11-07)

6.1. Notable changes

  • Git and Subversion subrepos have been disabled by default to mitigate a potential security risk if files overlapping with a subrepo managed to be committed to a repository.
  • Subrepos are now more paranoid about symlink traversal.
  • The share extension handles drive letters on Windows better.

It is possible that a specially malformed repository can cause Git subrepositories to run arbitrary code in the form of a .git/hooks/post-update script checked in to the repository in Mercurial 4.4 and earlier. Typical use of Mercurial prevents construction of such repositories, but they can be created programmatically.

7. Mercurial 4.4 (2017-11-01)

7.1. Notable changes

7.1.1. Control whitespace settings for annotation on hgweb

/annotate URLs on hgweb now accept query string arguments to influence how whitespace changes impact results.

The arguments "ignorews," "ignorewsamount," "ignorewseol," and "ignoreblanklines" now have the same meaning as their [annotate] config section counterparts. Any provided setting overrides the server default.

HTML checkboxes have been added to the paper and gitweb themes to expose current whitespace settings and to easily modify the current view.

7.1.2. Fast, heuristic copy-tracing

A new fast heuristic algorithm for copytracing which assumes that the files moves are either:

  1. renames in the same directory
  2. moves in other directories with same names

You can use this algorithm by setting 'experimental.copytrace=heuristics'. This setting performs full copytracing if both source and destination branches contains non-public changesets only.

7.1.3. Other changes

  • Estimated time is more accurate with non-linear progress
  • "hg status -v" can now show unfinished state. For example, when in an unfinished rebase state, "hg status -v" might show:
     # The repository is in an unfinished *rebase* state.
     # No unresolved merge conflicts.
     # To continue:                hg rebase --continue
     # To abort:                   hg rebase --abort
  • Added '--ignore-space-at-eol' diff option to ignore whitespace differences at line endings.
  • show: use consistent node length in views
  • show: decrease minimum displayed hash length from 5 to 4
  • A new uncommit extension which provides 'hg uncommit' using which one can uncommit part or all of the changeset. This command undoes the effect of a local commit, returning the affected files to their uncommitted state.
  • 'hg clone --uncompressed' uses clone bundles when possible
  • 'hg annotate --skip' now prints a '*' on lines with skipped revisions
  • New 'commands.update.check' feature to adjust constraints on when 'hg update' will allow updates with a dirty working copy.
  • Add an experimental -L/--line-range FILE,FROMLINE:TOLINE option to 'hg log' command to follow the history of files by line range. In combination with -p/--patch option, only diff hunks within specified line range will be displayed. Feedback, especially on UX aspects, is welcome.

  • Print warning when fsmonitor isn't being used on a large repository

7.2. Backwards Compatibility Changes

  • The config option for copytrace 'experimental.disablecopytrace' is now replaced with 'experimental.copytrace' which defaults to 'on'. If you need to turn off copytracing, add '[experimental] copytrace = off' to your config.
  • 'hg clone --stream' should now be used instead of --uncompressed. --uncompressed is marked as deprecated and is an alias for --stream. There is no schedule for elimination of --uncompressed.
  • The 'experimental.updatecheck' name for the new 'commands.update.check' feature is now deprecated, and will be removed after this release.
  • Mercurial subrepositories are now shared instead of cloned when the parent repository is shared. This prevents dangling subrepository references in the share source. Previously shared repositories with cloned subrepositories will continue to function unchanged.
  • Push no longer triggers a pushkey hook when updating phases. Use the new 'txnclose-phase' and 'txnclose-phase' hooks instead. (Applies when both server and client use version 4.4 or above).

7.3. Bug Fixes

  • Core rebase algorithm has been rewritten to be more robust (issue5578, issue5630)

  • Creating a share of a repository with a Mercurial subrepository will now share the subrepository (issue5675)

7.4. Performance Improvements

  • improved performance when many aliases are defined

7.5. API Changes

7.5.1. remove peer.batch()

Replace with peer.iterbatch().

7.5.2. Other Changes

  • @peer.batchable can no longer emit local values
  • @peer.batchable functions must now yield exactly 2 values
  • Rename attributes on sshpeer to reflect peer API
  • peer.peerrepository has been removed. Use repository.peer abstract base class to represent a peer repository.
  • revset.stringset() now takes 'order' as the last argument.

8. Mercurial 4.3.3 (2017-10-01)

  • Prevent crashes when clearing progress bar. (issue5684)

  • rebase: move bookmarks with --keep (issue5682)

9. Mercurial 4.3.2 (2017-09-18)

  • restore compatibility with older versions of Python 2.7 by not using a bytearray with struct.unpack_from()
  • restore mingw compatibility for setup.py
  • hgwebdir: read 'web.template' untrusted (plugs potential security issue)
  • repair: preserve phase when not using generaldelta (issue5678)

  • ssh: fix flakey ssh errors on BSD systems
  • restore error handling behavior around certain I/O errors; the regressed behavior could result in transactions not being properly rolled back if stdio handles encountered errors (issue5658)

  • templatekw: choose {latesttag} by len(changes), not date (issue5659)

  • record: fix revert -i for lines without newline (issue5651)

  • mq: create non-lossy patches, also with custom global diff configuration

10. Mercurial 4.3 / 4.3.1 (2017-08-10)

(4.3.1 was released immediately after 4.3 to fix a release oversight.)

An overview of new features available. This is a regularly-scheduled quarterly feature release.

10.1. Notable changes

  • experimental amend extension providing the amend command
  • experimental sparse extension
  • Support for Python 2.6 has been dropped.
  • Bundles created by the strip extension now store phase information. It will be restored when unbundling.
  • The strip extension now removes relevant obsmarkers. If a backup requested (the default), the obsmarkers are stored in the backup bundle and will be restored when unbundling.
  • hg show work (from the experimental show extension) now displays more info

  • hg show stack is a new view for the current, in-progress changeset and others around it

  • Mitigation for two security vulnerabilities

10.2. CVE-2017-1000115

Mercurial's symlink auditing was incomplete prior to 4.3, and could be abused to write to files outside the repository.

10.3. CVE-2017-1000116

Mercurial was not sanitizing hostnames passed to ssh, allowing shell injection attacks on clients by specifying a hostname starting with -oProxyCommand. This is also present in Git (CVE-2017-1000117) and Subversion (CVE-2017-9800), so please patch those tools as well if you have them installed.

11. Mercurial 4.2.3 (2017-08-10)

This was an out-of-cycle backport of security fixes from 4.3 for users stuck on Python 2.6.

12. Mercurial 4.2.2 (2017-07-05)

This is a regularly-scheduled bugfix release.

  • largefiles: avoid a crash when archiving a subrepo with largefiles disabled
  • rebase: also test abort from pretxnclose error
  • rebase: backed out changes 2519994d25ca and cf8ad0e6c0e4 (issue5610)

  • rebase: reinforce testing around precommit hook interrupting a rebase

13. Mercurial 4.2.1 (2017-6-4)

This is a regularly-scheduled bugfix release.

  • hg graft now works when grafting across merges that were problematic before (b4e1e30528c7).

  • A race condition in hg status was partially fixed (issue5584).

  • The message about deprecated SHA-1 hashes in the [hostfingerprints] config section now references the correct syntax for replacing them with SHA-256 hashes (issue5559).

14. Mercurial 4.2 (2017-5-2)

An overview of new features available. This is a regularly-scheduled quarterly feature release.

14.1. Notable changes

  • Pager support has been moved into core and is now enabled by default. This is now controlled with the ui.paginate setting.
    • Note that in 4.2-rc, the ui.paginate option was named pager.enable. The old name has been dropped in the final release. If you had turned pagination off using pager.enable=False, please update your config.
  • Color support has also been moved into core and is now enabled by default (the ui.color setting now defaults to 'auto').
  • The new experimental 'show' extension provides a way to view various information about your repository in an ergonomic way. It is deliberately designed for human consumption and not for scripting, so it doesn't carry the same backward compatibility guarantees as other commands. See 'hg help -e show' for more information.

  • Mercurial now requires setuptools on Windows.

14.2. commands

  • Pager support has been added to the 'log', 'diff', 'branches', 'files', 'status', 'summary', and 'tags' commands, as well as the '--patch', '--list', and '--stat' options of hg shelve.
  • bisect: set a blockedtag when running the check command
  • bookmarks: check HG_PENDING strictly
  • branches: populate all template keywords in formatter
  • commandserver: handle backlog before exiting
  • commandserver: prevent unlinking socket twice
  • commit: optionally strip quotes from commit template (BC)
  • diff: add --binary option for git mode diffs
  • help: add pointer how to narrow list of resolved/unresolved files (issue5469)

  • pager: advertise the config option in the default hgrc
  • pager: avoid shell=True on subprocess.Popen for better errors (issue5491)

  • pager: don't terminate with extreme prejudice on SIGPIPE (BC)
  • pager: exit cleanly on SIGPIPE (BC)
  • pager: improve support for various flavors of 'more' on Windows
  • pager: use less as a fallback on Unix
  • pull: abort pull --update if config requires destination (issue5528)

  • serve: add support for Mercurial subrepositories
  • status: handle more node indicators in buildstatus
  • status: support commands.status.relative config
  • update: accept --merge to allow merging across topo branches (issue5125)

  • verify: fix length check

14.3. core

  • bundle2: ignore errors seeking a bundle after an exception (issue4784)

  • checkheads: upgrade the obsolescence postprocessing logic (issue4354)

  • color: insert color code after every "\e[0m" (issue5413)

  • color: sync text attributes and buffered text output on Windows (issue5508)

  • config: use "churn" as an example extension
  • config: drop pager from the recommended extension
  • context: optimize linkrev adjustment in blockancestors() (issue5538)

  • crecord: avoid setting non-existing SIGTSTP signal on windows (issue5512)

  • debian: configure editor and pager to sensible-editor and sensible-pager by default
  • dispatch: ignore further SIGPIPE while handling KeyboardInterrupt

  • dispatch: protect against malicious 'hg serve --stdio' invocations (SEC)
  • dispatch: start profiling earlier
  • filemerge: optionally strip quotes from merge marker template (BC)
  • formatter: add support for changeset templating
  • formatter: support json formatting of long type
  • graphlog: draw multiple edges towards null node (issue5440)

  • graphlog: optionally strip quotes from graphnode template (BC)
  • localrepo: deprecate 'repo.join' in favor of 'repo.vfs.join'
  • localrepo: deprecate 'repo.opener' (API)
  • localrepo: deprecate 'wfile'
  • localrepo: deprecated 'repo.wopener' (API)
  • match: adding support for matching files inside a directory
  • packaging: add make target for linux wheels
  • patch: make diff in git mode respect --text option (issue5510)

  • plain: ignore [commands] config
  • profiling: add statprof support for Chrome trace viewer rendering
  • progress: retry ferr.flush() and .write() on EINTR (issue5532)

  • py3: stop exporting urlparse from pycompat and util (API)
  • rcutil: let environ override system configs (BC)
  • rcutil: let rccomponents return different types of configs (API)
  • rcutil: move scmutil.*rcpath to rcutil (API)
  • rcutil: rename rcpath to rccomponents (API)
  • rcutil: split osrcpath to return default.d paths (API)
  • record: update help message to use operation instead of "record" (issue5432)

  • revlog: avoid applying delta chain on cache hit
  • revset: split language services to revsetlang module (API)
  • revset: stop supporting plain list as input set (API)
  • revset: stop supporting predicate that returns plain list (API)
  • setup: use setuptools on Windows (issue5400)

  • smartset: move set classes and related functions from revset module (API)
  • sshpeer: try harder to snag stderr when stdout closes unexpectedly
  • templatefilter: add support for 'long' to json()
  • templatekw: have showlist() take mapping dict with no **kwargs expansion (API)
  • templatekw: make join() escape values of extras (BC) (issue5504)

  • templater: make pad() strip color codes before computing width (issue5416)

  • test-profile: allow negative time in JSON output (issue5542)
  • track-tags: write all tag changes to a file
  • util: always force line buffered stdout when stdout is a tty (BC)
  • vfs: extract 'vfs' class and related code to a new 'vfs' module (API)

14.4. extensions

  • histedit: log the time taken to read in the commands list
  • histedit: make check for unresolved conflicts explicit (issue5545)

  • histedit: modify rollup to discard date from the rollup commit (issue4820)

  • histedit: use safecleanupnode in _aborthistedit (issue5500)

  • largefiles: add copytostore() fstandin argument to replace readstandin() (API)
  • largefiles: add lfile argument to updatestandin() for efficiency (API)
  • largefiles: make copytostore() accept only changectx as the 2nd argument (API)
  • largefiles: omit updating newly added standin at linear merging
  • largefiles: remove unused keyword argument of copytostore() (API)
  • largefiles: replace hashrepofile by hashfile (API)
  • largefiles: set the extension as enabled locally after a share requiring it
  • patchbomb: add config knob to generate flags by template (issue5354)

  • patchbomb: drop internal option for pbranch extension (API)
  • patchbomb: use modern pager to display -n/--test result (BC)
  • rebase: abort hg pull --rebase if rebase.requiredest is set (issue5514)

  • rebase: abort if *any* commit in rebase set is public
  • rebase: add flag to require destination
  • rebase: allow aborting if last-message.txt is missing
  • rebase: allow destination-free continue and abort (issue5513)

  • rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
  • rebase: unhide original working directory node as well (issue5219)

  • shelve: add -n/--name option to unshelve (issue5475)

  • shelve: add logic to preserve active bookmarks
  • show: new extension for displaying various repository data

14.5. hgweb

  • hgweb: add a "patch" query parameter to filelog command
  • hgweb: do not show "descending" link in followlines UI for filelog heads
  • hgweb: handle a "descend" query parameter in filelog command
  • hgweb: handle a "linerange" request parameter in filelog command
  • hgwebdir: add support for explicit index files

14.6. Behavior changes

  • commit: optionally strip quotes from commit template (BC)
  • filemerge: optionally strip quotes from merge marker template (BC)
  • graphlog: optionally strip quotes from graphnode template (BC)
  • pager: don't terminate with extreme prejudice on SIGPIPE (BC)
  • pager: exit cleanly on SIGPIPE (BC)
  • patchbomb: use modern pager to display -n/--test result (BC)
  • rcutil: let environ override system configs (BC)
  • rebase: allow rebasing children of wd to wd if a new branch has been set (BC)
  • templatekw: make join() escape values of extras (BC) (issue5504)

  • util: always force line buffered stdout when stdout is a tty (BC)

14.7. Internal API changes

  • largefiles: add copytostore() fstandin argument to replace readstandin() (API)
  • largefiles: add lfile argument to updatestandin() for efficiency (API)
  • largefiles: make copytostore() accept only changectx as the 2nd argument (API)
  • largefiles: remove unused keyword argument of copytostore() (API)
  • largefiles: replace hashrepofile by hashfile (API)
  • localrepo: deprecate 'repo.opener' (API)
  • localrepo: deprecated 'repo.wopener' (API)
  • patchbomb: drop internal option for pbranch extension (API)
  • py3: stop exporting urlparse from pycompat and util (API)
  • rcutil: let rccomponents return different types of configs (API)
  • rcutil: move scmutil.*rcpath to rcutil (API)
  • rcutil: rename rcpath to rccomponents (API)
  • rcutil: split osrcpath to return default.d paths (API)
  • revset: split language services to revsetlang module (API)
  • revset: stop supporting plain list as input set (API)
  • revset: stop supporting predicate that returns plain list (API)
  • smartset: move set classes and related functions from revset module (API)
  • templatekw: have showlist() take mapping dict with no **kwargs expansion (API)
  • vfs: extract 'vfs' class and related code to a new 'vfs' module (API)

15. Mercurial 4.1.3 (2017-4-18)

This is an out of cycle release to address a security issue:

  • hg serve --stdio could be tricked into granting authorized users access to the Python debugger. Thanks to Jonathan Claudius of Mozilla for reporting this issue. This issue is only a security issue for repositories served using --stdio, which includes ssh but *not* http. This is CVE-2017-9462.

16. Mercurial 4.1.2 (2017-4-3)

This is a regularly-scheduled bugfix release.

  • Mercurial should work inside IIS on Windows again. (issue5493)

  • zstd support now refuses to work on old bundle formats. (issue5506)

  • Merges involving subrepositories no longer crash in some cases. (issue5505)

  • Checking for new heads during push is no longer accidentally quadratic

17. Mercurial 4.1.1 (2017-3-2)

This is a regularly-scheduled bugfix release.

  • Several incorrect mailing list addresses have been corrected.
  • Various error cases have been corrected during push and pull.
  • Minor issues that happened when Mercurial spawned worker processes have been fixed.

18. Mercurial 4.1 (2017-2-1)

An overview of new features available. This is a regularly-scheduled quarterly feature release.

18.1. commands

  • commands: config option to control bundle compression level
  • crecord: add an experimental option for space key to move cursor down
  • crecord: rewrite status line text (BC)
  • diff: add experimental support for more git-diff extended diff features
  • graft: support grafting changes to new file in renamed directory (issue5436)

  • help: show help for disabled extensions (issue5228)

  • help: update help for 'hg update' which was misleading (issue5427)

  • merge: fix crash on criss cross merge with dir move and delete (issue5020)

  • summary: add evolution "troubles" information to summary output
  • summary: use the same labels as log command in "parent: " line
  • templates: display evolution "troubles" in command line style

18.2. core

  • changelog: keep track of file end in appender (issue5444)

  • dispatch: stop supporting non-use of @command (API)
  • hook: do not redirect stdout/err/in to ui while running in-process hooks (BC)
  • httppeer: advertise and support application/mercurial-0.2
  • localrepo: experimental support for non-zlib revlog compression
  • manifest: add bundlemanifestlog support
  • manifest: add unionmanifestlog support
  • manifest: make revlog verification optional
  • patch: add experimental config knob for displaying the index header
  • patch: add similarity config knob in experimental section
  • patch: add label for coloring the index extended header
  • patch: add label for coloring the similarity extended header
  • profiling: make statprof the default profiler (BC)
  • profiling: use vendored statprof and upstream enhancements (BC)
  • revlog: REVIDX_EXTSTORED flag
  • revlog: add clone method
  • revlog: ensure that flags do not overflow 2 bytes
  • revlog: flag processor
  • revlog: inline start() and end() for perf reasons
  • revlog: make compressed size comparisons consistent
  • revlog: merge hash checking subfunctions
  • revlog: move decompress() from module to revlog class (API)
  • revlog: optimize _chunkraw when startrev==endrev
  • revlog: pass revlog flags to addrevision
  • revlog: reorder index accessors to match data structure order
  • revlog: use compression engine API for compression
  • revlog: use compression engine APIs for decompression
  • revset: add regular expression support to 'desc'
  • revset: make children() not look at p2 if null (issue5439)

  • run-tests: forward Python USER_BASE from site (issue5425)

  • server: move cmdutil.service() to new module (API)
  • templatekw: force noprefix=False to insure diffstat consistency (issue4755)

  • ui: check EOF of getpass() response read from command-server channel
  • ui: do not translate empty configsource() to 'none' (API)
  • ui: factor out ui.load() to create a ui without loading configs (API)
  • util: compression APIs to support revlog compression and decompression
  • util: declare wire protocol support of compression engines
  • wireproto: advertise supported media types and compression formats
  • wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)
  • wireproto: perform chunking and compression at protocol layer (API)

18.3. extensions

  • convert: add config option to control storing original revision
  • convert: add config option to copy extra keys from Git commits
  • convert: config option for git rename limit
  • convert: config option to control Git committer actions
  • rebase: calculate ancestors for --base separately (issue5420)

  • rebase: check for conflicts before continuing
  • rebase: fail-fast the pull if working dir is not clean (BC)
  • shelve: allow multiple shelves with --patch and --stat
  • shelve: choose a legal shelve name when no name is passed (issue5112)

  • shelve: make --keep option survive user intervention (issue5431)

  • shelve: make unshelve not crash when there are missing files (issue4176)

18.4. hgweb

  • hgweb: link to raw-file on annotation page (BC)
  • hgweb: make log streams compatible with command server
  • hgweb: restore ascending iteration on revs in filelog web command
  • hgweb: support Content Security Policy

18.5. chg

  • chg: send type information via S channel (BC)
  • chg: support long socket path
  • chgserver: make S channel support pager request
  • chgserver: override runcommand

18.6. Behavior Changes

  • chg: send type information via S channel (BC)
  • crecord: rewrite status line text (BC)
  • hgweb: link to raw-file on annotation page (BC)
  • hook: do not redirect stdout/err/in to ui while running in-process hooks (BC)
  • profiling: make statprof the default profiler (BC)
  • profiling: use vendored statprof and upstream enhancements (BC)
  • rebase: fail-fast the pull if working dir is not clean (BC)
  • wireproto: only advertise HTTP-specific capabilities to HTTP peers (BC)

18.7. Internal API Changes

  • bookmarks: make bookmarks.comparebookmarks accept binary nodes (API)
  • bookmarks: rename 'compare()' to 'comparebookmarks()' (API)
  • revlog: move decompress() from module to revlog class (API)
  • server: move cmdutil.service() to new module (API)
  • ui: do not translate empty configsource() to 'none' (API)
  • ui: factor out ui.load() to create a ui without loading configs (API)
  • util: remove compressors dict (API)
  • util: remove decompressors dict (API)
  • wireproto: perform chunking and compression at protocol layer (API)
  • dispatch: stop supporting non-use of @command (API)

19. Mercurial 4.0.2 (2017-01-04)

This is a regularly-scheduled bugfix release.

  • demandimport: do not raise ImportError for unknown item in fromlist

  • posix: make poll() restart on interruption by signal (issue5452)

  • hgweb: add missing slash to file log url in rss style

20. Mercurial 4.0.1 (2016-12-1)

This is a regularly-scheduled bugfix release.

  • hgweb: cache fctx.parents() in annotate command (issue5414)

  • vfs, scmutil: ignore EPERM at os.utime, which avoids ambiguity (issue5418)

21. Mercurial 4.0 (2016-11-1)

An overview of new features available. This is a regularly-scheduled quarterly feature release. Unlike other 4.0 software releases, this is simply 3.9 + .1, so it should be the usual pain-free upgrade.

21.1. commands

  • annotate: calculate line count correctly
  • branchmap: acquires lock before writting the rev branch cache
  • clone: set default path correctly when doing a clone+share (issue5378)

  • copy: distinguish "file exists" cases and add a hint (BC)
  • commit: return 1 for interactive commit with no changes (issue5397)

  • config: add template support
  • debugobsolete: add formatter support (issue5134)

  • files: change documentation to match its behaviour (issue5276)

  • grep: add formatter support
  • help: show content for explicitly disabled extension (issue5228)

  • import: abort instead of crashing when copy source does not exist (issue5375)

  • import: report directory-relative paths in error messages (issue5224)

  • log: copy the way of ancestor traversal to --follow matcher (issue5376)

  • log: preserve topo sort in graph even if additional filter options specified
  • merge: add conflict labels to merge command
  • merge: avoid superfluous filemerges when grafting through renames (issue5407)

  • strip: report both bundle files in case of exception (issue5368)

  • tag: clarify warning about making a tag on a branch head
  • version: add formatter support
  • flags: allow specifying --no-boolean-flag on the command line (BC)

21.2. core

  • changelog: disable delta chains
  • copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)

  • formatter: add function to convert list to appropriate format (issue5217)

  • lock: show more detail for new-style locks in lock waiting message (issue4752)

  • revset: do not rewrite ':y' to '0:y' (issue5385)

  • revset: fix order of nested '_(|int|hex)list' expression (BC)
  • revset: fix order of nested 'or' expression (BC)
  • revset: fix order of nested 'range' expression (BC)
  • revset: make reverse() and sort() no-ops when ordering requirement allows (BC)
  • revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)

  • templater: provide a termwidth keyword (issue5395)

  • templater: add inheritance support to style maps
  • templater: add relpath() to convert repo path to relative path (issue5394)

  • templater: make pad() evaluate boolean argument (BC)
  • wireproto: unescape argument names in batch command (BC)

21.3. extensions

  • journal: properly check for held lock (issue5349)

  • journal: use fm.formatdate() to pass date tuple in appropriate type (BC)
  • journal: use fm.formatlist() to pass hashes in appropriate type (BC)
  • journal: use fm.hexfunc() to get full hash in JSON/template output (BC)
  • largefiles: fix 'deleted' files sometimes persistently appearing with R status
  • largefiles: handle that a found standin file doesn't exist when removing it
  • largefiles: more safe handling of interruptions while updating modifications
  • largefiles: when setting/clearing x bit on largefiles, don't change other bits
  • mq: release lock after transaction in qrefresh
  • mq: take wlock when 'qqueue' is doing write operations
  • rebase: properly calculate total commits to rebase (issue5347)

  • rebase: rebase changesets in topo order (issue5370) (BC)

21.4. hgweb

  • hgweb: avoid line wrap between revision and annotate-info (issue5398)

  • hgweb: config option to control zlib compression level

WhatsNew (last edited 2024-03-21 11:28:40 by RaphaelGomes)