graphlog: fix incoming with local repo (issue1731)

hgext/graphlog.py

@@ -1,376 +1,378
 # ASCII graph log extension for Mercurial
 #
 # Copyright 2007 Joel Rosdahl <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 '''command to view revision graphs from a shell
 
 This extension adds a --graph option to the incoming, outgoing and log
 commands. When this options is given, an ASCII representation of the
 revision graph is also shown.
 '''
 
 import os, sys
 from mercurial.cmdutil import revrange, show_changeset
 from mercurial.commands import templateopts
 from mercurial.i18n import _
 from mercurial.node import nullrev
 from mercurial import bundlerepo, changegroup, cmdutil, commands, extensions
 from mercurial import hg, url, util, graphmod
 
 ASCIIDATA = 'ASC'
 
-def asciiformat(ui, repo, revdag, opts):
+def asciiformat(ui, repo, revdag, opts, parentrepo=None):
     """formats a changelog DAG walk for ASCII output"""
-    showparents = [ctx.node() for ctx in repo[None].parents()]
+    if parentrepo is None:
+        parentrepo = repo
+    showparents = [ctx.node() for ctx in parentrepo[None].parents()]
     displayer = show_changeset(ui, repo, opts, buffered=True)
     for (id, type, ctx, parentids) in revdag:
         if type != graphmod.CHANGESET:
             continue
         displayer.show(ctx)
         lines = displayer.hunk.pop(ctx.rev()).split('\n')[:-1]
         char = ctx.node() in showparents and '@' or 'o'
         yield (id, ASCIIDATA, (char, lines), parentids)
 
 def asciiedges(nodes):
     """adds edge info to changelog DAG walk suitable for ascii()"""
     seen = []
     for node, type, data, parents in nodes:
         if node not in seen:
             seen.append(node)
         nodeidx = seen.index(node)
 
         knownparents = []
         newparents = []
         for parent in parents:
             if parent in seen:
                 knownparents.append(parent)
             else:
                 newparents.append(parent)
 
         ncols = len(seen)
         nextseen = seen[:]
         nextseen[nodeidx:nodeidx + 1] = newparents
         edges = [(nodeidx, nextseen.index(p)) for p in knownparents]
 
         if len(newparents) > 0:
             edges.append((nodeidx, nodeidx))
         if len(newparents) > 1:
             edges.append((nodeidx, nodeidx + 1))
         nmorecols = len(nextseen) - ncols
         seen = nextseen
         yield (nodeidx, type, data, edges, ncols, nmorecols)
 
 def fix_long_right_edges(edges):
     for (i, (start, end)) in enumerate(edges):
         if end > start:
             edges[i] = (start, end + 1)
 
 def get_nodeline_edges_tail(
         node_index, p_node_index, n_columns, n_columns_diff, p_diff, fix_tail):
     if fix_tail and n_columns_diff == p_diff and n_columns_diff != 0:
         # Still going in the same non-vertical direction.
         if n_columns_diff == -1:
             start = max(node_index + 1, p_node_index)
             tail = ["|", " "] * (start - node_index - 1)
             tail.extend(["/", " "] * (n_columns - start))
             return tail
         else:
             return ["\\", " "] * (n_columns - node_index - 1)
     else:
         return ["|", " "] * (n_columns - node_index - 1)
 
 def draw_edges(edges, nodeline, interline):
     for (start, end) in edges:
         if start == end + 1:
             interline[2 * end + 1] = "/"
         elif start == end - 1:
             interline[2 * start + 1] = "\\"
         elif start == end:
             interline[2 * start] = "|"
         else:
             nodeline[2 * end] = "+"
             if start > end:
                 (start, end) = (end,start)
             for i in range(2 * start + 1, 2 * end):
                 if nodeline[i] != "+":
                     nodeline[i] = "-"
 
 def get_padding_line(ni, n_columns, edges):
     line = []
     line.extend(["|", " "] * ni)
     if (ni, ni - 1) in edges or (ni, ni) in edges:
         # (ni, ni - 1)      (ni, ni)
         # | | | |           | | | |
         # +---o |           | o---+
         # | | c |           | c | |
         # | |/ /            | |/ /
         # | | |             | | |
         c = "|"
     else:
         c = " "
     line.extend([c, " "])
     line.extend(["|", " "] * (n_columns - ni - 1))
     return line
 
 def ascii(ui, dag):
     """prints an ASCII graph of the DAG
 
     dag is a generator that emits tuples with the following elements:
 
       - Column of the current node in the set of ongoing edges.
       - Type indicator of node data == ASCIIDATA.
       - Payload: (char, lines):
         - Character to use as node's symbol.
         - List of lines to display as the node's text.
       - Edges; a list of (col, next_col) indicating the edges between
         the current node and its parents.
       - Number of columns (ongoing edges) in the current revision.
       - The difference between the number of columns (ongoing edges)
         in the next revision and the number of columns (ongoing edges)
         in the current revision. That is: -1 means one column removed;
         0 means no columns added or removed; 1 means one column added.
     """
     prev_n_columns_diff = 0
     prev_node_index = 0
     for (node_index, type, (node_ch, node_lines), edges, n_columns, n_columns_diff) in dag:
 
         assert -2 < n_columns_diff < 2
         if n_columns_diff == -1:
             # Transform
             #
             #     | | |        | | |
             #     o | |  into  o---+
             #     |X /         |/ /
             #     | |          | |
             fix_long_right_edges(edges)
 
         # add_padding_line says whether to rewrite
         #
         #     | | | |        | | | |
         #     | o---+  into  | o---+
         #     |  / /         |   | |  # <--- padding line
         #     o | |          |  / /
         #                    o | |
         add_padding_line = (len(node_lines) > 2 and
                             n_columns_diff == -1 and
                             [x for (x, y) in edges if x + 1 < y])
 
         # fix_nodeline_tail says whether to rewrite
         #
         #     | | o | |        | | o | |
         #     | | |/ /         | | |/ /
         #     | o | |    into  | o / /   # <--- fixed nodeline tail
         #     | |/ /           | |/ /
         #     o | |            o | |
         fix_nodeline_tail = len(node_lines) <= 2 and not add_padding_line
 
         # nodeline is the line containing the node character (typically o)
         nodeline = ["|", " "] * node_index
         nodeline.extend([node_ch, " "])
 
         nodeline.extend(
             get_nodeline_edges_tail(
                 node_index, prev_node_index, n_columns, n_columns_diff,
                 prev_n_columns_diff, fix_nodeline_tail))
 
         # shift_interline is the line containing the non-vertical
         # edges between this entry and the next
         shift_interline = ["|", " "] * node_index
         if n_columns_diff == -1:
             n_spaces = 1
             edge_ch = "/"
         elif n_columns_diff == 0:
             n_spaces = 2
             edge_ch = "|"
         else:
             n_spaces = 3
             edge_ch = "\\"
         shift_interline.extend(n_spaces * [" "])
         shift_interline.extend([edge_ch, " "] * (n_columns - node_index - 1))
 
         # draw edges from the current node to its parents
         draw_edges(edges, nodeline, shift_interline)
 
         # lines is the list of all graph lines to print
         lines = [nodeline]
         if add_padding_line:
             lines.append(get_padding_line(node_index, n_columns, edges))
         lines.append(shift_interline)
 
         # make sure that there are as many graph lines as there are
         # log strings
         while len(node_lines) < len(lines):
             node_lines.append("")
         if len(lines) < len(node_lines):
             extra_interline = ["|", " "] * (n_columns + n_columns_diff)
             while len(lines) < len(node_lines):
                 lines.append(extra_interline)
 
         # print lines
         indentation_level = max(n_columns, n_columns + n_columns_diff)
         for (line, logstr) in zip(lines, node_lines):
             ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
             ui.write(ln.rstrip() + '\n')
 
         # ... and start over
         prev_node_index = node_index
         prev_n_columns_diff = n_columns_diff
 
 def get_revs(repo, rev_opt):
     if rev_opt:
         revs = revrange(repo, rev_opt)
         return (max(revs), min(revs))
     else:
         return (len(repo) - 1, 0)
 
 def check_unsupported_flags(opts):
     for op in ["follow", "follow_first", "date", "copies", "keyword", "remove",
                "only_merges", "user", "only_branch", "prune", "newest_first",
                "no_merges", "include", "exclude"]:
         if op in opts and opts[op]:
             raise util.Abort(_("--graph option is incompatible with --%s") % op)
 
 def graphlog(ui, repo, path=None, **opts):
     """show revision history alongside an ASCII revision graph
 
     Print a revision history alongside a revision graph drawn with
     ASCII characters.
 
     Nodes printed as an @ character are parents of the working
     directory.
     """
 
     check_unsupported_flags(opts)
     limit = cmdutil.loglimit(opts)
     start, stop = get_revs(repo, opts["rev"])
     stop = max(stop, start - limit + 1)
     if start == nullrev:
         return
 
     if path:
         path = util.canonpath(repo.root, os.getcwd(), path)
     if path: # could be reset in canonpath
         revdag = graphmod.filerevs(repo, path, start, stop)
     else:
         revdag = graphmod.revisions(repo, start, stop)
 
     fmtdag = asciiformat(ui, repo, revdag, opts)
     ascii(ui, asciiedges(fmtdag))
 
 def graphrevs(repo, nodes, opts):
     limit = cmdutil.loglimit(opts)
     nodes.reverse()
     if limit < sys.maxint:
         nodes = nodes[:limit]
     return graphmod.nodes(repo, nodes)
 
 def goutgoing(ui, repo, dest=None, **opts):
     """show the outgoing changesets alongside an ASCII revision graph
 
     Print the outgoing changesets alongside a revision graph drawn with
     ASCII characters.
 
     Nodes printed as an @ character are parents of the working
     directory.
     """
 
     check_unsupported_flags(opts)
     dest, revs, checkout = hg.parseurl(
         ui.expandpath(dest or 'default-push', dest or 'default'),
         opts.get('rev'))
     if revs:
         revs = [repo.lookup(rev) for rev in revs]
     other = hg.repository(cmdutil.remoteui(ui, opts), dest)
     ui.status(_('comparing with %s\n') % url.hidepassword(dest))
     o = repo.findoutgoing(other, force=opts.get('force'))
     if not o:
         ui.status(_("no changes found\n"))
         return
 
     o = repo.changelog.nodesbetween(o, revs)[0]
     revdag = graphrevs(repo, o, opts)
     fmtdag = asciiformat(ui, repo, revdag, opts)
     ascii(ui, asciiedges(fmtdag))
 
 def gincoming(ui, repo, source="default", **opts):
     """show the incoming changesets alongside an ASCII revision graph
 
     Print the incoming changesets alongside a revision graph drawn with
     ASCII characters.
 
     Nodes printed as an @ character are parents of the working
     directory.
     """
 
     check_unsupported_flags(opts)
     source, revs, checkout = hg.parseurl(ui.expandpath(source), opts.get('rev'))
     other = hg.repository(cmdutil.remoteui(repo, opts), source)
     ui.status(_('comparing with %s\n') % url.hidepassword(source))
     if revs:
         revs = [other.lookup(rev) for rev in revs]
     incoming = repo.findincoming(other, heads=revs, force=opts["force"])
     if not incoming:
         try:
             os.unlink(opts["bundle"])
         except:
             pass
         ui.status(_("no changes found\n"))
         return
 
     cleanup = None
     try:
 
         fname = opts["bundle"]
         if fname or not other.local():
             # create a bundle (uncompressed if other repo is not local)
             if revs is None:
                 cg = other.changegroup(incoming, "incoming")
             else:
                 cg = other.changegroupsubset(incoming, revs, 'incoming')
             bundletype = other.local() and "HG10BZ" or "HG10UN"
             fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
             # keep written bundle?
             if opts["bundle"]:
                 cleanup = None
             if not other.local():
                 # use the created uncompressed bundlerepo
                 other = bundlerepo.bundlerepository(ui, repo.root, fname)
 
         chlist = other.changelog.nodesbetween(incoming, revs)[0]
         revdag = graphrevs(other, chlist, opts)
-        fmtdag = asciiformat(ui, repo, revdag, opts)
+        fmtdag = asciiformat(ui, other, revdag, opts, parentrepo=repo)
         ascii(ui, asciiedges(fmtdag))
 
     finally:
         if hasattr(other, 'close'):
             other.close()
         if cleanup:
             os.unlink(cleanup)
 
 def uisetup(ui):
     '''Initialize the extension.'''
     _wrapcmd(ui, 'log', commands.table, graphlog)
     _wrapcmd(ui, 'incoming', commands.table, gincoming)
     _wrapcmd(ui, 'outgoing', commands.table, goutgoing)
 
 def _wrapcmd(ui, cmd, table, wrapfn):
     '''wrap the command'''
     def graph(orig, *args, **kwargs):
         if kwargs['graph']:
             return wrapfn(*args, **kwargs)
         return orig(*args, **kwargs)
     entry = extensions.wrapcommand(table, cmd, graph)
     entry[1].append(('G', 'graph', None, _("show the revision DAG")))
 
 cmdtable = {
     "glog":
         (graphlog,
          [('l', 'limit', '', _('limit number of changes displayed')),
           ('p', 'patch', False, _('show patch')),
           ('r', 'rev', [], _('show the specified revision or range')),
          ] + templateopts,
          _('hg glog [OPTION]... [FILE]')),
 }

tests/test-glog

@@ -1,174 +1,174
 #!/bin/sh
 
 # @  (34) head
 # |
 # | o  (33) head
 # | |
 # o |    (32) expand
 # |\ \
 # | o \    (31) expand
 # | |\ \
 # | | o \    (30) expand
 # | | |\ \
 # | | | o |  (29) regular commit
 # | | | | |
 # | | o | |    (28) merge zero known
 # | | |\ \ \
 # o | | | | |  (27) collapse
 # |/ / / / /
 # | | o---+  (26) merge one known; far right
 # | | | | |
 # +---o | |  (25) merge one known; far left
 # | | | | |
 # | | o | |  (24) merge one known; immediate right
 # | | |\| |
 # | | o | |  (23) merge one known; immediate left
 # | |/| | |
 # +---o---+  (22) merge two known; one far left, one far right
 # | |  / /
 # o | | |    (21) expand
 # |\ \ \ \
 # | o---+-+  (20) merge two known; two far right
 # |  / / /
 # o | | |    (19) expand
 # |\ \ \ \
 # +---+---o  (18) merge two known; two far left
 # | | | |
 # | o | |    (17) expand
 # | |\ \ \
 # | | o---+  (16) merge two known; one immediate right, one near right
 # | | |/ /
 # o | | |    (15) expand
 # |\ \ \ \
 # | o-----+  (14) merge two known; one immediate right, one far right
 # | |/ / /
 # o | | |    (13) expand
 # |\ \ \ \
 # +---o | |  (12) merge two known; one immediate right, one far left
 # | | |/ /
 # | o | |    (11) expand
 # | |\ \ \
 # | | o---+  (10) merge two known; one immediate left, one near right
 # | |/ / /
 # o | | |    (9) expand
 # |\ \ \ \
 # | o-----+  (8) merge two known; one immediate left, one far right
 # |/ / / /
 # o | | |    (7) expand
 # |\ \ \ \
 # +---o | |  (6) merge two known; one immediate left, one far left
 # | |/ / /
 # | o | |    (5) expand
 # | |\ \ \
 # | | o | |  (4) merge two known; one immediate left, one immediate right
 # | |/|/ /
 # | o / /  (3) collapse
 # |/ / /
 # o / /  (2) collapse
 # |/ /
 # o /  (1) collapse
 # |/
 # o  (0) root
 
 "$TESTDIR/hghave" no-outer-repo || exit 80
 
 set -e
 
 commit()
 {
     rev=$1
     msg=$2
     shift 2
     if [ "$#" -gt 0 ]; then
         hg debugsetparents "$@"
     fi
     echo $rev > a
     hg commit -Aqd "$rev 0" -m "($rev) $msg"
 }
 
 echo "[extensions]" >> $HGRCPATH
 echo "graphlog=" >> $HGRCPATH
 
 echo % init
 hg init repo
 
 cd repo
 
 echo % empty repo
 hg glog
 
 echo % building tree
 commit 0 "root"
 commit 1 "collapse" 0
 commit 2 "collapse" 1
 commit 3 "collapse" 2
 commit 4 "merge two known; one immediate left, one immediate right" 1 3
 commit 5 "expand" 3 4
 commit 6 "merge two known; one immediate left, one far left" 2 5
 commit 7 "expand" 2 5
 commit 8 "merge two known; one immediate left, one far right" 0 7
 commit 9 "expand" 7 8
 commit 10 "merge two known; one immediate left, one near right" 0 6
 commit 11 "expand" 6 10
 commit 12 "merge two known; one immediate right, one far left" 1 9
 commit 13 "expand" 9 11
 commit 14 "merge two known; one immediate right, one far right" 0 12
 commit 15 "expand" 13 14
 commit 16 "merge two known; one immediate right, one near right" 0 1
 commit 17 "expand" 12 16
 commit 18 "merge two known; two far left" 1 15
 commit 19 "expand" 15 17
 commit 20 "merge two known; two far right" 0 18
 commit 21 "expand" 19 20
 commit 22 "merge two known; one far left, one far right" 18 21
 commit 23 "merge one known; immediate left" 1 22
 commit 24 "merge one known; immediate right" 0 23
 commit 25 "merge one known; far left" 21 24
 commit 26 "merge one known; far right" 18 25
 commit 27 "collapse" 21
 commit 28 "merge zero known" 1 26
 commit 29 "regular commit" 0
 commit 30 "expand" 28 29
 commit 31 "expand" 21 30
 commit 32 "expand" 27 31
 commit 33 "head" 18
 commit 34 "head" 32
 
 echo % glog -q
 hg glog -q
 
 echo % glog
 hg glog
 
 echo % file glog
 hg glog a
 
 echo % unused arguments
 hg glog -q foo bar || echo failed
 
 echo % from outer space
 cd ..
 hg glog -l1 repo
 hg glog -l1 repo/a
 hg glog -l1 repo/missing
 
 echo % file log with revs != cset revs
 hg init flog
 cd flog
 echo one >one
 hg add one
 hg commit -mone
 echo two >two
 hg add two
 hg commit -mtwo
 echo more >two
 hg commit -mmore
 hg glog two
 
 echo % incoming and outgoing
 cd ..
 hg clone -U -r31 repo repo2
 cd repo2
-hg incoming -q --graph
+hg incoming --graph ../repo
 cd ..
 hg -R repo outgoing --graph repo2

tests/test-glog.out

@@ -1,619 +1,639
 % init
 % empty repo
 % building tree
 % glog -q
 @  34:fea3ac5810e0
 |
 | o  33:68608f5145f9
 | |
 o |    32:d06dffa21a31
 |\ \
 | o \    31:621d83e11f67
 | |\ \
 | | o \    30:6e11cd4b648f
 | | |\ \
 | | | o |  29:cd9bb2be7593
 | | | | |
 | | o | |    28:44ecd0b9ae99
 | | |\ \ \
 o | | | | |  27:886ed638191b
 |/ / / / /
 | | o---+  26:7f25b6c2f0b9
 | | | | |
 +---o | |  25:91da8ed57247
 | | | | |
 | | o | |  24:a9c19a3d96b7
 | | |\| |
 | | o | |  23:a01cddf0766d
 | |/| | |
 +---o---+  22:e0d9cccacb5d
 | |  / /
 o | | |    21:d42a756af44d
 |\ \ \ \
 | o---+-+  20:d30ed6450e32
 |  / / /
 o | | |    19:31ddc2c1573b
 |\ \ \ \
 +---+---o  18:1aa84d96232a
 | | | |
 | o | |    17:44765d7c06e0
 | |\ \ \
 | | o---+  16:3677d192927d
 | | |/ /
 o | | |    15:1dda3f72782d
 |\ \ \ \
 | o-----+  14:8eac370358ef
 | |/ / /
 o | | |    13:22d8966a97e3
 |\ \ \ \
 +---o | |  12:86b91144a6e9
 | | |/ /
 | o | |    11:832d76e6bdf2
 | |\ \ \
 | | o---+  10:74c64d036d72
 | |/ / /
 o | | |    9:7010c0af0a35
 |\ \ \ \
 | o-----+  8:7a0b11f71937
 |/ / / /
 o | | |    7:b632bb1b1224
 |\ \ \ \
 +---o | |  6:b105a072e251
 | |/ / /
 | o | |    5:4409d547b708
 | |\ \ \
 | | o | |  4:26a8bac39d9f
 | |/|/ /
 | o / /  3:27eef8ed80b4
 |/ / /
 o / /  2:3d9a33b8d1e1
 |/ /
 o /  1:6db2ef61d156
 |/
 o  0:e6eb3150255d
 
 % glog
 @  changeset:   34:fea3ac5810e0
 |  tag:         tip
 |  parent:      32:d06dffa21a31
 |  user:        test
 |  date:        Thu Jan 01 00:00:34 1970 +0000
 |  summary:     (34) head
 |
 | o  changeset:   33:68608f5145f9
 | |  parent:      18:1aa84d96232a
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:33 1970 +0000
 | |  summary:     (33) head
 | |
 o |    changeset:   32:d06dffa21a31
 |\ \   parent:      27:886ed638191b
 | | |  parent:      31:621d83e11f67
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:32 1970 +0000
 | | |  summary:     (32) expand
 | | |
 | o |    changeset:   31:621d83e11f67
 | |\ \   parent:      21:d42a756af44d
 | | | |  parent:      30:6e11cd4b648f
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
 | | | |  summary:     (31) expand
 | | | |
 | | o |    changeset:   30:6e11cd4b648f
 | | |\ \   parent:      28:44ecd0b9ae99
 | | | | |  parent:      29:cd9bb2be7593
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
 | | | | |  summary:     (30) expand
 | | | | |
 | | | o |  changeset:   29:cd9bb2be7593
 | | | | |  parent:      0:e6eb3150255d
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
 | | | | |  summary:     (29) regular commit
 | | | | |
 | | o | |    changeset:   28:44ecd0b9ae99
 | | |\ \ \   parent:      1:6db2ef61d156
 | | | | | |  parent:      26:7f25b6c2f0b9
 | | | | | |  user:        test
 | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
 | | | | | |  summary:     (28) merge zero known
 | | | | | |
 o | | | | |  changeset:   27:886ed638191b
 |/ / / / /   parent:      21:d42a756af44d
 | | | | |    user:        test
 | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
 | | | | |    summary:     (27) collapse
 | | | | |
 | | o---+  changeset:   26:7f25b6c2f0b9
 | | | | |  parent:      18:1aa84d96232a
 | | | | |  parent:      25:91da8ed57247
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
 | | | | |  summary:     (26) merge one known; far right
 | | | | |
 +---o | |  changeset:   25:91da8ed57247
 | | | | |  parent:      21:d42a756af44d
 | | | | |  parent:      24:a9c19a3d96b7
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
 | | | | |  summary:     (25) merge one known; far left
 | | | | |
 | | o | |  changeset:   24:a9c19a3d96b7
 | | |\| |  parent:      0:e6eb3150255d
 | | | | |  parent:      23:a01cddf0766d
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
 | | | | |  summary:     (24) merge one known; immediate right
 | | | | |
 | | o | |  changeset:   23:a01cddf0766d
 | |/| | |  parent:      1:6db2ef61d156
 | | | | |  parent:      22:e0d9cccacb5d
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
 | | | | |  summary:     (23) merge one known; immediate left
 | | | | |
 +---o---+  changeset:   22:e0d9cccacb5d
 | |   | |  parent:      18:1aa84d96232a
 | |  / /   parent:      21:d42a756af44d
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
 | | | |    summary:     (22) merge two known; one far left, one far right
 | | | |
 o | | |    changeset:   21:d42a756af44d
 |\ \ \ \   parent:      19:31ddc2c1573b
 | | | | |  parent:      20:d30ed6450e32
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
 | | | | |  summary:     (21) expand
 | | | | |
 | o---+-+  changeset:   20:d30ed6450e32
 |   | | |  parent:      0:e6eb3150255d
 |  / / /   parent:      18:1aa84d96232a
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
 | | | |    summary:     (20) merge two known; two far right
 | | | |
 o | | |    changeset:   19:31ddc2c1573b
 |\ \ \ \   parent:      15:1dda3f72782d
 | | | | |  parent:      17:44765d7c06e0
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
 | | | | |  summary:     (19) expand
 | | | | |
 +---+---o  changeset:   18:1aa84d96232a
 | | | |    parent:      1:6db2ef61d156
 | | | |    parent:      15:1dda3f72782d
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
 | | | |    summary:     (18) merge two known; two far left
 | | | |
 | o | |    changeset:   17:44765d7c06e0
 | |\ \ \   parent:      12:86b91144a6e9
 | | | | |  parent:      16:3677d192927d
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
 | | | | |  summary:     (17) expand
 | | | | |
 | | o---+  changeset:   16:3677d192927d
 | | | | |  parent:      0:e6eb3150255d
 | | |/ /   parent:      1:6db2ef61d156
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
 | | | |    summary:     (16) merge two known; one immediate right, one near right
 | | | |
 o | | |    changeset:   15:1dda3f72782d
 |\ \ \ \   parent:      13:22d8966a97e3
 | | | | |  parent:      14:8eac370358ef
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
 | | | | |  summary:     (15) expand
 | | | | |
 | o-----+  changeset:   14:8eac370358ef
 | | | | |  parent:      0:e6eb3150255d
 | |/ / /   parent:      12:86b91144a6e9
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
 | | | |    summary:     (14) merge two known; one immediate right, one far right
 | | | |
 o | | |    changeset:   13:22d8966a97e3
 |\ \ \ \   parent:      9:7010c0af0a35
 | | | | |  parent:      11:832d76e6bdf2
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
 | | | | |  summary:     (13) expand
 | | | | |
 +---o | |  changeset:   12:86b91144a6e9
 | | |/ /   parent:      1:6db2ef61d156
 | | | |    parent:      9:7010c0af0a35
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
 | | | |    summary:     (12) merge two known; one immediate right, one far left
 | | | |
 | o | |    changeset:   11:832d76e6bdf2
 | |\ \ \   parent:      6:b105a072e251
 | | | | |  parent:      10:74c64d036d72
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
 | | | | |  summary:     (11) expand
 | | | | |
 | | o---+  changeset:   10:74c64d036d72
 | | | | |  parent:      0:e6eb3150255d
 | |/ / /   parent:      6:b105a072e251
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
 | | | |    summary:     (10) merge two known; one immediate left, one near right
 | | | |
 o | | |    changeset:   9:7010c0af0a35
 |\ \ \ \   parent:      7:b632bb1b1224
 | | | | |  parent:      8:7a0b11f71937
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
 | | | | |  summary:     (9) expand
 | | | | |
 | o-----+  changeset:   8:7a0b11f71937
 | | | | |  parent:      0:e6eb3150255d
 |/ / / /   parent:      7:b632bb1b1224
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
 | | | |    summary:     (8) merge two known; one immediate left, one far right
 | | | |
 o | | |    changeset:   7:b632bb1b1224
 |\ \ \ \   parent:      2:3d9a33b8d1e1
 | | | | |  parent:      5:4409d547b708
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
 | | | | |  summary:     (7) expand
 | | | | |
 +---o | |  changeset:   6:b105a072e251
 | |/ / /   parent:      2:3d9a33b8d1e1
 | | | |    parent:      5:4409d547b708
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
 | | | |    summary:     (6) merge two known; one immediate left, one far left
 | | | |
 | o | |    changeset:   5:4409d547b708
 | |\ \ \   parent:      3:27eef8ed80b4
 | | | | |  parent:      4:26a8bac39d9f
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
 | | | | |  summary:     (5) expand
 | | | | |
 | | o | |  changeset:   4:26a8bac39d9f
 | |/|/ /   parent:      1:6db2ef61d156
 | | | |    parent:      3:27eef8ed80b4
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
 | | | |    summary:     (4) merge two known; one immediate left, one immediate right
 | | | |
 | o | |  changeset:   3:27eef8ed80b4
 |/ / /   user:        test
 | | |    date:        Thu Jan 01 00:00:03 1970 +0000
 | | |    summary:     (3) collapse
 | | |
 o | |  changeset:   2:3d9a33b8d1e1
 |/ /   user:        test
 | |    date:        Thu Jan 01 00:00:02 1970 +0000
 | |    summary:     (2) collapse
 | |
 o |  changeset:   1:6db2ef61d156
 |/   user:        test
 |    date:        Thu Jan 01 00:00:01 1970 +0000
 |    summary:     (1) collapse
 |
 o  changeset:   0:e6eb3150255d
    user:        test
    date:        Thu Jan 01 00:00:00 1970 +0000
    summary:     (0) root
 
 % file glog
 @  changeset:   34:fea3ac5810e0
 |  tag:         tip
 |  parent:      32:d06dffa21a31
 |  user:        test
 |  date:        Thu Jan 01 00:00:34 1970 +0000
 |  summary:     (34) head
 |
 | o  changeset:   33:68608f5145f9
 | |  parent:      18:1aa84d96232a
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:33 1970 +0000
 | |  summary:     (33) head
 | |
 o |    changeset:   32:d06dffa21a31
 |\ \   parent:      27:886ed638191b
 | | |  parent:      31:621d83e11f67
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:32 1970 +0000
 | | |  summary:     (32) expand
 | | |
 | o |  changeset:   31:621d83e11f67
 | | |  parent:      21:d42a756af44d
 | | |  parent:      30:6e11cd4b648f
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:31 1970 +0000
 | | |  summary:     (31) expand
 | | |
 | o |    changeset:   30:6e11cd4b648f
 | |\ \   parent:      28:44ecd0b9ae99
 | | | |  parent:      29:cd9bb2be7593
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
 | | | |  summary:     (30) expand
 | | | |
 | | o |  changeset:   29:cd9bb2be7593
 | | | |  parent:      0:e6eb3150255d
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
 | | | |  summary:     (29) regular commit
 | | | |
 | o | |  changeset:   28:44ecd0b9ae99
 | | | |  parent:      1:6db2ef61d156
 | | | |  parent:      26:7f25b6c2f0b9
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
 | | | |  summary:     (28) merge zero known
 | | | |
 o | | |  changeset:   27:886ed638191b
 | | | |  parent:      21:d42a756af44d
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:27 1970 +0000
 | | | |  summary:     (27) collapse
 | | | |
 | o | |  changeset:   26:7f25b6c2f0b9
 | | | |  parent:      18:1aa84d96232a
 | | | |  parent:      25:91da8ed57247
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
 | | | |  summary:     (26) merge one known; far right
 | | | |
 | o | |  changeset:   25:91da8ed57247
 | | | |  parent:      21:d42a756af44d
 | | | |  parent:      24:a9c19a3d96b7
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
 | | | |  summary:     (25) merge one known; far left
 | | | |
 | o | |  changeset:   24:a9c19a3d96b7
 | | | |  parent:      0:e6eb3150255d
 | | | |  parent:      23:a01cddf0766d
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
 | | | |  summary:     (24) merge one known; immediate right
 | | | |
 | o | |  changeset:   23:a01cddf0766d
 | | | |  parent:      1:6db2ef61d156
 | | | |  parent:      22:e0d9cccacb5d
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
 | | | |  summary:     (23) merge one known; immediate left
 | | | |
 | o | |  changeset:   22:e0d9cccacb5d
 |/ / /   parent:      18:1aa84d96232a
 | | |    parent:      21:d42a756af44d
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:22 1970 +0000
 | | |    summary:     (22) merge two known; one far left, one far right
 | | |
 o | |    changeset:   21:d42a756af44d
 |\ \ \   parent:      19:31ddc2c1573b
 | | | |  parent:      20:d30ed6450e32
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
 | | | |  summary:     (21) expand
 | | | |
 | o---+  changeset:   20:d30ed6450e32
 |   | |  parent:      0:e6eb3150255d
 |  / /   parent:      18:1aa84d96232a
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:20 1970 +0000
 | | |    summary:     (20) merge two known; two far right
 | | |
 o | |    changeset:   19:31ddc2c1573b
 |\ \ \   parent:      15:1dda3f72782d
 | | | |  parent:      17:44765d7c06e0
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
 | | | |  summary:     (19) expand
 | | | |
 +-----o  changeset:   18:1aa84d96232a
 | | |    parent:      1:6db2ef61d156
 | | |    parent:      15:1dda3f72782d
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:18 1970 +0000
 | | |    summary:     (18) merge two known; two far left
 | | |
 | o |    changeset:   17:44765d7c06e0
 | |\ \   parent:      12:86b91144a6e9
 | | | |  parent:      16:3677d192927d
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
 | | | |  summary:     (17) expand
 | | | |
 | | o |  changeset:   16:3677d192927d
 | | | |  parent:      0:e6eb3150255d
 | | | |  parent:      1:6db2ef61d156
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:16 1970 +0000
 | | | |  summary:     (16) merge two known; one immediate right, one near right
 | | | |
 o | | |    changeset:   15:1dda3f72782d
 |\ \ \ \   parent:      13:22d8966a97e3
 | | | | |  parent:      14:8eac370358ef
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
 | | | | |  summary:     (15) expand
 | | | | |
 | o | | |  changeset:   14:8eac370358ef
 | |/ / /   parent:      0:e6eb3150255d
 | | | |    parent:      12:86b91144a6e9
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
 | | | |    summary:     (14) merge two known; one immediate right, one far right
 | | | |
 o | | |    changeset:   13:22d8966a97e3
 |\ \ \ \   parent:      9:7010c0af0a35
 | | | | |  parent:      11:832d76e6bdf2
 | | | | |  user:        test
 | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
 | | | | |  summary:     (13) expand
 | | | | |
 +---o | |  changeset:   12:86b91144a6e9
 | |  / /   parent:      1:6db2ef61d156
 | | | |    parent:      9:7010c0af0a35
 | | | |    user:        test
 | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
 | | | |    summary:     (12) merge two known; one immediate right, one far left
 | | | |
 | o | |  changeset:   11:832d76e6bdf2
 | | | |  parent:      6:b105a072e251
 | | | |  parent:      10:74c64d036d72
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
 | | | |  summary:     (11) expand
 | | | |
 | o | |  changeset:   10:74c64d036d72
 | | | |  parent:      0:e6eb3150255d
 | | | |  parent:      6:b105a072e251
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:10 1970 +0000
 | | | |  summary:     (10) merge two known; one immediate left, one near right
 | | | |
 o | | |  changeset:   9:7010c0af0a35
 | | | |  parent:      7:b632bb1b1224
 | | | |  parent:      8:7a0b11f71937
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
 | | | |  summary:     (9) expand
 | | | |
 o | | |  changeset:   8:7a0b11f71937
 | | | |  parent:      0:e6eb3150255d
 | | | |  parent:      7:b632bb1b1224
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:08 1970 +0000
 | | | |  summary:     (8) merge two known; one immediate left, one far right
 | | | |
 o | | |  changeset:   7:b632bb1b1224
 | | | |  parent:      2:3d9a33b8d1e1
 | | | |  parent:      5:4409d547b708
 | | | |  user:        test
 | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
 | | | |  summary:     (7) expand
 | | | |
 | o | |  changeset:   6:b105a072e251
 |/ / /   parent:      2:3d9a33b8d1e1
 | | |    parent:      5:4409d547b708
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:06 1970 +0000
 | | |    summary:     (6) merge two known; one immediate left, one far left
 | | |
 o | |  changeset:   5:4409d547b708
 | | |  parent:      3:27eef8ed80b4
 | | |  parent:      4:26a8bac39d9f
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:05 1970 +0000
 | | |  summary:     (5) expand
 | | |
 o | |  changeset:   4:26a8bac39d9f
 | | |  parent:      1:6db2ef61d156
 | | |  parent:      3:27eef8ed80b4
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:04 1970 +0000
 | | |  summary:     (4) merge two known; one immediate left, one immediate right
 | | |
 o | |  changeset:   3:27eef8ed80b4
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:03 1970 +0000
 | | |  summary:     (3) collapse
 | | |
 o | |  changeset:   2:3d9a33b8d1e1
 |/ /   user:        test
 | |    date:        Thu Jan 01 00:00:02 1970 +0000
 | |    summary:     (2) collapse
 | |
 o |  changeset:   1:6db2ef61d156
 |/   user:        test
 |    date:        Thu Jan 01 00:00:01 1970 +0000
 |    summary:     (1) collapse
 |
 o  changeset:   0:e6eb3150255d
    user:        test
    date:        Thu Jan 01 00:00:00 1970 +0000
    summary:     (0) root
 
 % unused arguments
 hg glog: invalid arguments
 hg glog [OPTION]... [FILE]
 
 show revision history alongside an ASCII revision graph
 failed
 % from outer space
 @  changeset:   34:fea3ac5810e0
 |  tag:         tip
 |  parent:      32:d06dffa21a31
 |  user:        test
 |  date:        Thu Jan 01 00:00:34 1970 +0000
 |  summary:     (34) head
 |
 @  changeset:   34:fea3ac5810e0
 |  tag:         tip
 |  parent:      32:d06dffa21a31
 |  user:        test
 |  date:        Thu Jan 01 00:00:34 1970 +0000
 |  summary:     (34) head
 |
 % file log with revs != cset revs
 @  changeset:   2:12c28321755b
 |  tag:         tip
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     more
 |
 o  changeset:   1:5ac72c0599bf
    user:        test
    date:        Thu Jan 01 00:00:00 1970 +0000
    summary:     two
 
 % incoming and outgoing
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 31 changesets with 31 changes to 1 files
-o  34:fea3ac5810e0
-|
-| o  33:68608f5145f9
+comparing with ../repo
+searching for changes
+o  changeset:   34:fea3ac5810e0
+|  tag:         tip
+|  parent:      32:d06dffa21a31
+|  user:        test
+|  date:        Thu Jan 01 00:00:34 1970 +0000
+|  summary:     (34) head
 |
-o  32:d06dffa21a31
+| o  changeset:   33:68608f5145f9
+|    parent:      18:1aa84d96232a
+|    user:        test
+|    date:        Thu Jan 01 00:00:33 1970 +0000
+|    summary:     (33) head
 |
-o  27:886ed638191b
+o  changeset:   32:d06dffa21a31
+|  parent:      27:886ed638191b
+|  parent:      31:621d83e11f67
+|  user:        test
+|  date:        Thu Jan 01 00:00:32 1970 +0000
+|  summary:     (32) expand
+|
+o  changeset:   27:886ed638191b
+   parent:      21:d42a756af44d
+   user:        test
+   date:        Thu Jan 01 00:00:27 1970 +0000
+   summary:     (27) collapse
 
 comparing with repo2
 searching for changes
 @  changeset:   34:fea3ac5810e0
 |  tag:         tip
 |  parent:      32:d06dffa21a31
 |  user:        test
 |  date:        Thu Jan 01 00:00:34 1970 +0000
 |  summary:     (34) head
 |
 | o  changeset:   33:68608f5145f9
 |    parent:      18:1aa84d96232a
 |    user:        test
 |    date:        Thu Jan 01 00:00:33 1970 +0000
 |    summary:     (33) head
 |
 o  changeset:   32:d06dffa21a31
 |  parent:      27:886ed638191b
 |  parent:      31:621d83e11f67
 |  user:        test
 |  date:        Thu Jan 01 00:00:32 1970 +0000
 |  summary:     (32) expand
 |
 o  changeset:   27:886ed638191b
    parent:      21:d42a756af44d
    user:        test
    date:        Thu Jan 01 00:00:27 1970 +0000
    summary:     (27) collapse