thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 12:21:46 +0100] rev 13676
i18n-de: added translations concerning win32text and .hgeol
thron7 <thron7@users.sourceforge.net> [Sun, 13 Mar 2011 11:38:27 +0100] rev 13675
i18n-de: added translations for Perforce conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:54:43 +0100] rev 13674
i18n-de: added translations for Subversion conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 18:32:02 +0100] rev 13673
i18n-de: added translation for CVS conversion options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13672
i18n-de: added translations for convert.hg.* options
thron7 <thron7@users.sourceforge.net> [Sat, 12 Mar 2011 17:42:17 +0100] rev 13671
i18n-de: translate some strings
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13670
revset: fix a number of highly dubious continue statements
This patch definitely needs a review and would also benefit from
some new testsuite entries.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13669
graphlog: do not swallow all TypeError exceptions (fix 29c800ee54cf)
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Wed, 16 Mar 2011 23:54:55 +0100] rev 13668
archive: use hardcoded constants when creating .zip archives
Do not rely on local stat constants, which may differ.
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:06:57 +0100] rev 13667
hgweb: support multiple directories for the same path
[paths]
/dir = /path/1/*, /path/2/*
timeless <timeless@gmail.com> [Wed, 16 Mar 2011 03:28:56 +0100] rev 13666
templates: provide granularity for future values for age filter
Bernhard Leiner <bleiner@gmail.com> [Wed, 16 Mar 2011 23:09:14 +0100] rev 13665
revset: report a parse error if a revset is not parsed completely (issue2654)
Adrian Buehlmann <adrian@cadifra.com> [Wed, 16 Mar 2011 18:48:59 +0100] rev 13664
config: use util.posixfile
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:03:56 +0100] rev 13663
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).
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 20:53:55 +0100] rev 13662
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.
Radomir Dopieralski <sheep@stxnext.pl> [Tue, 15 Mar 2011 18:33:36 +0100] rev 13661
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>
David Wolever <david@wolever.net> [Tue, 15 Mar 2011 17:50:02 -0400] rev 13660
Updating hgext.extdiff to use revsets
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 16:07:06 +0100] rev 13659
merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:45 +0100] rev 13658
relink: mark abort message for translation
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 15:34:10 +0100] rev 13657
relink: avoid trying to lock the same repo twice
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:51:47 +0100] rev 13656
relink: format reclaimed byte count nicely
Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:25:12 +0100] rev 13655
test-relink: remove unnecessary ui.username setting
David Soria Parra <dsp@php.net> [Wed, 16 Mar 2011 09:05:59 +0100] rev 13654
test-https: match output from 31eac42d9123
Matt Mackall <mpm@selenic.com> [Tue, 15 Mar 2011 16:53:46 -0500] rev 13653
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 22:37:50 +0100] rev 13652
merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:35:31 +0100] rev 13651
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>
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:31:54 +0100] rev 13650
eol: no need to accumulate files when checking all changesets
Just check the files touched by the changesets.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:08:18 +0100] rev 13649
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>
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:59:44 -0500] rev 13648
merge with stable
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 09:36:17 +0100] rev 13647
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.