transplant: add "transplanted" keyword $ hg log --template '{rev} {transplanted}\n' 7 a53251cdf717679d1907b289f991534be05c997a

merge with i18n

i18n: merge with stable

i18n-da: synchronize with e9628665b670

i18n: don't mark trivial string for translation

i18n: merge with mpm

i18n-de: correct translation for some fuzzy strings

i18n-de: synchronize with 994510694b1d

i18n-de: added translations concerning hardlinks

i18n-de: added more translations concerning rebase

i18n-de: added translations concerning rebase

i18n-de: added translations concerning email sending

i18n-de: added translations concerning patches

i18n-de: added translations concerning win32text and .hgeol

i18n-de: added translations for Perforce conversion options

i18n-de: added translations for Subversion conversion options

i18n-de: added translation for CVS conversion options

i18n-de: added translations for convert.hg.* options

i18n-de: translate some strings

revset: fix a number of highly dubious continue statements This patch definitely needs a review and would also benefit from some new testsuite entries.

graphlog: do not swallow all TypeError exceptions (fix 29c800ee54cf)

archive: use hardcoded constants when creating .zip archives Do not rely on local stat constants, which may differ.

hgweb: support multiple directories for the same path [paths] /dir = /path/1/*, /path/2/*

templates: provide granularity for future values for age filter

revset: report a parse error if a revset is not parsed completely (issue2654)

config: use util.posixfile

bundle: update current bookmark to most recent revision on current branch We check if the current bookmark is set to the first parent of the dirstate. Is this the case we move the bookmark to most recent revision on the current branch (where hg update will update you to).

localrepo: do not update bookmarks in addchangegroup We want to update the current bookmark to the most recent revision on current branch unless there is a remote bookmark that points to a different descendant. Addchangegroup is called before we can check for remote bookmarks. We don't update the bookmark in addchangegroup anymore to allow proper updating of bookmarks in pull.

rebase: add -m/--message to rebase --collapse (issue2389) When collapsing changesets with rebase, you get a chance to edit the commit message manually, but there is no way to pass this message from the command line. This patch adds a `--message` (with short form `-m`) and `--logfile` (with short form `-m`) options to the rebase command. These options suppresses the generation of the default commit message, and instead use the message provided in the option (in case of `-m`) or in the file it points to (in case of `-l`). If you use this option without the `--collapse` option, it will raise an error. Options documentation edited by Patrick Mezard <pmezard@gmail.com>

Updating hgext.extdiff to use revsets

merge with stable

relink: mark abort message for translation

relink: avoid trying to lock the same repo twice

relink: format reclaimed byte count nicely

test-relink: remove unnecessary ui.username setting

test-https: match output from 31eac42d9123

merge with stable

merge with crew

convert/svn: fix _iterfiles() output in root dir case (issue2647) When converting directory additions/replacement with project directory set to root, _iterfiles() sometimes returned paths starting with a slash making following svn calls to fail. I could not reproduce the issue with hand-crafted repositories. Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>

eol: no need to accumulate files when checking all changesets Just check the files touched by the changesets.

eol: improve hook failure output Before, only the first failure was reported: abort: b.txt should not have CRLF line endings while now all of them are listed: abort: end-of-line check failed: d.txt in a7040e68714f should not have CRLF line endings b.txt in fbcf9b1025f5 should not have CRLF line endings As first suggested by Antoine Pitrou <solipsis@pitrou.net>

merge with stable

bookmarks: remove API limitation in setcurrent setcurrent refuses to set a new current bookmark if the current bookmark points to the current dirstate. This restriction is not needed. A current bookmark can point to a different bookmark.

bookmarks: separate bookmarks update code from localrepo's pull. We explicitly want to update bookmarks from a remote. This will avoid duplicate calls to listkeys if we clone (which calls pull) and keep bookmark related code together.

tests: add tests for bookmarks support in hg identify

identify: list bookmarks for remote repositories

hgignore: ignore dll files generated under cygwin

pager: don't page stderr if it's being redirected (issue2541)

color: port to using ctypes (issue2687) replacing usage of pywin32, which was removed for Mercurial 1.8

hgweb: drop use of super() for Exception base class In Python 2.4, Exception is an old-style class and doesn't work with super.

diff: make diff -c aware of revision sets

color: wrap lines in docstring

merge with stable

setup: fix mac build broken by e42d18538e1d Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything printed to stderr implies failure. Since runcmd() was originally only intended to run hg, this was fine until it was pressed into service for running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does the minimal amount of work to run a subprocess, and runhg(), which calls runcmd().

color: don't mention internal function in docstring The render_text function actually never existed, the docstring probably meant the render_effects function instead.

keyword: offer additional datefilters when the extension is enabled Before the additional datefilters (utcdate, svnisodate, svnutcdate) were used when kwtemplater was initialized. Now they always be used once the extension is enabled.

keyword: docstrings for additional date filters

mq: do not let qrefresh write bad patch

graphlog: give meaningful error if more than one file is given

merge with stable

test-https: update to match output from 3f6a4579f803

tests: respect new hg clone listkey queries in http-proxy test

bookmarks: discard current bookmark if absent from the bookmarks (issue2692) After a rollback, the current bookmark might be absent from the bookmarks file. In that case we discard it instead of displaying a traceback during commit.

fix test-highlight after bookmark support change for hgweb

merge with stable

eol: do not abort when win32text is found, only warn The win32text extension does not break eol or vice-versa, so it is not a fatal error to have both of them enabled. It's just folly. So spewing warnings in this condition is preferrable to aborting. When both extensions are enabled, the user now sees: % hg st the eol extension is incompatible with the win32text extension win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension M hgext/eol.py

merge with stable

tests: fix failures introduced in 7359cb753a54

tests: fix permission issue trying to remove test directory

bookmarks: fix update of the current bookmark during rename We need to get rid of the previous bookmark after changing current bookmark.

setup: remove unnecessary code for win32com (pywin32)

test-highlight: fix test output (introduced by 2151703e7f84)

eol: rename hook into checkheadshook, add checkallhook (issue2665) "hook" is still an alias for "checkheadshook".

eol: make the hook check all new heads, not only tip (issue2666) Report and test by Antoine Pitrou <solipsis@pitrou.net>

eol: the hook no longer requires the extension to be loaded Reading rules in the hook means we no longer need ui to be filled and do not need reposetup() to be run anymore.

eol: extract parsing error handling in parseeol()

eol: separate .hgeol parsing from merge in ui This will help refactoring the hook.

eol: remove unused argument in readhgeol()

eol: explain why reading .hgeol from the working dir is special

templates: widen the graph canvas (issue2683)

rebase: don't use util.Abort for an internal error

help: limit documentation width to at most 80 characters Reading long lines is suboptimal no matter how wide the terminal is.

merge with stable

transplant: avoid the word "rebase" when we mean "transplant"

transplant: explain that changesets are copied, not moved

hg: add support for cloning bookmarks

httprepo: use caps instead of between for compat check We usually query the capabilities at some point anyway so this way the first roundtrip actually does useful work.

revset: add a revset command to get bisect state.

bisect: new command to extend the bisect range (issue2690) When bisect ends in a merge point, and one of the parent wasn't checked, this usually means the culprit is in a branch that wasn't scanned. For this case we provide a new command which extends the range of the bisect search to the common ancestor of the parents of the merge.

hgweb: pmezard thinks one default is enough

don't depend on features of Exception as much BaseException.message has been deprecated, so we try to not rely on it.

deal with empty Content-Length headers

hgweb: add separate page with bookmarks listing

hgweb: add display of bookmarks for changelog and changeset

merge with stable

setup.py: use StrictVersion instead of manual comparison