zeroconf: better fix for readName error Stop parsing when an unknown type is seen, since it is impossible to resynchronize on the stream.

zeroconf: try utf-16 decoding if utf-8 fails

import: import each patch in a file or stream as a separate change Supports hg export <revrange>, mail messages, and mailboxes. Does not support multiple patches in a single MIME attachment. Closes issue167.

ui: look before you leap on sys.stdout.closed

mq: fix deprecation mention, line length

merge with mpm

addbranchrevs: fallback for older servers

add -b/--branch option to clone, bundle, incoming, outgoing, pull, push

subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

streamclone: allow uncompressed clones by default

help: Improved body text

commands: Try to improve help options text for basic commands Mostly rewrite -r text

check-code.py: make help strings consistent

check-code.py: escape backslash

qnew: ignore force option This makes the default behavior the same as qnew --force, and deprecates the force option.

strip apostrophes from an error messages

mq: fix typo, thanks pmezard

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

merge with main

localrepo: minor formatting - remove double space

coverage.py: fixed syntax error

merge with stable

zeroconf: gethostbyaddr may also fail with socket.herror

Merge with stable

commands: label from user is in local encoding repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8 before checking for a naming conflict. Keep the original label for ui.status()

merge with main

copies: check if revisions are related (bug found with pylint)

Merge with stable

Added signature for changeset 4aa619c4c2c0

Added tag 1.4.3 for changeset 4aa619c4c2c0

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: synchronized with b08ffd27dfc8

Merge with stable.

i18n: fix typo in German translation

i18n-ja: synchronized with e7727a545c48

Merge with stable

templates: rename `Last change' column in hgwebdir repository list. This patch changes column headers in the templates that previously said `Last change' to `Last modified'. Neither code nor functionality are changed other than that. For some time now, I have been annoyed by the fact the `Last change' column didn't list the age of the youngest changeset in the repository, or at least tip. It just occurred to me that this is because the wording is slightly misleading; what the column in fact lists is when the repository was last *modified*, that is, when changesets was last added or removed from it. The word `change' can be understood as referring to the changeset itself. Using `changed' would be ever so slightly less amigous. However, the standard nomenclature in this case is `modification date' and `Last modified', which is incidentally entirely unambigous. Hence, `Last modified' is the wording used.

run-tests: split tests/blacklist in tests/blacklists/* Following discussions with Gilles Morris [1], it seems that it is preferable to use several blacklist files in a blacklists/ directory. It is easier to add an unversioned file for experiments than modifying a tracked file. Also fall back to a simpler syntax, giving up ConfigParser, now that section names are not needed anymore. And allow --blacklist parameter to be a complete path, instead of only one of the filenames contained in tests/blacklists/ [1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html

subrepo: fix errors reported by pylint

copies: revert d1cd09bb4d18 The behavior of rebase both before and after the fix was actually incorrect, and this change regressed other parts of copy behavior.

Merge with i18n

Merge with stable

config: handle short continuations (issue1999) Thanks to Greg Ward for spotting and testing

copies: fix issue1994 Unscramble divergence test

i18n-sv: Translated twelve basic commands The help text and output strings surrounding these commands are now available in glorious Swedish: outgoing, paths, recover, rename, resolve, revert, rollback, root, showconfig, tag, tags, tip This also syncs with 279c8a73fde1.

bugzilla: lowercase mysqldb var

check-code: del isn't a function

check-code: fix copyright date

test-minirst: hide trailing whitespace from check-code

zeroconf: flag third-party Zeroconf.py for ignore in check-code

check-code: add some ignore hints

check-code: check thyself

Merge with stable.

patchbomb: document [patchbomb] config section for addresses

hgrc.5: whether bcc is prompted for is up to the extension There is no code in mail.py that forbids an extension to prompt for bcc.

many, many trivial check-code fixups

Introduce check-code.py check-code is a simple regex-based framework for checking our code and tests for common style and portability errors. Currently, it knows a fair amount about our Python and C style, and a little about common shell script portability problems.

merge with stable

test-encode: Use tr chacter classes instead of character ranges Solaris ...

Merge with stable

templates: do not add "ago" twice After 1d75c683ada1, "ago" is added by the ago template filter.

Merge with stable

tests: Don't use $PWD $PWD doesn't work with solaris sh - use `pwd` instead

mq: Do not translate import message that are appended to commits. We should not translate the "imported patch" message. The translated message confuses the detection whether the user has not updated the commit message yet. We try to avoid to translate generated commit messages.

subrepo: handle svn externals and meta changes (issue1982) - Detect changes to meta on regular and external entries - Do not try to commit external entries

subrepo: svn xml output is much easier to parse That's especially true with status flags: there are different fields and values for regular changes, meta changes, externals changes and externals meta changes.

subrepo: make svn use C locale for portability My reasons to do c2e2a5e6c36b were wrong. We want to have non-localized svn output while preserving current locale for input arguments and svn internals. This is achieved by setting LC_MESSAGE=C.

Merge with stable

summary: L10N messages hide clean-ness of workdir from 'hg summary' 'hg summary' recognizes workdir as clean by searching for 'clean' is in own output text. But 'clean' is one of I18N target texts, so 'hg summary --quiet' behaves incorrectly in non-English locale.

mercurial.el: add forgotten version number The number was accidentally removed in the change from GPLv2 to GPLv2+ in 25e572394f5c.

test-subrepo-svn: remove bashism