# HG changeset patch # User Thomas Arendsen Hein # Date 1181818446 -7200 # Node ID 11cf7898396144bbae5f5be6638e9d7acc9808a9 # Parent 7de7a80e742207204969f85188e6c4d6c6b493bd Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color. diff --git a/hgext/graphlog.py b/hgext/graphlog.py --- a/hgext/graphlog.py +++ b/hgext/graphlog.py @@ -147,7 +147,7 @@ def graphlog(ui, repo, *args, **opts): 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 @@ def graphlog(ui, repo, *args, **opts): # 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, " "]) diff --git a/tests/test-glog.out b/tests/test-glog.out --- a/tests/test-glog.out +++ b/tests/test-glog.out @@ -2,7 +2,7 @@ % empty repo % building tree % glog -q -. 34:0eed7cd895e0 +@ 34:0eed7cd895e0 | | o 33:2e9d1b521374 | | @@ -73,7 +73,7 @@ o / 1:3cae7826a707 o 0:7aa22e58e8c1 % glog -. changeset: 34:0eed7cd895e0 +@ changeset: 34:0eed7cd895e0 | tag: tip | parent: 32:77f7d8438a3c | user: test