graphlog: paths arguments must be or'ed

hgext/graphlog.py

@@ -1,398 +1,397 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.
 '''
 
 from mercurial.cmdutil import show_changeset
 from mercurial.commands import templateopts
 from mercurial.i18n import _
 from mercurial.node import nullrev
 from mercurial import cmdutil, commands, extensions, scmutil
 from mercurial import hg, util, graphmod
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 
 ASCIIDATA = 'ASC'
 
 def asciiedges(type, char, lines, 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)
     nextseen = seen[:]
     nextseen[nodeidx:nodeidx + 1] = newparents
     edges = [(nodeidx, nextseen.index(p)) for p in knownparents]
 
     while len(newparents) > 2:
         # ascii() only knows how to add or remove a single column between two
         # calls. Nodes with more than two parents break this constraint so we
         # introduce intermediate expansion lines to grow the active node list
         # slowly.
         edges.append((nodeidx, nodeidx))
         edges.append((nodeidx, nodeidx + 1))
         nmorecols = 1
         yield (type, char, lines, (nodeidx, edges, ncols, nmorecols))
         char = '\\'
         lines = []
         nodeidx += 1
         ncols += 1
         edges = []
         del newparents[0]
 
     if len(newparents) > 0:
         edges.append((nodeidx, nodeidx))
     if len(newparents) > 1:
         edges.append((nodeidx, nodeidx + 1))
     nmorecols = len(nextseen) - ncols
     seen[:] = nextseen
     yield (type, char, lines, (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:
             if 2 * end >= len(nodeline):
                 continue
             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 = scmutil.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(pats, opts):
     for op in ["follow_first", "copies", "newest_first"]:
         if op in opts and opts[op]:
             raise util.Abort(_("-G/--graph option is incompatible with --%s")
                              % op.replace("_", "-"))
     if pats and opts.get('follow'):
         raise util.Abort(_("-G/--graph option is incompatible with --follow "
                            "with file argument"))
 
 def revset(pats, opts):
     """Return revset str built of revisions, log options and file patterns.
     """
     opt2revset = {
         'follow':      ('follow()', None),
         'no_merges':   ('not merge()', None),
         'only_merges': ('merge()', None),
         'removed':     ('removes("*")', None),
         'date':        ('date(%(val)r)', None),
         'branch':      ('branch(%(val)r)', ' or '),
         'exclude':     ('not file(%(val)r)', ' and '),
         'include':     ('file(%(val)r)', ' and '),
+        '_pats':       ('file(%(val)r)', ' or '),
         'keyword':     ('keyword(%(val)r)', ' or '),
         'prune':       ('not (%(val)r or ancestors(%(val)r))', ' and '),
         'user':        ('user(%(val)r)', ' or '),
         'rev':         ('%(val)s', ' or '),
         }
 
+    opts = dict(opts)
     # branch and only_branch are really aliases and must be handled at
     # the same time
     if 'branch' in opts and 'only_branch' in opts:
-        opts = dict(opts)
         opts['branch'] = opts['branch'] + opts.pop('only_branch')
+    opts['_pats'] = list(pats)
 
     revset = []
     for op, val in opts.iteritems():
         if not val:
             continue
         if op not in opt2revset:
             continue
         revop, andor = opt2revset[op]
         if '%(val)' not in revop:
             revset.append(revop)
         else:
             if not isinstance(val, list):
                 expr = revop % {'val': val}
             else:
                 expr = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
             revset.append(expr)
 
-    for path in pats:
-        revset.append('file(%r)' % path)
-
     if revset:
         revset = '(' + ' and '.join(revset) + ')'
     else:
         revset = 'all()'
     return revset
 
 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)
         edges = edgefn(type, char, lines, seen, rev, parents)
         for type, char, lines, coldata in edges:
             ascii(ui, state, type, char, lines, coldata)
     displayer.close()
 
 @command('glog',
     [('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]'))
 def graphlog(ui, repo, *pats, **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(pats, opts)
 
     revs = sorted(scmutil.revrange(repo, [revset(pats, opts)]), reverse=1)
     limit = cmdutil.loglimit(opts)
     if limit is not None:
         revs = revs[:limit]
     revdag = graphmod.dagwalker(repo, revs)
 
     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('log', commands.table, graphlog)
     _wrapcmd('incoming', commands.table, gincoming)
     _wrapcmd('outgoing', commands.table, goutgoing)
 
 def _wrapcmd(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")))

tests/test-glog.t

@@ -1,1488 +1,1523 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"
   > }
 
   $ cat > printrevset.py <<EOF
   > from mercurial import extensions, revset, commands
   > from hgext import graphlog
   >  
   > def uisetup(ui):
   >     def printrevset(orig, ui, repo, *pats, **opts):
   >         if opts.get('print_revset'):
   >             expr = graphlog.revset(pats, opts)
   >             tree = revset.parse(expr)[0]
   >             ui.write(tree, "\n")
   >             return 0
   >         return orig(ui, repo, *pats, **opts)
   >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
   >     entry[1].append(('', 'print-revset', False,
   >                      'print generated revset and exit (DEPRECATED)'))
   > EOF
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "graphlog=" >> $HGRCPATH
   $ echo "printrevset=`pwd`/printrevset.py" >> $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
   | | | | | |  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 per revset:
 
   $ hg glog -r 'file("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
   | | | | | |  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 per revset (only merges):
 
   $ hg log -G -r 'file("a")' -m
   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:   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:   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
   | | | | |
 
 
 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
   |
 
 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
   | | |
 
 Point out a common and an uncommon unshown parent
 
   $ hg glog -r 'rev(8) or rev(9)'
   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
   | |
 
 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(File) + limit + -ra:b, b < tip:
 
   $ hg glog -l1 -r32:34 -r 'file("a")'
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
 
 limit(file(File) and a::b), b < tip:
 
   $ hg glog -r 'limit(file("a") and 32::34, 1)'
   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 -r 'limit(file("a") and 34::32, 1)'
 
 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
 
   $ hg branch branch
   marked working directory as branch branch
   (branches are permanent and global, did you want a bookmark?)
   $ commit 36 "buggy merge: identical parents" 35 35
   $ hg glog -l5
   @  changeset:   36:08a19a744424
   |  branch:      branch
   |  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
   | | |
 
 Test log -G options
 
   $ testlog() {
   >   hg log -G --print-revset "$@"
   >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > log.nodes
   >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > glog.nodes
   >   diff -u log.nodes glog.nodes
   > }
 
   $ testlog -u test -u not-a-user
   ('group', ('group', ('or', ('func', ('symbol', 'user'), ('string', 'test')), ('func', ('symbol', 'user'), ('string', 'not-a-user')))))
   $ testlog -b not-a-branch
   ('group', ('group', ('func', ('symbol', 'branch'), ('string', 'not-a-branch'))))
   abort: unknown revision 'not-a-branch'!
   abort: unknown revision 'not-a-branch'!
   $ testlog -b default -b branch --only-branch branch
   ('group', ('group', ('or', ('or', ('func', ('symbol', 'branch'), ('string', 'default')), ('func', ('symbol', 'branch'), ('string', 'branch'))), ('func', ('symbol', 'branch'), ('string', 'branch')))))
   $ testlog -k expand -k merge
   ('group', ('group', ('or', ('func', ('symbol', 'keyword'), ('string', 'expand')), ('func', ('symbol', 'keyword'), ('string', 'merge')))))
   $ hg log -G --include 'some file' --exclude 'another file'
   $ hg log -G --follow  --template 'nodetag {rev}\n' | grep nodetag | wc -l
   \s*36 (re)
   $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l
   \s*0 (re)
   $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l
   \s*28 (re)
   $ hg log -G --no-merges --template 'nodetag {rev}\n'
   o  nodetag 35
   |
   o    nodetag 34
   |\
   | \
   | |\
   | | \
   | | |\
   | | | \
   | | | |\
   | | | | \
   | | | | |\
   +-+-+-+-----o  nodetag 33
   | | | | | |
   +---------o  nodetag 29
   | | | | |
   +-+-+---o  nodetag 27
   | | | |/
   | | | o  nodetag 3
   | | |/
   | | o  nodetag 2
   | |/
   | o  nodetag 1
   |/
   o  nodetag 0
   
   $ hg log -G -d 'brace ) in a date'
   abort: invalid date: 'brace ) in a date'
   [255]
   $ hg log -G -P 32 --template '{rev}\n'
   @  36
   |
   o  35
   |
   o  34
   |
   | o  33
   | |
   $ hg log -G --follow a
   abort: -G/--graph option is incompatible with --follow with file argument
   [255]
+
+
+Dedicated repo for --follow and paths filtering
+
+  $ cd ..
+  $ hg init follow
+  $ cd follow
+  $ echo a > a
+  $ hg ci -Am "add a"
+  adding a
+  $ hg cp a b
+  $ hg ci -m "copy a b"
+  $ mkdir dir
+  $ hg mv b dir
+  $ hg ci -m "mv b dir/b"
+  $ hg mv a b
+  $ echo a > d
+  $ hg add d
+  $ hg ci -m "mv a b; add d"
+  $ hg mv dir/b e
+  $ hg ci -m "mv dir/b e"
+  $ hg glog --template '({rev}) {desc|firstline}\n'
+  @  (4) mv dir/b e
+  |
+  o  (3) mv a b; add d
+  |
+  o  (2) mv b dir/b
+  |
+  o  (1) copy a b
+  |
+  o  (0) add a
+  
+
+  $ testlog a c
+  ('group', ('group', ('or', ('func', ('symbol', 'file'), ('string', 'a')), ('func', ('symbol', 'file'), ('string', 'c')))))