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

patchbomb: Reply-To support From RFC 5322: an optional reply-to field MAY also be included, which contains the field name "Reply-To" and a comma-separated list of one or more addresses. [...] When the "Reply-To:" field is present, it indicates the address(es) to which the author of the message suggests that replies be sent. In the absence of the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es) specified in the "From:" field unless otherwise specified by the person composing the reply. Reply-To addresses may be specified either via command line with --reply-to or via the 'email' or 'patchbomb' sections of the config file.

merge: tool.check = prompt will force an interactive merge check tool.check = prompt can be used when the exit status of a merge tool is unreliable but an explicit user signoff on the merge result is acceptable.

merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.

give worst-case 'merge' merge-tool lowest priority Another tool had -10 already. Since 'merge' is clearly a worst-case tool (internal), lowering to -100 ensures there's plenty of room for slightly better cases.

merge: tool.premerge=keep will leave premerge markers in $local

merge with mpm

merge with stable

context: fallback function should not return None

test-subrepo-svn: fix strange svn behaviour on windows I got a full path when pusing the external like: Sending C:/foo/bar/test-subrepo-svn/sub/t/s/alpha instead of the relative path

tests: force color ansi mode on Windows

acl: improve undefined group error handling

test-acl: avoid $HGTMP on windows sed does not like colons and there are other path normalization issues.

acl: grp module is not available on windows

convert/svn: report path discovery progress When converting non-local repositories, scanning changed paths before retrieving data can be almost as slow as retrieving the data itself, thanks to HTTP calls overhead.

convert: display files data retrieval progress

convert: add progress support

convert: merge sources getmode() into getfile()

convert/svn: remove useless sort