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)