Commit b3d75bc4 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

obslog: show the other parts of splits

parent db1dfa818187
Pipeline #6661 passed with stage
in 5 minutes and 17 seconds
...@@ -113,9 +113,11 @@ TEMPLATE_FIRST_LINE = b"""{if(rev, "%(presentnode)s", "%(missingnode)s")}""" % { ...@@ -113,9 +113,11 @@ TEMPLATE_FIRST_LINE = b"""{if(rev, "%(presentnode)s", "%(missingnode)s")}""" % {
b"presentnode": TEMPLATE_PRESENT_NODE, b"presentnode": TEMPLATE_PRESENT_NODE,
b"missingnode": TEMPLATE_MISSING_NODE b"missingnode": TEMPLATE_MISSING_NODE
} }
TEMPLATE_RELNODES = b"""{label("evolve.node", join(relnodes % "{relnode|short}", ", "))}"""
TEMPLATE_PREDNODES = b"""{label("evolve.node", join(prednodes % "{prednode|short}", ", "))}""" TEMPLATE_PREDNODES = b"""{label("evolve.node", join(prednodes % "{prednode|short}", ", "))}"""
TEMPLATE_SUCCNODES = b"""{label("evolve.node", join(succnodes % "{succnode|short}", ", "))}""" TEMPLATE_SUCCNODES = b"""{label("evolve.node", join(succnodes % "{succnode|short}", ", "))}"""
TEMPLATE_NODES = b"""{if(prednodes, "from %(prednodes)s")}{if(succnodes, "as %(succnodes)s")}""" % { TEMPLATE_NODES = b"""{if(relnodes, "together with %(relnodes)s ")}{if(prednodes, "from %(prednodes)s")}{if(succnodes, "as %(succnodes)s")}""" % {
b"relnodes": TEMPLATE_RELNODES,
b"prednodes": TEMPLATE_PREDNODES, b"prednodes": TEMPLATE_PREDNODES,
b"succnodes": TEMPLATE_SUCCNODES b"succnodes": TEMPLATE_SUCCNODES
} }
...@@ -660,6 +662,21 @@ def displaymarkers(ui, fm, nodes, markers, node, repo, includediff=False, ...@@ -660,6 +662,21 @@ def displaymarkers(ui, fm, nodes, markers, node, repo, includediff=False,
nodelist = fm.formatlist(hexnodes, b'prednode') nodelist = fm.formatlist(hexnodes, b'prednode')
fm.data(prednodes=nodelist) fm.data(prednodes=nodelist)
relnodes = set()
if successive:
# TODO: show other parts of folds
pass
else:
for marker in markers:
if len(marker[1]) > 1:
relnodes |= set(marker[1])
relnodes.discard(node)
if relnodes:
relnodes = (nodemod.hex(node) for node in sorted(relnodes))
nodelist = fm.formatlist(relnodes, b'relnode')
fm.data(relnodes=nodelist)
# Operations # Operations
operations = obsutil.markersoperations(markers) operations = obsutil.markersoperations(markers)
if operations: if operations:
......
...@@ -277,14 +277,14 @@ Check that obslog never crashes on a cycle ...@@ -277,14 +277,14 @@ Check that obslog never crashes on a cycle
| rewritten(description, parent, content) from 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000) | rewritten(description, parent, content) from 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
@ 868d2e0eb19c (4) D @ 868d2e0eb19c (4) D
|\ split(description, parent, content) from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000) |\ split(description, parent, content) together with 2a34000d3544 from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, parent, content) from d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| x d9f908fde1a1 (6) F | x d9f908fde1a1 (6) F
| | rewritten(description, parent, content) from 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
+---x 2a34000d3544 (1) A +---x 2a34000d3544 (1) A
| | split(description, parent, content) from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | split(description, parent, content) together with 868d2e0eb19c from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
x | a8df460dbbfe (3) C x | a8df460dbbfe (3) C
| | rewritten(description, parent, content) from c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
...@@ -320,14 +320,14 @@ Check that all option doesn't crash on a cycle either ...@@ -320,14 +320,14 @@ Check that all option doesn't crash on a cycle either
| rewritten(description, parent, content) from 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000) | rewritten(description, parent, content) from 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
@ 868d2e0eb19c (4) D @ 868d2e0eb19c (4) D
|\ split(description, parent, content) from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000) |\ split(description, parent, content) together with 2a34000d3544 from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, parent, content) from d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| x d9f908fde1a1 (6) F | x d9f908fde1a1 (6) F
| | rewritten(description, parent, content) from 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
+---x 2a34000d3544 (1) A +---x 2a34000d3544 (1) A
| | split(description, parent, content) from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | split(description, parent, content) together with 868d2e0eb19c from a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
x | a8df460dbbfe (3) C x | a8df460dbbfe (3) C
| | rewritten(description, parent, content) from c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
...@@ -380,6 +380,9 @@ Check the json output is valid in this case ...@@ -380,6 +380,9 @@ Check the json output is valid in this case
"prednodes": [ "prednodes": [
"a8df460dbbfe9ef0c1e5ab4fff02e9514672e379" "a8df460dbbfe9ef0c1e5ab4fff02e9514672e379"
], ],
"relnodes": [
"2a34000d35446022104f7a091c06fe21ff2b5912"
],
"users": [ "users": [
"test" "test"
], ],
...@@ -548,6 +551,9 @@ Check the json output is valid in this case ...@@ -548,6 +551,9 @@ Check the json output is valid in this case
"prednodes": [ "prednodes": [
"a8df460dbbfe9ef0c1e5ab4fff02e9514672e379" "a8df460dbbfe9ef0c1e5ab4fff02e9514672e379"
], ],
"relnodes": [
"868d2e0eb19c2b55a2894d37e1c435c221384d48"
],
"users": [ "users": [
"test" "test"
], ],
......
...@@ -392,14 +392,14 @@ walking algorithm works no matter the level of successors + precursors ...@@ -392,14 +392,14 @@ walking algorithm works no matter the level of successors + precursors
$ hg obslog 12 $ hg obslog 12
* 7b3290f6e0a0 (12) fold1 * 7b3290f6e0a0 (12) fold1
|\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) |\ split(parent, content) together with d0f33db50670 from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
x | d15d0ffc75f6 (8) fold1 x | d15d0ffc75f6 (8) fold1
|\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000) |\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | |
| | x e036916b63ea (11) fold0 | | x e036916b63ea (11) fold0
| | | split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | split(parent, content) together with 19e14c8397fc from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | |
x | | 868d2e0eb19c (4) D x | | 868d2e0eb19c (4) D
/ / / /
...@@ -441,17 +441,17 @@ While with all option, we should see 15 changesets ...@@ -441,17 +441,17 @@ While with all option, we should see 15 changesets
$ hg obslog --all 15 $ hg obslog --all 15
o 19e14c8397fc (10) fold0 o 19e14c8397fc (10) fold0
| split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with e036916b63ea from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| * 7b3290f6e0a0 (12) fold1 | * 7b3290f6e0a0 (12) fold1
| |\ split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) | |\ split(parent, content) together with d0f33db50670 from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | | rewritten(description, parent, content) from e036916b63ea using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | |
| | | @ d4a000f63ee9 (15) fold2 | | | @ d4a000f63ee9 (15) fold2
| | | | split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | | split(parent, content) together with ec31316faa9d from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | | | |
| | | | * ec31316faa9d (14) fold2 | | | | * ec31316faa9d (14) fold2
| | | |/| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | |/| split(parent, content) together with d4a000f63ee9 from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | rewritten(description, parent, content) from d0f33db50670 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | note: this is a note stored in obsmarker in prune | | | | | note: this is a note stored in obsmarker in prune
| | | | | | | | | |
...@@ -460,10 +460,10 @@ While with all option, we should see 15 changesets ...@@ -460,10 +460,10 @@ While with all option, we should see 15 changesets
| | | | | | note: folding changesets to test | | | | | | note: folding changesets to test
| | | | | | | | | | | |
| +-------x d0f33db50670 (13) fold1 | +-------x d0f33db50670 (13) fold1
| | | | | split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | | | | split(parent, content) together with 7b3290f6e0a0 from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | | | | | |
+---x | | e036916b63ea (11) fold0 +---x | | e036916b63ea (11) fold0
| | / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000) | | / / split(parent, content) together with 19e14c8397fc from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | | | |
| | x / 0da815c333f6 (5) E | | x / 0da815c333f6 (5) E
| | / | | /
......
...@@ -193,11 +193,11 @@ Actual test ...@@ -193,11 +193,11 @@ Actual test
$ hg obslog de7290d8b885 --hidden --all --patch $ hg obslog de7290d8b885 --hidden --all --patch
o 1ae8bc733a14 (4) A0 o 1ae8bc733a14 (4) A0
| split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 337fec4d2edc, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o 337fec4d2edc (2) A0 | o 337fec4d2edc (2) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r de7290d8b885 -r 337fec4d2edc b | diff -r de7290d8b885 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
...@@ -216,11 +216,11 @@ Actual test ...@@ -216,11 +216,11 @@ Actual test
| |
| |
| @ c7f044602e9b (5) A0 | @ c7f044602e9b (5) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o f257fde29c7a (3) A0 | o f257fde29c7a (3) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, c7f044602e9b from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
x de7290d8b885 (1) A0 x de7290d8b885 (1) A0
...@@ -268,7 +268,7 @@ Actual test ...@@ -268,7 +268,7 @@ Actual test
$ hg obslog c7f044602e9b --patch $ hg obslog c7f044602e9b --patch
@ c7f044602e9b (5) A0 @ c7f044602e9b (5) A0
| split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
x de7290d8b885 (1) A0 x de7290d8b885 (1) A0
...@@ -333,6 +333,11 @@ Actual test ...@@ -333,6 +333,11 @@ Actual test
"prednodes": [ "prednodes": [
"de7290d8b885925115bb9e88887252dfc20ef2a8" "de7290d8b885925115bb9e88887252dfc20ef2a8"
], ],
"relnodes": [
"1ae8bc733a14e374f11767d2ad128d4c891dc43f",
"337fec4d2edcf0e7a467e35f818234bc620068b5",
"f257fde29c7a847c9b607f6e958656d0df0fb15c"
],
"users": [ "users": [
"test" "test"
], ],
...@@ -364,11 +369,11 @@ Check that obslog on all heads shows a coherent graph ...@@ -364,11 +369,11 @@ Check that obslog on all heads shows a coherent graph
$ hg obslog 2::5 --patch $ hg obslog 2::5 --patch
o 1ae8bc733a14 (4) A0 o 1ae8bc733a14 (4) A0
| split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 337fec4d2edc, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o 337fec4d2edc (2) A0 | o 337fec4d2edc (2) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r de7290d8b885 -r 337fec4d2edc b | diff -r de7290d8b885 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
...@@ -387,11 +392,11 @@ Check that obslog on all heads shows a coherent graph ...@@ -387,11 +392,11 @@ Check that obslog on all heads shows a coherent graph
| |
| |
| @ c7f044602e9b (5) A0 | @ c7f044602e9b (5) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o f257fde29c7a (3) A0 | o f257fde29c7a (3) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, c7f044602e9b from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
x de7290d8b885 (1) A0 x de7290d8b885 (1) A0
...@@ -411,11 +416,11 @@ Check that obslog on all heads shows a coherent graph ...@@ -411,11 +416,11 @@ Check that obslog on all heads shows a coherent graph
$ hg obslog 5 --all --patch $ hg obslog 5 --all --patch
o 1ae8bc733a14 (4) A0 o 1ae8bc733a14 (4) A0
| split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 337fec4d2edc, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o 337fec4d2edc (2) A0 | o 337fec4d2edc (2) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, c7f044602e9b, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r de7290d8b885 -r 337fec4d2edc b | diff -r de7290d8b885 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
...@@ -434,11 +439,11 @@ Check that obslog on all heads shows a coherent graph ...@@ -434,11 +439,11 @@ Check that obslog on all heads shows a coherent graph
| |
| |
| @ c7f044602e9b (5) A0 | @ c7f044602e9b (5) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, f257fde29c7a from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
| o f257fde29c7a (3) A0 | o f257fde29c7a (3) A0
|/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 1ae8bc733a14, 337fec4d2edc, c7f044602e9b from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
x de7290d8b885 (1) A0 x de7290d8b885 (1) A0
......
...@@ -156,7 +156,7 @@ Check that obslog on the first successor after split shows the revision plus ...@@ -156,7 +156,7 @@ Check that obslog on the first successor after split shows the revision plus
the split one the split one
$ hg obslog 337fec4d2edc --patch $ hg obslog 337fec4d2edc --patch
o 337fec4d2edc (2) A0 o 337fec4d2edc (2) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| diff -r 471597cad322 -r 337fec4d2edc b | diff -r 471597cad322 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
...@@ -170,7 +170,7 @@ the split one ...@@ -170,7 +170,7 @@ the split one
With the all option, it should show all three changesets With the all option, it should show all three changesets
$ hg obslog --all 337fec4d2edc --patch $ hg obslog --all 337fec4d2edc --patch
o 337fec4d2edc (2) A0 o 337fec4d2edc (2) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| diff -r 471597cad322 -r 337fec4d2edc b | diff -r 471597cad322 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
...@@ -180,7 +180,7 @@ With the all option, it should show all three changesets ...@@ -180,7 +180,7 @@ With the all option, it should show all three changesets
| |
| |
| @ f257fde29c7a (3) A0 | @ f257fde29c7a (3) A0
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
...@@ -190,7 +190,7 @@ Check that obslog on the second successor after split shows the revision plus ...@@ -190,7 +190,7 @@ Check that obslog on the second successor after split shows the revision plus
the split one the split one
$ hg obslog f257fde29c7a --patch $ hg obslog f257fde29c7a --patch
@ f257fde29c7a (3) A0 @ f257fde29c7a (3) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
...@@ -199,7 +199,7 @@ the split one ...@@ -199,7 +199,7 @@ the split one
With the all option, it should show all three changesets With the all option, it should show all three changesets
$ hg obslog f257fde29c7a --all --patch $ hg obslog f257fde29c7a --all --patch
o 337fec4d2edc (2) A0 o 337fec4d2edc (2) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| diff -r 471597cad322 -r 337fec4d2edc b | diff -r 471597cad322 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
...@@ -209,7 +209,7 @@ With the all option, it should show all three changesets ...@@ -209,7 +209,7 @@ With the all option, it should show all three changesets
| |
| |
| @ f257fde29c7a (3) A0 | @ f257fde29c7a (3) A0
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
...@@ -239,7 +239,7 @@ Check that obslog on both successors after split shows a coherent graph ...@@ -239,7 +239,7 @@ Check that obslog on both successors after split shows a coherent graph
$ hg obslog 'f257fde29c7a+337fec4d2edc' --patch $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch
o 337fec4d2edc (2) A0 o 337fec4d2edc (2) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| diff -r 471597cad322 -r 337fec4d2edc b | diff -r 471597cad322 -r 337fec4d2edc b
| --- a/b Thu Jan 01 00:00:00 1970 +0000 | --- a/b Thu Jan 01 00:00:00 1970 +0000
...@@ -249,7 +249,7 @@ Check that obslog on both successors after split shows a coherent graph ...@@ -249,7 +249,7 @@ Check that obslog on both successors after split shows a coherent graph
| |
| |
| @ f257fde29c7a (3) A0 | @ f257fde29c7a (3) A0
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, changesets rebased) | (No patch available, changesets rebased)
| |
...@@ -313,7 +313,7 @@ Check output on the server side ...@@ -313,7 +313,7 @@ Check output on the server side
$ hg obslog -R $TESTTMP/server --patch tip $ hg obslog -R $TESTTMP/server --patch tip
o f257fde29c7a (2) A0 o f257fde29c7a (2) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, predecessor is unknown locally) | (No patch available, predecessor is unknown locally)
| |
...@@ -324,12 +324,12 @@ Check output on the server side ...@@ -324,12 +324,12 @@ Check output on the server side
$ hg obslog -R $TESTTMP/server --all --patch tip $ hg obslog -R $TESTTMP/server --all --patch tip
o 337fec4d2edc (1) A0 o 337fec4d2edc (1) A0
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) | split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, predecessor is unknown locally) | (No patch available, predecessor is unknown locally)
| |
| o f257fde29c7a (2) A0 | o f257fde29c7a (2) A0
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing split | note: testing split
| (No patch available, predecessor is unknown locally) | (No patch available, predecessor is unknown locally)
| |
...@@ -342,14 +342,14 @@ Check output on the server side ...@@ -342,14 +342,14 @@ Check output on the server side
$ hg obslog -R $TESTTMP/server --no-graph --all --patch tip $ hg obslog -R $TESTTMP/server --no-graph --all --patch tip
f257fde29c7a (2) A0 f257fde29c7a (2) A0
split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) split(parent, content) together with 337fec4d2edc from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split note: testing split
(No patch available, predecessor is unknown locally) (No patch available, predecessor is unknown locally)
471597cad322 471597cad322
337fec4d2edc (1) A0 337fec4d2edc (1) A0
split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) split(parent, content) together with f257fde29c7a from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split note: testing split
(No patch available, predecessor is unknown locally) (No patch available, predecessor is unknown locally)
......
...@@ -1085,13 +1085,13 @@ XXX: this is messy, we should solve things in better way ...@@ -1085,13 +1085,13 @@ XXX: this is messy, we should solve things in better way
| | rewritten(description, parent, content) from ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
x | 4f25cd9cd2bf (2) added m x | 4f25cd9cd2bf (2) added m
| | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | split(description, parent, content) together with e1154ec0206a from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| x ee4af146c5cf (5) added n | x ee4af146c5cf (5) added n
| | rebased(parent) from e1154ec0206a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | rebased(parent) from e1154ec0206a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| x e1154ec0206a (3) added n | x e1154ec0206a (3) added n
|/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(description, parent, content) together with 4f25cd9cd2bf from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |
o a51bce62c219 (1) added m and n o a51bce62c219 (1) added m and n
...@@ -1220,10 +1220,10 @@ When the public changeset is split across various topological branches ...@@ -1220,10 +1220,10 @@ When the public changeset is split across various topological branches
| | rewritten(description, parent, content) from bb87595f9a77 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | | rewritten(description, parent, content) from bb87595f9a77 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
x | a47263294745 (2) added p x | a47263294745 (2) added p
| | split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) | | split(description, content) together with bb87595f9a77 from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| x bb87595f9a77 (3) added q | x bb87595f9a77 (3) added q
|/ split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |/ split(description, content) together with a47263294745 from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
| |