tests: unify test-branches

tests: unify test-dumprevlog

tests: unify test-dirstate-future

tests: unify test-fncache

tests: unify test-bookmarks-strip

tests: unify test-bookmarks-rebase

tests: unify test-bookmarks-current

tests: unify test-bookmarks

tests: unify test-bisect2

tests: unify test-bad-pull

tests: unify test-bad-extension

tests: unify test-backwards-remove

tests: unify test-backout

tests: unify test-audit-path

tests: unify test-archive-symlinks

tests: unify test-archive

tests: unify test-annotate

tests: unify test-addremove-similar

tests: unify test-addremove

tests: unify test-acl

tests: unify test-abort-checkin

tests: unify test-1102

tests: unify test-586

mercurial.spec: gettext is a build requirement for getting proper localization

http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.

rebase: recompute the set of skipped rev when using --continue (issue2330)

Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.

Merge with stable

tests: update to match "hg help resolve" output from 53fdc0989047

test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

Merge with stable

resolve: updated help documentation for improved clarity

convert: Test svn sink for a repo with tags. This test case backs the fix in changeset 7e5f5e5858f9. The subversion sink used to crash, if the source repo used tags.

hgrc.5: fix "hg hg status" -> "hg status"

url: expand vars in all [auth] settings (issue2328)

merge with stable

merge with i18n

merge with i18n

i18n: merge Romanian translation

i18n: merge with stable

i18n-it: update many broken fuzzy messages I started updating many fuzzy messages which no longer expressed the intended meaning - new translations are inserted only to keep coherence. Not all fuzzy messages have been fixed, yet.

i18n-it: readd missing non-ASCII characters Some accented vowels had disappeared.

i18n-it: avoid using two spaces after a '.' See http://en.wikipedia.org/wiki/Sentence_spacing to verify that single spacing is indeed correct.

i18n-ro: initial version

Merge with stable

test-check-code: fix test after e1359ad582f6

cmdutil: remove unnecessary parenthesis

patch: fix typo in comment

qguard: label patch names by status when listing guards

hg.clone: do not ignore branch argument when source is a repo object This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear: hopefully using a test to cover this usage should prevent any bugs.

merge: fix typo in docstring

check-code: add exit status so that we can use it in a shell command combination and/or in hg hooks.

test-patch.t: typos

tests: unify test-alias

tests: unify test-parents

tests: merge all 4 test-symlink* into test-symlinks

tests: unify test-symlink-root

tests: unify test-symlink-basic

tests: unify test-symlink-addremove

tests: unify test-qimport-eol

tests: unify test-import

tests: unify test-clone

tests: unify test-copy

tests: unify test-commit-unresolved

unify test-commit-copy

tests: unify test-commit

tests: unify test-committer

tests: unify test-transplant

tests: unify test-walk

tests: unify test-symlinks

tests: unify test-conflict

tests: unify test-identify

tests: unify test-add

tests: remove useless sed in test-hook

tests: unify test-hook

tests: unify test-flags

repair: do not compress partial bundle if we do not keep it on disk A partial bundle is created to temporarily save revisions > rev but not descending from the node to strip, to be able to restore the changesets after stripping the changelog. Since this bundle is not kept after the strip operation, and is not user-visible, it is not necessary and should be faster to avoid compression.

store: skip decodir check if path does not contain '.hg/' The three replace calls are slower than this simple __contains__, and anyway we should not have this many paths ending with .i, .d, or .hg compared to the normal, un-encoded other paths.

strip: support multiple revisions

tests: unify test-tag

tests: unify test-verify

tests: unify test-init

tests: unify test-paths

tests: unify test-patch

tests: unify test-status-color

tests: unify test-status

tests: catch re.error if test line is not a valid regular expression

Merge with stable

convert: less shouting in SVN sink warning

convert: Using --dest-type svn crashed, if the source repo used tags. The convert extension requires puttags(self, tags) to return a sequence for a multi-variable assignment. If puttags implicitly returns None, the code will break when trying to un-pack None for assignment.

commands: use round parenthesis in 'hg head --active' help This is the style used in the rest of the help strings.

graphlog: mark --branch as incompatible with --graph The --only-branch option was deprecated in 0d5f139b23c1 and --branch was added instead. But the graphlog extension was not updated to match the change.

subrepos: support remapping of .hgsub source paths Given a .hgsub file containing lib/libfoo = http://server/libfoo the 'lib/libfoo' subrepo will be cloned from 'http://server/libfoo'. This changeset introduces a remapping mechanism whereby the source paths (the right-hand sides) in the .hgsub file can be remapped. This subpaths section [subpaths] http://server = /local will result in the 'lib/libfoo' subrepo being cloned from '/local/libfoo' instead of from 'http://server/libfoo'. The patterns (left-hand sides) are really regular expressions and the replacement strings (right-hand sides) can refer to matched groups using normal backreferences. This can be used for more complicated replacements such as [subpaths] http://server/(.*)-hg/ = http://hg.server/\1/ which replaces 'http://server/foo-hg/' with 'http://hg.server/foo/'. All patterns are applied in the order by which they are listed in the config files.

bookmarks: replace var used as a Boolean with a Boolean

merge with stable