graphmod: use revsets internally

Thanks for the idea and most of the implementation to Klaus Koch

Backs revisions() and filerevs() with DAG walker which can iterate through
arbitrary list of revisions instead of strict one by one iteration from start to
stop. When a gap occurs in a revisions (i.e. in file log), the next topological
parent within the revset is searched and the connection to it is printed in the
ascii graph.

File graph can draw sometimes more connections than previous version, because
graph is produced according to the revset, not according to a file's filelog.

In case the graph contains several branches where the left parent is null, the
graphs for each are printed sequentially, not in parallel as it was a case
earlier (see for example the graph for README in hg-dev).

hgext/graphlog.py

@@ -1,342 +1,340 b''
 # 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 or any later version.
 
 '''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
 from mercurial.cmdutil import revrange, show_changeset
 from mercurial.commands import templateopts
 from mercurial.i18n import _
 from mercurial.node import nullrev
 from mercurial import cmdutil, commands, extensions
 from mercurial import hg, scmutil, util, graphmod
 
 ASCIIDATA = 'ASC'
 
 def asciiedges(seen, rev, parents):
     """adds edge info to changelog DAG walk suitable for ascii()"""
     if rev not in seen:
         seen.append(rev)
     nodeidx = seen.index(rev)
 
     knownparents = []
     newparents = []
     for parent in parents:
         if parent in seen:
             knownparents.append(parent)
         else:
             newparents.append(parent)
 
     ncols = len(seen)
     seen[nodeidx:nodeidx + 1] = newparents
     edges = [(nodeidx, seen.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(seen) - ncols
     return nodeidx, 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 asciistate():
     """returns the initial value for the "state" argument to ascii()"""
     return [0, 0]
 
 def ascii(ui, state, type, char, text, coldata):
     """prints an ASCII graph of the DAG
 
     takes the following arguments (one call per node in the graph):
 
       - ui to write to
       - Somewhere to keep the needed state in (init to asciistate())
       - 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.
     """
 
     idx, edges, ncols, coldiff = coldata
     assert -2 < coldiff < 2
     if coldiff == -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(text) > 2 and coldiff == -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(text) <= 2 and not add_padding_line
 
     # nodeline is the line containing the node character (typically o)
     nodeline = ["|", " "] * idx
     nodeline.extend([char, " "])
 
     nodeline.extend(
         get_nodeline_edges_tail(idx, state[1], ncols, coldiff,
                                 state[0], fix_nodeline_tail))
 
     # shift_interline is the line containing the non-vertical
     # edges between this entry and the next
     shift_interline = ["|", " "] * idx
     if coldiff == -1:
         n_spaces = 1
         edge_ch = "/"
     elif coldiff == 0:
         n_spaces = 2
         edge_ch = "|"
     else:
         n_spaces = 3
         edge_ch = "\\"
     shift_interline.extend(n_spaces * [" "])
     shift_interline.extend([edge_ch, " "] * (ncols - idx - 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(idx, ncols, edges))
     lines.append(shift_interline)
 
     # make sure that there are as many graph lines as there are
     # log strings
     while len(text) < len(lines):
         text.append("")
     if len(lines) < len(text):
         extra_interline = ["|", " "] * (ncols + coldiff)
         while len(lines) < len(text):
             lines.append(extra_interline)
 
     # print lines
     indentation_level = max(ncols, ncols + coldiff)
     for (line, logstr) in zip(lines, text):
         ln = "%-*s %s" % (2 * indentation_level, "".join(line), logstr)
         ui.write(ln.rstrip() + '\n')
 
     # ... and start over
     state[0] = coldiff
     state[1] = idx
 
 def get_revs(repo, rev_opt):
     if rev_opt:
         revs = revrange(repo, rev_opt)
         if len(revs) == 0:
             return (nullrev, nullrev)
         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", "branch", "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.replace("_", "-"))
 
 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'
         displayer.show(ctx)
         lines = displayer.hunk.pop(rev).split('\n')[:-1]
         displayer.flush(rev)
         ascii(ui, state, type, char, lines, edgefn(seen, rev, parents))
     displayer.close()
 
 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"])
     if start == nullrev:
         return
 
-    if path:
-        path = scmutil.canonpath(repo.root, os.getcwd(), path)
     if path: # could be reset in canonpath
         revdag = graphmod.filerevs(repo, path, start, stop, limit)
     else:
         if limit is not None:
             stop = max(stop, start - limit + 1)
         revdag = graphmod.revisions(repo, start, stop)
 
     displayer = show_changeset(ui, repo, opts, buffered=True)
     showparents = [ctx.node() for ctx in repo[None].parents()]
     generate(ui, revdag, displayer, showparents, asciiedges)
 
 def graphrevs(repo, nodes, opts):
     limit = cmdutil.loglimit(opts)
     nodes.reverse()
     if limit is not None:
         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)
     o = hg._outgoing(ui, repo, dest, opts)
     if o is None:
         return
 
     revdag = graphrevs(repo, o, opts)
     displayer = show_changeset(ui, repo, opts, buffered=True)
     showparents = [ctx.node() for ctx in repo[None].parents()]
     generate(ui, revdag, displayer, showparents, asciiedges)
 
 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.
     """
     def subreporecurse():
         return 1
 
     check_unsupported_flags(opts)
     def display(other, chlist, displayer):
         revdag = graphrevs(other, chlist, opts)
         showparents = [ctx.node() for ctx in repo[None].parents()]
         generate(ui, revdag, displayer, showparents, asciiedges)
 
     hg._incoming(display, subreporecurse, ui, repo, source, opts, buffered=True)
 
 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']:
             try:
                 return wrapfn(*args, **kwargs)
             except TypeError, e:
                 if len(args) > wrapfn.func_code.co_argcount:
                     raise util.Abort(_('--graph option allows at most one file'))
                 raise
         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'), _('NUM')),
           ('p', 'patch', False, _('show patch')),
           ('r', 'rev', [],
            _('show the specified revision or range'), _('REV')),
          ] + templateopts,
          _('hg glog [OPTION]... [FILE]')),
 }

mercurial/graphmod.py

@@ -1,122 +1,220 b''
 # Revision graph generator for Mercurial
 #
 # Copyright 2008 Dirkjan Ochtman <[e-mail]>
 # 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 or any later version.
 
 """supports walking the history as DAGs suitable for graphical output
 
 The most basic format we use is that of::
 
   (id, type, data, [parentids])
 
 The node and parent ids are arbitrary integers which identify a node in the
 context of the graph returned. Type is a constant specifying the node type.
 Data depends on type.
 """
 
 from mercurial.node import nullrev
+from mercurial.cmdutil import revrange
 
 CHANGESET = 'C'
 
-def revisions(repo, start, stop):
-    """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples
-
-    This generator function walks through the revision history from revision
-    start to revision stop (which must be less than or equal to start). It
-    returns a tuple for each node. The node and parent ids are arbitrary
-    integers which identify a node in the context of the graph returned.
+def revisions(repo, start, end):
+    """DAG generator for revisions between start and end
     """
-    cur = start
-    while cur >= stop:
-        ctx = repo[cur]
-        parents = set([p.rev() for p in ctx.parents() if p.rev() != nullrev])
-        yield (cur, CHANGESET, ctx, sorted(parents))
-        cur -= 1
+    revset = '%s:%s' % (start, end)
+    return dagwalker(repo, revrange(repo, [revset]))
 
 def filerevs(repo, path, start, stop, limit=None):
-    """file cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples
+    """DAG generator, which is limited by file passed
+    """
+    revset = '%s:%s and file("%s")' % (start, stop, path)
+    if limit:
+        revset = 'limit(%s, %s)' % (revset, limit)
+    return dagwalker(repo, revrange(repo, [revset]))
 
-    This generator function walks through the revision history of a single
-    file from revision start down to revision stop.
+def dagwalker(repo, revs):
+    """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples
+
+    This generator function walks through revisions (which should be ordered
+    from bigger to lower). It returns a tuple for each node. The node and parent
+    ids are arbitrary integers which identify a node in the context of the graph
+    returned.
     """
-    filerev = len(repo.file(path)) - 1
-    rev = stop + 1
-    count = 0
-    while filerev >= 0 and rev > stop:
-        fctx = repo.filectx(path, fileid=filerev)
-        parents = set([f.linkrev() for f in fctx.parents() if f.path() == path])
-        rev = fctx.rev()
-        if rev <= start:
-            yield (rev, CHANGESET, fctx.changectx(), sorted(parents))
-            count += 1
-            if count == limit:
-                break
-        filerev -= 1
+    if not revs:
+        return []
+
+    ns = [repo[r].node() for r in revs]
+    revdag = list(nodes(repo, ns))
+
+    cl = repo.changelog
+    lowestrev = min(revs)
+    gpcache = {}
+    leafs = {}
+
+    for i, (id, c, ctx, parents) in enumerate(revdag):
+        mpars = [p.rev() for p in ctx.parents() if
+                 p.rev() != nullrev and p.rev() not in parents]
+        grandparents = []
+
+        for mpar in mpars:
+            gp = gpcache.get(mpar) or grandparent(cl, lowestrev, revs, mpar)
+            gpcache[mpar] = gp
+            if gp is None:
+                leafs.setdefault(mpar, []).append((i, ctx))
+            else:
+                grandparents.append(gp)
+
+        if grandparents:
+            for gp in grandparents:
+                if gp not in revdag[i][3]:
+                    revdag[i][3].append(gp)
+
+    for parent, leafs in leafs.iteritems():
+        for i, ctx in leafs:
+            revdag[i][3].append(parent)
+
+    return revdag
 
 def nodes(repo, nodes):
     """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples
 
     This generator function walks the given nodes. It only returns parents
     that are in nodes, too.
     """
     include = set(nodes)
     for node in nodes:
         ctx = repo[node]
         parents = set([p.rev() for p in ctx.parents() if p.node() in include])
         yield (ctx.rev(), CHANGESET, ctx, sorted(parents))
 
 def colored(dag):
     """annotates a DAG with colored edge information
 
     For each DAG node this function emits tuples::
 
       (id, type, data, (col, color), [(col, nextcol, color)])
 
     with the following new elements:
 
       - Tuple (col, color) with column and color index for the current node
       - A list of tuples indicating the edges between the current node and its
         parents.
     """
     seen = []
     colors = {}
     newcolor = 1
     for (cur, type, data, parents) in dag:
 
         # Compute seen and next
         if cur not in seen:
             seen.append(cur) # new head
             colors[cur] = newcolor
             newcolor += 1
 
         col = seen.index(cur)
         color = colors.pop(cur)
         next = seen[:]
 
         # Add parents to next
         addparents = [p for p in parents if p not in next]
         next[col:col + 1] = addparents
 
         # Set colors for the parents
         for i, p in enumerate(addparents):
             if not i:
                 colors[p] = color
             else:
                 colors[p] = newcolor
                 newcolor += 1
 
         # Add edges to the graph
         edges = []
         for ecol, eid in enumerate(seen):
             if eid in next:
                 edges.append((ecol, next.index(eid), colors[eid]))
             elif eid == cur:
                 for p in parents:
                     edges.append((ecol, next.index(p), color))
 
         # Yield and move on
         yield (cur, type, data, (col, color), edges)
         seen = next
+
+
+def grandparent(cl, lowestrev, roots, head):
+    """Return closest 'root' rev in topological path from 'roots' to 'head'.
+
+    Derived from revlog.revlog.nodesbetween, but only returns next rev
+    of topologically sorted list of all nodes N that satisfy of these
+    constraints:
+
+    1. N is a descendant of some node in 'roots'
+    2. N is an ancestor of 'head'
+    3. N is some node in 'roots' or nullrev
+
+    Every node is considered to be both a descendant and an ancestor
+    of itself, so every reachable node in 'roots' and 'head' will be
+    included in 'nodes'.
+    """
+    ancestors = set()
+    # Start at the top and keep marking parents until we're done.
+    revstotag = set([head])
+    revstotag.discard(nullrev)
+    llowestrev = max(nullrev, lowestrev)
+
+    while revstotag:
+        r = revstotag.pop()
+        # A node's revision number represents its place in a
+        # topologically sorted list of nodes.
+        if r >= llowestrev:
+            if r not in ancestors:
+                # If we are possibly a descendent of one of the roots
+                # and we haven't already been marked as an ancestor
+                ancestors.add(r) # Mark as ancestor
+                # Add non-nullrev parents to list of nodes to tag.
+                revstotag.update([p for p in cl.parentrevs(r)])
+
+    if not ancestors:
+        return
+    # Now that we have our set of ancestors, we want to remove any
+    # roots that are not ancestors.
+
+    # If one of the roots was nullrev, everything is included anyway.
+    if lowestrev > nullrev:
+        # But, since we weren't, let's recompute the lowest rev to not
+        # include roots that aren't ancestors.
+
+        # Filter out roots that aren't ancestors of heads
+        _roots = ancestors.intersection(roots)
+        if not _roots:
+            return
+        # Recompute the lowest revision
+        lowestrev = min(roots)
+    else:
+        # We are descending from nullrev, and don't need to care about
+        # any other roots.
+        lowestrev = nullrev
+        _roots = [nullrev]
+
+    # The roots are just the descendants.
+    # Don't start at nullrev since we don't want nullrev in our output list,
+    # and if nullrev shows up in descedents, empty parents will look like
+    # they're descendents.
+    lowestrevisnullrev = (lowestrev == nullrev)
+    for r in xrange(head - 1, max(lowestrev, -1) - 1, -1):
+        if lowestrevisnullrev or r in _roots:
+            pass
+        elif _roots.issuperset(cl.parentrevs(r)):
+            # A node is a descendent if either of its parents are
+            # descendents.  (We seeded the dependents list with the roots
+            # up there, remember?)
+            _roots.add(r)
+        else:
+            continue
+        if r in ancestors:
+            # Only include nodes that are both descendents and ancestors.
+            return r

tests/test-debugbuilddag.t

@@ -1,321 +1,321 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "graphlog=" >> $HGRCPATH
 
 overwritten and appended files
 
   $ rm -rf repo
   $ hg init repo
   $ cd repo
   $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa
 dag
   $ hg debugdag -t -b
   +2:f
   +3:p2
   @temp*f+3
   @default*/p2+2:tip
 tip
   $ hg id
   f96e381c614c tip
 glog
   $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
   @  11: r11 [] @ 11.00
   |
   o  10: r10 [] @ 10.00
   |
   o    9: r9 [] @ 9.00
   |\
   | o  8: r8 [temp] @ 8.00
   | |
   | o  7: r7 [temp] @ 7.00
   | |
   | o  6: r6 [temp] @ 6.00
   | |
   | o  5: r5 [temp] @ 5.00
   | |
   o |  4: r4 [] @ 4.00
   | |
   o |  3: r3 [] @ 3.00
   | |
   o |  2: r2 [] @ 2.00
   |/
   o  1: r1 [] @ 1.00
   |
   o  0: r0 [] @ 0.00
   
 glog of
   $ hg glog --template '{rev}: {desc} [{branches}]\n' of
   @  11: r11 []
   |
   o  10: r10 []
   |
   o    9: r9 []
   |\
   | o  8: r8 [temp]
   | |
   | o  7: r7 [temp]
   | |
   | o  6: r6 [temp]
   | |
   | o  5: r5 [temp]
   | |
   o |  4: r4 []
   | |
   o |  3: r3 []
   | |
   o |  2: r2 []
   |/
   o  1: r1 []
   |
   o  0: r0 []
   
 glog af
   $ hg glog --template '{rev}: {desc} [{branches}]\n' af
   @  11: r11 []
   |
   o  10: r10 []
   |
   o    9: r9 []
   |\
   | o  8: r8 [temp]
   | |
   | o  7: r7 [temp]
   | |
   | o  6: r6 [temp]
   | |
   | o  5: r5 [temp]
   | |
   o |  4: r4 []
   | |
   o |  3: r3 []
   | |
   o |  2: r2 []
   |/
   o  1: r1 []
   |
   o  0: r0 []
   
 tags
   $ hg tags -v
   tip                               11:f96e381c614c
   p2                                 4:d9d6db981b55 local
   f                                  1:73253def624e local
 cat of
   $ hg cat of
   r11
 cat af
   $ hg cat af
   r0
   r1
   r5
   r6
   r7
   r8
   r9
   r10
   r11
   $ cd ..
 
 new and mergeable files
 
   $ rm -rf repo
   $ hg init repo
   $ cd repo
   $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn
 dag
   $ hg debugdag -t -b
   +2:f
   +3:p2
   @temp*f+3
   @default*/p2+2:tip
 tip
   $ hg id
   9c5ce9b70771 tip
 glog
   $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
   @  11: r11 [] @ 11.00
   |
   o  10: r10 [] @ 10.00
   |
   o    9: r9 [] @ 9.00
   |\
   | o  8: r8 [temp] @ 8.00
   | |
   | o  7: r7 [temp] @ 7.00
   | |
   | o  6: r6 [temp] @ 6.00
   | |
   | o  5: r5 [temp] @ 5.00
   | |
   o |  4: r4 [] @ 4.00
   | |
   o |  3: r3 [] @ 3.00
   | |
   o |  2: r2 [] @ 2.00
   |/
   o  1: r1 [] @ 1.00
   |
   o  0: r0 [] @ 0.00
   
 glog mf
   $ hg glog --template '{rev}: {desc} [{branches}]\n' mf
   @  11: r11 []
   |
   o  10: r10 []
   |
   o    9: r9 []
   |\
   | o  8: r8 [temp]
   | |
   | o  7: r7 [temp]
   | |
   | o  6: r6 [temp]
   | |
   | o  5: r5 [temp]
   | |
   o |  4: r4 []
   | |
   o |  3: r3 []
   | |
   o |  2: r2 []
   |/
   o  1: r1 []
   |
   o  0: r0 []
   
 
 man r4
   $ hg manifest -r4
   mf
   nf0
   nf1
   nf2
   nf3
   nf4
 cat r4 mf
   $ hg cat -r4 mf
   0 r0
   1
   2 r1
   3
   4 r2
   5
   6 r3
   7
   8 r4
   9
   10
   11
   12
   13
   14
   15
   16
   17
   18
   19
   20
   21
   22
   23
 man r8
   $ hg manifest -r8
   mf
   nf0
   nf1
   nf5
   nf6
   nf7
   nf8
 cat r8 mf
   $ hg cat -r8 mf
   0 r0
   1
   2 r1
   3
   4
   5
   6
   7
   8
   9
   10 r5
   11
   12 r6
   13
   14 r7
   15
   16 r8
   17
   18
   19
   20
   21
   22
   23
 man
   $ hg manifest
   mf
   nf0
   nf1
   nf10
   nf11
   nf2
   nf3
   nf4
   nf5
   nf6
   nf7
   nf8
   nf9
 cat mf
   $ hg cat mf
   0 r0
   1
   2 r1
   3
   4 r2
   5
   6 r3
   7
   8 r4
   9
   10 r5
   11
   12 r6
   13
   14 r7
   15
   16 r8
   17
   18 r9
   19
   20 r10
   21
   22 r11
   23
   $ cd ..
 
 command
 
   $ rm -rf repo
   $ hg init repo
   $ cd repo
   $ hg debugbuilddag '+2 !"touch X" +2' -q -o
 dag
   $ hg debugdag -t -b
   +4:tip
 glog
   $ hg glog --template '{rev}: {desc} [{branches}]\n'
   @  3: r3 []
   |
   o  2: r2 []
   |
   o  1: r1 []
   |
   o  0: r0 []
   
 glog X
   $ hg glog --template '{rev}: {desc} [{branches}]\n' X
   o  2: r2 []
-  
+  |
   $ cd ..

tests/test-glog.t

@@ -1,930 +1,930 b''
 @  (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
 
   $ 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
 
   $ hg init repo
   $ cd repo
 
 Empty repo:
 
   $ hg glog
 
 
 Building DAG:
 
   $ 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
 
 
   $ hg 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
   
 
   $ hg 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:
   $ hg glog a
   @  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
+  | o |    changeset:   31:621d83e11f67
+  | |\ \   parent:      21:d42a756af44d
+  | | | |  parent:      30:6e11cd4b648f
   | | | |  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
+  | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
+  | | | |  summary:     (31) expand
   | | | |
-  | 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:   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:   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:   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:   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:   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:   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:   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
+  | 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:      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:   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:   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:   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:   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:   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 -q foo bar
   hg glog: invalid arguments
   hg glog [OPTION]... [FILE]
   
   show revision history alongside an ASCII revision graph
   [255]
 
 Only one file is allowed:
   $ hg log -G foo bar
   abort: --graph option allows at most one file
   [255]
 
 Empty revision range - display nothing:
   $ hg glog -r 1..0
 
 From outer space:
   $ cd ..
   $ hg glog -l1 repo
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   $ hg glog -l1 repo/a
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   $ hg glog -l1 repo/missing
 
 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
   @  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
-  
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     two
+  |
 
 Issue1896: File log with explicit style
   $ hg glog --style=default one
   o  changeset:   0:3d578b4a1f53
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     one
   
 Issue2395: glog --style header and footer
   $ hg glog --style=xml one
   <?xml version="1.0"?>
   <log>
   o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
      <author email="test">test</author>
      <date>1970-01-01T00:00:00+00:00</date>
      <msg xml:space="preserve">one</msg>
      </logentry>
   </log>
 
   $ cd ..
 
 Incoming and outgoing:
 
   $ hg clone -U -r31 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 31 changesets with 31 changes to 1 files
   $ cd repo2
 
   $ hg incoming --graph ../repo
   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  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
   
   $ cd ..
 
   $ hg -R repo outgoing --graph repo2
   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
   
 
 File + limit with revs != cset revs:
   $ cd repo
   $ touch b
   $ hg ci -Aqm0
   $ hg glog -l2 a
   o  changeset:   34:fea3ac5810e0
   |  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
   | |
 
 File + limit + -ra:b, (b - a) < limit:
   $ hg glog -l3000 -r32:tip a
   o  changeset:   34:fea3ac5810e0
   |  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
   | | |
 
 File + limit + -ra:b, b < tip:
   $ hg glog -l1 -r32:34 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
 
 File + limit + -ra:b, b < tip, (b - a) < limit:
   $ hg glog -l10 -r33:34 a
   o  changeset:   34:fea3ac5810e0
   |  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
   | |
 
 Do not crash or produce strange graphs if history is buggy
 
   $ commit 36 "buggy merge: identical parents" 35 35
   $ hg glog -l5
   @  changeset:   36:95fa8febd08a
   |  tag:         tip
   |  parent:      35:9159c3644c5e
   |  parent:      35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:36 1970 +0000
   |  summary:     (36) buggy merge: identical parents
   |
   o  changeset:   35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     0
   |
   o  changeset:   34:fea3ac5810e0
   |  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
   | | |