mq: extend support for the --mq argument to extension commands This allows commands like `purge' to accept the --mq option.

repository: drop unused rjoin() method This method was introduced by cfeeac24fc1e but grepping the history does not reveal any call. Extensions may use it but the method intent is not even clear to me.

tests: unify test-export

revert: wrap long line

util: remove lexists, Python 2.4 introduced os.path.lexists

Merge with stable

context: mark string for translation

test-convert-cvs: test fuzz

test-dispatch: drop test for missing working directory hstuart reported problems when the local Python has been configured to do stuff and crash before reaching the expected error handler.

Merge with stable

bookmarks: guard against listing bookmarks on unsupported repos This fixes clones and pulls from statichttprepository repos.

mdiff.patch(): add a special case for when the base text is empty remove the special casing from revlog.addgroup()

revlog: add rawsize(), identical to size() but not subclassed by filelog

revlog.addrevision(): move computation of nodeid in addrevision() The check "if node in nodemap" is already done earlier in addgroup().

contrib/compress: compress should activate parentdelta

contrib/compress: correct ordering of copying Changelog should always be copied last, otherwise readers can see an inconsistent repo.

contrib/compress: refactor revlog copying

contrib/compress: use store API instead of a collector

contrib/compress: proper lock handling Lock the src repo before beginning the compression and lock the destination repo before copying the revlogs. Proper handling of exceptions.

contrib/compress: use hg API to compute the destination path

contrib/compress: use repo's transaction method

contrib/compress: remove unused variables

tests: unify test-hgrc

tests: remove test-log.out, useless after unification

revlog: fix docstring

deltaparent(): don't return nullrev for a revision containing a full snapshot this allows us to simplify manifest.readdelta and revlog.revdiff

merge with stable

tests: fix up bisect test output

merge: move reverse-merge logic out of filemerge (issue2342)

bisect: add test for unrelated starting revisions

merge with stable

bisect: better message for unrelated starting revisions

debuginstall: report installpath

tests: unify test-glog

bookmarks: fix long line

merge with stable

revlog: addgroup re-adds punched revisions for missing parents While reading changegroup if a node with missing parents is encountered, we add a punched entry in the index with null parents for the missing parent node.

revlog: generate full revisions when parent node is missing The full revision is sent if the first parent, against which diff is calculated, is missing at remote. This happens in the case of shallow clones.

revlog.revision(): inline deltachain computation

revlog.revision(): remove debug code

revlog.revision(): don't use nullrev as the default value for the cache I is probably a bug if the deltachain computation think there was a cache hit at nullrev. Use None instead, this will never trigger a cache hit.

revlog.revision(): minor cleanup Rename some variables, making the name more obvious (in particular "cache" was actually two different variable. Move code around, moving the index preloading before the deltachain computation, without that index preloading was useless (everything was read in deltachain).

bookmarks: Check if the bookmark to delete exists on the remote

Merge with stable

win32: remove useless lstat() fallback in nlinks() The fallback was introduced by 3b4f05ff3130 at the same time than nlinks(). Apparently it only handles the case where target path does not exist. Just raise IOError directly.

win32: correctly break hardlinks on network drives (issue761) win32.nlinks() was often returning 1 instead of the correct hardlinks count when reading from network drives. This made commit or push to a repository on a network share to fail breaking the hardlinks in the datastore, possibly causing integrity errors in repositories linked locally on the remote side. Here is what the MSDN says about GetFileInformationByHandle(): Depending on the underlying network features of the operating system and the type of server connected to, the GetFileInformationByHandle function may fail, return partial information, or full information for the given file. In practice, we never got the correct hardlinks count when reading from and to many combinations of Window XP, 2003, Vista and 7, via network drives or RDP shares. It always returned 1 instead. The only setup returning an accurate links count was a samba on Debian. To avoid this, Mercurial now breaks the hardlinks unconditionally when writing to a network drive.

merge with stable

aliases: provide more flexible ways to work with shell alias arguments This patch changes the functionality of shell aliases to add more powerful options for working with shell alias arguments. First: the alias name + arguments to a shell alias are set as an HG_ARGS environment variable, delimited by spaces. This matches the behavior of hooks. Second: any occurrences of "$@" (without quotes) are replaced with the arguments, separated by spaces. This happens *before* the alias gets to the shell. Third: any positive numeric variables ("$1", "$2", etc) are replaced with the appropriate argument, indexed from 1. "$0" is replaced with the name of the alias. Any "extra" numeric variables are replaced with an empty string. This happens *before* the alias gets to the shell. These changes allow for more flexible shell aliases: [alias] echo = !echo $@ count = !hg log -r "$@" --template='.' | wc -c | sed -e 's/ //g' qqueuemv = !mv "`hg root`/.hg/patches-$1" "`hg root`/.hg/patches-$2" In action: $ hg echo foo foo $ hg count 'branch(default)' 901 $ hg count 'branch(stable) and keyword(fixes)' 102 $ hg qqueuemv myfeature somefeature

util: add an interpolate() function to for replacing multiple values util.interpolate can be used to replace multiple items in a string all at once (and optionally apply a function to the replacement), without worrying about recursing: >>> import util >>> s = '$foo, $spam' >>> util.interpolate(r'\$', { 'foo': 'bar', 'spam': 'eggs' }, s) 'bar, eggs' >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s) 'spam, foo' >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s, lambda s: s.upper()) 'SPAM, FOO' The patch also changes filemerge.py to use this new function.

convert: use encoding.encoding instead of locale.getpreferredencoding() The latter may not return useful results in certain OS X environments.

convert: properly set encoding for gnuarch converter

log: add logging for commands

ui: add logging hook

tests: unify test-merge10

tests: unify test-merge9

tests: unify test-merge8

tests: unify test-merge7

tests: unify test-merge6

tests: unify test-merge5

tests: unify test-merge4

tests: unify test-merge2

tests: unify test-merge1

tests: unify test-excessive-merge

tests: unify test-double-merge

tests: unify test-copy-move-merge

tests: unify test-merge-closedheads

merge with stable

color: enable branches support This commit updates the branches command to use ui.label for the branch names and the changeset. This implementation allows assigning colors to the four states of a branch: active, closed, current and inactive. While you can configure color for the four states, only current and closed have default colors of green and black bold respectively.

mq/qqueue: update bash completion

mq/qqueue: add --purge option to delete a queue and its patch dir qqueue --delete only deletes the reference to the queue, and leaves the associated patch directory behind. There is no Mercurial-way of getting rid of that patch directory afterward. This patch adds the --purge option to qqueue, that deletes the queue from the list, and also removes the associated patch dir. If the queue was non-existant, but the patch dir was, it is removed nonetheless. This is to avoid manual intervention in the .hg directory.

mq/qqueue: commonalise the queue deletion code

mq: don't inherit default and default-push paths with --mq (issue2333) Configuration from the outer repo is inherited to the patches repo when --mq is used. In case the patches repo only has paths.default configured but the outer repo has paths.default-push then the inherited default-push will win. Very confusing. Inheriting the default paths is however wrong in all sane cases, so now we explicitly remove them.

test-subrepo-paths: use printf instead of echo Different shells have different opinions on how to backslashes must be escaped for echo, but printf is consistent across zsh, dash, bash, tcsh, and csh.

parendelta: fix computation of base rev (fixes issue2337) Refactor revlog._addrevision() and put the correct base rev in the parent-delta case: base(rev) should always be equal to the first full snapshot that is needed by the delta chain, in both parent-delta and tip-delta case. Before this fix, the base rev was in most case wrong (and in the case where p1 == nullid, this triggered the bug from issue2337). This means that repositories converted to parent-delta earlier are corrupted and needs to be reconverted.

revlog._addrevision(): make the parent of the cached delta explicit

subrepos: handle backslashes in subpaths

help: document stringify templatefilter

test-subrepo-paths: moved comment lines to where they belong

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: fix typo in commit help text spotted by Fred Maranhão

i18n: merge with stable

i18n-pt_BR: synchronized with 2da0cf99b642

i18n-pt_BR: fix typo

i18n-da: synchronized with 7fa36341e7a0

log: fix the bug 'hg log --stat -p == hg log --stat' Before: hg log --stat -p -r tip # only show stat After: hg log --stat -p -r tip # show stat _and_ diff

hgfixes: added a fixer to convert changes in the email package This patch adds a fixer that accounts for changes in python packages, as the framework provided by lib2to3 is only able to track changes in module names. This fixer (hopefully) can fix any change in one-level hierarchies. To exemplify, this fixer can successfully change an import from "email.MIMEMultipart" to "email.mime.multipart".

contrib/setup3k.py: added script to build hg with py3k This patch implements a script that inherits most of its functionality from hg's setup.py and adds support to calling 2to3 during invocation with python3. The motivation of having this script around is twofold: 1) It enables py3k crazies to test mercurial in py3k and, hopefully, patch it more easily, so it can improve the py3k support to eventually run there. 2) Being separated from the main setup.py eliminates the need to make hg's setup.py even more cluttered, and enables "independent" development until the port is done. Some considerations about the structure of this patch: Mercurial already overrides the behavior of build_py, this patch tweaks it a bit more to add support to call 2to3 with a custom fixer* location for Mercurial. There is also a need of having the core C modules built *before* the translation process starts, otherwise 2to3 will think those are global modules. * A fixer is a python module that transforms python 2.x code in python 3.x code.

mq: save qrefresh message for easy recovery in case it fails (issue2062) Currently, if you start editing a commit message from qrefresh -e and, for any reason: forget you were editing it, leave the editor open and start qpopping and qpushing, when you decide to save your commit message, it is going to fail. This patch copies the commit behavior of saving the message contents in $HGROOT/.hg/last-message.txt before continuing.

util: avoid using hashlib on Python < 2.5 (issue2278) The following patch allows the use of python2.4 with a standalone hashlib rather than assuming that python2.5 is in use when hashlib is imported successfully.

ui: differentiate empty configlist from None

revset: predicate to avoid lookup errors A query like head() and (descendants("bad") and not descendants("fix")) (testing if repo heads are affected by a bug) will abort with a RepoLookupError if either badrev or fixrev aren't found inside the repository, which is not very informative. The new predicate returns an empty set for lookup errors, so head() and (descendants(present("bad")) and not descendants(present("fix"))) will behave as wanted even if those revisions are not found.

inotify: show the exact command used to start the server

demandimport: store level argument on _demandmod instances The 'level' argument to __import__ was added in Python 2.6, and is specified for either relative or absolute imports. The fix introduced in e160f2312815 allowed such imports to proceed without failure, but effectively disabled demandimport for them. This is particularly unfortunate in Python 3.x, where *all* imports are either relative or absolute. The solution introduced here is to store the level argument on the demandimport instance, and propagate it to _origimport() when its value isn't None. Please note that this patch hasn't been tested in Python 3.x, and thus may not be complete. I'm worried about how sub-imports are handled; I don't know what they are, or whether the level argument should be modified for them. I've added 'TODO' notes to these cases; hopefully, someone more knowledgable of these issues will deal with them.

revert: use opts.get If you want to programatically perform a revert right now you need to include a date=False parameter due to the use of opt["date"] instead of opt.get("date").

tests: unify test-copy2

mq/qqueue: enable renaming of active queue

mq/qqueue: split _setactive Prepare _setactive to be called without checking for applied patches.

merge with stable

templates: add filenolink to raw style (issue2332)

revlog: optimize deltachain

manifest: correct readdelta() according to parentdeltas

contrib: simple extension to practically convert a repo from tip delta to parentdelta

localrepo: add parentdelta to requires only if enabled in config file

revlog: append delta against p1

revlog: teach revlog to construct a revision from parentdeltas

revlog: deltachain() returns chain of revs need to construct a revision

revlog: parentdelta flags for revlog index

glossary: fixed typo

Merge with stable

tests: unify test-clone-r

tests: unify test-debugcomplete

tests: unify tests-debugindexdot

tests: unify test-debugbuilddag

tests: unify test-diffdir

tests: unify test-children

tests: unify test-revlog-packentry

tests: unify test-revlog-group-emptyiter

tests: unify test-install