Merge with crew
authorBrendan Cully <brendan@kublai.com>
Thu, 14 Jun 2007 10:59:17 -0700
changeset 4585 d2dde1681933
parent 4584 0d26e3d0eeeb (current diff)
parent 4583 11cf78983961 (diff)
child 4587 d8a08b92ad34
Merge with crew
--- a/hgext/graphlog.py	Thu Jun 14 10:58:49 2007 -0700
+++ b/hgext/graphlog.py	Thu Jun 14 10:59:17 2007 -0700
@@ -147,7 +147,7 @@
     Print a revision history alongside a revision graph drawn with
     ASCII characters.
 
-    Nodes printed as a . character are parents of the working
+    Nodes printed as an @ character are parents of the working
     directory.
     """
 
@@ -199,10 +199,10 @@
         #     o | |            o | |
         fix_nodeline_tail = len(log_strings) <= 2 and not add_padding_line
 
-        # nodeline is the line containing the node character (. or o).
+        # nodeline is the line containing the node character (@ or o).
         nodeline = ["|", " "] * node_index
         if node in repo_parents:
-            node_ch = "."
+            node_ch = "@"
         else:
             node_ch = "o"
         nodeline.extend([node_ch, " "])
--- a/tests/test-glog.out	Thu Jun 14 10:58:49 2007 -0700
+++ b/tests/test-glog.out	Thu Jun 14 10:59:17 2007 -0700
@@ -2,7 +2,7 @@
 % empty repo
 % building tree
 % glog -q
-.  34:0eed7cd895e0
+@  34:0eed7cd895e0
 |
 | o  33:2e9d1b521374
 | |
@@ -73,7 +73,7 @@
 o  0:7aa22e58e8c1
 
 % glog
-.  changeset:   34:0eed7cd895e0
+@  changeset:   34:0eed7cd895e0
 |  tag:         tip
 |  parent:      32:77f7d8438a3c
 |  user:        test