Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 10:59:03 -0600] rev 15468
merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 19:01:10 +0100] rev 15467
i18n: merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 18:58:17 +0100] rev 15466
i18n-da: add new strings from Mercurial 2.0
Martin Geisler <mg@lazybytes.net> [Wed, 09 Nov 2011 18:26:54 +0100] rev 15465
i18n-ru: fix translation of --logfile (issue3095)
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sun, 06 Nov 2011 23:35:33 +0100] rev 15464
rebase: treat nullmerge as a special case in rebasestate (issue3046)
When storing/restoring a nullmerge (-2), a 'standard' conversion was made
and an existing changeset was wrongly used.
Nullmerge should instead be treated as a special case.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Nov 2011 21:31:39 +0100] rev 15463
graft: mark a string for translation
Nicolas Venegas <nvenegas@atlassian.com> [Wed, 09 Nov 2011 16:55:59 -0800] rev 15462
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Prior to this patch "hg diff -U0", i.e., zero lines of context, would
output hunk headers with a start line one greater than what GNU patch
and git output. Guido van Rossum documents the unified diff format[1]
as having a start line value "one lower than one would expect" for
zero length hunks.
Comparing the behaviour of the three systems prior to this patch in
transforming
c1
c3
to
c1
c2
c3
- GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
Since "hg export --config diff.unified=0" outputs zero-context unified
diffs, "hg import" has also been updated to account for start lines
one less than expected for zero length hunk ranges.
[1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
Patrick Mezard <pmezard@gmail.com> [Tue, 08 Nov 2011 17:08:58 +0100] rev 15461
convert/bzr: correctly handle divergent nested renames (issue3089)
With renames like:
a -> b
a/c -> a/c
We were ignoring or duplicating the second one instead of leaving files
unchanged or moving them to their proper destination only.
To avoid this, we process the files in reverse lexicographic order, from most
to least specific change, and ignore files already processed.
v2:
- Add a test
- Change "reverse=1" into "reverse=True"
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Nov 2011 20:13:53 +0100] rev 15460
setup: subclass build command
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Nov 2011 20:13:52 +0100] rev 15459
setup: has_ext_modules always returns false when pure is specified
When pure is specified ext_modules is emptied in hgbuildpy.finalize_options.
Before this happens has_ext_modules returned True.
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Jul 2011 05:57:39 +0200] rev 15458
setup: subclass distribution instead of overwriting original
Matt Mackall <mpm@selenic.com> [Wed, 09 Nov 2011 16:36:54 -0600] rev 15457
check-code: enable camelcase check, fix up problems
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 07 Nov 2011 13:20:22 +0100] rev 15456
phases: handle unknown nodes in boundary
We filter unknown node out of the boundary. No data is lost. A
filtering is explicitly done after strip too
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 07 Nov 2011 12:27:25 +0100] rev 15455
phases: add rollback support
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 07 Nov 2011 14:11:01 +0100] rev 15454
phases: add a moveboundary function to move phases boundaries
Also include logic to detect when to write phases data.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 07 Nov 2011 18:37:58 +0100] rev 15453
phases: improve context.phase()
* force recompute of outdated cache
* handle nullrev case
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15452
util: don't encode ':' in url paths
':' has no special meaning in paths, so there is no need for encoding it.
Not encoding ':' makes it easier to test on windows.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15451
run-tests: make $TESTTMP matching case-insensitive on windows
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15450
run-tests: don't quote command names - that do apparently not work with msys
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15449
tests: ignore \r on windows
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15448
run-tests: convert windows paths to unix
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 15447
tests: make (glob) on windows accept \ instead of /
Globbing is usually used for filenames, so on windows it is reasonable and very
convenient that glob patterns accepts '\' or '/' when the pattern specifies
'/'.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:24:53 +0100] rev 15446
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 15445
tests: use 'hghave system-sh' to guard tests that requires sh in system()
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 15444
tests: use 'hghave no-windows' to avoid testing reserved file names on windows
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 15443
tests: use 'hghave unix-permissions' for tests that really use chmod
chmod of helper scripts is not included.
tests that exercise the x bit in the file system uses 'hghave execbit'.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:54 +0100] rev 15442
tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:54 +0100] rev 15441
tests: use 'hghave symlink' for tests using symlinks
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:54 +0100] rev 15440
windows: use umask 022 in debugstate output
debugstate would always report files as mode 666 or 777 on Windows.
umask is not used on Windows, but faking and using a defalt value of 022
matches what the test suite uses on Unix.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:53 +0100] rev 15439
dispatch: exit with 8-bit exit code
The exit code returned from a program to the shell is unsigned 8-bit, but
Mercurial would sometimes try to exit with negative numbers or None. sys.exit
on Unix will convert that to 8-bit exit codes, but on Windows negative values
showed up as 0.
The exit code is now explicitly converted to unsigned 8-bit.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:53 +0100] rev 15438
tests: don't let time go back before 0 o'clock in bisect3.t
Windows agree that it was
Thu Jan 01 00:00:00 1970 +0000
but it also claims that it was
Thu Dec 31 23:59:59 1969 -0000
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:49:00 +0100] rev 15437
diff: always use / in paths in diff
Subrepo diffs would sometimes use backslash on windows.
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:49:00 +0100] rev 15436
cmdutil: don't use repr on paths in pathauditor - it looks strange on windows
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:44:04 +0100] rev 15435
tests: make '(esc)' matching in run-tests.py work as intended
The code for match on (esc) lines didn't work, and it would thus always end up
emitting another suggestion ... which however would match the old one.
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:41 -0600] rev 15434
run-tests: replace inline python handling with more native scheme
Normally changes in tests are reported like this in diffs:
$ cat foo
- a
+ b
Using -i mode lets us update tests when the new results are correct
and/or populate tests with their output.
But with the standard doctest framework, inline Python sections in
tests changes instead result in a big failure report that's unhelpful.
So here, we replace the doctest calls with a simple compile/eval loop.
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:39 -0600] rev 15433
merge with crew
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:39:04 +0100] rev 15432
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:32:13 +0100] rev 15431
merge with main
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:31:38 +0100] rev 15430
merge with main
David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:12:31 -0400] rev 15429
subrepo: improve help for svn subrepo support
Add details on which commands are supported for Subversion subrepos.
David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:12:30 -0400] rev 15428
subrepo: improve help for git subrepo support
Add details on which commands are supported for git subrepos.
David M. Carr <david@carrclan.us> [Thu, 03 Nov 2011 23:11:40 -0400] rev 15427
subrepo: update help for commit to reflect new default behavior
Update the subrepo help to be consistent with the new default behavior,
which is to abort if any subrepo is dirty.
Martin Geisler <mg@aragost.com> [Thu, 03 Nov 2011 14:40:58 +0100] rev 15426
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 03 Nov 2011 10:52:58 -0200] rev 15425
i18n: disable translations with conflicting prompt keys (issue3082)
This is just a stopgap until a proper solution is implemented.
Matt Mackall <mpm@selenic.com> [Sun, 06 Nov 2011 14:40:31 -0600] rev 15424
log: hide hidden option until it actually does something
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 04 Nov 2011 00:40:47 +0100] rev 15423
phases: add a very simple test
Note that the expected output is wrong as is should be phase-1. But
the machinery to plant new root is to come in later commit.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 09 Oct 2011 14:25:04 +0200] rev 15422
phases: add a phase template keyword
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Oct 2011 18:25:53 +0200] rev 15421
phases: add a phase method to context
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 04 Nov 2011 00:20:20 +0100] rev 15420
phases: add a cache allowing to know in which phase a changeset is
Matt Mackall <mpm@selenic.com> [Sun, 06 Nov 2011 11:57:24 -0600] rev 15419
phases: handle errors other than ENOENT appropriately
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 04 Nov 2011 00:16:24 +0100] rev 15418
phases: basic I/O logic
Add function to read and write phase roots. Add a _phaseroots filecache on
localrepo class to access the phaseroots data.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 03 Nov 2011 23:49:14 +0100] rev 15417
phases: Minimal first add.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:18:10 -0500] rev 15416
run-tests: minor cleanups
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:08:45 -0500] rev 15415
run-tests: pull out line matching function
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:51:04 -0500] rev 15414
run-tests: pull out unified matching funcs
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:48:56 -0500] rev 15413
tests: add some comments to the unified test code
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:30:00 -0500] rev 15412
tests: rewrite inline Python support
Tests with inline Python could turn '>>>' into their underlying python
invocation if the test got updated with -i.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 12:58:30 -0500] rev 15411
merge with stable
David M. Carr <david@carrclan.us> [Wed, 02 Nov 2011 01:17:11 -0400] rev 15410
add: support adding explicit files in subrepos
Change the behavior of the add command such that explicit paths in
subrepos are always added. This eliminates the previous behavior
where if you called "hg add" for an explicit path in a subrepo
without specifying the -S option, it would be silently ignored.
If you specify patterns, or no arguments at all, the -S option
will still be needed to activate recursion into subrepos.
David M. Carr <david@carrclan.us> [Tue, 01 Nov 2011 23:53:29 -0400] rev 15409
tests: add test for add of explicit path in subrepo
Add test coverage for the existing behavior where adds of explicit paths in
subrepos are silently ignored. This is in preparation for changing the
behavior of the add command to have better support for subrepos.
Hao Lian <hao@fogcreek.com> [Thu, 03 Nov 2011 10:59:32 -0400] rev 15408
largefiles: ensure destination directory exists before findfile links to there
When (1) findfile links a largefile from the user cache to the store
and (2) the store directory doesn't exist yet, findfile errors out. A
simple call to util.makedirs fixes it.
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 11:24:55 -0500] rev 15407
misc: adding missing file close() calls
Spotted by Victor Stinner <victor.stinner@haypocalc.com>
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> [Thu, 20 Oct 2011 00:37:34 +0200] rev 15406
bisect: remove superfluous parameter in label()
The argument is not used. This is a left-over of non-published
iterations, and it passed through.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Matt Mackall <mpm@selenic.com> [Wed, 02 Nov 2011 15:06:40 -0500] rev 15405
log: hide some low-utility options