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