Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 11:50:42 -0500] rev 7970
Merge with crew-stable
Rocco Rutte <pdmef@gmx.net> [Sat, 04 Apr 2009 18:08:41 +0200] rev 7969
convert: simple fix for non-existent synthetic/mergepoint attributes
Marti Raudsepp <marti@juffo.org> [Sat, 04 Apr 2009 18:04:38 +0200] rev 7968
convert: handle comments starting with '#' in authormap files
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 04 Apr 2009 17:55:52 +0200] rev 7967
cmdutil: refactor handling of templating in show_changeset()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 04 Apr 2009 17:46:11 +0200] rev 7966
templater: move stylemap function from hgweb to templater
Tobias Bell <tobias.bell@gmail.com> [Sat, 04 Apr 2009 10:51:52 +0200] rev 7965
i18n-de: translated record
Tobias Bell <tobias.bell@gmail.com> [Fri, 03 Apr 2009 22:35:07 +0200] rev 7964
i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py
Fabian Kreutz <fabian.kreutz@starnet.fi> [Fri, 03 Apr 2009 11:57:05 +0300] rev 7963
i18n-de: docu for resolve
Marti Raudsepp <marti@juffo.org> [Sat, 04 Apr 2009 15:41:32 +0200] rev 7962
convert: fix authormap handling of lines without '='
Unpacking the result from str.split raises ValueError, not IndexError, if the
line does not contain a '='.
Marti Raudsepp <marti@juffo.org> [Sat, 14 Mar 2009 14:31:08 +0200] rev 7961
convert: Add testcase for convert authormap.
Alexander Solovyov <piranha@piranha.org.ua> [Wed, 01 Apr 2009 12:11:14 +0300] rev 7960
extensions loading: don't fail if path to extension ends with a '/'
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Apr 2009 15:14:36 +0200] rev 7959
tests: guess lexer by filename for recent pygments
Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii
by util.tolocal, which yields class="err". Guess lexer by extension instead.
Jeremy Whitlock <jcscoobyrs@gmail.com> [Thu, 02 Apr 2009 18:18:43 -0600] rev 7958
Fix how setup.py identifies the Mercurial version.
There is a problem with setup.py where it will not identify the Mercurial
version properly when not being ran in within a repository even if
mercurial/__version__.py exists.
To fix, use mercurial.__version__.version when available before defaulting
to "unknown". (Using mercurial.util.version() is not an option due to a
dependency issue where osutil can be referenced before it is built.)
Pavel Volkovitskiy <int@mtx.ru> [Thu, 02 Apr 2009 22:25:49 +0400] rev 7957
right way to check if file was in renamed directory, fixes import monotone
repos with renamed directories
Henrik Stuart <henrik.stuart@edlund.dk> [Thu, 02 Apr 2009 14:48:06 +0200] rev 7956
convert: added cvsnt mergepoint support
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Thu, 26 Mar 2009 16:58:50 +0200] rev 7955
rebase: keep original mq patch format (Issue1574)
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.
Note: this version corrects a failure in the test
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Mon, 30 Mar 2009 18:26:32 +0200] rev 7954
rebase: don't lose rename/copy data (Issue1423)
Justin Peng <justin.peng.sw@gmail.com> [Wed, 01 Apr 2009 09:11:00 -0700] rev 7953
Correct a bug on date formats with '>' or '<' accompanied by space characters.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 29 Mar 2009 14:43:49 +0200] rev 7952
rebase: store/restore arguments correctly
Keep and keepbranches were lost after an interruption
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 29 Mar 2009 14:47:59 +0200] rev 7951
rebase: correct help text
Show the correct parameters in help text
Greg Ward <greg-hg@gerg.ca> [Sat, 28 Mar 2009 12:27:20 -0400] rev 7950
issue1578: fix crash: do not use synthetic changesets as merge parents.
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 14:52:03 -0500] rev 7949
windows: get Abort from error
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 14:51:48 -0500] rev 7948
move encoding bits from util to encoding
In addition to cleaning up util, this gets rid of some circular dependencies.
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 13:20:52 -0500] rev 7947
move util.Abort to error.py
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 12:37:44 -0500] rev 7946
setup: remove spurious posix import
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 12:37:38 -0500] rev 7945
pure/parsers: fix circular imports, import mercurial modules properly
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 12:37:30 -0500] rev 7944
pure/bdiff: fix circular import
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 12:37:07 -0500] rev 7943
posix: kill some trailing newlines
Matt Mackall <mpm@selenic.com> [Fri, 03 Apr 2009 12:37:06 -0500] rev 7942
mention default branch in branch and clone help
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 10 Mar 2009 19:16:16 +0100] rev 7941
i18n: update italian translation
Fabian Kreutz <fabian.kreutz@starnet.fi> [Thu, 02 Apr 2009 10:30:00 +0300] rev 7940
i18n-de: Commands (push and pull) + typos
Tobias Bell <tobias.bell@gmail.com> [Thu, 02 Apr 2009 08:15:39 +0200] rev 7939
i18n-de: translated global options of commands