FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Mar 2011 22:44:03 +0900] rev 13513
i18n-ja: synchronized with 0a6bca3d5273
Wagner Bruna <wbruna@yahoo.com> [Tue, 01 Mar 2011 01:00:35 -0300] rev 13512
i18n-pt_BR: synchronized with 9b617c56eb65
Augie Fackler <durin42@gmail.com> [Mon, 28 Feb 2011 19:15:08 -0600] rev 13511
zsh completion: complete bookmarks where they are accepted
This used to work because bookmarks were pseudo-tags, but broke
once bookmarks became their own first-class object.
Mads Kiilerich <mads@kiilerich.com> [Tue, 01 Mar 2011 02:54:16 +0100] rev 13510
tests: test-mq-subrepo.t Solaris 10 sh compliance
Solaris 10 sh do apparently not like temporary environment variable assignment
before a function call. There is no problem with commands.
Kevin Bullock <kbullock@ringworld.org> [Mon, 28 Feb 2011 16:45:15 -0600] rev 13509
bash_completion: complete bookmarks
Since bookmarks moved into core and are no longer merged with the list
of tags (d012d95499f7), they don't get completed in bash_completion
along with other revision specifiers. This adds a new function to
provide the list of bookmarks for completion, and another, _hg_labels(),
to list all tags, branches, and bookmarks. It further modifies
completion for all commands where '_hg_tags; _hg_branches' was used to
use '_hg_labels' instead.
Matt Mackall <mpm@selenic.com> [Mon, 28 Feb 2011 17:41:40 -0600] rev 13508
mq: fix qpush recursion in _findtags when status file is wrong (issue2664)
test from timeless to guard against regressing this
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 11 Feb 2011 13:10:39 +0100] rev 13507
mq: gracefully handle malformated status file
This patch prevent mq to crash when .hg/patches/status contains Malformed lines
(without ":"). Blank lines are ignored and other malformed lines issue a
warning.
Mads Kiilerich <mads@kiilerich.com> [Thu, 24 Feb 2011 00:47:49 +0100] rev 13506
revset: fix typo when assigning weight to reverse and limit
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 15:46:48 +0100] rev 13505
eol: do not abort on parse error
Handle parse errors in the .hgeol similarly to how parse errors in the
.hgtags file are handled: by issuing a warning. This allows the user
to revert the file using 'hg revert' or 'hg update -C'.
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 11:34:51 +0100] rev 13504
eol: fix test typos introduced in 5007ff32f356
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 11:31:36 +0100] rev 13503
eol: test win32text compatible encode/decode filters
Martin Geisler <mg@aragost.com> [Mon, 28 Feb 2011 09:28:18 +0100] rev 13502
eol: be explicit about how to enable hook (issue2661)
Antoine Pitrou <solipsis@pitrou.net> [Sun, 27 Feb 2011 19:50:28 +0100] rev 13501
eol: stop after first matched rule in hook (issue2660)
When matching a file against the rules in .hgeol, the eol extension's
hook should stop after the first matching rule is encountered.
Otherwise, if this rule is contradicted by other more general rule
(for example a catch-all at the end of .hgeol), some files are simply
impossible to push. Trivial example:
**.bat = CRLF
** = LF
If all matching rules were applied, a .bat file would be rejected
either because it has LFs (first rule) or because it has CRLFs (second
rule).
Matt Mackall <mpm@selenic.com> [Sun, 27 Feb 2011 15:58:29 -0600] rev 13500
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Feb 2011 18:21:51 -0300] rev 13499
i18n-pt_BR: synchronized with 3178aca36b0f
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 Feb 2011 12:07:09 +0100] rev 13498
help: document branch template keyword
The branch keyword was added in d79fdff55627
Matt Mackall <mpm@selenic.com> [Sat, 26 Feb 2011 10:40:22 -0600] rev 13497
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Sat, 26 Feb 2011 16:39:57 +0100] rev 13496
i18n-sv: started translation of mq and patchbomb
Jens Bäckman <jens.backman@gmail.com> [Sat, 26 Feb 2011 16:31:11 +0100] rev 13495
i18n-sv: synchronized with 95b0d4c1c9e1
Pavel Boldin <boldin.pavel@gmail.com> [Fri, 25 Feb 2011 21:01:30 +0300] rev 13494
convert.svn: branch name which equals trunk means `default' branch (issue2653)
Converting from subversion specifying config.svn.trunk results
in storing trunk under branch named as config.svn.trunk, where `default'
brunch is expected. Submission contains patch and test.
Ry4an Brase <ry4an-hg@ry4an.org> [Fri, 25 Feb 2011 23:26:24 -0600] rev 13493
ui: always report untrusted hgrc files when debug enabled
It was suggested in IRC that people disabling the reporting of unstructed hgrc
files can masquerade as problems. This makes sure untrusted hgrc files are
always reported if --debug is used.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 24 Feb 2011 13:57:52 -0300] rev 13492
tests: test renaming a file added on two branches (issue2089)
The issue was fixed by d100702326d5 .
Matt Mackall <mpm@selenic.com> [Fri, 25 Feb 2011 15:35:01 -0600] rev 13491
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 25 Feb 2011 22:26:02 +0900] rev 13490
i18n-ja: synchronized with 16725043a6fc
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 12:08:40 +0100] rev 13489
i18n-de: translate some bookmark strings
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 12:07:42 +0100] rev 13488
i18n-de: synchronized with 703717eb112c
Martin Geisler <mg@aragost.com> [Thu, 24 Feb 2011 12:04:45 +0100] rev 13487
i18n-da: translate some small strings
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 23 Feb 2011 12:57:09 -0300] rev 13486
i18n-pt_BR: synchronized with 9f2c407caf34
Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:35:44 +0100] rev 13485
i18n-da: synchronize with 14a699ed774b
Martin Geisler <mg@aragost.com> [Wed, 23 Feb 2011 15:31:49 +0100] rev 13484
i18n: merge with main