merge with stable

fix bug in prepush logic involving merge changesets When creating new branches and merging them into existing ones, you would sometimes be able to push some changesets (the existing branches) without using --force, even when that creates a new head on the remote. A test which triggers the error has been added.

Merge with stable

commands: add missing options in command line help

commands: mark strings for translation

keyword: clarify object of backwards compatibility

commit: write last-message.txt with no content modifications. This assumes the user will use either a sane editor (anything but Notepad) or the same editor again: even Notepad should be able to read what it previously wrote.

mail: add parseaddrlist() function for parsing many addresses at once Adds a new function addrlistencode() to mercurial.mail, like addressencode(), but accepts a list of addresses as input, and returns a list of formatted addresses. This will be used by patchbomb. The difference is that each element in the input list can contain multiple addresses (comma separated or otherwise), and are split using Python's email.Utils.getaddresses().

patchbomb: fix parsing of multiple addresses, allow multiple addrs in --to/cc/bcc Instead of using custom code to split apart addresses, we now use mail.parseaddrlist() which always does the Right Thing as it relies on Python's email.Utils.getaddresses(). Previously, 'hg email --to=foo,bar' only respected foo and discarded bar. Also, commas in names were not allowed in hgrc or the interactive prompt; specifying '"Lastname, Firstname" <foo>' would confuse patchbomb. The testcase uses '-m tmp.mbox' because -n (like in other tests) would disable address mangling.

templates: add raw templates for tags/branches pages

extdiff: wrap long lines in docstring and comments Gettext wraps lines in the messages when it writes them to the hg.pot file and that makes long lines look odd in the resulting .po file.

Merge with stable

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