keyword: the CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.

keyword: sort demo output to ensure deterministic output

extdiff: prevent exception on double-translation The docstring is translated twice: once when used as a format string, and once on display. The second translation fails when the first translation introduces non-ASCII characters in the string. The problem is that the gettext module calls unicode(message) on the string, i.e., it decodes it to a Unicode string using the ASCII encoding (the default encoding). By translating it into a Unicode string here, the unicode() call becomes a noop.

Merge with stable again

Merge stable heads

Fix changelog test

Merge with stable

list branches in changelog template

commit: if relevant, tell user their commit message was saved. (issue1635) Specifically, if: 1) the user edited the message (it didn't come straight from -m) and 2) the commit was aborted by an exception then the saved commit message in .hg/last-message.txt could come in handy, so mention it with a ui.write(). This doesn't help users who manually rollback to amend a changeset: the fact that the message was saved to .hg/last-message.txt is invisible in that case.

commit: save commit message so it's not destroyed by rollback. (issue1635) Rationale: if a pretxncommit hook rejects this commit, the transaction is rolled back and the user's commit message is irrevocably lost. So save a copy in .hg/last-message.txt, just in case. Also handy if the user deliberately rolls back a commit in order to amend it.

inotify: create a common, OS-independent server entry point * rename server.py to linuxserver.py * create server.py: it will contain OS-independent logic for servers, and will import the right server depending on the OS * old server.server class is renamed to linuxserver.socketlistener

perf.perflog: add option to follow renames

run-tests: LANGUAGE may make tests fail

Merge with mpm

merge with crew

findrenames: improve coding-style

findrenames: speedup exact match benchmarked on crew repo with: rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done followed by: hg addremove -s 100 before: Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000) after : Time: real 6.790 secs (user 5.310+0.000 sys 1.350+0.000)

findrenames: refactor the score computation

findrenames: first loop over the removed files, it's faster Getting the file from the working dir is less expensive than getting it from the repo history, hence the speedup. benchmarked on crew repo with: rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done followed by: hg addremove -s 100 before: Time: real 68.760 secs (user 65.760+0.000 sys 2.490+0.000) after : Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)

localrepo: support 'rev in repo' syntax

zsh completion: add summary

Merge with stable

Merge with crew

Merge with i18n