Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 10:06:09 +0100] rev 13537
test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13536
merge: drop resolve state for mergers with identical contents (
issue2680)
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:36 -0600] rev 13535
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:12 -0600] rev 13534
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/
Adrian Buehlmann <adrian@cadifra.com> [Fri, 18 Feb 2011 01:19:01 +0100] rev 13533
statichttprepo: abort if opener mode is 'r+' or 'rb+'
The old version of the check failed to catch
modifying modes 'r+' and 'rb+'.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:11:15 +0100] rev 13532
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 13531
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant but it is much simpler than rewriting our own
purge command for subversion.
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:41:38 +0100] rev 13530
convert/svn: stop using svn bindings when pushing to svn
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 22:19:28 +0100] rev 13529
convert/svn: read trunk name once, use None for default
Patrick Mezard <pmezard@gmail.com> [Thu, 03 Mar 2011 21:42:15 +0100] rev 13528
mq: mention qfinish in qimport help
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 22:00:41 -0600] rev 13527
merge with stable
Steve Borho <steve@borho.org> [Wed, 02 Mar 2011 21:57:20 -0600] rev 13526
bookmark: fix invalidation of localrepo._bookmarkcurrent
Eric Eisner <ede@mit.edu> [Wed, 02 Mar 2011 12:19:18 -0500] rev 13525
subrepo: show the source that git clones
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:52:31 +0100] rev 13524
check-code: catch "echo > $HGRCPATH" too
Make error message consistent with the other error messages.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:23:22 +0100] rev 13523
merge with stable
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:22:50 +0100] rev 13522
check-code: better check for overwriting $HGRCPATH
Suggested by Mads Kiilerich on IRC.
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:16:11 +0100] rev 13521
test-eol-*: remove unused config settings
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 14:09:06 +0100] rev 13520
mq: forbid commit of merge involving mq patches
Martin Geisler <mg@aragost.com> [Tue, 01 Mar 2011 17:01:17 +0100] rev 13519
tests: don't overwrite HGRCPATH
Overwriting instead of appending to the file removes the [defaults]
section put into the file by run-tests.py.
It also defeats the --inotify option to run-tests.py.
(Nothing was broken yet, but the lack of -d "0 0" cause changeset
hashes to change unexpectedly in a test case I was editing.)
Martin Geisler <mg@aragost.com> [Wed, 02 Mar 2011 13:24:48 +0100] rev 13518
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:38 -0600] rev 13517
Added signature for changeset
2616325766e3
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 16:01:32 -0600] rev 13516
Added tag 1.8 for changeset
2616325766e3
Gilles Moris <gilles.moris@free.fr> [Tue, 01 Mar 2011 07:28:20 +0100] rev 13515
contrib: update tcsh_completion for Mercurial 1.8
Added the following commands: bookmarks debugignore.
Fix the tcsh parse script for the current help text layout.
Matt Mackall <mpm@selenic.com> [Tue, 01 Mar 2011 12:48:31 -0600] rev 13514
merge with i18n
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
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 23:15:02 +0900] rev 13483
i18n-ja: synchronized with
7458b7e0d8d5
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 23 Feb 2011 22:52:38 +0900] rev 13482
i18n-ja: synchronized with
ba50f1600131
Matt Mackall <mpm@selenic.com> [Fri, 25 Feb 2011 15:31:32 -0600] rev 13481
context: be even more careful about result order in ancestors() (
issue2642)
The earlier patch could be confused by more complicated topologies.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 01:14:15 +0530] rev 13480
convert/svn: abort operation when python bindings are not available
Subversion python bindings check was not present in svn_sink source
class which made it fail while using svn as destination repository.
Added a more maintainble svn bindings check for svn_source and svn_sink
classes.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Thu, 24 Feb 2011 00:45:02 +0530] rev 13479
convert/svn: handle MissingTool exception from converter_sink class
The converter_sink class had no way of handling MissingTool
exception. This change makes it to abort when there is a
MissingTool exception.
David Soria Parra <dsp@php.net> [Thu, 24 Feb 2011 14:38:50 +0100] rev 13478
bookmarks: restrict moving a bookmark to its descendants (
issue1502)
A bookmark can only move to a descendant on commit, pull or
unbundle. Bookmarks cannot jump between heads anymore. This fixese
issue 1502.
We explicitly use new.node(), to emphasise that we are updating the
current bookmark to the new node.