[PATCH] graphlog: add another graph node type, unstable, signified by character "*"
Anton Shestakov
av6 at dwimlabs.net
Fri Dec 22 15:59:34 UTC 2017
# HG changeset patch
# User Anton Shestakov <av6 at dwimlabs.net>
# Date 1513955824 -28800
# Fri Dec 22 23:17:04 2017 +0800
# Node ID 9a1654009818562a26e99c535df7de532780ce75
# Parent bb6a80fc969a2c5da80cbb7f29de7ca576c4e251
graphlog: add another graph node type, unstable, signified by character "*"
diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -538,6 +538,8 @@ def showgraphnode(repo, ctx, **args):
return '@'
elif ctx.obsolete():
return 'x'
+ elif ctx.isunstable():
+ return '*'
elif ctx.closesbranch():
return '_'
else:
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -188,7 +188,7 @@ With allowunstable, amend could work in
$ hg log -T '{rev} {node|short} {desc}\n' -G
@ 3 be169c7e8dbe B
|
- | o 2 26805aba1e60 C
+ | * 2 26805aba1e60 C
| |
| x 1 112478962961 B
|/
diff --git a/tests/test-drawdag.t b/tests/test-drawdag.t
--- a/tests/test-drawdag.t
+++ b/tests/test-drawdag.t
@@ -208,7 +208,7 @@ Create obsmarkers via comments
> EOS
$ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
- o G 711f53bbef0bebd12eb6f0511d5e2e998b984846
+ * G 711f53bbef0bebd12eb6f0511d5e2e998b984846
|
x F 64a8289d249234b9886244d379f15e6b650b28e3
|
diff --git a/tests/test-exchange-obsmarkers-case-A4.t b/tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t
+++ b/tests/test-exchange-obsmarkers-case-A4.t
@@ -68,7 +68,7 @@ initial
$ hg log -G --hidden
@ e5ea8f9c7314 (draft): A1
|
- | o 06055a7959d4 (draft): B
+ | * 06055a7959d4 (draft): B
| |
| x 28b51eb45704 (draft): A0
|/
diff --git a/tests/test-exchange-obsmarkers-case-B5.t b/tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t
+++ b/tests/test-exchange-obsmarkers-case-B5.t
@@ -80,7 +80,7 @@ initial
|
@ e5ea8f9c7314 (draft): A1
|
- | o 1d0f3cd25300 (draft): C
+ | * 1d0f3cd25300 (draft): C
| |
| x 6e72f0a95b5e (draft): B0
| |
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -820,7 +820,7 @@ Test setup
| instability: content-divergent
| summary: A2
|
- | o changeset: 2:fdf9bde5129a
+ | * changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -856,7 +856,7 @@ Test setup
| obsolete: rewritten using amend as 4:019fadeab383
| summary: A2
|
- | o changeset: 2:fdf9bde5129a
+ | * changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -884,12 +884,12 @@ Check templates
Predecessors template should show current revision as it is the working copy
$ hg tlog
- o 019fadeab383
+ * 019fadeab383
| Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
| map: 1:471f378eab4c5e25f6c77f785b27c936efb22874
- | o fdf9bde5129a
+ | * fdf9bde5129a
|/ Predecessors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| json: ["471f378eab4c5e25f6c77f785b27c936efb22874"]
@@ -902,9 +902,9 @@ Predecessors template should show curren
o ea207398892e
$ hg fatelog
- o 019fadeab383
+ * 019fadeab383
|
- | o fdf9bde5129a
+ | * fdf9bde5129a
|/
| @ 471f378eab4c
|/ Obsfate: rewritten using amend as 2:fdf9bde5129a by test (at 1970-01-01 00:00 +0000); rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
@@ -916,7 +916,7 @@ Predecessors template should show curren
Predecessors template should not show predecessors as they are not displayed in
the log
$ hg tlog
- o 019fadeab383
+ * 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -924,7 +924,7 @@ the log
$ hg fatelog
- o 019fadeab383
+ * 019fadeab383
|
| @ fdf9bde5129a
|/
@@ -933,7 +933,7 @@ the log
Predecessors template should the predecessors as we force their display with
--hidden
$ hg tlog --hidden
- o 019fadeab383
+ * 019fadeab383
| Predecessors: 3:65b757b745b9
| semi-colon: 3:65b757b745b9
| json: ["65b757b745b935093c87a2bccd877521cccffcbd"]
@@ -960,7 +960,7 @@ Predecessors template should the predece
$ hg fatelog --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000);
@@ -972,7 +972,7 @@ Predecessors template should the predece
$ hg fatelogjson --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"]}]
@@ -987,7 +987,7 @@ Check other fatelog implementations
-----------------------------------
$ hg fatelogkw --hidden -q
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383
@@ -999,7 +999,7 @@ Check other fatelog implementations
o ea207398892e
$ hg fatelogkw --hidden
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383
@@ -1011,7 +1011,7 @@ Check other fatelog implementations
o ea207398892e
$ hg fatelogkw --hidden -v
- o 019fadeab383
+ * 019fadeab383
|
| x 65b757b745b9
|/ Obsfate: rewritten using amend as 4:019fadeab383 by test (at 1970-01-01 00:00 +0000)
@@ -1023,7 +1023,7 @@ Check other fatelog implementations
o ea207398892e
$ hg log -G -T "default" --hidden
- o changeset: 4:019fadeab383
+ * changeset: 4:019fadeab383
| tag: tip
| parent: 0:ea207398892e
| user: test
@@ -1877,14 +1877,14 @@ Diverge one of the splitted commit
| instability: content-divergent
| summary: Add B only
|
- | o changeset: 8:b18bc8331526
+ | * changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent
| summary: Add only B
|
- | o changeset: 7:ba2ed02b0c9a
+ | * changeset: 7:ba2ed02b0c9a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan, content-divergent
@@ -1897,7 +1897,7 @@ Diverge one of the splitted commit
| obsolete: rewritten using amend as 9:0b997eb7ceee
| summary: Add A,B,C
|
- o changeset: 5:dd800401bd8c
+ * changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -1925,19 +1925,19 @@ Check templates
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o b18bc8331526
+ | * b18bc8331526
|/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
| multi-line: 8:b18bc8331526
| multi-line: 9:0b997eb7ceee
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
- o dd800401bd8c
+ * dd800401bd8c
|
o f897c6137566
|
@@ -1946,13 +1946,13 @@ Check templates
$ hg fatelog
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
- o dd800401bd8c
+ * dd800401bd8c
|
o f897c6137566
|
@@ -1964,12 +1964,12 @@ Check templates
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o b18bc8331526
+ | * b18bc8331526
|/ Predecessors: 6:4a004186e638
| semi-colon: 6:4a004186e638
| json: ["4a004186e63889f20cb16434fcbd72220bd1eace"]
| map: 6:4a004186e63889f20cb16434fcbd72220bd1eace
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -1983,7 +1983,7 @@ Check templates
| multi-line: 8:b18bc8331526
| multi-line: 9:0b997eb7ceee
| json: [["b18bc8331526a22cbb1801022bd1555bf291c48b"], ["0b997eb7ceeee06200a02f8aab185979092d514e"]]
- o dd800401bd8c
+ * dd800401bd8c
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -2019,13 +2019,13 @@ Check templates
$ hg fatelog --hidden
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000); rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000);
- o dd800401bd8c
+ * dd800401bd8c
|
| x 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000);
@@ -2040,13 +2040,13 @@ Check templates
$ hg fatelogjson --hidden
@ 0b997eb7ceee
|
- | o b18bc8331526
+ | * b18bc8331526
|/
- | o ba2ed02b0c9a
+ | * ba2ed02b0c9a
| |
| x 4a004186e638
|/ Obsfate: [{"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["b18bc8331526a22cbb1801022bd1555bf291c48b"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["b18bc8331526a22cbb1801022bd1555bf291c48b"]}, {"markers": [["4a004186e63889f20cb16434fcbd72220bd1eace", ["0b997eb7ceeee06200a02f8aab185979092d514e"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "successors": ["0b997eb7ceeee06200a02f8aab185979092d514e"]}]
- o dd800401bd8c
+ * dd800401bd8c
|
| x 9bd10a0775e4
|/ Obsfate: [{"markers": [["9bd10a0775e478708cada5f176ec6de654359ce7", ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"], 0, [["user", "test"]], [0.0, 0], null]], "successors": ["dd800401bd8c79d815329277739e433e883f784e", "4a004186e63889f20cb16434fcbd72220bd1eace", "ba2ed02b0c9a56b9fdbc4e79c7e57866984d8a1f"]}]
@@ -2063,22 +2063,22 @@ Check templates
$ hg rebase -r 7 -d 8 --config extensions.rebase=
rebasing 7:ba2ed02b0c9a "Add A,B,C"
$ hg tlog
- o eceed8f98ffc
+ * eceed8f98ffc
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| | Predecessors: 4:9bd10a0775e4
| | semi-colon: 4:9bd10a0775e4
| | json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| | map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- o | b18bc8331526
+ * | b18bc8331526
|/ Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
| map: 4:9bd10a0775e478708cada5f176ec6de654359ce7
- o dd800401bd8c
+ * dd800401bd8c
| Predecessors: 4:9bd10a0775e4
| semi-colon: 4:9bd10a0775e4
| json: ["9bd10a0775e478708cada5f176ec6de654359ce7"]
@@ -2094,13 +2094,13 @@ Check templates
$ hg fatelog
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000); split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000);
@@ -2112,18 +2112,18 @@ Check other fatelog implementations
-----------------------------------
$ hg fatelogkw --hidden -q
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526
| Obsfate: rewritten using amend as 9:0b997eb7ceee
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -2137,18 +2137,18 @@ Check other fatelog implementations
o ea207398892e
$ hg fatelogkw --hidden
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526
| Obsfate: rewritten using amend as 9:0b997eb7ceee
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
@@ -2162,18 +2162,18 @@ Check other fatelog implementations
o ea207398892e
$ hg fatelogkw --hidden -v
- o eceed8f98ffc
+ * eceed8f98ffc
|
- | o 0b997eb7ceee
+ | * 0b997eb7ceee
| |
- o | b18bc8331526
+ * | b18bc8331526
|/
| x ba2ed02b0c9a
| | Obsfate: rewritten using rebase as 10:eceed8f98ffc by test (at 1970-01-01 00:00 +0000)
| x 4a004186e638
|/ Obsfate: rewritten using amend as 8:b18bc8331526 by test (at 1970-01-01 00:00 +0000)
| Obsfate: rewritten using amend as 9:0b997eb7ceee by test (at 1970-01-01 00:00 +0000)
- o dd800401bd8c
+ * dd800401bd8c
|
| @ 9bd10a0775e4
|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a by test (at 1970-01-01 00:00 +0000)
@@ -2187,7 +2187,7 @@ Check other fatelog implementations
o ea207398892e
$ hg log -G -T "default" --hidden
- o changeset: 10:eceed8f98ffc
+ * changeset: 10:eceed8f98ffc
| tag: tip
| parent: 8:b18bc8331526
| user: test
@@ -2195,14 +2195,14 @@ Check other fatelog implementations
| instability: content-divergent
| summary: Add A,B,C
|
- | o changeset: 9:0b997eb7ceee
+ | * changeset: 9:0b997eb7ceee
| | parent: 5:dd800401bd8c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: content-divergent
| | summary: Add B only
| |
- o | changeset: 8:b18bc8331526
+ * | changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -2222,7 +2222,7 @@ Check other fatelog implementations
| obsolete: rewritten using amend as 9:0b997eb7ceee
| summary: Add A,B,C
|
- o changeset: 5:dd800401bd8c
+ * changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -62,9 +62,9 @@ A_1 have two direct and divergent succes
obsoleted 1 changesets
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg log -G --hidden
- o 3:392fd25390da A_2
+ * 3:392fd25390da A_2
|
- | o 2:82623d38b9ba A_1
+ | * 2:82623d38b9ba A_1
|/
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
|/
@@ -129,7 +129,7 @@ indirect divergence with known changeset
|
| x 3:392fd25390da A_2 [rewritten as 4:01f36c5a8fda]
|/
- | o 2:82623d38b9ba A_1
+ | * 2:82623d38b9ba A_1
|/
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
|/
@@ -181,9 +181,9 @@ indirect divergence with known changeset
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
$ hg debugobsolete `getid A_0` `getid A_2`
$ hg log -G --hidden
- o 3:392fd25390da A_2
+ * 3:392fd25390da A_2
|
- | o 2:82623d38b9ba A_1
+ | * 2:82623d38b9ba A_1
|/
| x 1:007dc284c1f8 A_0 [rewritten as 2:82623d38b9ba; rewritten as 3:392fd25390da]
|/
@@ -431,11 +431,11 @@ Check more complex obsolescence graft (w
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete `getid A_5` `getid A_9`
$ hg log -G --hidden
- o 10:bed64f5d2f5a A_9
+ * 10:bed64f5d2f5a A_9
|
- | o 9:14608b260df8 A_8
+ | * 9:14608b260df8 A_8
|/
- | o 8:7ae126973a96 A_7
+ | * 8:7ae126973a96 A_7
|/
| x 7:3750ebee865d B_0 [rewritten as 3:392fd25390da]
| |
@@ -443,7 +443,7 @@ Check more complex obsolescence graft (w
|/
| x 5:6a411f0d7a0a A_4 [rewritten as 6:e442cfc57690]
|/
- | o 4:01f36c5a8fda A_3
+ | * 4:01f36c5a8fda A_3
|/
| x 3:392fd25390da A_2 [rewritten as 5:6a411f0d7a0a]
|/
@@ -673,7 +673,7 @@ Use scmutil.cleanupnodes API to create d
$ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
@ 5:1a2a9b5b0030 B2 content-divergent
|
- | o 4:70d5a63ca112 B4 content-divergent
+ | * 4:70d5a63ca112 B4 content-divergent
| |
| o 1:48b9aae0607f Z
|
diff --git a/tests/test-push-checkheads-partial-C2.t b/tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t
+++ b/tests/test-push-checkheads-partial-C2.t
@@ -64,7 +64,7 @@ Test setup
$ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
- | o d73caddc5533 (draft): B0
+ | * d73caddc5533 (draft): B0
| |
| x 8aaa48160adc (draft): A0
|/
diff --git a/tests/test-push-checkheads-partial-C4.t b/tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t
+++ b/tests/test-push-checkheads-partial-C4.t
@@ -64,7 +64,7 @@ Test setup
$ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
- | o d73caddc5533 (draft): B0
+ | * d73caddc5533 (draft): B0
| |
| x 8aaa48160adc (draft): A0
|/
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -1735,7 +1735,7 @@ racing commit push a new head obsoleting
$ hg -R server graph
o 720c5163ecf6 C-V (default)
|
- | o a98a47d8b85b C-U (default)
+ | * a98a47d8b85b C-U (default)
| |
| x b0ee3d6f51bc C-Q (default)
|/
@@ -1835,9 +1835,9 @@ Check the result of the push
b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg -R server graph --hidden
- o 39bc0598afe9 C-W (default)
+ * 39bc0598afe9 C-W (default)
|
- | o a98a47d8b85b C-U (default)
+ | * a98a47d8b85b C-U (default)
|/
x b0ee3d6f51bc C-Q (default)
|
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -190,7 +190,7 @@ More complex case where part of the reba
$ hg log -G
@ 11:4596109a6a43 D
|
- | o 10:5ae4c968c6ac C
+ | * 10:5ae4c968c6ac C
| |
| x 9:08483444fef9 D (rewritten using rebase as 11:4596109a6a43)
| |
@@ -464,7 +464,7 @@ Test that rewriting leaving instability
|
o 10:7c6027df6a99 B
|
- | o 9:cf44d2f5a9f4 D
+ | * 9:cf44d2f5a9f4 D
| |
| x 8:e273c5e7d2d2 C (rewritten using rebase as 11:0d8f238b634c)
| |
@@ -494,7 +494,7 @@ Test multiple root handling
|
| o 12:102b4c1d889b D
|/
- | o 10:7c6027df6a99 B
+ | * 10:7c6027df6a99 B
| |
| x 7:02de42196ebe H (rewritten using rebase as 13:bfe264faf697)
| |
@@ -588,7 +588,7 @@ test on rebase dropping a merge
|
| o 10:b5313c85b22e D
|/
- | o 8:53a6a128b2b7 M
+ | * 8:53a6a128b2b7 M
| |\
| | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
| | |
@@ -623,15 +623,15 @@ Test hidden changesets in the rebase set
$ hg log -G
@ 15:5ae8a643467b J
|
- o 14:9ad579b4a5de I
+ * 14:9ad579b4a5de I
|
- | o 12:acd174b7ab39 I
+ | * 12:acd174b7ab39 I
| |
| o 11:6c11a6218c97 H
| |
o | 10:b5313c85b22e D
|/
- | o 8:53a6a128b2b7 M
+ | * 8:53a6a128b2b7 M
| |\
| | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
| | |
@@ -665,21 +665,21 @@ Test hidden changesets in the rebase set
$ hg log -G
@ 18:bfaedf8eb73b M
|
- | o 17:97219452e4bd L
+ | * 17:97219452e4bd L
| |
| x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
|/
- | o 15:5ae8a643467b J
+ | * 15:5ae8a643467b J
| |
| x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
|/
- | o 12:acd174b7ab39 I
+ | * 12:acd174b7ab39 I
| |
| o 11:6c11a6218c97 H
| |
o | 10:b5313c85b22e D
|/
- | o 8:53a6a128b2b7 M
+ | * 8:53a6a128b2b7 M
| |\
| | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
| | |
@@ -1016,7 +1016,7 @@ obsolete changeset which successor is in
> a
> EOF
$ hg log -G -r 'a'::
- o 7:1143e9adc121 f
+ * 7:1143e9adc121 f
|
| o 6:d60ebfa0f1cb e
| |
@@ -1052,7 +1052,7 @@ consequence f (descendant of d) is left
|
o 8:67e8f4a16c49 b
|
- | o 7:1143e9adc121 f
+ | * 7:1143e9adc121 f
| |
| | x 6:d60ebfa0f1cb e (rewritten using rebase as 11:eb6d63fc4ed5)
| | |
@@ -1085,15 +1085,15 @@ By allowing divergence, we can perform t
$ hg log -G -r 'a':: -T instabilities
o 10:e1744ea07510 f
|
- o 9:e2b36ea9a0a0 d (content-divergent)
+ * 9:e2b36ea9a0a0 d (content-divergent)
|
o 8:6a0376de376e c
|
| x 7:1143e9adc121 f
| |
- | | o 6:d60ebfa0f1cb e (orphan)
+ | | * 6:d60ebfa0f1cb e (orphan)
| | |
- | | o 5:027ad6c5830d d' (orphan content-divergent)
+ | | * 5:027ad6c5830d d' (orphan content-divergent)
| | |
| x | 4:76be324c128b d
| |/
@@ -1132,7 +1132,7 @@ Similar test on a more complex graph
> a
> EOF
$ hg log -G -r 'a':
- o 8:2876ce66c6eb g
+ * 8:2876ce66c6eb g
|
| o 7:3ffec603ab53 f
| |
@@ -1168,7 +1168,7 @@ Similar test on a more complex graph
|
o 9:67e8f4a16c49 b
|
- | o 8:2876ce66c6eb g
+ | * 8:2876ce66c6eb g
| |
| | x 7:3ffec603ab53 f (rewritten using rebase as 12:ef6251596616)
| | |
@@ -1531,7 +1531,7 @@ parent gets moved:
| |
o | E
| |
- | o C
+ | * C
| |
o | D2
| |
diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -428,11 +428,11 @@ Split a non-head without rebase
|
o 5:e704349bd21b split 1
|
- | o 4:777940761eba d3 d3
+ | * 4:777940761eba d3 d3
| |
| @ 3:f4a0a8d004cc d2 d2
| |
- | o 2:b5c5ea414030 d1 d1
+ | * 2:b5c5ea414030 d1 d1
| |
| x 1:1df0d5c5a3ab a2
|/
@@ -506,13 +506,13 @@ Split a non-head with obsoleted descenda
|/
o 11:0947baa74d47 Split B
|
- | o 9:88ede1d5ee13 I
+ | * 9:88ede1d5ee13 I
| |
| x 6:af8cbf225b7b G1
| |
| x 3:be0ef73c17ad D
| |
- | | o 8:74863e5b5074 H
+ | | * 8:74863e5b5074 H
| | |
| | x 5:ee481a2a1e69 F
| | |
diff --git a/tests/test-strip.t b/tests/test-strip.t
--- a/tests/test-strip.t
+++ b/tests/test-strip.t
@@ -1288,15 +1288,15 @@ we have reusable code here
$ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
- o 12:1473d4b996d1 G2 b-F at divergent3 b-G
+ * 12:1473d4b996d1 G2 b-F at divergent3 b-G
|
- | o 11:d11b3456a873 F2 b-F
+ | * 11:d11b3456a873 F2 b-F
| |
- | o 8:5cb05ba470a7 H
+ | * 8:5cb05ba470a7 H
|/|
| o 4:7fb047a69f22 E b-F at divergent1
| |
- | | o 10:7c78f703e465 D2 b-D
+ | | * 10:7c78f703e465 D2 b-D
| | |
| | x 6:26805aba1e60 C
| | |
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -242,21 +242,21 @@ Partial uncommit in the middle, does not
|
o 11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
|
- | o 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
+ | * 10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
| |
- | | o 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
+ | | * 9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
| | |
| | | x 8:83815831694b1271e9f207cb1b79b2b19275edcb files abcde + foo
| | |/
| | | x 7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
| | |/
- | | o 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
+ | | * 6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
| | |
| | | x 5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
| | |/
| | | x 4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
| | |/
- | | o 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
+ | | * 3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
| | |
| | x 2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
| |/
More information about the Mercurial-devel
mailing list