Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:31 +0100] rev 9821
bundle: add test for Issue1704
Original version by Greg Ward.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 07 Nov 2009 12:28:30 +0100] rev 9820
bundle: don't send too many changesets (Issue1704)
The fast path in changegroupsubset can send too many csets. This happens
because it uses the parents of all bases as common nodes and then goes
forward from this again. If a base has a parent that has another child,
which is -not- a base, then this other child will nevertheless end up in
the changegroup.
The fix is to not use findmissing(), but use nodesbetween() instead, as
do the slow path and incoming/outgoing.
The change to test-notify.out is correct, because it actually hits this
bug, as can be seen by glog'ing the two repos:
@ 22c88
|\
| o 0a184
| |
o | 0647d
|/
o cb9a9
and
o 0647d
|
@ cb9a9
It used to pull 0647d again, which is unnecessary.
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 22:32:17 +0100] rev 9819
convert: reenable SVN support after license issue solved
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Nov 2009 18:08:24 +0100] rev 9818
patchbomb: normalize date format in generated mboxes
mbox format should use time.asctime(). Unfortunately, this function writes
2-characters day of week on Windows while unix one writes a single character.
Normalize to Windows version since the other one can hardly be written with
strftime().
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 11:57:03 +0100] rev 9817
hghave: be more tolerant to rst2html output
On Windows, rst2html.bat calls rst2html.py, printing something like:
"rst2html.py (Docutils"
(notice the extra ".py")
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 21:55:59 +0100] rev 9816
test-convert-hg-svn: fix test output
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 20:15:49 +0100] rev 9815
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 10:06:08 +0100] rev 9814
buildrpm: enhance changelog of the RPM file
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:59:55 +0100] rev 9813
buildrpm: build full RPM package including sources
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:53:23 +0100] rev 9812
buildrpm: cleanup script