Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:46 +0200] rev 14131
graphmod: correctly emit nodes with more than 2 predecessors
The grandparent() function was returning only the closest predecessor of a
missing parent while it must return all of them to display a correct ancestry
graph.
Patrick Mezard <pmezard@gmail.com> [Sun, 01 May 2011 15:51:20 +0200] rev 14130
graphlog: display nodes with more than 2 predecessors
While nodes with more than 2 parents do not exist in revision graphs, they do
appear when you transform them by removing subgraphs while trying to preserve
ancestry links.
This code was borrowed from Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
pbranch extension.
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 08:29:50 -0500] rev 14129
context: provide an efficient iterator for workingctx
This avoids needing to call status or build a synthetic manifest.
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 06:06:59 -0500] rev 14128
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 01 May 2011 06:04:08 -0500] rev 14127
merge with nicdumz
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 01 May 2011 10:51:10 +0200] rev 14126
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 18:31:28 +0200] rev 14125
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14124
tests: move rebase-keep-branch into rebase-named-branches
It's not worth building a repository just to test keep branch
when we can do it our bigger, other, already built repositories.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14123
tests: move testcase from rebase-named-branches to rebase-parameters
It saves us a clone of a repository.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14122
tests: change test-rebase-parameters to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14121
tests: change test-rebase-detach to use bundle/rebase.hg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14120
tests: simplify test-rebase-named-branches
We were cloning a repo to perform a smoke test that could
have been performed earlier.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14119
tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Add two changesets to the scenario so that the bundle can be reused
within three tests.
Before:
@ 5: 'F'
|
| o 4: 'E'
|/|
o | 3: 'D
| |
| o 2: 'C'
|/
| o 1: 'B'
|/
o 0: 'A'
After:
@ 7: 'H'
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
Revisions 0-1 keep the same number/label. Others were translated by
an offset of 2 (2.C -> 4.E)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14118
tests: introduce a rebase bundle to use with rebase tests
Allows saving a few seconds in test runs by not constructing
over and over the same repository.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 14117
tests: create a bundle to bootstrap tests using a remote repository
It should be faster to use a single common bundle instead of
recreating 4 times the same repository manually.