test-command-template: test 'file_copies' keyword

cmdutil: extract file copies closure into templatekw

cmdutil: extract latest tags closures in templatekw

cmdutil: extract file changes closures into templatekw

cmdutil: extract repo dependent closures in templatekw

cmdutil: extract ctx dependent closures into templatekw

cmdutil: replace showlist() closure with a function

Merge with crew-stable

convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>

win32mbcs: Add configuration to specify path encoding Add win32mbcs.encoding configuration option to specify the encoding to use instead of encoding.encoding. This option is useful for the users who want to write UTF-8 log message on non UTF-8 path encoding environment.

Merge with stable

mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".

revlog: rewrite several method docstrings - methods: findmissing(), nodesbetween(), descendants(), ancestors() - the goal is precise, concise, accurate, grammatical, understandable, consistently formatted docstrings

color: Add support for bookmarks

color: Do not pass --color, --no-color parameters to wrapped function Passing the --color and --no-color parameter to the wrapped function can cause a invalid argument exception if the wrapped function doesn't accepts a **opts dict.

Merge with stable

test-hgrc: cleanup - don't create a repository for no reason. - empty $HGRCPATH for better isolation between tests

config: raise ConfigError on non-existing include files Before, an %include directive for a non-existing file resulted in an IOError and a traceback.

Merge with i18n

i18n-el: translate Mercurial's copyright info message

i18n-el: translate the rest of hgext/bookmarks

i18n-el: translate the help of acl.py

i18n-el: translate hgext/bugzilla.py

i18n-el: remove obsolete translations

i18n-el: translate verify

i18n-el: add missing space to "remote: "'s translation

i18n-el: resync i18n/el.po with changeset 2ba40cdaacb2

i18n-el: remove some Danish strings The original el.po file was copied from da.po and I missed a few Danish strings in the version I submitted to crew.

mercurial.iss: add tcsh completion script

run-tests: backout d7c23f4a14c7 We no longer have any data files, so this is no longer needed. Augie Fackler reported on IRC that this "hack" had never worked for him in the first place.

mercurial.iss: backout 08bbed8ac9b8 Not a complete backout, the bash_completion script is still installed.

setup: backout 68964567e406 We decided that it is better to let the distributions install these files themselves since they know where to put them.

subrepo: document necessary methods for a subrepo class

merge with the stable branch

cmdutil: copy auth section in remoteui This allows me to specify an auth section in a .hg/hgrc instead of just a global or user-level hgrc.

log --follow: use a set instead of a list benchmarked with hg log -qf on the linux kernel: before: Time: real 39.010 secs (user 38.840+0.000 sys 0.060+0.000) after: Time: real 8.560 secs (user 8.440+0.000 sys 0.080+0.000)

Merge with stable

patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Thanks to Augie Fackler for reporting this.

help: don't display bogus help messages for invalid aliases

run-tests: install data files correctly In 68964567e406 we began installing some data files in PREFIX/share. When preparing to run the tests, run-tests.py uses --home="" in order to work around home being set in a ~/.pydistutils.cfg file. This somehow overwrites the --prefix option. The result was that the share/ directory was installed in the top of the Mercurial source tree.

Merge with stable

patchbomb: handle repository#rev URLs correctly

contrib: helper extension to track memory usage

export: fix tests

commands.export: accept -r option as revision specification This brings consistency with other commands option and allows specification of negative numbers (-r -2), which were recognized as options earlier.

status: add the --change option to display files changed in a revision This option is similar to the one already used for the diff command. Unfortunately, the c and C short option are already used for status, so there is no corresponding short option. However, there is no short option for --rev either, so that's consistent.

run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS Introduce a inotify.appendpid configuration possibility that appends pids to inotify.pidfile when set to True.

cmdutil: service: add appendpid parameter to append pids to pid file

changegroupsubset: readdelta() can be used if the previous rev is a parent

changegroupsubset: simplify parents pruning

shrink-revlog: improve performance: use changegroup instead of revisions Before: real 0m23.971s Now: real 0m4.229s The only case where the output would be different is if the newer hg was using a different diff algorithm than used originally.

Update win32 installer paths for bash and zsh scripts after move done in 68964567e406

rst2man: s/dont/don't/ in comment

rst2man: separate inline blocks from previous paragraphs

setup: install some useful data files. The selection is somewhat arbitrary. In the case of the Zsh completion file, it will not conflict with the builtin Zsh completions: they are in a file named `_mercurial', not `_hg'.

color: add support for churn --diffstat

Makefile: help/ was moved in f91e5630ce7e update paths to match

Update win32 installer with changes from f91e5630ce7e

doc: correct path to help files in Makefile

setup: cleanup coding style

setup: install translation files as package data Remove the `install_package_data' subclass of `install_data' and use the `package_data' functionality provided by distutils instead. As package data must be located within the package directory, the data files are now generated in the build directory. To simplify the functionality of this change, the top-level `doc' and `templates' directories have been moved into the `mercurial' package directory.

setup: don't ship i18n directory The directory was never actually used at runtime and other programs don't ship it either.

Merge with stable

handle file URIs correctly, according to RFC 2396 (issue1153) The new code aims to implement the RFC correctly for file URIs. Previously they were handled incorrectly in several ways, which could cause problem on Windows in particular.

transplant: fix small bug when a patch fails while using --filter

Merge with stable

alias: do not crash when aliased command has no usage help text

Merge with stable

revlog: add fast path to ancestor

share: add a test script.

hgk: do not ignore ---/+++ lines in diff

Merge with stable

Added signature for changeset 439d7ea6fe3a

Added tag 1.4.1 for changeset 439d7ea6fe3a

Merge with stable

share: fix interaction with clone

Merge with crew

Merge with stable

Merge with i18n

Merge with stable

i18n: hand-transplant change in 36760956f6d3

i18n-da: synchronized with af5f99d8195e

merge with i18n-stable

i18n-pt_BR: added strings from crew 5b149c88d9e8

backout experimental change from 777c1df76ef4

context: parents() already filters nullid

context: use key-sorting instead of tuples

Merge with stable

doc/Makefile: ensure C locale The man pages can actually be translated by building them in a different locale. However, the man pages contain internal links to certain sections, and when the section titles are translated, the links change too. So it is currently not recommended to build the man pages in anything by the "C" locale.

commands: mark "ssh://" as inline literals in help texts

test-rollback: fix reference to /bin/false (fails on OSX)

Merge with stable

schemes: fixed typos in module docstring

schemes extension

schemes: fixed typos in module docstring

schemes extension

Merge with crew

convert: better error on invalid repository type

cmdutil: fix missing default 'extra' template

test blacklist: add inotify-failures target

run-tests: add a "--blacklist target" option to skip predefined test lists Rely on a ConfigParser file, tests/blacklist, to define blacklist targets. This allows exposing specific test suites for testing incomplete/particular features, e.g. "run-tests.py --blacklist inotify-failures --inotify *"

run-tests: add --inotify option to test runner Activate inotify extension when running tests.

merge with stable

extdiff: respect --option in command aliases (issue949)

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