merge: fix mergestate comment

rebase: avoid losing branch commits with --keepbranch (issue4835)

lock.release: do not unlink inherited locks This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances. A subprocess unlinking a lock will lead to potential corruption from other concurrent processes.

lock: add a method to reacquire the lock after subprocesses exit This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances.

lock: add a method to prepare the lock for inheritance This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances.

lock: introduce state to keep track of inheritance This is part of a series that will allow locks to be inherited by subprocesses in limited circumstances. In upcoming patches we will refer to this state.

error: add an exception to indicate lock inheritance API contract violations

clone: check update rev for being True In 30be3aeb5344, there was an attempt to fallback to looking up the update revision assuming it was always a rev but the documentation states: True means update to default rev, anything else is treated as a revision Therefore, we should only fallback to looking up the update rev if it is not True. This bug was found in hg-git and I couldn't think of a test that does this in pure Mercurial since the source repository is checked for the revision as well (and therefore gracefully falls back).

clone: fix over-indented continuation line

resolve: consistently describe re-merge + unresolved

mercurial: add debugextensions command (issue4676) Add debugextensions command to help users debug their extension problems. If there are no extensions command prints nothing, otherwise it prints names of extension modules. If quiet or verbose option is not specified it prints(after extensions name) last version of mercurial in which given module was tested for non internal modules or not tested with user mercurial version. If verbose is specified it prints following information for every extension: extension name, import source, testedwith and buglink information. Extensions are printed sorted by extension name.

dispatch: stop warning about EPIPE in --debug mode It seems silly for "hg --debug manifest | less" to print a scary message after the user hits "q" in less. hg should just exit silently instead, since EPIPE on stdout is a perfectly reasonable result.

rebase: don't rebase obsolete commit whose successor is already rebased This patch avoids unnecessary conflicts to resolve during rebase for the users of changeset evolution. This patch modifies rebase to skip obsolete commits if they are being rebased on their successors. It introduces a new rebase state 'revprecursor' for these revisions that are being skipped and a new message to inform the user of what is happening. This feature is gated behind the config flag experimental.rebaseskipobsolete When an obsolete commit is skipped, the output is: not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"

check-code: forbid mutable value for default argument default value are common to all call. Using mutable value is a classical source of bug in Python. We forbid it. The regexp (Courtesy of Matt Mackall) is only catching such value on the first line of a definition, but that will be good enough for now.

httpconnection: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

transplant: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

mq: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. The underlying function already handle "None" as an option value, so we do not need to do anything else.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

largefiles: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

histedit: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

templater: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

addremove: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. We added support for None in the underlying function in the parent commit. therefore we do not need to do anything but passing None.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

match: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

addremove: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

tag: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs. We just added support of None for the underlying function, so nothing else the required.

commit: remove a mutable default argument Mutable default arguments are know to the state of California to cause bugs.

lock: move acquirefn call to inside the lock We're going to need to call it again as part of reinitialization after a subprocess inherits the lock.

localrepo: call lock.lock with releasefn as a keyword arg We'll be adding an acquirefn argument soon, and this makes that clearer.

copies: move debug statement to appropriate place

bidmerge: choose shortest list of diverge and rename/delete warnings Slightly less arbitrary than choosing the first set.

copies: rename diverge2 to divergeset for clarity

copies: begin separating mergecopies sides

copies: rename ctx() to getfctx() for clarity

monoblue: port code selection without line numbers from gitweb This is adapted from 2239626369f5. It also fixes issue4790 in monoblue; tab characters now have meaningful width on the modified pages (file view, file diff, changeset).

help: copy-edit description of ui.supportcontact

ui: avoid mutable default arguments I almost introduced a bug around this code by accidentally mutating a default argument. There's no reason for these to exist. It is OK to not assign {} to environ in ui.system because util.system knows how to deal with that.

util: avoid mutable default arguments I almost introduced a bug around this code by accidentally mutating a default argument. There's no reason for these to exist.

obsstore: fast path to check if obsstore is empty

obsstore: delay loading markers from obsstore file This will allow us to use cached revisions without parsing obsstore. Because _version isn't determined at __init__, the debugobsconvert command no longer works correctly. I'll fix it by a separate patch for the evolve extension.

obsstore: initialize _all markers without using _addmarkers() The next patch will make _all variable propertycached to avoid costly parsing of obsstore. This means we can't call _addmarkers() to initialize _all. Because all cached markers depend on _all, it isn't necessary to update these caches when _all is initially loaded.

revset: avoid implicit None testing in revset Implicit None testing is a very good way to get in trouble. We explicitly test for None.

revset: speed up existence checks for ordered filtered sets Previously, calling 'if foo:' on a ordered filtered set would start iterating in whatever the current direction was and return if a value was available. If the current direction was ascending, but the set had a fastdesc available, this meant we did a lot more work than necessary. If this was applied without my previous max/min fixes, it would improve max() performance (this was my first attempt at fixing the issue). Since those previous fixes went in though, this doesn't have a visible benefit in the benchmarks, but it does seem clearly better than it was before so I think it should still go in.