[PATCH] graphlog: add special char for public and secret phases

alain.leufroy at logilab.fr alain.leufroy at logilab.fr
Wed Jan 18 09:57:58 CST 2012


# HG changeset patch
# User Alain Leufroy <alain.leufroy at logilab.fr>
# Date 1326896559 -3600
# Node ID 43bd418c215edf2a230b3420972a877509157e07
# Parent  2642ac9d28d1375eb8ca92baafa05c02d59a84c6
graphlog: add special char for public and secret phases

diff -r 2642ac9d28d1 -r 43bd418c215e hgext/graphlog.py
--- a/hgext/graphlog.py	Tue Jan 17 11:08:23 2012 +0100
+++ b/hgext/graphlog.py	Wed Jan 18 15:22:39 2012 +0100
@@ -298,7 +298,7 @@
 def generate(ui, dag, displayer, showparents, edgefn):
     seen, state = [], asciistate()
     for rev, type, ctx, parents in dag:
-        char = ctx.node() in showparents and '@' or 'o'
+        char = ctx.node() in showparents and '@' or 'Oo.'[ctx.phase()]
         displayer.show(ctx)
         lines = displayer.hunk.pop(rev).split('\n')[:-1]
         displayer.flush(rev)
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-convert-splicemap.t
--- a/tests/test-convert-splicemap.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-convert-splicemap.t	Wed Jan 18 15:22:39 2012 +0100
@@ -73,7 +73,7 @@
   | |
   @ |  2 "addc" files: c
   |/
-  o  1 "addb" files: a b
+  O  1 "addb" files: a b
   |
-  o  0 "adda" files: a
+  O  0 "adda" files: a
   
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-graft.t
--- a/tests/test-graft.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-graft.t	Wed Jan 18 15:22:39 2012 +0100
@@ -32,13 +32,13 @@
   | |
   o |  test at 4.draft: 4
   |/
-  o  baz at 3.public: 3
+  O  baz at 3.public: 3
   |
-  o  test at 2.public: 2
+  O  test at 2.public: 2
   |
-  o  bar at 1.public: 1
+  O  bar at 1.public: 1
   |
-  o  test at 0.public: 0
+  O  test at 0.public: 0
   
 
 Need to specify a rev:
@@ -209,19 +209,19 @@
   |
   o  foo at 7.draft: 2
   |
-  | o    test at 6.secret: 6
+  | .    test at 6.secret: 6
   | |\
   | | o  test at 5.draft: 5
   | | |
   | o |  test at 4.draft: 4
   | |/
-  | o  baz at 3.public: 3
+  | O  baz at 3.public: 3
   | |
-  | o  test at 2.public: 2
+  | O  test at 2.public: 2
   | |
-  | o  bar at 1.public: 1
+  | O  bar at 1.public: 1
   |/
-  o  test at 0.public: 0
+  O  test at 0.public: 0
   
 Graft again onto another branch should preserve the original source
   $ hg up -q 0
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-import-bypass.t
--- a/tests/test-import-bypass.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-import-bypass.t	Wed Jan 18 15:22:39 2012 +0100
@@ -179,7 +179,7 @@
   |
   o  2:16581080145e test 0 0 - default - adde
   |
-  | o  1:4e322f7ce8e3 test 0 0 - foo - changea
+  | O  1:4e322f7ce8e3 test 0 0 - foo - changea
   |/
   @  0:07f494440405 test 0 0 - default - adda
   
@@ -205,7 +205,7 @@
   | |
   @ |  1:4e322f7ce8e3 test 0 0 - foo - changea
   |/
-  o  0:07f494440405 test 0 0 - default - adda
+  O  0:07f494440405 test 0 0 - default - adda
   
 
   $ cd ..
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-phases-exchange.t	Wed Jan 18 15:22:39 2012 +0100
@@ -41,25 +41,25 @@
   |
   o  2 draft a-C - 54acac6f23ab
   |
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
   $ cd ../beta
   $ hgph
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg up -q
   $ mkcommit b-A
   $ hgph
   @  2 draft b-A - f54f1bb90ff3
   |
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg pull ../alpha
   pulling from ../alpha
@@ -70,15 +70,15 @@
   added 2 changesets with 2 changes to 2 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hgph
-  o  4 public a-D - b555f63b6063
+  O  4 public a-D - b555f63b6063
   |
-  o  3 public a-C - 54acac6f23ab
+  O  3 public a-C - 54acac6f23ab
   |
   | @  2 draft b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 pull did not updated ../alpha state.
@@ -90,9 +90,9 @@
   |
   o  2 draft a-C - 54acac6f23ab
   |
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg push ../beta
   pushing to ../beta
@@ -101,11 +101,11 @@
   $ hgph
   @  3 public a-D - b555f63b6063
   |
-  o  2 public a-C - 54acac6f23ab
+  O  2 public a-C - 54acac6f23ab
   |
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 update must update phase of common changeset too
@@ -121,30 +121,30 @@
 
   $ cd ../beta
   $ hgph # not updated by remote pull
-  o  4 public a-D - b555f63b6063
+  O  4 public a-D - b555f63b6063
   |
-  o  3 public a-C - 54acac6f23ab
+  O  3 public a-C - 54acac6f23ab
   |
   | @  2 draft b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg pull ../alpha
   pulling from ../alpha
   searching for changes
   no changes found
   $ hgph
-  o  4 public a-D - b555f63b6063
+  O  4 public a-D - b555f63b6063
   |
-  o  3 public a-C - 54acac6f23ab
+  O  3 public a-C - 54acac6f23ab
   |
   | @  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Publish configuration option
@@ -239,15 +239,15 @@
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
   $ hgph
-  o  4 public a-D - b555f63b6063
+  O  4 public a-D - b555f63b6063
   |
-  | o  3 public b-A - f54f1bb90ff3
+  | O  3 public b-A - f54f1bb90ff3
   | |
-  o |  2 public a-C - 54acac6f23ab
+  O |  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 pulling from Publish=False to publish=False with some public
@@ -260,15 +260,15 @@
   |
   o  5 draft n-A - d6bcb4f74035
   |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  o |  3 public b-A - f54f1bb90ff3
+  O |  3 public b-A - f54f1bb90ff3
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ cd ../mu
   $ hg pull ../nu
@@ -284,15 +284,15 @@
   |
   o  5 draft n-A - d6bcb4f74035
   |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ cd ..
 
@@ -300,15 +300,15 @@
 
   $ cd alpha
   $ hgph
-  o  4 public b-A - f54f1bb90ff3
+  O  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg pull ../mu
   pulling from ../mu
@@ -323,15 +323,15 @@
   |
   o  5 draft n-A - d6bcb4f74035
   |
-  o  4 public b-A - f54f1bb90ff3
+  O  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ cd ..
 
@@ -345,17 +345,17 @@
   $ hgph
   @  6 public n-B - 145e75495359
   |
-  o  5 public n-A - d6bcb4f74035
+  O  5 public n-A - d6bcb4f74035
   |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  o |  3 public b-A - f54f1bb90ff3
+  O |  3 public b-A - f54f1bb90ff3
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Push
@@ -375,19 +375,19 @@
   $ cd ..
   $ cd alpha
   $ hgph
-  o  6 public n-B - 145e75495359
+  O  6 public n-B - 145e75495359
   |
-  o  5 public n-A - d6bcb4f74035
+  O  5 public n-A - d6bcb4f74035
   |
-  o  4 public b-A - f54f1bb90ff3
+  O  4 public b-A - f54f1bb90ff3
   |
   | @  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 (end insertion)
@@ -396,18 +396,18 @@
 initial setup
 
   $ hg glog # of alpha
-  o  changeset:   6:145e75495359
+  O  changeset:   6:145e75495359
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     n-B
   |
-  o  changeset:   5:d6bcb4f74035
+  O  changeset:   5:d6bcb4f74035
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     n-A
   |
-  o  changeset:   4:f54f1bb90ff3
+  O  changeset:   4:f54f1bb90ff3
   |  parent:      1:548a3d25dbf0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
@@ -418,17 +418,17 @@
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     a-D
   | |
-  | o  changeset:   2:54acac6f23ab
+  | O  changeset:   2:54acac6f23ab
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     a-C
   |
-  o  changeset:   1:548a3d25dbf0
+  O  changeset:   1:548a3d25dbf0
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     a-B
   |
-  o  changeset:   0:054250a37db4
+  O  changeset:   0:054250a37db4
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     a-A
@@ -448,19 +448,19 @@
   | |
   | o  7 draft a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=False (unknown changeset)
@@ -481,19 +481,19 @@
   | |
   | o  7 draft a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
   $ cd ../mu
@@ -502,19 +502,19 @@
   |
   o  7 draft a-E - e9f537e46dea
   |
-  | o  6 public n-B - 145e75495359
+  | O  6 public n-B - 145e75495359
   | |
-  | o  5 public n-A - d6bcb4f74035
+  | O  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public a-D - b555f63b6063
+  O |  4 public a-D - b555f63b6063
   | |
-  o |  3 public a-C - 54acac6f23ab
+  O |  3 public a-C - 54acac6f23ab
   | |
-  | o  2 public b-A - f54f1bb90ff3
+  | O  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=True (unknown changeset)
@@ -527,23 +527,23 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   $ hgph # again d6bcb4f74035 and 145e75495359 changed because common is too smart
-  o  8 public a-F - b740e3e5c05d
+  O  8 public a-F - b740e3e5c05d
   |
-  o  7 public a-E - e9f537e46dea
+  O  7 public a-E - e9f537e46dea
   |
-  | o  6 public n-B - 145e75495359
+  | O  6 public n-B - 145e75495359
   | |
-  | o  5 public n-A - d6bcb4f74035
+  | O  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public a-D - b555f63b6063
+  O |  4 public a-D - b555f63b6063
   | |
-  o |  3 public a-C - 54acac6f23ab
+  O |  3 public a-C - 54acac6f23ab
   | |
-  | o  2 public b-A - f54f1bb90ff3
+  | O  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=True (common changeset)
@@ -554,19 +554,19 @@
   searching for changes
   no changes found
   $ hgph
-  o  6 public a-F - b740e3e5c05d
+  O  6 public a-F - b740e3e5c05d
   |
-  o  5 public a-E - e9f537e46dea
+  O  5 public a-E - e9f537e46dea
   |
-  o  4 public a-D - b555f63b6063
+  O  4 public a-D - b555f63b6063
   |
-  o  3 public a-C - 54acac6f23ab
+  O  3 public a-C - 54acac6f23ab
   |
   | @  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ cd ../alpha
   $ hgph # e9f537e46dea and b740e3e5c05d should have been sync to 0
@@ -574,23 +574,23 @@
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Pushing to Publish=False (common changeset that change phase + unknown one)
@@ -607,46 +607,46 @@
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ cd ../mu
   $ hgph # d6bcb4f74035 should have changed phase
   >      # again d6bcb4f74035 and 145e75495359 changed because common was too smart
   o  9 draft a-H - 967b449fbc94
   |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 
@@ -658,48 +658,48 @@
   searching for changes
   no changes found
   $ hgph
-  o  9 public a-H - 967b449fbc94
+  O  9 public a-H - 967b449fbc94
   |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hgph -R ../alpha # a-H should have been synced to 0
   @  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 
@@ -712,27 +712,27 @@
   $ hgph
   @  11 secret A-secret - 435b5d83910c
   |
-  o  10 public a-H - 967b449fbc94
+  O  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
   1 changesets found
@@ -745,25 +745,25 @@
   $ hgph -R ../mu
   o  10 draft A-secret - 435b5d83910c
   |
-  o  9 public a-H - 967b449fbc94
+  O  9 public a-H - 967b449fbc94
   |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
   $ hg pull ../mu
   pulling from ../mu
@@ -772,27 +772,27 @@
   $ hgph
   @  11 draft A-secret - 435b5d83910c
   |
-  o  10 public a-H - 967b449fbc94
+  O  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 pushing a locally public and draft changesets remotly secret should make them appear on the remote side
@@ -808,25 +808,25 @@
   $ hgph -R ../mu
   o  10 draft A-secret - 435b5d83910c
   |
-  o  9 public a-H - 967b449fbc94
+  O  9 public a-H - 967b449fbc94
   |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 pull new changeset with common draft locally
@@ -861,27 +861,27 @@
   | |
   o |  11 draft A-secret - 435b5d83910c
   |/
-  o  10 public a-H - 967b449fbc94
+  O  10 public a-H - 967b449fbc94
   |
   | o  9 draft a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 Test that test are properly ignored on remote event when existing locally
@@ -958,25 +958,25 @@
   | |
   o |  10 draft A-secret - 435b5d83910c
   |/
-  o  9 public a-H - 967b449fbc94
+  O  9 public a-H - 967b449fbc94
   |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  | o  4 public a-D - b555f63b6063
+  | O  4 public a-D - b555f63b6063
   | |
-  | o  3 public a-C - 54acac6f23ab
+  | O  3 public a-C - 54acac6f23ab
   | |
-  o |  2 public b-A - f54f1bb90ff3
+  O |  2 public b-A - f54f1bb90ff3
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
 2. cloning publishing repository
@@ -985,32 +985,32 @@
 
   $ hg clone -U alpha Upsilon
   $ hgph -R Upsilon
-  o  13 public mu-more - 5237fb433fc8
+  O  13 public mu-more - 5237fb433fc8
   |
-  | o  12 public alpha-more - 1c5cfd894796
+  | O  12 public alpha-more - 1c5cfd894796
   | |
-  o |  11 public A-secret - 435b5d83910c
+  O |  11 public A-secret - 435b5d83910c
   |/
-  o  10 public a-H - 967b449fbc94
+  O  10 public a-H - 967b449fbc94
   |
-  | o  9 public a-G - 3e27b6f1eee1
+  | O  9 public a-G - 3e27b6f1eee1
   | |
-  | o  8 public a-F - b740e3e5c05d
+  | O  8 public a-F - b740e3e5c05d
   | |
-  | o  7 public a-E - e9f537e46dea
+  | O  7 public a-E - e9f537e46dea
   | |
-  +---o  6 public n-B - 145e75495359
+  +---O  6 public n-B - 145e75495359
   | |
-  o |  5 public n-A - d6bcb4f74035
+  O |  5 public n-A - d6bcb4f74035
   | |
-  o |  4 public b-A - f54f1bb90ff3
+  O |  4 public b-A - f54f1bb90ff3
   | |
-  | o  3 public a-D - b555f63b6063
+  | O  3 public a-D - b555f63b6063
   | |
-  | o  2 public a-C - 54acac6f23ab
+  | O  2 public a-C - 54acac6f23ab
   |/
-  o  1 public a-B - 548a3d25dbf0
+  O  1 public a-B - 548a3d25dbf0
   |
-  o  0 public a-A - 054250a37db4
+  O  0 public a-A - 054250a37db4
   
 
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-phases.t
--- a/tests/test-phases.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-phases.t	Wed Jan 18 15:22:39 2012 +0100
@@ -204,17 +204,17 @@
   |\
   | o  6 draft B'
   | |
-  +---o  5 secret H
+  +---.  5 secret H
   | |
-  o |  4 secret E
+  . |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
-  o  1 public B
+  O  1 public B
   |
-  o  0 public A
+  O  0 public A
   
 
 display changesets phase
@@ -239,17 +239,17 @@
   |\
   | o  6 draft B'
   | |
-  +---o  5 secret H
+  +---.  5 secret H
   | |
-  o |  4 secret E
+  . |  4 secret E
   | |
   o |  3 draft D
   | |
-  o |  2 public C
+  O |  2 public C
   |/
-  o  1 public B
+  O  1 public B
   |
-  o  0 public A
+  O  0 public A
   
 
 move changeset backward
@@ -262,17 +262,17 @@
   |\
   | o  6 draft B'
   | |
-  +---o  5 secret H
+  +---.  5 secret H
   | |
-  o |  4 secret E
+  . |  4 secret E
   | |
   o |  3 draft D
   | |
   o |  2 draft C
   |/
-  o  1 public B
+  O  1 public B
   |
-  o  0 public A
+  O  0 public A
   
 
 move changeset forward and backward
@@ -283,7 +283,7 @@
   |\
   | o  6 draft B'
   | |
-  +---o  5 secret H
+  +---.  5 secret H
   | |
   o |  4 draft E
   | |
@@ -293,5 +293,5 @@
   |/
   o  1 draft B
   |
-  o  0 public A
+  O  0 public A
   
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-push-warn.t
--- a/tests/test-push-warn.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-push-warn.t	Wed Jan 18 15:22:39 2012 +0100
@@ -519,9 +519,9 @@
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  2: B b1
   |
-  o  1: B b
+  O  1: B b
   |
-  o  0: A a
+  O  0: A a
   
 outgoing:
 
@@ -604,11 +604,11 @@
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  3: B b1
   |
-  | o  2: A a1
+  | O  2: A a1
   | |
-  o |  1: B b
+  O |  1: B b
   |/
-  o  0: A a
+  O  0: A a
   
 outgoing:
 
@@ -693,11 +693,11 @@
   $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
   @  3: B b1
   |
-  o  2: B b0
+  O  2: B b0
   
-  o  1: A a1
+  O  1: A a1
   |
-  o  0: A a0
+  O  0: A a0
   
 outgoing:
 
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-abort.t	Wed Jan 18 15:22:39 2012 +0100
@@ -42,7 +42,7 @@
   |
   o  3:draft 'L1'
   |
-  | o  2:secret 'C3'
+  | .  2:secret 'C3'
   |/
   o  1:draft 'C2'
   |
@@ -69,7 +69,7 @@
   |
   o  3:draft 'L1'
   |
-  | o  2:secret 'C3'
+  | .  2:secret 'C3'
   |/
   o  1:draft 'C2'
   |
@@ -116,11 +116,11 @@
   |
   o  3:draft 'B bis'
   |
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
-  | o  1:public 'B'
+  | O  1:public 'B'
   |/
-  o  0:public 'A'
+  O  0:public 'A'
   
   $ hg rebase -b 4 -d 2
   merging c
@@ -136,9 +136,9 @@
   |
   | @  2:secret 'C'
   | |
-  | o  1:public 'B'
+  | O  1:public 'B'
   |/
-  o  0:public 'A'
+  O  0:public 'A'
   
   $ hg rebase -a
   rebase aborted
@@ -148,9 +148,9 @@
   |
   o  3:draft 'B bis'
   |
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
-  | o  1:public 'B'
+  | O  1:public 'B'
   |/
-  o  0:public 'A'
+  O  0:public 'A'
   
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-check-restore.t	Wed Jan 18 15:22:39 2012 +0100
@@ -59,7 +59,7 @@
   | |
   | o  3:draft 'D'
   |/
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
   | o  1:draft 'B'
   |/
@@ -90,7 +90,7 @@
   | |
   o |  3:draft 'D'
   |/
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
   | o  1:draft 'B'
   |/
@@ -112,7 +112,7 @@
   | |
   | o  3:draft 'D'
   |/
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
   | o  1:draft 'B'
   |/
@@ -140,7 +140,7 @@
   |
   o  3:draft 'D'
   |
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
   | o  1:draft 'B'
   |/
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-conflicts.t	Wed Jan 18 15:22:39 2012 +0100
@@ -42,7 +42,7 @@
   $ hg tglog
   @  5:secret 'L3'
   |
-  o  4:secret 'L2'
+  .  4:secret 'L2'
   |
   o  3:draft 'L1'
   |
@@ -83,7 +83,7 @@
   $ hg tglog
   @  5:secret 'L3'
   |
-  o  4:secret 'L2'
+  .  4:secret 'L2'
   |
   o  3:draft 'L1'
   |
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-detach.t	Wed Jan 18 15:22:39 2012 +0100
@@ -197,7 +197,7 @@
   | |
   | o  4: 'E'
   |/
-  | o  3: 'D'
+  | .  3: 'D'
   | |
   | o  2: 'C'
   | |
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-interruptions.t	Wed Jan 18 15:22:39 2012 +0100
@@ -112,7 +112,7 @@
   $ hg tglogp
   @  7:draft 'C'
   |
-  | o  6:secret 'Extra'
+  | .  6:secret 'Extra'
   | |
   o |  5:draft 'B'
   | |
@@ -235,15 +235,15 @@
   $ hg tglogp
   @  5:public 'B'
   |
-  o  4:public 'E'
+  O  4:public 'E'
   |
-  o  3:public 'D'
+  O  3:public 'D'
   |
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
-  | o  1:public 'B'
+  | O  1:public 'B'
   |/
-  o  0:public 'A'
+  O  0:public 'A'
   
 Abort the rebasing:
 
@@ -254,14 +254,14 @@
   $ hg tglogp
   @  5:public 'B'
   |
-  o  4:public 'E'
+  O  4:public 'E'
   |
-  o  3:public 'D'
+  O  3:public 'D'
   |
-  | o  2:secret 'C'
+  | .  2:secret 'C'
   | |
-  | o  1:public 'B'
+  | O  1:public 'B'
   |/
-  o  0:public 'A'
+  O  0:public 'A'
   
   $ cd ..
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-rebase-pull.t	Wed Jan 18 15:22:39 2012 +0100
@@ -59,11 +59,11 @@
   $ hg tglog
   @  3: 'L1'
   |
-  o  2: 'R1'
+  O  2: 'R1'
   |
-  o  1: 'C2'
+  O  1: 'C2'
   |
-  o  0: 'C1'
+  O  0: 'C1'
   
 Re-run:
 
@@ -108,6 +108,6 @@
   no changes found
 
   $ hg tglog -l 1
-  o  2: 'R1'
+  O  2: 'R1'
   |
 
diff -r 2642ac9d28d1 -r 43bd418c215e tests/test-revset-outgoing.t
--- a/tests/test-revset-outgoing.t	Tue Jan 17 11:08:23 2012 +0100
+++ b/tests/test-revset-outgoing.t	Wed Jan 18 15:22:39 2012 +0100
@@ -55,9 +55,9 @@
   |
   | o  2:1d4099801a4e: '3' stable
   | |
-  | o  1:7bee6c3bea3a: '2' stable
+  | O  1:7bee6c3bea3a: '2' stable
   |/
-  o  0:f7b1eb17ad24: '0'
+  O  0:f7b1eb17ad24: '0'
   
 
   $ hg tout


More information about the Mercurial-devel mailing list