commands: annotate follows by default, separate -f/--file option

Merge with crew-stable

test-mq-qrefresh: test qrefresh when tip != qtip

mq: remove qrefresh slow path (issue2025) The slow path/fast path distinction has existed since mq was added to Mercurial in 2006. The slow path was used whenever the refreshed revision wasn't the tip

interpret repo#name url syntax as branch instead of revision Previously, the name part of an repo#name url was interpreted as a revision, similar to using the --rev option. Now it is instead looked up as a branch first, and if that succeeds all the heads of the branch will be processed instead of just its tip-most head. If the branch lookup fails, it will be assumed to be an revision as before (e.g. for tags).

dispatch: provide help for disabled extensions and commands Before a command is declared unknown, each extension in hgext is searched, starting with hgext.<cmdname>. If there's a matching command, a help message suggests the appropriate extension and how to enable it. Every extension could potentially be imported, but for cases like rebase, relink, etc. only one extension is imported. For the case of "hg help disabledext", if the extension is in hgext, the extension description is read and a similar help suggestion is printed. No extension import occurs.

extensions: refactor disabled()

mq: don't warn on qpush against a branch head

mq: deprecate qinit and qcommit

mq: deprecate qsave, qrestore and related options

mq: add --mq option to some commands This causes them to operate on the queue repository as qcommit does, and is nicer than hg -R $(hg root)

pull: with -u and -r, update to the first revision given This makes pull consistent with clone. The actual change is in mercurial.hg.parseurl, changing its checkout result, which is only used for pull.

localrepo: inline single-use nested function

localrepo: unify changegroup and changegroupsubset code paths a bit

merge: add hints about the use of 'hg heads' to find the rev to merge

prepush: warn about every new outgoing named branch, not just the first

prepush: rename variables, refactor

rebase: add --detach option to detach intermediate revisions (issue1950) When rebasing an intermediate revision, rebase keeps a parent relationship with the original parent. This option forces the removal of this relationship. In more depth, it 'fakes' null merges between the target revision and the ancestors of source, dropping every change from the ancestors. The result is that every change in source and its descendants will be rebased, ignoring the changes in its ancestors.

rebase: refactoring Separate rebase-specific functions, in order to provide a better base to extend rebase's capabilities. Note that this will be useful especially to share functions with 'adapt'.

commands: do all branch heads by default, demote topological to -t/--topo

commands: actually implement --closed for topological heads

commands: externalize branchheads so we can do it for all branches at once

commands: move inactive/closed out so they can have more effect

commands: don't do too much work for error messages

commands: allow --closed even for topological heads displays But it actually only starts working later on.

util: make spawndetached() handle subprocess early terminations The file-based synchronization introduced by e22695b4472f hangs when the child process fails before terminating the handshake, which the previous pipe-based version handled correctly. To fix this, the parent polling loop was fixed to detect premature terminations of the child process.

zeroconf: do not try to encode encoded strings (issue1942)

zeroconf: override default destination folder on clone

merge with main

merge with main

fix spaces/identation issues

Merge with crew

Merge with crew

run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy.

commands: fix more changeset header information in 'hg help export'

commands: fix the list of changeset header information in 'hg help export'

graphlog: remove unused import

keyword: fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.

commands: always order heads recent to oldest

commands: fix up stupidly untested heads simplification

revlog: fix up previously stupid API change

commands: simplify heads a little bit before I start hacking it up

localrepo: add a quick docstring for localrepo.branchmap()

commands: deprecate the heads -a option Hopefully we can remove it entirely in two releases or so.

revlog: add a fast path for checking ancestry

subrepo: correct copyright

record: function variable naming & signature cleanup. No functionality change. All tests pass.

add options dict to localrepo.store.opener and use it for defversion