Matt Mackall <mpm@selenic.com> [Thu, 17 Nov 2011 16:53:17 -0600] rev 15513
merge with stable
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> [Wed, 16 Nov 2011 08:34:36 +0100] rev 15512
hook: flush stdout before redirecting to stderr
When hook output redirection is enabled (e.g. when cloning over ssh), hook
output on stdout is redirected to stderr, to prevent the repository data on
stdout from being corrupted.
In certain cases, the redirection could cause part of the repository data to
end up on stderr as well. In case of a clone, this causes:
"abort: consistency error in delta!"
This was seen with a clone over ssh, an outgoing hook present (any
non-python type, e.g. 'pwd'), on certain repositories only,
probably depending on the distribution of the sent data)
This patch updates the hook redirection code to flush stdout before
redirecting, removing the problem.
Patrick Mezard <pmezard@gmail.com> [Wed, 16 Nov 2011 12:53:10 +0100] rev 15511
import: fix parent selection when importing merges
With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the
patch parents and "parents" the resulting commit parents, the current behaviour
is:
--bypass --exact p2 parents
0 0 0 [wp1, wp2]
0 0 1 [wp1, wp2]/buggy
0 1 0 [p1]
0 1 1 [p1, p2]
1 0 0 [wp1, wp2]
1 0 1 [p1, p2]
1 1 0 [p1]
1 1 1 [p1, p2]
The original behaviour before f53dc0787424 was:
--bypass --exact p2 parents
0 0 0 [wp1, wp2]
0 0 1 if p1 == wp1 then [p1, p2] otherwise [wp1, wp2]
0 1 0 [p1]
0 1 1 [p1, p2]
This patch restores the previous behaviour when --bypass is not set, and align
--bypass behaviour when --exact is not set with merge diffs.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Nov 2011 18:16:01 +0100] rev 15510
patch: simplify hunk extents parsing
Do not capture unwanted groups in regexps
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Nov 2011 21:37:14 +0100] rev 15509
diff: --ignore-blank-lines was too enthusiastic
It was ignoring changes from:
ab
to:
a
b
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 14:00:25 +0100] rev 15508
graft: disallow grafting grafted csets in specific situations (issue3091)
In particular, we do not allow:
- grafting an already grafted cset onto its original branch
- grafting already grafted csets with the same origin onto each other
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 11:23:52 +0100] rev 15507
graft: use revs to make tests more readable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 13:15:40 +0100] rev 15506
graft: preserve original source in subsequent grafts
Dmitry Panov <dop@itoolabs.com> [Sun, 13 Nov 2011 00:29:26 +0000] rev 15505
makedate: wrong timezone offset if DST rules changed this year (issue2511)
Python's time module sets timezone and altzone based on UTC offsets of
two dates: first and middle day of the current year. This approach
doesn't work on a year when DST rules change.
For example Russia abandoned winter time this year, so the correct UTC
offset should be +4 now, but time.timezone returns 3 hours difference
because that's what it was on 01.01.2011.
Related python issue: http://bugs.python.org/issue1647654
Marc-Antoine Ruel <maruel@google.com> [Thu, 17 Nov 2011 15:44:37 -0600] rev 15504
posix: fix findexe() to check for file type and access
Mads Kiilerich <mads@kiilerich.com> [Tue, 15 Nov 2011 02:44:55 +0100] rev 15503
forget: use forward slashes for internal paths
forget into a subrepo failed on windows because pathes were joined with \.
Mads Kiilerich <mads@kiilerich.com> [Fri, 11 Nov 2011 01:25:47 +0100] rev 15502
check-code: add --nolineno option for hiding line numbers
This makes the output more stable when it is used as a whitelist.
Matt Mackall <mpm@selenic.com> [Wed, 16 Nov 2011 18:04:19 -0600] rev 15501
merge: give a special message for internal:merge failure (issue3105)
Simon Heimberg <simohe@besonet.ch> [Sat, 12 Nov 2011 02:08:01 +0100] rev 15500
setup: raise when executing with python3 without c2to3 argument
Marc-Antoine Ruel <maruel@google.com> [Wed, 16 Nov 2011 17:55:32 -0600] rev 15499
posix: fix findexe() to check for file type and access
Mads Kiilerich <mads@kiilerich.com> [Tue, 15 Nov 2011 02:16:30 +0100] rev 15498
subrepo: use correct paths for subrepos with ..-relative paths on windows
posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.
Mads Kiilerich <mads@kiilerich.com> [Fri, 11 Nov 2011 01:07:10 +0100] rev 15497
add missing localization markup
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 00:10:56 +0100] rev 15496
url: handle file://localhost/c:/foo "correctly"
The path was parsed correctly, but localpath prepended an extra '/' (as in
'/c:/foo') because it assumed it was an absolute unix path.
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 00:10:52 +0100] rev 15495
help: it is 'file://localhost/', not 'file://local/'
The documentation has apparently always been wrong.
Simon Heimberg <simohe@besonet.ch> [Sun, 21 Aug 2011 15:23:43 +0200] rev 15494
setup: support executing with python3 including 2to3
Merge the code from contrib/setup3.py in setup.
The argument for executing is marked as experimental.
Reason: The file in contrib was outdated (packages, cmdclass, ...)
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Nov 2011 20:13:53 +0100] rev 15493
setup: hgbuildmo inherits from Command
hgbuildmo does not need anything provided by the build class.
Simon Heimberg <simohe@besonet.ch> [Sat, 12 Nov 2011 02:07:55 +0100] rev 15492
setup: make script executable with python3
Replace the incompatible print statement. Writing a warning to stderr is a good
idea anyway.
Kevin Bullock <kbullock@ringworld.org> [Wed, 17 Aug 2011 08:55:01 -0500] rev 15491
bookmark: remove excess creation of changectx's
Kevin Bullock <kbullock@ringworld.org> [Wed, 17 Aug 2011 08:49:40 -0500] rev 15490
bookmark: same order for options and code
Matt Mackall <mpm@selenic.com> [Tue, 15 Nov 2011 14:33:06 -0600] rev 15489
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 15 Nov 2011 14:25:11 -0600] rev 15488
dirstate: fix case-folding identity for traditional Unix
We used to use os.path.normcase which was a no-op, which was unhelpful
for cases like VFAT on Linux.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 15 Nov 2011 17:16:17 +0100] rev 15487
convert/bzr: fix test of divergent nested renames for bzr 1.x
54c0517c0fe8 introduced a new block in test-convert-bzr-directories.t
which produces a slightly different output with older bzr versions.
Tested with bzr 1.5 on Debian lenny.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 11 Nov 2011 00:22:02 +0100] rev 15486
phases: set common changeset to public on pull
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 11 Nov 2011 00:21:17 +0100] rev 15485
phases: mark content pushed as public in local repo on push
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 11 Nov 2011 00:19:00 +0100] rev 15484
phases: marked content of a changegroup as published
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 11 Nov 2011 00:15:22 +0100] rev 15483
phases: set new commit in 1-phase
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 11 Nov 2011 00:16:53 +0100] rev 15482
phases: add retractboundary function to move boundary backward
The advanceboundary documentation is updated to highlight the difference.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 10 Nov 2011 01:09:15 +0100] rev 15481
phases: rename moveboundary into advance boundary
This rename prepare the creation of retract boundaru that move boundary backward
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 10 Nov 2011 01:08:08 +0100] rev 15480
phases: remove underbar into target_phase argument
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 17:06:30 -0600] rev 15479
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 17:06:12 -0600] rev 15478
tests: fix trailing whitespace
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 15:55:26 -0600] rev 15477
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 15:40:34 -0600] rev 15476
mq: add a warning about uncommitted changes for qfinish
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 15:08:51 -0600] rev 15475
hgweb: add hint about finding library path with debuginstall
David M. Carr <david@carrclan.us> [Wed, 09 Nov 2011 19:46:51 -0500] rev 15474
forget: support forgetting explicit paths in subrepos
Change the behavior of the forget command such that explicit paths in
subrepos are handled by forgetting the file in the subrepo. This eliminates the
previous behavior where if you called "hg forget" for an explicit path in a
subrepo, it would state that the file is already untracked.
David M. Carr <david@carrclan.us> [Wed, 09 Nov 2011 19:46:49 -0500] rev 15473
tests: add test for behavior of forget for explicit path in subrepo
Adds a section to test-subrepo.t that demonstrates the current behavior
when you pass the full path to a file in a subrepo to hg forget.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 11 Nov 2011 02:33:01 +0900] rev 15472
largefiles: treat status of cache missed largefiles as "missing" correctly
"hg status" may treat cache missed largefiles as "removed" incorrectly.
assumptions for problem case:
- there is no cache for largefile "L"
- at first, update working directory to the revision in which "L" is
not yet added,
- then, update working directory to the revision in which "L" is
already added
and now, "hg status" treats "L" as "removed".
current implementation does not allocate entry for cache missed
largefile in ".hg/largefiles/dirstate", but files without
".hg/largefiles/dirstate" entry are treated as "removed" by largefiles
extension.
"hg revert" can not recover from this situation, but "rm -rf
.hg/largefiles", because it causes dirstate rebuilding.
this patch invokes normallookup() for cache missed largefiles to
allocate entry in ".hg/largefiles/dirstate", so "hg status" can treat
it as "missing" correctly.
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:27 -0600] rev 15471
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 10 Nov 2011 11:00:02 -0600] rev 15470
merge with i18n
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Nov 2011 17:09:48 +0100] rev 15469
rebase: ensure target is not taken as external (issue3085)
This could happen in specific situations in which 'target'
was selected as external and used for p1 _and_ p2.
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