Mercurial 4.6 release

1. New Features

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.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.3. notify extension

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

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.

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.

4. 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 remove.d Use "peer.commandexecutor()" instead.

More notes to sort into the above

0.1. commands

• annotate: add support for template keywords and functions depending on ctx
• annotate: correct parameter name of decorate() function
• annotate: do not construct attr.s object per line while computing history
• annotate: drop linenumber flag from fctx.annotate() (API)
• annotate: pack line content into annotateline object (API)
• bookmarks: calculateupdate() returns a bookmark, not a rev
• bookmarks: fix a repr in a message on Python 3
• bookmarks: switch from repo.changectx('.') to repo['.']

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

• bookmarks: use command executor for wire protocol commands
• bookmarks: use isrevsymbol() for detecting collision with existing symbol
• bookmarks: write bookmarks file deterministically
• branchmap: make error messages consistent between Python 2 and 3
• branchmap: wrap builtin exception in bytes for logging
• clone: avoid using repo.lookup() with binary nodeid
• clone: rename "rev" to "revs" since there can be many

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

• commands: rewrite legacy ternary operator hack using modern syntax
• commands: use command executor interface
• commands: use constants for merge things
• commandserver: prefer first-party selectors module from Python 3 to backport
• commandserver: rewrite protectio/restoreio to not depend on ui
• graft: check for missing revision first before scanning working copy
• log: do no expect templateresources() returning a dict
• log: do not invoke templatekw.showobsfate() as a function
• log: fix crash on empty revision with --copies switch
• log: pack filematcher and hunksfilter into changesetdiffer object
• log: pass ctx to makefilematcher() and makehunksfilter() functions
• logcmdutil: create hunksfilter and filematcher even if no diff option given
• logcmdutil: drop redundant "log" from function names (API)
• logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
• logcmdutil: rename classes and functions to conform to our coding style (API)
• logexchange: use command executor for wire protocol commands
• merge: deprecate accessing update results by index
• patch: avoid repeated binary checks if all files in a patch are text
• patch: buffer lines for a same hunk
• patch: error out if reached to EOF while reading hunk
• patch: implement a new worddiff algorithm
• patch: stop using cext.diffhelpers
• patch: unify check_binary and binary flags
• patches: release the GIL while applying the patch
• pull: pass rev to check out as integer to postincoming()
• push: avoid using repo.lookup() for converting to nodeid

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

• status: use context-returning revpair()
• tag: avoid using "r" variable name for nodeid
• tags: don't feed both int and None to min()
• tags: explicitly grab list of dict keys
• verify: allow suppressing warnings about extra files
• verify: don't reimplement any()
• verify: drop "revlog" from warning message
• verify: fix exception formatting bug in Python 3

0.2. core

• cmdutil: make node parameter of makefileobj() mandatory (API)
• cmdutil: pass ctx to makefilename() in place of repo/node pair (API)
• cmdutil: pass ctx to makefileobj() in place of repo/node pair (API)
• cmdutil: pass in parsed patch to tryimportone() (API)
• cmdutil: split functions of log-like commands to new module (API)

• context: drop support for changeid= (API)

• context: move handling of filtering error to revsymbol() (API)

• context: move reuse of context object to repo.getitem (API)

• context: remove unwanted assignments in basectx.new() (API)

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

• filelog: declare that filelog implements a storage interface
• repo: remove now-unused changectx() method (API)
• repository: define new interface for running commands
• revlog: add a _datareadfp context manager for data access needs

• revlog: detect pseudo file nodeids to raise WdirUnsupported exception

• revlog: make shortest() take a full binary nodeid (API)
• revlog: move datafile opening in a method
• revlog: move index file opening in a method
• revlog: reset _nodepos after strip
• revlog: use context manager for data file lifetime in checkinlinesize
• revlog: use context manager for data file lifetime in checksize
• revlog: use context manager for index file lifetime in checkinlinesize
• revset: drop support for posttreebuilthook() (API)
• revset: pass in lookup function instead of repo (API)
• templater: add option to parse template string just like raw string literal
• templater: complain about invalid application of '%' operator (BC)

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

• transaction: add a name and a repr implementation (API)

• ui: do not try readline support if fin/fout aren't standard streams

• util: handle fileno() on Python 3 throwing io.UnsupportedOperation

• util: whitelist apfs for hardlink support
• wireproto: allow wire protocol commands to declare transport support
• wireproto: client reactor support for receiving frames
• wireproto: convert legacy commands to command executor
• wireproto: crude support for version 2 HTTP peer
• wireproto: define and use types for wire protocol commands
• wireproto: disallow commands handlers for multiple transport versions
• wireproto: don't expose legacy commands to version 2 of wire protocol
• wireproto: function for testing if wire protocol command is available
• wireproto: make @wireprotocommand version 1 only by default
• wireproto: make version 2 @wireprotocommand an independent function
• wireproto: move gboptsmap to wireprototypes and rename (API)
• wireproto: move supportedcompengines out of wireproto
• wireproto: move value encoding functions to wireprototypes (API)
• wireproto: move version 1 peer functionality to standalone module (API)
• wireproto: only expose "hello" command to version 1 transports
• wireproto: port heads command to wire protocol v2
• wireproto: port keep command to wire protocol v2
• wireproto: port listkeys commands to wire protocol v2
• wireproto: port pushkey command to wire protocol version 2
• wireproto: properly call clonebundles command
• wireproto: remove unused proto argument from supportedcompengines (API)
• wireproto: rename wireproto to wireprotov1server (API)
• wireproto: separate commands tables for version 1 and 2 commands
• wireproto: service multiple command requests per HTTP request
• wireproto: support /api/* URL space for exposing APIs
• wireproto: support for receiving multiple requests
• wireproto: use CBOR for command requests
• wireproto: use command executor for unbundle
• wireprotoserver: check if command available before calling it
• wireprotoserver: rename getfile() to forwardpayload() (API)
• wireprotoserver: support logging SSH server I/O to a file descriptor
• wireprotov2: add support for more response types
• wireprotov2: change command response protocol to include a leading map
• wireprotov2: change frame type and name for command response
• wireprotov2: change frame type value for command data
• wireprotov2: establish a type for representing command response

0.3. extensions

• addbranchrevs: no longer accept revset as "revs" (API)
• addremove: remove dry_run, similarity from scmutil.addremove (API)
• annotate: drop linenumber flag from fctx.annotate() (API)
• annotate: pack line content into annotateline object (API)
• bundle2: make source a mandatory argument for bundle2.applybundle() (API)
• cmdutil: make node parameter of makefileobj() mandatory (API)
• cmdutil: pass ctx to makefilename() in place of repo/node pair (API)
• cmdutil: pass ctx to makefileobj() in place of repo/node pair (API)
• cmdutil: pass in parsed patch to tryimportone() (API)
• cmdutil: split functions of log-like commands to new module (API)

• context: drop support for changeid= (API)

• context: move handling of filtering error to revsymbol() (API)

• context: move reuse of context object to repo.getitem (API)

• context: remove unwanted assignments in basectx.new() (API)

• hg: pass command intents to repo/peer creation (API)
• localrepo: drop "remote" argument from lookupbranch() (API)
• logcmdutil: drop redundant "log" from function names (API)
• logcmdutil: hold makefilematcher/makehunksfilter() by changesetpriner (API)
• logcmdutil: rename classes and functions to conform to our coding style (API)
• peer: scatter module to the wind (API)
• procutil: drop unused 'newlines' option from popen*() (API)
• procutil: make explainexit() simply return a message (API)
• registrar: replace "cmdtype" with an intent-based mechanism (API)
• repo: remove now-unused changectx() method (API)
• revlog: make shortest() take a full binary nodeid (API)
• revset: drop support for posttreebuilthook() (API)
• revset: pass in lookup function instead of repo (API)

• revsymbol: stop delegating to repo.getitem for unhandled symbols (API)

• scmutil: make revpair() return context objects (API)

• transaction: add a name and a repr implementation (API)

• wireproto: move gboptsmap to wireprototypes and rename (API)
• wireproto: move value encoding functions to wireprototypes (API)
• wireproto: move version 1 peer functionality to standalone module (API)
• wireproto: remove unused proto argument from supportedcompengines (API)
• wireproto: rename wireproto to wireprotov1server (API)
• wireprotoserver: rename getfile() to forwardpayload() (API)