rebase: use helpers.sh in tests

strip: be quiet about temporary internal bundle

Merge with crew-stable

convert/svn: close gettags() log stream (issue2196)

convert/svn: remove useless try/catch While the try/catch was reintroduced in 2f0f9528e77b, it was made useless by the tags/ existence check in getheads().

Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source.

minirst: handle line breaks in hg role

extdiff: fix reST syntax in module docstring

Fixed a bashism with trap numbers in hgeditor. When using trap in a shell script, it's more portable to use signal names, instead of numbers. Signal names (INT, KILL,...) are defined in POSIX, whereas its corresponding numbers aren't.

Merge with stable

rebase: stress that only local changesets should be rebased

minirst: fix debug code

Merge with stable

tag: add -e/--edit option for modifying the commit message

extdiff: add labels, read diff arguments from [merge-tools] hgtk has been using these same configs since Feb. Users only have to name the tools they would like to use, ex: [extdiff] kdiff3 = meld =

patchbomb: respect HGPLAIN when piping --test output to PAGER It makes easy to use `hg email --test` from another tool.

pager: fork and exec pager as parent process With the pager as the child process instead of the parent process, the termination of the parent Mercurial process can cause the terminal to return before the pager exits. Inverting the relationship prevents that issue. Platforms without fork() will continue to use util.popen().

commit: fix complaint about branch merge creating new heads (issue2186)

Fix hg heads -r flag documentation The command arguments are "[-ac] [-r STARTREV] [REV]..."

Fix wording in hg pull documentation

merge: avoid to break the dirstate copy status on moved files In the case a file is locally tracked as copied in dirstate, and that a merge affects this file, this file should not be marked as modified in dirstate, as this will break the current copy state. Note: only affect working directory merge, not branch merge.

commands: initial audit of exit codes bisect: clarify None return bundle: return 1 on no changes clone: return result code copy: limit errors to 0/1 commit: return 1 on no changes forget: return 1 on errors grep: return 1 if no match found remove: return 1 on errors resolve: return 1 if something fails to resolve rollback: return 1 if no rollback data

hgweb: fix race in refreshing repo list (issue2188)

rollback: fix up tests

rollback: fix off-by-one in message

commit: note new branch heads rather than topological heads Move to using contexts while we're at it.

Merge with 1.5.3

Added signature for changeset fdcf80f26604

Added tag 1.5.3 for changeset fdcf80f26604

tag: strip whitespace from tag names (issue2174)

keyword: support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass

convert/svn: fix long line

i18n: fix up bad merge

summary: show if commit will be from a closed head

commit: inform the commiter when resurrecting a closed changeset

commit: prevent closing non-head changesets

Merge with stable

Merge with i18n

Merge with i18n

i18n-da: merge with stable

i18n-da: translated various small strings

i18n-da: synchronize with d29bd98ebff6

Merge with stable

static-http: disable lazy parsing This only hits if you're crazy enough to use static-http on a repository with revlogs larger than 1M. Don't do it.

expand paths to local repository or bundle in appropriate classes This avoids problem with unexpanded paths when it's not possible to expand it at higher level (for example, if file:~/path/ is supplied as path in schemes).

push: document return values between various repo methods. This starts at localrepository.push() and seeps down to push_addchangegroup(), push_unbundle(), prepush(), addchangegroup(), and leaks out to sshrepository.unbundle(), sshrepository.addchangegroup(), and httprepository.unbundle(). Seems to cover everything you ever wanted to know about pushing but were afraid to ask.

cmdutil: Warn when trying to copy/rename --after to a nonexistant file. Currently running 'hg rename --after foo.txt bar.typo' is a silent no-op. This patch adds a warning. It also updates the copy and rename tests. No actual functionality is changed. fixes issue 1822

slightly improve memctx api