tests/test-glog.t
author Yuya Nishihara <yuya@tcha.org>
Fri, 16 Mar 2018 22:36:40 +0900
changeset 37070 04aafcec00b9
parent 36219 f1addba385e5
child 38273 f3033692ccef
permissions -rw-r--r--
templater: add context.preload(t) to test if the specified template exists I'm going to remove 'templ' from the resources dict because it is the only resource that the caller can't provide. This also implies that putting 'templ' into the resources dict creates a reference cycle. context.preload(t) will be used in place of templater.__contains__().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     1
@  (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     2
|
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     3
| o  (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     4
| |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     5
o |    (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     6
|\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     7
| o \    (31) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     8
| |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
     9
| | o \    (30) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    10
| | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    11
| | | o |  (29) regular commit
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    12
| | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    13
| | o | |    (28) merge zero known
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    14
| | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    15
o | | | | |  (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    16
|/ / / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    17
| | o---+  (26) merge one known; far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    18
| | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    19
+---o | |  (25) merge one known; far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    20
| | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    21
| | o | |  (24) merge one known; immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    22
| | |\| |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    23
| | o | |  (23) merge one known; immediate left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    24
| |/| | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    25
+---o---+  (22) merge two known; one far left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    26
| |  / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    27
o | | |    (21) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    28
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    29
| o---+-+  (20) merge two known; two far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    30
|  / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    31
o | | |    (19) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    32
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    33
+---+---o  (18) merge two known; two far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    34
| | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    35
| o | |    (17) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    36
| |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    37
| | o---+  (16) merge two known; one immediate right, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    38
| | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    39
o | | |    (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    40
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    41
| o-----+  (14) merge two known; one immediate right, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    42
| |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    43
o | | |    (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    44
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    45
+---o | |  (12) merge two known; one immediate right, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    46
| | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    47
| o | |    (11) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    48
| |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    49
| | o---+  (10) merge two known; one immediate left, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    50
| |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    51
o | | |    (9) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    52
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    53
| o-----+  (8) merge two known; one immediate left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    54
|/ / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    55
o | | |    (7) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    56
|\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    57
+---o | |  (6) merge two known; one immediate left, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    58
| |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    59
| o | |    (5) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    60
| |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    61
| | o | |  (4) merge two known; one immediate left, one immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    62
| |/|/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    63
| o / /  (3) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    64
|/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    65
o / /  (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    66
|/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    67
o /  (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    68
|/
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    69
o  (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    70
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    71
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    72
  $ commit()
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    73
  > {
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    74
  >   rev=$1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    75
  >   msg=$2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    76
  >   shift 2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    77
  >   if [ "$#" -gt 0 ]; then
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    78
  >       hg debugsetparents "$@"
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    79
  >   fi
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    80
  >   echo $rev > a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    81
  >   hg commit -Aqd "$rev 0" -m "($rev) $msg"
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    82
  > }
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
    83
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    84
  $ cat > printrevset.py <<EOF
33975
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    85
  > from __future__ import absolute_import
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    86
  > from mercurial import (
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    87
  >   cmdutil,
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    88
  >   commands,
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    89
  >   extensions,
35925
7625b4f7db70 cmdutil: split functions of log-like commands to new module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35816
diff changeset
    90
  >   logcmdutil,
33975
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    91
  >   revsetlang,
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
    92
  >   smartset,
33975
04518bd58e8a tests: update test-glog to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33794
diff changeset
    93
  > )
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 17207
diff changeset
    94
  > 
35548
b14c8bcfbad9 log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35543
diff changeset
    95
  > def logrevset(repo, pats, opts):
35927
572f36e9a780 logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35925
diff changeset
    96
  >     revs = logcmdutil._initialrevs(repo, opts)
35548
b14c8bcfbad9 log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35543
diff changeset
    97
  >     if not revs:
b14c8bcfbad9 log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35543
diff changeset
    98
  >         return None
35927
572f36e9a780 logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35925
diff changeset
    99
  >     match, pats, slowpath = logcmdutil._makematcher(repo, revs, pats, opts)
572f36e9a780 logcmdutil: drop redundant "log" from function names (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35925
diff changeset
   100
  >     return logcmdutil._makerevset(repo, match, pats, slowpath, opts)
35548
b14c8bcfbad9 log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35543
diff changeset
   101
  > 
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   102
  > def uisetup(ui):
35556
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
   103
  >     def printrevset(orig, repo, pats, opts):
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
   104
  >         revs, filematcher = orig(repo, pats, opts)
36219
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   105
  >         if opts.get(b'print_revset'):
35548
b14c8bcfbad9 log: drop unused expr from return value of getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35543
diff changeset
   106
  >             expr = logrevset(repo, pats, opts)
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
   107
  >             if expr:
31044
0b8356705de6 revset: split language services to revsetlang module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 29933
diff changeset
   108
  >                 tree = revsetlang.parse(expr)
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
   109
  >                 tree = revsetlang.analyze(tree)
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
   110
  >             else:
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
   111
  >                 tree = []
35556
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
   112
  >             ui = repo.ui
36219
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   113
  >             ui.write(b'%r\n' % (opts.get(b'rev', []),))
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   114
  >             ui.write(revsetlang.prettyformat(tree) + b'\n')
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   115
  >             ui.write(smartset.prettyformat(revs) + b'\n')
35556
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
   116
  >             revs = smartset.baseset()  # display no revisions
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
   117
  >         return revs, filematcher
35928
c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35927
diff changeset
   118
  >     extensions.wrapfunction(logcmdutil, 'getrevs', printrevset)
36219
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   119
  >     aliases, entry = cmdutil.findcmd(b'log', commands.table)
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   120
  >     entry[1].append((b'', b'print-revset', False,
f1addba385e5 py3: add b'' prefixes to make printrevset.py work in test-glog.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35928
diff changeset
   121
  >                      b'print generated revset and exit (DEPRECATED)'))
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   122
  > EOF
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   123
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   124
  $ echo "[extensions]" >> $HGRCPATH
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   125
  $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   126
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   127
  $ hg init repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   128
  $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   129
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   130
Empty repo:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   131
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   132
  $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   133
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   134
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   135
Building DAG:
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   136
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   137
  $ commit 0 "root"
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   138
  $ commit 1 "collapse" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   139
  $ commit 2 "collapse" 1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   140
  $ commit 3 "collapse" 2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   141
  $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   142
  $ commit 5 "expand" 3 4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   143
  $ commit 6 "merge two known; one immediate left, one far left" 2 5
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   144
  $ commit 7 "expand" 2 5
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   145
  $ commit 8 "merge two known; one immediate left, one far right" 0 7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   146
  $ commit 9 "expand" 7 8
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   147
  $ commit 10 "merge two known; one immediate left, one near right" 0 6
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   148
  $ commit 11 "expand" 6 10
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   149
  $ commit 12 "merge two known; one immediate right, one far left" 1 9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   150
  $ commit 13 "expand" 9 11
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   151
  $ commit 14 "merge two known; one immediate right, one far right" 0 12
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   152
  $ commit 15 "expand" 13 14
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   153
  $ commit 16 "merge two known; one immediate right, one near right" 0 1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   154
  $ commit 17 "expand" 12 16
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   155
  $ commit 18 "merge two known; two far left" 1 15
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   156
  $ commit 19 "expand" 15 17
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   157
  $ commit 20 "merge two known; two far right" 0 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   158
  $ commit 21 "expand" 19 20
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   159
  $ commit 22 "merge two known; one far left, one far right" 18 21
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   160
  $ commit 23 "merge one known; immediate left" 1 22
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   161
  $ commit 24 "merge one known; immediate right" 0 23
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   162
  $ commit 25 "merge one known; far left" 21 24
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   163
  $ commit 26 "merge one known; far right" 18 25
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   164
  $ commit 27 "collapse" 21
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   165
  $ commit 28 "merge zero known" 1 26
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   166
  $ commit 29 "regular commit" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   167
  $ commit 30 "expand" 28 29
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   168
  $ commit 31 "expand" 21 30
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   169
  $ commit 32 "expand" 27 31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   170
  $ commit 33 "head" 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   171
  $ commit 34 "head" 32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   172
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   173
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   174
  $ hg log -G -q
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   175
  @  34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   176
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   177
  | o  33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   178
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   179
  o |    32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   180
  |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   181
  | o \    31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   182
  | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   183
  | | o \    30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   184
  | | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   185
  | | | o |  29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   186
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   187
  | | o | |    28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   188
  | | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   189
  o | | | | |  27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   190
  |/ / / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   191
  | | o---+  26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   192
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   193
  +---o | |  25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   194
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   195
  | | o | |  24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   196
  | | |\| |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   197
  | | o | |  23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   198
  | |/| | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   199
  +---o---+  22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   200
  | |  / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   201
  o | | |    21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   202
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   203
  | o---+-+  20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   204
  |  / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   205
  o | | |    19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   206
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   207
  +---+---o  18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   208
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   209
  | o | |    17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   210
  | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   211
  | | o---+  16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   212
  | | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   213
  o | | |    15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   214
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   215
  | o-----+  14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   216
  | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   217
  o | | |    13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   218
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   219
  +---o | |  12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   220
  | | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   221
  | o | |    11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   222
  | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   223
  | | o---+  10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   224
  | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   225
  o | | |    9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   226
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   227
  | o-----+  8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   228
  |/ / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   229
  o | | |    7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   230
  |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   231
  +---o | |  6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   232
  | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   233
  | o | |    5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   234
  | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   235
  | | o | |  4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   236
  | |/|/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   237
  | o / /  3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   238
  |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   239
  o / /  2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   240
  |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   241
  o /  1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   242
  |/
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   243
  o  0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   244
  
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   245
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   246
  $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   247
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   248
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   249
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   250
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   251
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   252
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   253
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   254
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   255
  | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   256
  | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   257
  | |  date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   258
  | |  summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   259
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   260
  o |    changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   261
  |\ \   parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   262
  | | |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   263
  | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   264
  | | |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   265
  | | |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   266
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   267
  | o |    changeset:   31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   268
  | |\ \   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   269
  | | | |  parent:      30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   270
  | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   271
  | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   272
  | | | |  summary:     (31) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   273
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   274
  | | o |    changeset:   30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   275
  | | |\ \   parent:      28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   276
  | | | | |  parent:      29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   277
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   278
  | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   279
  | | | | |  summary:     (30) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   280
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   281
  | | | o |  changeset:   29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   282
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   283
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   284
  | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   285
  | | | | |  summary:     (29) regular commit
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   286
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   287
  | | o | |    changeset:   28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   288
  | | |\ \ \   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   289
  | | | | | |  parent:      26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   290
  | | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   291
  | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   292
  | | | | | |  summary:     (28) merge zero known
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   293
  | | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   294
  o | | | | |  changeset:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   295
  |/ / / / /   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   296
  | | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   297
  | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   298
  | | | | |    summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   299
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   300
  | | o---+  changeset:   26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   301
  | | | | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   302
  | | | | |  parent:      25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   303
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   304
  | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   305
  | | | | |  summary:     (26) merge one known; far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   306
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   307
  +---o | |  changeset:   25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   308
  | | | | |  parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   309
  | | | | |  parent:      24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   310
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   311
  | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   312
  | | | | |  summary:     (25) merge one known; far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   313
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   314
  | | o | |  changeset:   24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   315
  | | |\| |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   316
  | | | | |  parent:      23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   317
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   318
  | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   319
  | | | | |  summary:     (24) merge one known; immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   320
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   321
  | | o | |  changeset:   23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   322
  | |/| | |  parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   323
  | | | | |  parent:      22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   324
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   325
  | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   326
  | | | | |  summary:     (23) merge one known; immediate left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   327
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   328
  +---o---+  changeset:   22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   329
  | |   | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   330
  | |  / /   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   331
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   332
  | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   333
  | | | |    summary:     (22) merge two known; one far left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   334
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   335
  o | | |    changeset:   21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   336
  |\ \ \ \   parent:      19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   337
  | | | | |  parent:      20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   338
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   339
  | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   340
  | | | | |  summary:     (21) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   341
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   342
  | o---+-+  changeset:   20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   343
  |   | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   344
  |  / / /   parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   345
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   346
  | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   347
  | | | |    summary:     (20) merge two known; two far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   348
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   349
  o | | |    changeset:   19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   350
  |\ \ \ \   parent:      15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   351
  | | | | |  parent:      17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   352
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   353
  | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   354
  | | | | |  summary:     (19) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   355
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   356
  +---+---o  changeset:   18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   357
  | | | |    parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   358
  | | | |    parent:      15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   359
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   360
  | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   361
  | | | |    summary:     (18) merge two known; two far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   362
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   363
  | o | |    changeset:   17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   364
  | |\ \ \   parent:      12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   365
  | | | | |  parent:      16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   366
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   367
  | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   368
  | | | | |  summary:     (17) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   369
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   370
  | | o---+  changeset:   16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   371
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   372
  | | |/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   373
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   374
  | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   375
  | | | |    summary:     (16) merge two known; one immediate right, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   376
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   377
  o | | |    changeset:   15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   378
  |\ \ \ \   parent:      13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   379
  | | | | |  parent:      14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   380
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   381
  | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   382
  | | | | |  summary:     (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   383
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   384
  | o-----+  changeset:   14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   385
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   386
  | |/ / /   parent:      12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   387
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   388
  | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   389
  | | | |    summary:     (14) merge two known; one immediate right, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   390
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   391
  o | | |    changeset:   13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   392
  |\ \ \ \   parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   393
  | | | | |  parent:      11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   394
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   395
  | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   396
  | | | | |  summary:     (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   397
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   398
  +---o | |  changeset:   12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   399
  | | |/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   400
  | | | |    parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   401
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   402
  | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   403
  | | | |    summary:     (12) merge two known; one immediate right, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   404
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   405
  | o | |    changeset:   11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   406
  | |\ \ \   parent:      6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   407
  | | | | |  parent:      10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   408
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   409
  | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   410
  | | | | |  summary:     (11) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   411
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   412
  | | o---+  changeset:   10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   413
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   414
  | |/ / /   parent:      6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   415
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   416
  | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   417
  | | | |    summary:     (10) merge two known; one immediate left, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   418
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   419
  o | | |    changeset:   9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   420
  |\ \ \ \   parent:      7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   421
  | | | | |  parent:      8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   422
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   423
  | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   424
  | | | | |  summary:     (9) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   425
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   426
  | o-----+  changeset:   8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   427
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   428
  |/ / / /   parent:      7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   429
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   430
  | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   431
  | | | |    summary:     (8) merge two known; one immediate left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   432
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   433
  o | | |    changeset:   7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   434
  |\ \ \ \   parent:      2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   435
  | | | | |  parent:      5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   436
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   437
  | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   438
  | | | | |  summary:     (7) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   439
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   440
  +---o | |  changeset:   6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   441
  | |/ / /   parent:      2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   442
  | | | |    parent:      5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   443
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   444
  | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   445
  | | | |    summary:     (6) merge two known; one immediate left, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   446
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   447
  | o | |    changeset:   5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   448
  | |\ \ \   parent:      3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   449
  | | | | |  parent:      4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   450
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   451
  | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   452
  | | | | |  summary:     (5) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   453
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   454
  | | o | |  changeset:   4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   455
  | |/|/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   456
  | | | |    parent:      3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   457
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   458
  | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   459
  | | | |    summary:     (4) merge two known; one immediate left, one immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   460
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   461
  | o | |  changeset:   3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   462
  |/ / /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   463
  | | |    date:        Thu Jan 01 00:00:03 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   464
  | | |    summary:     (3) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   465
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   466
  o | |  changeset:   2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   467
  |/ /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   468
  | |    date:        Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   469
  | |    summary:     (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   470
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   471
  o |  changeset:   1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   472
  |/   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   473
  |    date:        Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   474
  |    summary:     (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   475
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   476
  o  changeset:   0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   477
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   478
     date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   479
     summary:     (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   480
  
5939
56e8a54bf71d graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents: 4735
diff changeset
   481
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   482
File glog:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   483
  $ hg log -G a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   484
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   485
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   486
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   487
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   488
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   489
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   490
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   491
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   492
  | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   493
  | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   494
  | |  date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   495
  | |  summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   496
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   497
  o |    changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   498
  |\ \   parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   499
  | | |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   500
  | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   501
  | | |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   502
  | | |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   503
  | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   504
  | o |    changeset:   31:621d83e11f67
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   505
  | |\ \   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   506
  | | | |  parent:      30:6e11cd4b648f
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   507
  | | | |  user:        test
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   508
  | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   509
  | | | |  summary:     (31) expand
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   510
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   511
  | | o |    changeset:   30:6e11cd4b648f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   512
  | | |\ \   parent:      28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   513
  | | | | |  parent:      29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   514
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   515
  | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   516
  | | | | |  summary:     (30) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   517
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   518
  | | | o |  changeset:   29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   519
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   520
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   521
  | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   522
  | | | | |  summary:     (29) regular commit
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   523
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   524
  | | o | |    changeset:   28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   525
  | | |\ \ \   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   526
  | | | | | |  parent:      26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   527
  | | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   528
  | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   529
  | | | | | |  summary:     (28) merge zero known
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   530
  | | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   531
  o | | | | |  changeset:   27:886ed638191b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   532
  |/ / / / /   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   533
  | | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   534
  | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   535
  | | | | |    summary:     (27) collapse
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   536
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   537
  | | o---+  changeset:   26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   538
  | | | | |  parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   539
  | | | | |  parent:      25:91da8ed57247
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   540
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   541
  | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   542
  | | | | |  summary:     (26) merge one known; far right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   543
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   544
  +---o | |  changeset:   25:91da8ed57247
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   545
  | | | | |  parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   546
  | | | | |  parent:      24:a9c19a3d96b7
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   547
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   548
  | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   549
  | | | | |  summary:     (25) merge one known; far left
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   550
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   551
  | | o | |  changeset:   24:a9c19a3d96b7
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   552
  | | |\| |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   553
  | | | | |  parent:      23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   554
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   555
  | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   556
  | | | | |  summary:     (24) merge one known; immediate right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   557
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   558
  | | o | |  changeset:   23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   559
  | |/| | |  parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   560
  | | | | |  parent:      22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   561
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   562
  | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   563
  | | | | |  summary:     (23) merge one known; immediate left
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   564
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   565
  +---o---+  changeset:   22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   566
  | |   | |  parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   567
  | |  / /   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   568
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   569
  | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   570
  | | | |    summary:     (22) merge two known; one far left, one far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   571
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   572
  o | | |    changeset:   21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   573
  |\ \ \ \   parent:      19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   574
  | | | | |  parent:      20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   575
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   576
  | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   577
  | | | | |  summary:     (21) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   578
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   579
  | o---+-+  changeset:   20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   580
  |   | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   581
  |  / / /   parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   582
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   583
  | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   584
  | | | |    summary:     (20) merge two known; two far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   585
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   586
  o | | |    changeset:   19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   587
  |\ \ \ \   parent:      15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   588
  | | | | |  parent:      17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   589
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   590
  | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   591
  | | | | |  summary:     (19) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   592
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   593
  +---+---o  changeset:   18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   594
  | | | |    parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   595
  | | | |    parent:      15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   596
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   597
  | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   598
  | | | |    summary:     (18) merge two known; two far left
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   599
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   600
  | o | |    changeset:   17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   601
  | |\ \ \   parent:      12:86b91144a6e9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   602
  | | | | |  parent:      16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   603
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   604
  | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   605
  | | | | |  summary:     (17) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   606
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   607
  | | o---+  changeset:   16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   608
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   609
  | | |/ /   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   610
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   611
  | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   612
  | | | |    summary:     (16) merge two known; one immediate right, one near right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   613
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   614
  o | | |    changeset:   15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   615
  |\ \ \ \   parent:      13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   616
  | | | | |  parent:      14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   617
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   618
  | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   619
  | | | | |  summary:     (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   620
  | | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   621
  | o-----+  changeset:   14:8eac370358ef
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   622
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   623
  | |/ / /   parent:      12:86b91144a6e9
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   624
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   625
  | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   626
  | | | |    summary:     (14) merge two known; one immediate right, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   627
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   628
  o | | |    changeset:   13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   629
  |\ \ \ \   parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   630
  | | | | |  parent:      11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   631
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   632
  | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   633
  | | | | |  summary:     (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   634
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   635
  +---o | |  changeset:   12:86b91144a6e9
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   636
  | | |/ /   parent:      1:6db2ef61d156
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   637
  | | | |    parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   638
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   639
  | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   640
  | | | |    summary:     (12) merge two known; one immediate right, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   641
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   642
  | o | |    changeset:   11:832d76e6bdf2
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   643
  | |\ \ \   parent:      6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   644
  | | | | |  parent:      10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   645
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   646
  | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   647
  | | | | |  summary:     (11) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   648
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   649
  | | o---+  changeset:   10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   650
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   651
  | |/ / /   parent:      6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   652
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   653
  | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   654
  | | | |    summary:     (10) merge two known; one immediate left, one near right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   655
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   656
  o | | |    changeset:   9:7010c0af0a35
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   657
  |\ \ \ \   parent:      7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   658
  | | | | |  parent:      8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   659
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   660
  | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   661
  | | | | |  summary:     (9) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   662
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   663
  | o-----+  changeset:   8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   664
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   665
  |/ / / /   parent:      7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   666
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   667
  | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   668
  | | | |    summary:     (8) merge two known; one immediate left, one far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   669
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   670
  o | | |    changeset:   7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   671
  |\ \ \ \   parent:      2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   672
  | | | | |  parent:      5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   673
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   674
  | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   675
  | | | | |  summary:     (7) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   676
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   677
  +---o | |  changeset:   6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   678
  | |/ / /   parent:      2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   679
  | | | |    parent:      5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   680
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   681
  | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   682
  | | | |    summary:     (6) merge two known; one immediate left, one far left
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   683
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   684
  | o | |    changeset:   5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   685
  | |\ \ \   parent:      3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   686
  | | | | |  parent:      4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   687
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   688
  | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   689
  | | | | |  summary:     (5) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   690
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   691
  | | o | |  changeset:   4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   692
  | |/|/ /   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   693
  | | | |    parent:      3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   694
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   695
  | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   696
  | | | |    summary:     (4) merge two known; one immediate left, one immediate right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   697
  | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   698
  | o | |  changeset:   3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   699
  |/ / /   user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   700
  | | |    date:        Thu Jan 01 00:00:03 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   701
  | | |    summary:     (3) collapse
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   702
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   703
  o | |  changeset:   2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   704
  |/ /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   705
  | |    date:        Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   706
  | |    summary:     (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   707
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   708
  o |  changeset:   1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   709
  |/   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   710
  |    date:        Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   711
  |    summary:     (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   712
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   713
  o  changeset:   0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   714
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   715
     date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   716
     summary:     (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   717
  
7383
b501c7f3c2ad graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6969
diff changeset
   718
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   719
File glog per revset:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   720
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   721
  $ hg log -G -r 'file("a")'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   722
  @  changeset:   34:fea3ac5810e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   723
  |  tag:         tip
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   724
  |  parent:      32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   725
  |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   726
  |  date:        Thu Jan 01 00:00:34 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   727
  |  summary:     (34) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   728
  |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   729
  | o  changeset:   33:68608f5145f9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   730
  | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   731
  | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   732
  | |  date:        Thu Jan 01 00:00:33 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   733
  | |  summary:     (33) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   734
  | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   735
  o |    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   736
  |\ \   parent:      27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   737
  | | |  parent:      31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   738
  | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   739
  | | |  date:        Thu Jan 01 00:00:32 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   740
  | | |  summary:     (32) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   741
  | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   742
  | o |    changeset:   31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   743
  | |\ \   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   744
  | | | |  parent:      30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   745
  | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   746
  | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   747
  | | | |  summary:     (31) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   748
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   749
  | | o |    changeset:   30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   750
  | | |\ \   parent:      28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   751
  | | | | |  parent:      29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   752
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   753
  | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   754
  | | | | |  summary:     (30) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   755
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   756
  | | | o |  changeset:   29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   757
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   758
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   759
  | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   760
  | | | | |  summary:     (29) regular commit
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   761
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   762
  | | o | |    changeset:   28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   763
  | | |\ \ \   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   764
  | | | | | |  parent:      26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   765
  | | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   766
  | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   767
  | | | | | |  summary:     (28) merge zero known
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   768
  | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   769
  o | | | | |  changeset:   27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   770
  |/ / / / /   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   771
  | | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   772
  | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   773
  | | | | |    summary:     (27) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   774
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   775
  | | o---+  changeset:   26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   776
  | | | | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   777
  | | | | |  parent:      25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   778
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   779
  | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   780
  | | | | |  summary:     (26) merge one known; far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   781
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   782
  +---o | |  changeset:   25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   783
  | | | | |  parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   784
  | | | | |  parent:      24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   785
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   786
  | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   787
  | | | | |  summary:     (25) merge one known; far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   788
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   789
  | | o | |  changeset:   24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   790
  | | |\| |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   791
  | | | | |  parent:      23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   792
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   793
  | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   794
  | | | | |  summary:     (24) merge one known; immediate right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   795
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   796
  | | o | |  changeset:   23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   797
  | |/| | |  parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   798
  | | | | |  parent:      22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   799
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   800
  | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   801
  | | | | |  summary:     (23) merge one known; immediate left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   802
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   803
  +---o---+  changeset:   22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   804
  | |   | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   805
  | |  / /   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   806
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   807
  | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   808
  | | | |    summary:     (22) merge two known; one far left, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   809
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   810
  o | | |    changeset:   21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   811
  |\ \ \ \   parent:      19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   812
  | | | | |  parent:      20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   813
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   814
  | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   815
  | | | | |  summary:     (21) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   816
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   817
  | o---+-+  changeset:   20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   818
  |   | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   819
  |  / / /   parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   820
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   821
  | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   822
  | | | |    summary:     (20) merge two known; two far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   823
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   824
  o | | |    changeset:   19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   825
  |\ \ \ \   parent:      15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   826
  | | | | |  parent:      17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   827
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   828
  | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   829
  | | | | |  summary:     (19) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   830
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   831
  +---+---o  changeset:   18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   832
  | | | |    parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   833
  | | | |    parent:      15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   834
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   835
  | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   836
  | | | |    summary:     (18) merge two known; two far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   837
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   838
  | o | |    changeset:   17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   839
  | |\ \ \   parent:      12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   840
  | | | | |  parent:      16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   841
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   842
  | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   843
  | | | | |  summary:     (17) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   844
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   845
  | | o---+  changeset:   16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   846
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   847
  | | |/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   848
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   849
  | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   850
  | | | |    summary:     (16) merge two known; one immediate right, one near right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   851
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   852
  o | | |    changeset:   15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   853
  |\ \ \ \   parent:      13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   854
  | | | | |  parent:      14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   855
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   856
  | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   857
  | | | | |  summary:     (15) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   858
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   859
  | o-----+  changeset:   14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   860
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   861
  | |/ / /   parent:      12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   862
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   863
  | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   864
  | | | |    summary:     (14) merge two known; one immediate right, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   865
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   866
  o | | |    changeset:   13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   867
  |\ \ \ \   parent:      9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   868
  | | | | |  parent:      11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   869
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   870
  | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   871
  | | | | |  summary:     (13) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   872
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   873
  +---o | |  changeset:   12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   874
  | | |/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   875
  | | | |    parent:      9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   876
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   877
  | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   878
  | | | |    summary:     (12) merge two known; one immediate right, one far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   879
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   880
  | o | |    changeset:   11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   881
  | |\ \ \   parent:      6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   882
  | | | | |  parent:      10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   883
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   884
  | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   885
  | | | | |  summary:     (11) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   886
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   887
  | | o---+  changeset:   10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   888
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   889
  | |/ / /   parent:      6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   890
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   891
  | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   892
  | | | |    summary:     (10) merge two known; one immediate left, one near right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   893
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   894
  o | | |    changeset:   9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   895
  |\ \ \ \   parent:      7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   896
  | | | | |  parent:      8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   897
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   898
  | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   899
  | | | | |  summary:     (9) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   900
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   901
  | o-----+  changeset:   8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   902
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   903
  |/ / / /   parent:      7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   904
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   905
  | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   906
  | | | |    summary:     (8) merge two known; one immediate left, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   907
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   908
  o | | |    changeset:   7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   909
  |\ \ \ \   parent:      2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   910
  | | | | |  parent:      5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   911
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   912
  | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   913
  | | | | |  summary:     (7) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   914
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   915
  +---o | |  changeset:   6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   916
  | |/ / /   parent:      2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   917
  | | | |    parent:      5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   918
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   919
  | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   920
  | | | |    summary:     (6) merge two known; one immediate left, one far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   921
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   922
  | o | |    changeset:   5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   923
  | |\ \ \   parent:      3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   924
  | | | | |  parent:      4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   925
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   926
  | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   927
  | | | | |  summary:     (5) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   928
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   929
  | | o | |  changeset:   4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   930
  | |/|/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   931
  | | | |    parent:      3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   932
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   933
  | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   934
  | | | |    summary:     (4) merge two known; one immediate left, one immediate right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   935
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   936
  | o | |  changeset:   3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   937
  |/ / /   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   938
  | | |    date:        Thu Jan 01 00:00:03 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   939
  | | |    summary:     (3) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   940
  | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   941
  o | |  changeset:   2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   942
  |/ /   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   943
  | |    date:        Thu Jan 01 00:00:02 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   944
  | |    summary:     (2) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   945
  | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   946
  o |  changeset:   1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   947
  |/   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   948
  |    date:        Thu Jan 01 00:00:01 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   949
  |    summary:     (1) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   950
  |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   951
  o  changeset:   0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   952
     user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   953
     date:        Thu Jan 01 00:00:00 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   954
     summary:     (0) root
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   955
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   956
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   957
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   958
File glog per revset (only merges):
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   959
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   960
  $ hg log -G -r 'file("a")' -m
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   961
  o    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   962
  |\   parent:      27:886ed638191b
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   963
  | :  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   964
  | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   965
  | :  date:        Thu Jan 01 00:00:32 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   966
  | :  summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   967
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   968
  o :  changeset:   31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   969
  |\:  parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   970
  | :  parent:      30:6e11cd4b648f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   971
  | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   972
  | :  date:        Thu Jan 01 00:00:31 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   973
  | :  summary:     (31) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   974
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   975
  o :    changeset:   30:6e11cd4b648f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   976
  |\ \   parent:      28:44ecd0b9ae99
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   977
  | ~ :  parent:      29:cd9bb2be7593
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   978
  |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   979
  |   :  date:        Thu Jan 01 00:00:30 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   980
  |   :  summary:     (30) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   981
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   982
  o :    changeset:   28:44ecd0b9ae99
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   983
  |\ \   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   984
  | ~ :  parent:      26:7f25b6c2f0b9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   985
  |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   986
  |   :  date:        Thu Jan 01 00:00:28 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   987
  |   :  summary:     (28) merge zero known
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   988
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   989
  o :    changeset:   26:7f25b6c2f0b9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   990
  |\ \   parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   991
  | | :  parent:      25:91da8ed57247
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   992
  | | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   993
  | | :  date:        Thu Jan 01 00:00:26 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   994
  | | :  summary:     (26) merge one known; far right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   995
  | | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   996
  | o :  changeset:   25:91da8ed57247
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   997
  | |\:  parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   998
  | | :  parent:      24:a9c19a3d96b7
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   999
  | | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1000
  | | :  date:        Thu Jan 01 00:00:25 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1001
  | | :  summary:     (25) merge one known; far left
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1002
  | | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1003
  | o :    changeset:   24:a9c19a3d96b7
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1004
  | |\ \   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1005
  | | ~ :  parent:      23:a01cddf0766d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1006
  | |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1007
  | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1008
  | |   :  summary:     (24) merge one known; immediate right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1009
  | |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1010
  | o :    changeset:   23:a01cddf0766d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1011
  | |\ \   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1012
  | | ~ :  parent:      22:e0d9cccacb5d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1013
  | |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1014
  | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1015
  | |   :  summary:     (23) merge one known; immediate left
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1016
  | |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1017
  | o :  changeset:   22:e0d9cccacb5d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1018
  |/:/   parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1019
  | :    parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1020
  | :    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1021
  | :    date:        Thu Jan 01 00:00:22 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1022
  | :    summary:     (22) merge two known; one far left, one far right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1023
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1024
  | o    changeset:   21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1025
  | |\   parent:      19:31ddc2c1573b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1026
  | | |  parent:      20:d30ed6450e32
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1027
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1028
  | | |  date:        Thu Jan 01 00:00:21 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1029
  | | |  summary:     (21) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1030
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1031
  +---o  changeset:   20:d30ed6450e32
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1032
  | | |  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1033
  | | ~  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1034
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1035
  | |    date:        Thu Jan 01 00:00:20 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1036
  | |    summary:     (20) merge two known; two far right
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1037
  | |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1038
  | o    changeset:   19:31ddc2c1573b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1039
  | |\   parent:      15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1040
  | | |  parent:      17:44765d7c06e0
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1041
  | | |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1042
  | | |  date:        Thu Jan 01 00:00:19 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1043
  | | |  summary:     (19) expand
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1044
  | | |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1045
  o | |  changeset:   18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1046
  |\| |  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1047
  ~ | |  parent:      15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1048
    | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1049
    | |  date:        Thu Jan 01 00:00:18 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1050
    | |  summary:     (18) merge two known; two far left
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1051
   / /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1052
  | o    changeset:   17:44765d7c06e0
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1053
  | |\   parent:      12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1054
  | | |  parent:      16:3677d192927d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1055
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1056
  | | |  date:        Thu Jan 01 00:00:17 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1057
  | | |  summary:     (17) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1058
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1059
  | | o    changeset:   16:3677d192927d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1060
  | | |\   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1061
  | | ~ ~  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1062
  | |      user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1063
  | |      date:        Thu Jan 01 00:00:16 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1064
  | |      summary:     (16) merge two known; one immediate right, one near right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1065
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1066
  o |    changeset:   15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1067
  |\ \   parent:      13:22d8966a97e3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1068
  | | |  parent:      14:8eac370358ef
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1069
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1070
  | | |  date:        Thu Jan 01 00:00:15 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1071
  | | |  summary:     (15) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1072
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1073
  | o |  changeset:   14:8eac370358ef
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1074
  | |\|  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1075
  | ~ |  parent:      12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1076
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1077
  |   |  date:        Thu Jan 01 00:00:14 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1078
  |   |  summary:     (14) merge two known; one immediate right, one far right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1079
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1080
  o |    changeset:   13:22d8966a97e3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1081
  |\ \   parent:      9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1082
  | | |  parent:      11:832d76e6bdf2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1083
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1084
  | | |  date:        Thu Jan 01 00:00:13 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1085
  | | |  summary:     (13) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1086
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1087
  +---o  changeset:   12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1088
  | | |  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1089
  | | ~  parent:      9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1090
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1091
  | |    date:        Thu Jan 01 00:00:12 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1092
  | |    summary:     (12) merge two known; one immediate right, one far left
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1093
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1094
  | o    changeset:   11:832d76e6bdf2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1095
  | |\   parent:      6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1096
  | | |  parent:      10:74c64d036d72
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1097
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1098
  | | |  date:        Thu Jan 01 00:00:11 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1099
  | | |  summary:     (11) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1100
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1101
  | | o  changeset:   10:74c64d036d72
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1102
  | |/|  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1103
  | | ~  parent:      6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1104
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1105
  | |    date:        Thu Jan 01 00:00:10 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1106
  | |    summary:     (10) merge two known; one immediate left, one near right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1107
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1108
  o |    changeset:   9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1109
  |\ \   parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1110
  | | |  parent:      8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1111
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1112
  | | |  date:        Thu Jan 01 00:00:09 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1113
  | | |  summary:     (9) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1114
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1115
  | o |  changeset:   8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1116
  |/| |  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1117
  | ~ |  parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1118
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1119
  |   |  date:        Thu Jan 01 00:00:08 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1120
  |   |  summary:     (8) merge two known; one immediate left, one far right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1121
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1122
  o |    changeset:   7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1123
  |\ \   parent:      2:3d9a33b8d1e1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1124
  | ~ |  parent:      5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1125
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1126
  |   |  date:        Thu Jan 01 00:00:07 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1127
  |   |  summary:     (7) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1128
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1129
  | o  changeset:   6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1130
  |/|  parent:      2:3d9a33b8d1e1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1131
  | ~  parent:      5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1132
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1133
  |    date:        Thu Jan 01 00:00:06 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1134
  |    summary:     (6) merge two known; one immediate left, one far left
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1135
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1136
  o    changeset:   5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1137
  |\   parent:      3:27eef8ed80b4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1138
  | ~  parent:      4:26a8bac39d9f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1139
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1140
  |    date:        Thu Jan 01 00:00:05 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1141
  |    summary:     (5) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1142
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1143
  o    changeset:   4:26a8bac39d9f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1144
  |\   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1145
  ~ ~  parent:      3:27eef8ed80b4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1146
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1147
       date:        Thu Jan 01 00:00:04 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1148
       summary:     (4) merge two known; one immediate left, one immediate right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1149
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1150
13631
29c800ee54cf graphlog: give meaningful error if more than one file is given
Klaus Koch <kuk42@gmx.net>
parents: 12951
diff changeset
  1151
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1152
Empty revision range - display nothing:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1153
  $ hg log -G -r 1..0
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1154
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1155
  $ cd ..
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1156
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1157
#if no-outer-repo
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1158
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1159
From outer space:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1160
  $ hg log -G -l1 repo
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1161
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1162
  |  tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1163
  ~  parent:      32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1164
     user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1165
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1166
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1167
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1168
  $ hg log -G -l1 repo/a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1169
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1170
  |  tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1171
  ~  parent:      32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1172
     user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1173
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1174
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1175
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1176
  $ hg log -G -l1 repo/missing
9728
acb1c59b4514 tests: glog with style and file parameter (issue1896)
Joel Rosdahl <joel@rosdahl.net>
parents: 9176
diff changeset
  1177
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1178
#endif
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1179
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1180
File log with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1181
  $ hg init flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1182
  $ cd flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1183
  $ echo one >one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1184
  $ hg add one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1185
  $ hg commit -mone
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1186
  $ echo two >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1187
  $ hg add two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1188
  $ hg commit -mtwo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1189
  $ echo more >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1190
  $ hg commit -mmore
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1191
  $ hg log -G two
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1192
  @  changeset:   2:12c28321755b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1193
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1194
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1195
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1196
  |  summary:     more
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1197
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1198
  o  changeset:   1:5ac72c0599bf
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
  1199
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1200
  ~  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1201
     summary:     two
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1202
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1203
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12365
diff changeset
  1204
Issue1896: File log with explicit style
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1205
  $ hg log -G --style=default one
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1206
  o  changeset:   0:3d578b4a1f53
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1207
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1208
     date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1209
     summary:     one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1210
  
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1211
Issue2395: glog --style header and footer
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1212
  $ hg log -G --style=xml one
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1213
  <?xml version="1.0"?>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1214
  <log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1215
  o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1216
     <author email="test">test</author>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1217
     <date>1970-01-01T00:00:00+00:00</date>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1218
     <msg xml:space="preserve">one</msg>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1219
     </logentry>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1220
  </log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1221
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1222
  $ cd ..
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1223
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1224
Incoming and outgoing:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1225
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1226
  $ hg clone -U -r31 repo repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1227
  adding changesets
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1228
  adding manifests
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1229
  adding file changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1230
  added 31 changesets with 31 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34090
diff changeset
  1231
  new changesets e6eb3150255d:621d83e11f67
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1232
  $ cd repo2
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1233
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1234
  $ hg incoming --graph ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1235
  comparing with ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1236
  searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1237
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1238
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1239
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1240
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1241
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1242
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1243
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1244
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1245
  |    parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1246
  |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1247
  |    date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1248
  |    summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1249
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1250
  o  changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1251
  |  parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1252
  |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1253
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1254
  |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1255
  |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1256
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1257
  o  changeset:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1258
     parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1259
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1260
     date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1261
     summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1262
  
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1263
  $ cd ..
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1264
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1265
  $ hg -R repo outgoing --graph repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1266
  comparing with repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1267
  searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1268
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1269
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1270
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1271
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1272
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1273
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1274
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1275
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1276
  |    parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1277
  |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1278
  |    date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1279
  |    summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1280
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1281
  o  changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1282
  |  parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1283
  |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1284
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1285
  |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1286
  |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1287
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1288
  o  changeset:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1289
     parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1290
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1291
     date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1292
     summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1293
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1294
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1295
File + limit with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1296
  $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1297
  $ touch b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1298
  $ hg ci -Aqm0
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1299
  $ hg log -G -l2 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1300
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1301
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1302
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1303
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1304
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1305
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1306
  o  changeset:   33:68608f5145f9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1307
  |  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1308
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1309
     date:        Thu Jan 01 00:00:33 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1310
     summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1311
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1312
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1313
File + limit + -ra:b, (b - a) < limit:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1314
  $ hg log -G -l3000 -r32:tip a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1315
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1316
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1317
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1318
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1319
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1320
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1321
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1322
  | |  parent:      18:1aa84d96232a
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1323
  | ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1324
  |    date:        Thu Jan 01 00:00:33 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1325
  |    summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1326
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1327
  o    changeset:   32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1328
  |\   parent:      27:886ed638191b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1329
  ~ ~  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1330
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1331
       date:        Thu Jan 01 00:00:32 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1332
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1333
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1334
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1335
Point out a common and an uncommon unshown parent
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1336
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1337
  $ hg log -G -r 'rev(8) or rev(9)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1338
  o    changeset:   9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1339
  |\   parent:      7:b632bb1b1224
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1340
  | ~  parent:      8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1341
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1342
  |    date:        Thu Jan 01 00:00:09 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1343
  |    summary:     (9) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1344
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1345
  o    changeset:   8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1346
  |\   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1347
  ~ ~  parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1348
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1349
       date:        Thu Jan 01 00:00:08 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1350
       summary:     (8) merge two known; one immediate left, one far right
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1351
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1352
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1353
File + limit + -ra:b, b < tip:
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1354
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1355
  $ hg log -G -l1 -r32:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1356
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1357
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1358
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1359
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1360
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1361
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1362
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1363
file(File) + limit + -ra:b, b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1364
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1365
  $ hg log -G -l1 -r32:34 -r 'file("a")'
14133
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
  1366
  o  changeset:   34:fea3ac5810e0
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
  1367
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1368
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1369
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1370
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1371
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1372
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1373
limit(file(File) and a::b), b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1374
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1375
  $ hg log -G -r 'limit(file("a") and 32::34, 1)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1376
  o    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1377
  |\   parent:      27:886ed638191b
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1378
  ~ ~  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1379
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1380
       date:        Thu Jan 01 00:00:32 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1381
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1382
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1383
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1384
File + limit + -ra:b, b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1385
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1386
  $ hg log -G -r 'limit(file("a") and 34::32, 1)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1387
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1388
File + limit + -ra:b, b < tip, (b - a) < limit:
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1389
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1390
  $ hg log -G -l10 -r33:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1391
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1392
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1393
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1394
     date:        Thu Jan 01 00:00:34 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1395
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1396
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1397
  o  changeset:   33:68608f5145f9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1398
  |  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1399
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1400
     date:        Thu Jan 01 00:00:33 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1401
     summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1402
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1403
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1404
Do not crash or produce strange graphs if history is buggy
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1405
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1406
  $ hg branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1407
  marked working directory as branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1408
  (branches are permanent and global, did you want a bookmark?)
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1409
  $ commit 36 "buggy merge: identical parents" 35 35
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1410
  $ hg log -G -l5
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1411
  @  changeset:   36:08a19a744424
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1412
  |  branch:      branch
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1413
  |  tag:         tip
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1414
  |  parent:      35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1415
  |  parent:      35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1416
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1417
  |  date:        Thu Jan 01 00:00:36 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1418
  |  summary:     (36) buggy merge: identical parents
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1419
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1420
  o  changeset:   35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1421
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1422
  |  date:        Thu Jan 01 00:00:00 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1423
  |  summary:     0
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1424
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1425
  o  changeset:   34:fea3ac5810e0
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1426
  |  parent:      32:d06dffa21a31
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1427
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1428
  |  date:        Thu Jan 01 00:00:34 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1429
  |  summary:     (34) head
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1430
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1431
  | o  changeset:   33:68608f5145f9
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1432
  | |  parent:      18:1aa84d96232a
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1433
  | ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1434
  |    date:        Thu Jan 01 00:00:33 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1435
  |    summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1436
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1437
  o    changeset:   32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1438
  |\   parent:      27:886ed638191b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1439
  ~ ~  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1440
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1441
       date:        Thu Jan 01 00:00:32 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1442
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1443
  
14081
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1444
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1445
Test log -G options
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1446
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1447
  $ testlog() {
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1448
  >   hg log -G --print-revset "$@"
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1449
  >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1450
  >     | sed 's/.*nodetag/nodetag/' > log.nodes
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1451
  >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1452
  >     | sed 's/.*nodetag/nodetag/' > glog.nodes
27556
1df9b8b2abda test-glog: avoid check-code violation after next patch
Augie Fackler <raf@durin42.com>
parents: 27216
diff changeset
  1453
  >   (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \
1df9b8b2abda test-glog: avoid check-code violation after next patch
Augie Fackler <raf@durin42.com>
parents: 27216
diff changeset
  1454
  >     | grep '^[-+@ ]' || :
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1455
  > }
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1456
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1457
glog always reorders nodes which explains the difference with log
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1458
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1459
  $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1460
  ['27', '25', '21', '34', '32', '31']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1461
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1462
  <baseset- [21, 25, 27, 31, 32, 34]>
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1463
  --- log.nodes	* (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1464
  +++ glog.nodes	* (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1465
  @@ -1,6 +1,6 @@
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1466
  -nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1467
  -nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1468
  -nodetag 21
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1469
   nodetag 34
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1470
   nodetag 32
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1471
   nodetag 31
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1472
  +nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1473
  +nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1474
  +nodetag 21
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1475
  $ testlog -u test -u not-a-user
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1476
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1477
  (or
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1478
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1479
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1480
        (symbol 'user')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1481
        (string 'test'))
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1482
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1483
        (symbol 'user')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1484
        (string 'not-a-user'))))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1485
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1486
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1487
    <addset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1488
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1489
        <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1490
        <user 'test'>>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1491
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1492
        <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1493
        <user 'not-a-user'>>>>
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1494
  $ testlog -b not-a-branch
16405
17deb6bbfbab graphlog: refactor revset() to return revisions
Patrick Mezard <patrick@mezard.eu>
parents: 16316
diff changeset
  1495
  abort: unknown revision 'not-a-branch'!
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1496
  abort: unknown revision 'not-a-branch'!
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1497
  abort: unknown revision 'not-a-branch'!
16407
49ef1c382965 graphlog: support changeset identifiers in --branch
Patrick Mezard <patrick@mezard.eu>
parents: 16405
diff changeset
  1498
  $ testlog -b 35 -b 36 --only-branch branch
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1499
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1500
  (or
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1501
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1502
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1503
        (symbol 'branch')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1504
        (string 'default'))
35644
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1505
      (or
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1506
        (list
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1507
          (func
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1508
            (symbol 'branch')
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1509
            (string 'branch'))
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1510
          (func
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1511
            (symbol 'branch')
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1512
            (string 'branch'))))))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1513
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1514
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1515
    <addset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1516
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1517
        <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1518
        <branch 'default'>>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1519
      <addset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1520
        <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1521
          <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1522
          <branch 'branch'>>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1523
        <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1524
          <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1525
          <branch 'branch'>>>>>
16150
0424f3c7d7ac graphlog: multiple --keyword must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16149
diff changeset
  1526
  $ testlog -k expand -k merge
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1527
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1528
  (or
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1529
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1530
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1531
        (symbol 'keyword')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1532
        (string 'expand'))
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1533
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1534
        (symbol 'keyword')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1535
        (string 'merge'))))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1536
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1537
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1538
    <addset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1539
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1540
        <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1541
        <keyword 'expand'>>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1542
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1543
        <fullreposet+ 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1544
        <keyword 'merge'>>>>
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
  1545
  $ testlog --only-merges
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1546
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1547
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1548
    (symbol 'merge')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1549
    None)
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1550
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1551
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1552
    <merge>>
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1553
  $ testlog --no-merges
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1554
  []
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1555
  (not
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1556
    (func
34090
7bbc4e113e5f parser: stabilize output of prettyformat() by using byte-safe repr()
Yuya Nishihara <yuya@tcha.org>
parents: 33975
diff changeset
  1557
      (symbol 'merge')
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1558
      None))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1559
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1560
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1561
    <not
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1562
      <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1563
        <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1564
        <merge>>>>
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
  1565
  $ testlog --date '2 0 to 4 0'
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1566
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1567
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1568
    (symbol 'date')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1569
    (string '2 0 to 4 0'))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1570
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1571
    <spanset- 0:37>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1572
    <date '2 0 to 4 0'>>
14083
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
  1573
  $ hg log -G -d 'brace ) in a date'
32496
bb18728ea617 util: raise ParseError when parsing dates (BC)
Boris Feld <boris.feld@octobus.net>
parents: 32045
diff changeset
  1574
  hg: parse error: invalid date: 'brace ) in a date'
14083
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
  1575
  [255]
16172
db75321c7a0e test-glog: test multiple --prune values
Patrick Mezard <patrick@mezard.eu>
parents: 16171
diff changeset
  1576
  $ testlog --prune 31 --prune 32
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1577
  []
35644
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1578
  (not
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1579
    (or
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1580
      (list
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1581
        (func
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1582
          (symbol 'ancestors')
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1583
          (string '31'))
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1584
        (func
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1585
          (symbol 'ancestors')
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1586
          (string '32')))))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1587
  <filteredset
35644
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1588
    <spanset- 0:37>,
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1589
    <not
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1590
      <addset
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1591
        <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1592
          <spanset- 0:37>,
35644
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1593
          <generatorsetdesc+>>,
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1594
        <filteredset
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1595
          <spanset- 0:37>,
7a0a90d63a8c log: use revsetlang.formatspec() to concatenate list expression
Yuya Nishihara <yuya@tcha.org>
parents: 35643
diff changeset
  1596
          <generatorsetdesc+>>>>>
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1597
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1598
Dedicated repo for --follow and paths filtering. The g is crafted to
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1599
have 2 filelog topological heads in a linear changeset graph.
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1600
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1601
  $ cd ..
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1602
  $ hg init follow
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1603
  $ cd follow
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1604
  $ testlog --follow
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1605
  []
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1606
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1607
  <baseset []>
24059
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1608
  $ testlog -rnull
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1609
  ['null']
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1610
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1611
  <baseset [-1]>
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1612
  $ echo a > a
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1613
  $ echo aa > aa
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1614
  $ echo f > f
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1615
  $ hg ci -Am "add a" a aa f
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1616
  $ hg cp a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1617
  $ hg cp f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1618
  $ hg ci -m "copy a b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1619
  $ mkdir dir
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1620
  $ hg mv b dir
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1621
  $ echo g >> g
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1622
  $ echo f >> f
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1623
  $ hg ci -m "mv b dir/b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1624
  $ hg mv a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1625
  $ hg cp -f f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1626
  $ echo a > d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1627
  $ hg add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1628
  $ hg ci -m "mv a b; add d"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1629
  $ hg mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1630
  $ hg ci -m "mv dir/b e"
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1631
  $ hg log -G --template '({rev}) {desc|firstline}\n'
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1632
  @  (4) mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1633
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1634
  o  (3) mv a b; add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1635
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1636
  o  (2) mv b dir/b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1637
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1638
  o  (1) copy a b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1639
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1640
  o  (0) add a
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1641
  
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1642
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1643
  $ testlog a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1644
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1645
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1646
    (symbol 'filelog')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1647
    (string 'a'))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1648
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1649
    <spanset- 0:5>, set([0])>
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1650
  $ testlog a b
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1651
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1652
  (or
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1653
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1654
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1655
        (symbol 'filelog')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1656
        (string 'a'))
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1657
      (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1658
        (symbol 'filelog')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1659
        (string 'b'))))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1660
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1661
    <spanset- 0:5>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1662
    <addset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1663
      <baseset+ [0]>,
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1664
      <baseset+ [1]>>>
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1665
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1666
Test falling back to slow path for non-existing files
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1667
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1668
  $ testlog a c
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1669
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1670
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1671
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1672
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1673
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1674
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1675
      (string 'p:a')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1676
      (string 'p:c')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1677
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1678
    <spanset- 0:5>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1679
    <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=2147483647>>
16161
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1680
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1681
Test multiple --include/--exclude/paths
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1682
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1683
  $ testlog --include a --include e --exclude b --exclude e a e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1684
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1685
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1686
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1687
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1688
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1689
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1690
      (string 'p:a')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1691
      (string 'p:e')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1692
      (string 'i:a')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1693
      (string 'i:e')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1694
      (string 'x:b')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1695
      (string 'x:e')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1696
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1697
    <spanset- 0:5>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1698
    <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=2147483647>>
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1699
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1700
Test glob expansion of pats
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1701
22947
c63a09b6b337 tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents: 22860
diff changeset
  1702
  $ expandglobs=`$PYTHON -c "import mercurial.util; \
33747
24849d53697d tests: clean up many print statements to be print functions instead
Augie Fackler <augie@google.com>
parents: 33542
diff changeset
  1703
  >   print(mercurial.util.expandglobs and 'true' or 'false')"`
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1704
  $ if [ $expandglobs = "true" ]; then
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1705
  >    testlog 'a*';
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1706
  > else
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1707
  >    testlog a*;
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1708
  > fi;
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1709
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1710
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1711
    (symbol 'filelog')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1712
    (string 'aa'))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1713
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1714
    <spanset- 0:5>, set([0])>
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1715
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1716
Test --follow on a non-existent directory
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1717
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1718
  $ testlog -f dir
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1719
  abort: cannot follow file not in parent revision: "dir"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1720
  abort: cannot follow file not in parent revision: "dir"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1721
  abort: cannot follow file not in parent revision: "dir"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1722
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1723
Test --follow on a directory
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1724
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1725
  $ hg up -q '.^'
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1726
  $ testlog -f dir
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1727
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1728
  (func
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1729
    (symbol '_matchfiles')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1730
    (list
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1731
      (string 'r:')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1732
      (string 'd:relpath')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1733
      (string 'p:dir')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1734
  <filteredset
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1735
    <generatorsetdesc->,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1736
    <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=2147483647>>
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1737
  $ hg up -q tip
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1738
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1739
Test --follow on file not in parent revision
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1740
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1741
  $ testlog -f a
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1742
  abort: cannot follow file not in parent revision: "a"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1743
  abort: cannot follow file not in parent revision: "a"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1744
  abort: cannot follow file not in parent revision: "a"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1745
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1746
Test --follow and patterns
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1747
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1748
  $ testlog -f 'glob:*'
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1749
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1750
  (func
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1751
    (symbol '_matchfiles')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1752
    (list
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1753
      (string 'r:')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1754
      (string 'd:relpath')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1755
      (string 'p:glob:*')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1756
  <filteredset
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1757
    <generatorsetdesc->,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1758
    <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=2147483647>>
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1759
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1760
Test --follow on a single rename
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1761
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1762
  $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1763
  $ testlog -f a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1764
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1765
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1766
  <generatorsetdesc->
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1767
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1768
Test --follow and multiple renames
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1769
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1770
  $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1771
  $ testlog -f e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1772
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1773
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1774
  <generatorsetdesc->
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1775
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1776
Test --follow and multiple filelog heads
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1777
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1778
  $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1779
  $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1780
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1781
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1782
  <generatorsetdesc->
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1783
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1784
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1785
  nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1786
  nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1787
  $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1788
  $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1789
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1790
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1791
  <generatorsetdesc->
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1792
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1793
  nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1794
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1795
  nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1796
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1797
Test --follow and multiple files
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1798
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1799
  $ testlog -f g e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1800
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1801
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1802
  <generatorsetdesc->
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1803
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1804
  nodetag 4
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1805
  nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1806
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1807
  nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1808
  nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1809
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1810
Test --follow null parent
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1811
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1812
  $ hg up -q null
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1813
  $ testlog -f
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1814
  []
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1815
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1816
  <baseset []>
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1817
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1818
Test --follow-first
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1819
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1820
  $ hg up -q 3
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1821
  $ echo ee > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1822
  $ hg ci -Am "add another e" e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1823
  created new head
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1824
  $ hg merge --tool internal:other 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1825
  0 files updated, 1 files merged, 1 files removed, 0 files unresolved
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1826
  (branch merge, don't forget to commit)
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1827
  $ echo merge > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1828
  $ hg ci -m "merge 5 and 4"
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1829
  $ testlog --follow-first
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1830
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1831
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1832
  <generatorsetdesc->
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1833
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1834
Cannot compare with log --follow-first FILE as it never worked
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1835
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1836
  $ hg log -G --print-revset --follow-first e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1837
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1838
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1839
  <generatorsetdesc->
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1840
  $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1841
  @    6 merge 5 and 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1842
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1843
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1844
  o  5 add another e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1845
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1846
  ~
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1847
16180
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1848
Test --copies
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1849
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1850
  $ hg log -G --copies --template "{rev} {desc|firstline} \
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1851
  >   copies: {file_copies_switch}\n"
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1852
  @    6 merge 5 and 4   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1853
  |\
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1854
  | o  5 add another e   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1855
  | |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1856
  o |  4 mv dir/b e   copies: e (dir/b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1857
  |/
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1858
  o  3 mv a b; add d   copies: b (a)g (f)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1859
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1860
  o  2 mv b dir/b   copies: dir/b (b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1861
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1862
  o  1 copy a b   copies: b (a)g (f)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1863
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1864
  o  0 add a   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1865
  
16181
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
  1866
Test "set:..." and parent revision
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
  1867
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
  1868
  $ hg up -q 4
16182
bd12ef347680 match: consider filesets as "anypats"
Patrick Mezard <patrick@mezard.eu>
parents: 16181
diff changeset
  1869
  $ testlog "set:copied()"
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1870
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1871
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1872
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1873
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1874
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1875
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1876
      (string 'p:set:copied()')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1877
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1878
    <spanset- 0:7>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1879
    <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=2147483647>>
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1880
  $ testlog --include "set:copied()"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1881
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1882
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1883
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1884
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1885
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1886
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1887
      (string 'i:set:copied()')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1888
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1889
    <spanset- 0:7>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1890
    <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=2147483647>>
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1891
  $ testlog -r "sort(file('set:copied()'), -rev)"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1892
  ["sort(file('set:copied()'), -rev)"]
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1893
  []
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1894
  <filteredset
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1895
    <fullreposet- 0:7>,
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1896
    <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='glob', rev=None>>
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1897
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1898
Test --removed
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1899
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1900
  $ testlog --removed
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1901
  []
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1902
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1903
  <spanset- 0:7>
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1904
  $ testlog --removed a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1905
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1906
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1907
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1908
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1909
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1910
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1911
      (string 'p:a')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1912
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1913
    <spanset- 0:7>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1914
    <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1915
  $ testlog --removed --follow a
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  1916
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1917
  (func
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1918
    (symbol '_matchfiles')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1919
    (list
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1920
      (string 'r:')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1921
      (string 'd:relpath')
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1922
      (string 'p:a')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  1923
  <filteredset
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  1924
    <generatorsetdesc->,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  1925
    <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1926
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1927
Test --patch and --stat with --follow and --follow-first
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1928
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1929
  $ hg up -q 3
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1930
  $ hg log -G --git --patch b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1931
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1932
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1933
  ~  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1934
     summary:     copy a b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1935
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1936
     diff --git a/a b/b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1937
     copy from a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1938
     copy to b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1939
  
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1940
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1941
  $ hg log -G --git --stat b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1942
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1943
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1944
  ~  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1945
     summary:     copy a b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1946
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1947
      b |  0
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1948
      1 files changed, 0 insertions(+), 0 deletions(-)
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1949
  
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1950
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1951
  $ hg log -G --git --patch --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1952
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1953
  |  user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1954
  |  date:        Thu Jan 01 00:00:00 1970 +0000
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1955
  |  summary:     copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1956
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1957
  |  diff --git a/a b/b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1958
  |  copy from a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1959
  |  copy to b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1960
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1961
  o  changeset:   0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1962
     user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1963
     date:        Thu Jan 01 00:00:00 1970 +0000
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1964
     summary:     add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1965
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1966
     diff --git a/a b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1967
     new file mode 100644
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1968
     --- /dev/null
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1969
     +++ b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1970
     @@ -0,0 +1,1 @@
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1971
     +a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1972
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1973
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1974
  $ hg log -G --git --stat --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1975
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1976
  |  user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1977
  |  date:        Thu Jan 01 00:00:00 1970 +0000
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1978
  |  summary:     copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1979
  |
20972
4e2fb0ad00a9 diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents: 20699
diff changeset
  1980
  |   b |  0
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1981
  |   1 files changed, 0 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1982
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1983
  o  changeset:   0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1984
     user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1985
     date:        Thu Jan 01 00:00:00 1970 +0000
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1986
     summary:     add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1987
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1988
      a |  1 +
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1989
      1 files changed, 1 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1990
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1991
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1992
  $ hg up -q 6
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1993
  $ hg log -G --git --patch --follow-first e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1994
  @    changeset:   6:fc281d8ff18d
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1995
  |\   tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1996
  | ~  parent:      5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1997
  |    parent:      4:17d952250a9d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1998
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1999
  |    date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2000
  |    summary:     merge 5 and 4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2001
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2002
  |    diff --git a/e b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2003
  |    --- a/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2004
  |    +++ b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2005
  |    @@ -1,1 +1,1 @@
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2006
  |    -ee
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2007
  |    +merge
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2008
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2009
  o  changeset:   5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2010
  |  parent:      3:5918b8d165d1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2011
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2012
     date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2013
     summary:     add another e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2014
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2015
     diff --git a/e b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2016
     new file mode 100644
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2017
     --- /dev/null
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2018
     +++ b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2019
     @@ -0,0 +1,1 @@
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2020
     +ee
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2021
  
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2022
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2023
Test old-style --rev
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2024
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2025
  $ hg tag 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2026
  $ testlog -r 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2027
  ['foo-bar']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  2028
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2029
  <baseset [6]>
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2030
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2031
Test --follow and forward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2032
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2033
  $ hg up -q 6
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2034
  $ echo g > g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2035
  $ hg ci -Am 'add g' g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2036
  created new head
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2037
  $ hg up -q 2
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2038
  $ hg log -G --template "{rev} {desc|firstline}\n"
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2039
  o  8 add g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2040
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2041
  | o  7 Added tag foo-bar for changeset fc281d8ff18d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2042
  |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2043
  o    6 merge 5 and 4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2044
  |\
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2045
  | o  5 add another e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2046
  | |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2047
  o |  4 mv dir/b e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2048
  |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2049
  o  3 mv a b; add d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2050
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2051
  @  2 mv b dir/b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2052
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2053
  o  1 copy a b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2054
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2055
  o  0 add a
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2056
  
25665
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2057
  $ hg archive -r 7 archive
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2058
  $ grep changessincelatesttag archive/.hg_archival.txt
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2059
  changessincelatesttag: 1
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2060
  $ rm -r archive
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2061
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2062
changessincelatesttag with no prior tag
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2063
  $ hg archive -r 4 archive
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2064
  $ grep changessincelatesttag archive/.hg_archival.txt
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2065
  changessincelatesttag: 5
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2066
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2067
  $ hg export 'all()'
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2068
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2069
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2070
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2071
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2072
  # Node ID f8035bb17114da16215af3436ec5222428ace8ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2073
  # Parent  0000000000000000000000000000000000000000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2074
  add a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2075
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2076
  diff -r 000000000000 -r f8035bb17114 a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2077
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2078
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2079
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2080
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2081
  diff -r 000000000000 -r f8035bb17114 aa
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2082
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2083
  +++ b/aa	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2084
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2085
  +aa
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2086
  diff -r 000000000000 -r f8035bb17114 f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2087
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2088
  +++ b/f	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2089
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2090
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2091
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2092
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2093
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2094
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2095
  # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2096
  # Parent  f8035bb17114da16215af3436ec5222428ace8ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2097
  copy a b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2098
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2099
  diff -r f8035bb17114 -r 216d4c92cf98 b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2100
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2101
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2102
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2103
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2104
  diff -r f8035bb17114 -r 216d4c92cf98 g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2105
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2106
  +++ b/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2107
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2108
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2109
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2110
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2111
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2112
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2113
  # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2114
  # Parent  216d4c92cf98ff2b4641d508b76b529f3d424c92
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2115
  mv b dir/b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2116
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2117
  diff -r 216d4c92cf98 -r bb573313a9e8 b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2118
  --- a/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2119
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2120
  @@ -1,1 +0,0 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2121
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2122
  diff -r 216d4c92cf98 -r bb573313a9e8 dir/b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2123
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2124
  +++ b/dir/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2125
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2126
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2127
  diff -r 216d4c92cf98 -r bb573313a9e8 f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2128
  --- a/f	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2129
  +++ b/f	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2130
  @@ -1,1 +1,2 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2131
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2132
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2133
  diff -r 216d4c92cf98 -r bb573313a9e8 g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2134
  --- a/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2135
  +++ b/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2136
  @@ -1,1 +1,2 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2137
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2138
  +g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2139
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2140
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2141
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2142
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2143
  # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2144
  # Parent  bb573313a9e8349099b6ea2b2fb1fc7f424446f3
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2145
  mv a b; add d
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2146
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2147
  diff -r bb573313a9e8 -r 5918b8d165d1 a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2148
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2149
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2150
  @@ -1,1 +0,0 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2151
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2152
  diff -r bb573313a9e8 -r 5918b8d165d1 b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2153
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2154
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2155
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2156
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2157
  diff -r bb573313a9e8 -r 5918b8d165d1 d
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2158
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2159
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2160
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2161
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2162
  diff -r bb573313a9e8 -r 5918b8d165d1 g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2163
  --- a/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2164
  +++ b/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2165
  @@ -1,2 +1,2 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2166
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2167
  -g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2168
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2169
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2170
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2171
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2172
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2173
  # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2174
  # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2175
  mv dir/b e
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2176
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2177
  diff -r 5918b8d165d1 -r 17d952250a9d dir/b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2178
  --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2179
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2180
  @@ -1,1 +0,0 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2181
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2182
  diff -r 5918b8d165d1 -r 17d952250a9d e
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2183
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2184
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2185
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2186
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2187
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2188
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2189
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2190
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2191
  # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2192
  # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2193
  add another e
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2194
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2195
  diff -r 5918b8d165d1 -r 99b31f1c2782 e
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2196
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2197
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2198
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2199
  +ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2200
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2201
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2202
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2203
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2204
  # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2205
  # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2206
  # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2207
  merge 5 and 4
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2208
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2209
  diff -r 99b31f1c2782 -r fc281d8ff18d dir/b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2210
  --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2211
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2212
  @@ -1,1 +0,0 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2213
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2214
  diff -r 99b31f1c2782 -r fc281d8ff18d e
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2215
  --- a/e	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2216
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2217
  @@ -1,1 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2218
  -ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2219
  +merge
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2220
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2221
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2222
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2223
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2224
  # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2225
  # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2226
  Added tag foo-bar for changeset fc281d8ff18d
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2227
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2228
  diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2229
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2230
  +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2231
  @@ -0,0 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2232
  +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2233
  # HG changeset patch
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2234
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2235
  # Date 0 0
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2236
  #      Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2237
  # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2238
  # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2239
  add g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2240
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2241
  diff -r fc281d8ff18d -r 24c2e826ddeb g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2242
  --- a/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2243
  +++ b/g	Thu Jan 01 00:00:00 1970 +0000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2244
  @@ -1,2 +1,1 @@
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2245
  -f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2246
  -f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2247
  +g
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2248
  $ testlog --follow -r6 -r8 -r5 -r7 -r4
35684
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35683
diff changeset
  2249
  ['6', '8', '5', '7', '4']
35556
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
  2250
  []
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
  2251
  <generatorsetdesc->
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2252
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2253
Test --follow-first and forward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2254
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2255
  $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
35684
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35683
diff changeset
  2256
  ['6', '8', '5', '7', '4']
35646
a177c6aa055a log: rewrite --follow-first -rREV like --follow for consistency (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 35644
diff changeset
  2257
  []
a177c6aa055a log: rewrite --follow-first -rREV like --follow for consistency (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 35644
diff changeset
  2258
  <generatorsetdesc->
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2259
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2260
Test --follow and backward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2261
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2262
  $ testlog --follow -r6 -r5 -r7 -r8 -r4
35684
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35683
diff changeset
  2263
  ['6', '5', '7', '8', '4']
35556
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
  2264
  []
b58964b9b541 test-glog: hook cmdutil.getlogrevs() so -frREV is rewritten accordingly
Yuya Nishihara <yuya@tcha.org>
parents: 35555
diff changeset
  2265
  <generatorsetdesc->
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2266
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2267
Test --follow-first and backward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2268
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2269
  $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
35684
1c929b4942a3 log: resolve --follow with -rREV in cmdutil.getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35683
diff changeset
  2270
  ['6', '5', '7', '8', '4']
35646
a177c6aa055a log: rewrite --follow-first -rREV like --follow for consistency (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 35644
diff changeset
  2271
  []
a177c6aa055a log: rewrite --follow-first -rREV like --follow for consistency (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 35644
diff changeset
  2272
  <generatorsetdesc->
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2273
24200
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2274
Test --follow with --rev of graphlog extension
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2275
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2276
  $ hg --config extensions.graphlog= glog -qfr1
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2277
  o  1:216d4c92cf98
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2278
  |
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2279
  o  0:f8035bb17114
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2280
  
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2281
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2282
Test subdir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2283
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2284
  $ hg up -q 3
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2285
  $ cd dir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2286
  $ testlog .
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2287
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2288
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2289
    (symbol '_matchfiles')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2290
    (list
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2291
      (string 'r:')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2292
      (string 'd:relpath')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2293
      (string 'p:.')))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2294
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2295
    <spanset- 0:9>,
35816
f6ca1e11d8b4 revset: evaluate filesets against each revision for 'file()' (issue5778)
Matt Harbison <matt_harbison@yahoo.com>
parents: 35690
diff changeset
  2296
    <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=2147483647>>
16434
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2297
  $ testlog ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2298
  []
35554
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2299
  (func
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2300
    (symbol 'filelog')
99a25bde65a3 test-glog: drop uninteresting nodes from AST output
Yuya Nishihara <yuya@tcha.org>
parents: 35548
diff changeset
  2301
    (string '../b'))
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2302
  <filteredset
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2303
    <spanset- 0:9>, set([1])>
16434
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2304
  $ testlog -f ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2305
  []
35686
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  2306
  []
b25fa5da4ca2 log: resolve --follow thoroughly in getlogrevs()
Yuya Nishihara <yuya@tcha.org>
parents: 35685
diff changeset
  2307
  <generatorsetdesc->
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2308
  $ cd ..
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2309
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2310
Test --hidden
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2311
 (enable obsolete)
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2312
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22947
diff changeset
  2313
  $ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22947
diff changeset
  2314
  > [experimental]
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
  2315
  > evolution.createmarkers=True
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2316
  > EOF
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2317
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2318
  $ hg debugobsolete `hg id --debug -i -r 8`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 32496
diff changeset
  2319
  obsoleted 1 changesets
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2320
  $ testlog
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2321
  []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2322
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2323
  <spanset- 0:9>
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2324
  $ testlog --hidden
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2325
  []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2326
  []
35555
d984d9b3411e test-glog: dump computed set
Yuya Nishihara <yuya@tcha.org>
parents: 35554
diff changeset
  2327
  <spanset- 0:9>
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2328
  $ hg log -G --template '{rev} {desc}\n'
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2329
  o  7 Added tag foo-bar for changeset fc281d8ff18d
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2330
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2331
  o    6 merge 5 and 4
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2332
  |\
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2333
  | o  5 add another e
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2334
  | |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2335
  o |  4 mv dir/b e
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2336
  |/
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2337
  @  3 mv a b; add d
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2338
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2339
  o  2 mv b dir/b
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2340
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2341
  o  1 copy a b
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2342
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2343
  o  0 add a
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2344
  
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
  2345
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2346
A template without trailing newline should do something sane
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2347
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2348
  $ hg log -G -r ::2 --template '{rev} {desc}'
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2349
  o  2 mv b dir/b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2350
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2351
  o  1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2352
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2353
  o  0 add a
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2354
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2355
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2356
Extra newlines must be preserved
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2357
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2358
  $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2359
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2360
  |  2 mv b dir/b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2361
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2362
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2363
  |  1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2364
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2365
  o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2366
     0 add a
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2367
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2368
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2369
The almost-empty template should do something sane too ...
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2370
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2371
  $ hg log -G -r ::2 --template '\n'
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2372
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2373
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2374
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2375
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2376
  o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2377
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2378
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2379
issue3772
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2380
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2381
  $ hg log -G -r :null
20699
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2382
  o  changeset:   0:f8035bb17114
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2383
  |  user:        test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2384
  |  date:        Thu Jan 01 00:00:00 1970 +0000
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2385
  |  summary:     add a
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2386
  |
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2387
  o  changeset:   -1:000000000000
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2388
     user:
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2389
     date:        Thu Jan 01 00:00:00 1970 +0000
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2390
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2391
  $ hg log -G -r null:null
18468
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2392
  o  changeset:   -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2393
     user:
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2394
     date:        Thu Jan 01 00:00:00 1970 +0000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2395
  
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2396
24202
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2397
should not draw line down to null due to the magic of fullreposet
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2398
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2399
  $ hg log -G -r 'all()' | tail -6
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2400
  |
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2401
  o  changeset:   0:f8035bb17114
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2402
     user:        test
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2403
     date:        Thu Jan 01 00:00:00 1970 +0000
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2404
     summary:     add a
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2405
  
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2406
25265
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2407
  $ hg log -G -r 'branch(default)' | tail -6
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2408
  |
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2409
  o  changeset:   0:f8035bb17114
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2410
     user:        test
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2411
     date:        Thu Jan 01 00:00:00 1970 +0000
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2412
     summary:     add a
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2413
  
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2414
25765
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2415
working-directory revision
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2416
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2417
  $ hg log -G -qr '. + wdir()'
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2418
  o  2147483647:ffffffffffff
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2419
  |
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2420
  @  3:5918b8d165d1
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2421
  |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2422
  ~
25765
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2423
35928
c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35927
diff changeset
  2424
node template with changesetprinter:
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2425
32045
3eceeede26e9 graphlog: optionally strip quotes from graphnode template (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 31558
diff changeset
  2426
  $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2427
  7  7:02dbb8e276b8
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2428
  |
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2429
  6    6:fc281d8ff18d
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2430
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2431
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2432
  5  5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2433
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2434
  ~
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2435
35928
c8e2d6ed1f9e cmdutil: drop aliases for logcmdutil functions (API)
Yuya Nishihara <yuya@tcha.org>
parents: 35927
diff changeset
  2436
node template with changesettemplater (shared cache variable):
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2437
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2438
  $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2439
  > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}'
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2440
  o  7 foo-bar+1
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2441
  |
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2442
  #    6 foo-bar+0
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2443
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2444
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2445
  o  5 null+5
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2446
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2447
  ~
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2448
28428
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2449
label() should just work in node template:
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2450
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2451
  $ hg log -Gqr 7 --config extensions.color= --color=debug \
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2452
  > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2453
  [branch.default|7]  [log.node|7:02dbb8e276b8]
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2454
  |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2455
  ~
28428
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2456
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
  2457
  $ cd ..
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2458
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2459
change graph edge styling
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2460
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2461
  $ cd repo
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2462
  $ cat << EOF >> $HGRCPATH
28617
1a1e4350b560 graphmod: move the graphstyle options to experimental
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28601
diff changeset
  2463
  > [experimental]
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2464
  > graphstyle.parent = |
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2465
  > graphstyle.grandparent = :
28601
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2466
  > graphstyle.missing =
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2467
  > EOF
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2468
  $ hg log -G -r 'file("a")' -m
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2469
  @  changeset:   36:08a19a744424
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2470
  :  branch:      branch
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2471
  :  tag:         tip
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2472
  :  parent:      35:9159c3644c5e
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2473
  :  parent:      35:9159c3644c5e
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2474
  :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2475
  :  date:        Thu Jan 01 00:00:36 1970 +0000
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2476
  :  summary:     (36) buggy merge: identical parents
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2477
  :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2478
  o    changeset:   32:d06dffa21a31
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2479
  |\   parent:      27:886ed638191b
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2480
  | :  parent:      31:621d83e11f67
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2481
  | :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2482
  | :  date:        Thu Jan 01 00:00:32 1970 +0000
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2483
  | :  summary:     (32) expand
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2484
  | :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2485
  o :  changeset:   31:621d83e11f67
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2486
  |\:  parent:      21:d42a756af44d
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2487
  | :  parent:      30:6e11cd4b648f
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2488
  | :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2489
  | :  date:        Thu Jan 01 00:00:31 1970 +0000
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2490
  | :  summary:     (31) expand
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2491
  | :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2492
  o :    changeset:   30:6e11cd4b648f
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2493
  |\ \   parent:      28:44ecd0b9ae99
28601
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2494
  | ~ :  parent:      29:cd9bb2be7593
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2495
  |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2496
  |   :  date:        Thu Jan 01 00:00:30 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2497
  |   :  summary:     (30) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2498
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2499
  o :    changeset:   28:44ecd0b9ae99
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2500
  |\ \   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2501
  | ~ :  parent:      26:7f25b6c2f0b9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2502
  |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2503
  |   :  date:        Thu Jan 01 00:00:28 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2504
  |   :  summary:     (28) merge zero known
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2505
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2506
  o :    changeset:   26:7f25b6c2f0b9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2507
  |\ \   parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2508
  | | :  parent:      25:91da8ed57247
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2509
  | | :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2510
  | | :  date:        Thu Jan 01 00:00:26 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2511
  | | :  summary:     (26) merge one known; far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2512
  | | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2513
  | o :  changeset:   25:91da8ed57247
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2514
  | |\:  parent:      21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2515
  | | :  parent:      24:a9c19a3d96b7
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2516
  | | :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2517
  | | :  date:        Thu Jan 01 00:00:25 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2518
  | | :  summary:     (25) merge one known; far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2519
  | | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2520
  | o :    changeset:   24:a9c19a3d96b7
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2521
  | |\ \   parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2522
  | | ~ :  parent:      23:a01cddf0766d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2523
  | |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2524
  | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2525
  | |   :  summary:     (24) merge one known; immediate right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2526
  | |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2527
  | o :    changeset:   23:a01cddf0766d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2528
  | |\ \   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2529
  | | ~ :  parent:      22:e0d9cccacb5d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2530
  | |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2531
  | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2532
  | |   :  summary:     (23) merge one known; immediate left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2533
  | |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2534
  | o :  changeset:   22:e0d9cccacb5d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2535
  |/:/   parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2536
  | :    parent:      21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2537
  | :    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2538
  | :    date:        Thu Jan 01 00:00:22 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2539
  | :    summary:     (22) merge two known; one far left, one far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2540
  | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2541
  | o    changeset:   21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2542
  | |\   parent:      19:31ddc2c1573b
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2543
  | | |  parent:      20:d30ed6450e32
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2544
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2545
  | | |  date:        Thu Jan 01 00:00:21 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2546
  | | |  summary:     (21) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2547
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2548
  +---o  changeset:   20:d30ed6450e32
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2549
  | | |  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2550
  | | ~  parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2551
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2552
  | |    date:        Thu Jan 01 00:00:20 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2553
  | |    summary:     (20) merge two known; two far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2554
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2555
  | o    changeset:   19:31ddc2c1573b
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2556
  | |\   parent:      15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2557
  | | |  parent:      17:44765d7c06e0
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2558
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2559
  | | |  date:        Thu Jan 01 00:00:19 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2560
  | | |  summary:     (19) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2561
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2562
  o | |  changeset:   18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2563
  |\| |  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2564
  ~ | |  parent:      15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2565
    | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2566
    | |  date:        Thu Jan 01 00:00:18 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2567
    | |  summary:     (18) merge two known; two far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2568
   / /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2569
  | o    changeset:   17:44765d7c06e0
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2570
  | |\   parent:      12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2571
  | | |  parent:      16:3677d192927d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2572
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2573
  | | |  date:        Thu Jan 01 00:00:17 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2574
  | | |  summary:     (17) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2575
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2576
  | | o    changeset:   16:3677d192927d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2577
  | | |\   parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2578
  | | ~ ~  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2579
  | |      user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2580
  | |      date:        Thu Jan 01 00:00:16 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2581
  | |      summary:     (16) merge two known; one immediate right, one near right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2582
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2583
  o |    changeset:   15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2584
  |\ \   parent:      13:22d8966a97e3
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2585
  | | |  parent:      14:8eac370358ef
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2586
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2587
  | | |  date:        Thu Jan 01 00:00:15 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2588
  | | |  summary:     (15) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2589
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2590
  | o |  changeset:   14:8eac370358ef
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2591
  | |\|  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2592
  | ~ |  parent:      12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2593
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2594
  |   |  date:        Thu Jan 01 00:00:14 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2595
  |   |  summary:     (14) merge two known; one immediate right, one far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2596
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2597
  o |    changeset:   13:22d8966a97e3
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2598
  |\ \   parent:      9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2599
  | | |  parent:      11:832d76e6bdf2
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2600
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2601
  | | |  date:        Thu Jan 01 00:00:13 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2602
  | | |  summary:     (13) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2603
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2604
  +---o  changeset:   12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2605
  | | |  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2606
  | | ~  parent:      9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2607
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2608
  | |    date:        Thu Jan 01 00:00:12 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2609
  | |    summary:     (12) merge two known; one immediate right, one far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2610
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2611
  | o    changeset:   11:832d76e6bdf2
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2612
  | |\   parent:      6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2613
  | | |  parent:      10:74c64d036d72
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2614
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2615
  | | |  date:        Thu Jan 01 00:00:11 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2616
  | | |  summary:     (11) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2617
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2618
  | | o  changeset:   10:74c64d036d72
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2619
  | |/|  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2620
  | | ~  parent:      6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2621
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2622
  | |    date:        Thu Jan 01 00:00:10 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2623
  | |    summary:     (10) merge two known; one immediate left, one near right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2624
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2625
  o |    changeset:   9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2626
  |\ \   parent:      7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2627
  | | |  parent:      8:7a0b11f71937
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2628
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2629
  | | |  date:        Thu Jan 01 00:00:09 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2630
  | | |  summary:     (9) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2631
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2632
  | o |  changeset:   8:7a0b11f71937
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2633
  |/| |  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2634
  | ~ |  parent:      7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2635
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2636
  |   |  date:        Thu Jan 01 00:00:08 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2637
  |   |  summary:     (8) merge two known; one immediate left, one far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2638
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2639
  o |    changeset:   7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2640
  |\ \   parent:      2:3d9a33b8d1e1
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2641
  | ~ |  parent:      5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2642
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2643
  |   |  date:        Thu Jan 01 00:00:07 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2644
  |   |  summary:     (7) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2645
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2646
  | o  changeset:   6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2647
  |/|  parent:      2:3d9a33b8d1e1
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2648
  | ~  parent:      5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2649
  |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2650
  |    date:        Thu Jan 01 00:00:06 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2651
  |    summary:     (6) merge two known; one immediate left, one far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2652
  |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2653
  o    changeset:   5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2654
  |\   parent:      3:27eef8ed80b4
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2655
  | ~  parent:      4:26a8bac39d9f
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2656
  |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2657
  |    date:        Thu Jan 01 00:00:05 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2658
  |    summary:     (5) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2659
  |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2660
  o    changeset:   4:26a8bac39d9f
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2661
  |\   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2662
  ~ ~  parent:      3:27eef8ed80b4
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2663
       user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2664
       date:        Thu Jan 01 00:00:04 1970 +0000
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2665
       summary:     (4) merge two known; one immediate left, one immediate right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2666
  
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2667
28999
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2668
Setting HGPLAIN ignores graphmod styling:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2669
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2670
  $ HGPLAIN=1 hg log -G -r 'file("a")' -m
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2671
  @  changeset:   36:08a19a744424
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2672
  |  branch:      branch
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2673
  |  tag:         tip
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2674
  |  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2675
  |  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2676
  |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2677
  |  date:        Thu Jan 01 00:00:36 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2678
  |  summary:     (36) buggy merge: identical parents
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2679
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2680
  o    changeset:   32:d06dffa21a31
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2681
  |\   parent:      27:886ed638191b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2682
  | |  parent:      31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2683
  | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2684
  | |  date:        Thu Jan 01 00:00:32 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2685
  | |  summary:     (32) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2686
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2687
  o |  changeset:   31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2688
  |\|  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2689
  | |  parent:      30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2690
  | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2691
  | |  date:        Thu Jan 01 00:00:31 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2692
  | |  summary:     (31) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2693
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2694
  o |    changeset:   30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2695
  |\ \   parent:      28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2696
  | | |  parent:      29:cd9bb2be7593
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2697
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2698
  | | |  date:        Thu Jan 01 00:00:30 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2699
  | | |  summary:     (30) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2700
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2701
  o | |    changeset:   28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2702
  |\ \ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2703
  | | | |  parent:      26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2704
  | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2705
  | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2706
  | | | |  summary:     (28) merge zero known
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2707
  | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2708
  o | | |    changeset:   26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2709
  |\ \ \ \   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2710
  | | | | |  parent:      25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2711
  | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2712
  | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2713
  | | | | |  summary:     (26) merge one known; far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2714
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2715
  | o-----+  changeset:   25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2716
  | | | | |  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2717
  | | | | |  parent:      24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2718
  | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2719
  | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2720
  | | | | |  summary:     (25) merge one known; far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2721
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2722
  | o | | |    changeset:   24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2723
  | |\ \ \ \   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2724
  | | | | | |  parent:      23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2725
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2726
  | | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2727
  | | | | | |  summary:     (24) merge one known; immediate right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2728
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2729
  | o---+ | |  changeset:   23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2730
  | | | | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2731
  | | | | | |  parent:      22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2732
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2733
  | | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2734
  | | | | | |  summary:     (23) merge one known; immediate left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2735
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2736
  | o-------+  changeset:   22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2737
  | | | | | |  parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2738
  |/ / / / /   parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2739
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2740
  | | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2741
  | | | | |    summary:     (22) merge two known; one far left, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2742
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2743
  | | | | o    changeset:   21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2744
  | | | | |\   parent:      19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2745
  | | | | | |  parent:      20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2746
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2747
  | | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2748
  | | | | | |  summary:     (21) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2749
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2750
  +-+-------o  changeset:   20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2751
  | | | | |    parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2752
  | | | | |    parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2753
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2754
  | | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2755
  | | | | |    summary:     (20) merge two known; two far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2756
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2757
  | | | | o    changeset:   19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2758
  | | | | |\   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2759
  | | | | | |  parent:      17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2760
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2761
  | | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2762
  | | | | | |  summary:     (19) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2763
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2764
  o---+---+ |  changeset:   18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2765
    | | | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2766
   / / / / /   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2767
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2768
  | | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2769
  | | | | |    summary:     (18) merge two known; two far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2770
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2771
  | | | | o    changeset:   17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2772
  | | | | |\   parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2773
  | | | | | |  parent:      16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2774
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2775
  | | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2776
  | | | | | |  summary:     (17) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2777
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2778
  +-+-------o  changeset:   16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2779
  | | | | |    parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2780
  | | | | |    parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2781
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2782
  | | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2783
  | | | | |    summary:     (16) merge two known; one immediate right, one near right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2784
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2785
  | | | o |    changeset:   15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2786
  | | | |\ \   parent:      13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2787
  | | | | | |  parent:      14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2788
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2789
  | | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2790
  | | | | | |  summary:     (15) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2791
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2792
  +-------o |  changeset:   14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2793
  | | | | |/   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2794
  | | | | |    parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2795
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2796
  | | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2797
  | | | | |    summary:     (14) merge two known; one immediate right, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2798
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2799
  | | | o |    changeset:   13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2800
  | | | |\ \   parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2801
  | | | | | |  parent:      11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2802
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2803
  | | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2804
  | | | | | |  summary:     (13) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2805
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2806
  | +---+---o  changeset:   12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2807
  | | | | |    parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2808
  | | | | |    parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2809
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2810
  | | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2811
  | | | | |    summary:     (12) merge two known; one immediate right, one far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2812
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2813
  | | | | o    changeset:   11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2814
  | | | | |\   parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2815
  | | | | | |  parent:      10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2816
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2817
  | | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2818
  | | | | | |  summary:     (11) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2819
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2820
  +---------o  changeset:   10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2821
  | | | | |/   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2822
  | | | | |    parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2823
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2824
  | | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2825
  | | | | |    summary:     (10) merge two known; one immediate left, one near right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2826
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2827
  | | | o |    changeset:   9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2828
  | | | |\ \   parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2829
  | | | | | |  parent:      8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2830
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2831
  | | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2832
  | | | | | |  summary:     (9) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2833
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2834
  +-------o |  changeset:   8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2835
  | | | |/ /   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2836
  | | | | |    parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2837
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2838
  | | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2839
  | | | | |    summary:     (8) merge two known; one immediate left, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2840
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2841
  | | | o |    changeset:   7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2842
  | | | |\ \   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2843
  | | | | | |  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2844
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2845
  | | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2846
  | | | | | |  summary:     (7) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2847
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2848
  | | | +---o  changeset:   6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2849
  | | | | |/   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2850
  | | | | |    parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2851
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2852
  | | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2853
  | | | | |    summary:     (6) merge two known; one immediate left, one far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2854
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2855
  | | | o |    changeset:   5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2856
  | | | |\ \   parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2857
  | | | | | |  parent:      4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2858
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2859
  | | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2860
  | | | | | |  summary:     (5) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2861
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2862
  | +---o | |  changeset:   4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2863
  | | | |/ /   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2864
  | | | | |    parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2865
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2866
  | | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2867
  | | | | |    summary:     (4) merge two known; one immediate left, one immediate right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2868
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2869
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2870
.. unless HGPLAINEXCEPT=graph is set:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2871
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2872
  $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2873
  @  changeset:   36:08a19a744424
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2874
  :  branch:      branch
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2875
  :  tag:         tip
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2876
  :  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2877
  :  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2878
  :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2879
  :  date:        Thu Jan 01 00:00:36 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2880
  :  summary:     (36) buggy merge: identical parents
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2881
  :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2882
  o    changeset:   32:d06dffa21a31
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2883
  |\   parent:      27:886ed638191b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2884
  | :  parent:      31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2885
  | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2886
  | :  date:        Thu Jan 01 00:00:32 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2887
  | :  summary:     (32) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2888
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2889
  o :  changeset:   31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2890
  |\:  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2891
  | :  parent:      30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2892
  | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2893
  | :  date:        Thu Jan 01 00:00:31 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2894
  | :  summary:     (31) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2895
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2896
  o :    changeset:   30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2897
  |\ \   parent:      28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2898
  | ~ :  parent:      29:cd9bb2be7593
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2899
  |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2900
  |   :  date:        Thu Jan 01 00:00:30 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2901
  |   :  summary:     (30) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2902
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2903
  o :    changeset:   28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2904
  |\ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2905
  | ~ :  parent:      26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2906
  |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2907
  |   :  date:        Thu Jan 01 00:00:28 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2908
  |   :  summary:     (28) merge zero known
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2909
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2910
  o :    changeset:   26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2911
  |\ \   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2912
  | | :  parent:      25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2913
  | | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2914
  | | :  date:        Thu Jan 01 00:00:26 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2915
  | | :  summary:     (26) merge one known; far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2916
  | | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2917
  | o :  changeset:   25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2918
  | |\:  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2919
  | | :  parent:      24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2920
  | | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2921
  | | :  date:        Thu Jan 01 00:00:25 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2922
  | | :  summary:     (25) merge one known; far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2923
  | | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2924
  | o :    changeset:   24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2925
  | |\ \   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2926
  | | ~ :  parent:      23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2927
  | |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2928
  | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2929
  | |   :  summary:     (24) merge one known; immediate right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2930
  | |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2931
  | o :    changeset:   23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2932
  | |\ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2933
  | | ~ :  parent:      22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2934
  | |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2935
  | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2936
  | |   :  summary:     (23) merge one known; immediate left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2937
  | |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2938
  | o :  changeset:   22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2939
  |/:/   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2940
  | :    parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2941
  | :    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2942
  | :    date:        Thu Jan 01 00:00:22 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2943
  | :    summary:     (22) merge two known; one far left, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2944
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2945
  | o    changeset:   21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2946
  | |\   parent:      19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2947
  | | |  parent:      20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2948
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2949
  | | |  date:        Thu Jan 01 00:00:21 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2950
  | | |  summary:     (21) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2951
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2952
  +---o  changeset:   20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2953
  | | |  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2954
  | | ~  parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2955
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2956
  | |    date:        Thu Jan 01 00:00:20 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2957
  | |    summary:     (20) merge two known; two far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2958
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2959
  | o    changeset:   19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2960
  | |\   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2961
  | | |  parent:      17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2962
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2963
  | | |  date:        Thu Jan 01 00:00:19 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2964
  | | |  summary:     (19) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2965
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2966
  o | |  changeset:   18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2967
  |\| |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2968
  ~ | |  parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2969
    | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2970
    | |  date:        Thu Jan 01 00:00:18 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2971
    | |  summary:     (18) merge two known; two far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2972
   / /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2973
  | o    changeset:   17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2974
  | |\   parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2975
  | | |  parent:      16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2976
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2977
  | | |  date:        Thu Jan 01 00:00:17 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2978
  | | |  summary:     (17) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2979
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2980
  | | o    changeset:   16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2981
  | | |\   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2982
  | | ~ ~  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2983
  | |      user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2984
  | |      date:        Thu Jan 01 00:00:16 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2985
  | |      summary:     (16) merge two known; one immediate right, one near right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2986
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2987
  o |    changeset:   15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2988
  |\ \   parent:      13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2989
  | | |  parent:      14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2990
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2991
  | | |  date:        Thu Jan 01 00:00:15 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2992
  | | |  summary:     (15) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2993
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2994
  | o |  changeset:   14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2995
  | |\|  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2996
  | ~ |  parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2997
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2998
  |   |  date:        Thu Jan 01 00:00:14 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2999
  |   |  summary:     (14) merge two known; one immediate right, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3000
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3001
  o |    changeset:   13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3002
  |\ \   parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3003
  | | |  parent:      11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3004
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3005
  | | |  date:        Thu Jan 01 00:00:13 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3006
  | | |  summary:     (13) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3007
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3008
  +---o  changeset:   12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3009
  | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3010
  | | ~  parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3011
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3012
  | |    date:        Thu Jan 01 00:00:12 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3013
  | |    summary:     (12) merge two known; one immediate right, one far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3014
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3015
  | o    changeset:   11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3016
  | |\   parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3017
  | | |  parent:      10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3018
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3019
  | | |  date:        Thu Jan 01 00:00:11 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3020
  | | |  summary:     (11) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3021
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3022
  | | o  changeset:   10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3023
  | |/|  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3024
  | | ~  parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3025
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3026
  | |    date:        Thu Jan 01 00:00:10 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3027
  | |    summary:     (10) merge two known; one immediate left, one near right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3028
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3029
  o |    changeset:   9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3030
  |\ \   parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3031
  | | |  parent:      8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3032
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3033
  | | |  date:        Thu Jan 01 00:00:09 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3034
  | | |  summary:     (9) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3035
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3036
  | o |  changeset:   8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3037
  |/| |  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3038
  | ~ |  parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3039
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3040
  |   |  date:        Thu Jan 01 00:00:08 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3041
  |   |  summary:     (8) merge two known; one immediate left, one far right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3042
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3043
  o |    changeset:   7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3044
  |\ \   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3045
  | ~ |  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3046
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3047
  |   |  date:        Thu Jan 01 00:00:07 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3048
  |   |  summary:     (7) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3049
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3050
  | o  changeset:   6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3051
  |/|  parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3052
  | ~  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3053
  |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3054
  |    date:        Thu Jan 01 00:00:06 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3055
  |    summary:     (6) merge two known; one immediate left, one far left
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3056
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3057
  o    changeset:   5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3058
  |\   parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3059
  | ~  parent:      4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3060
  |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3061
  |    date:        Thu Jan 01 00:00:05 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3062
  |    summary:     (5) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3063
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3064
  o    changeset:   4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3065
  |\   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3066
  ~ ~  parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3067
       user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3068
       date:        Thu Jan 01 00:00:04 1970 +0000
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3069
       summary:     (4) merge two known; one immediate left, one immediate right
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3070
  
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3071
Draw only part of a grandparent line differently with "<N><char>"; only the
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3072
last N lines (for positive N) or everything but the first N lines (for
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3073
negative N) along the current node use the style, the rest of the edge uses
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3074
the parent edge styling.
28999
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3075
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3076
Last 3 lines:
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3077
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3078
  $ cat << EOF >> $HGRCPATH
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3079
  > [experimental]
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3080
  > graphstyle.parent = !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3081
  > graphstyle.grandparent = 3.
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3082
  > graphstyle.missing =
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3083
  > EOF
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3084
  $ hg log -G -r '36:18 & file("a")' -m
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3085
  @  changeset:   36:08a19a744424
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3086
  !  branch:      branch
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3087
  !  tag:         tip
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3088
  !  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3089
  !  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3090
  !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3091
  .  date:        Thu Jan 01 00:00:36 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3092
  .  summary:     (36) buggy merge: identical parents
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3093
  .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3094
  o    changeset:   32:d06dffa21a31
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3095
  !\   parent:      27:886ed638191b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3096
  ! !  parent:      31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3097
  ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3098
  ! .  date:        Thu Jan 01 00:00:32 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3099
  ! .  summary:     (32) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3100
  ! .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3101
  o !  changeset:   31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3102
  !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3103
  ! !  parent:      30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3104
  ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3105
  ! !  date:        Thu Jan 01 00:00:31 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3106
  ! !  summary:     (31) expand
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3107
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3108
  o !    changeset:   30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3109
  !\ \   parent:      28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3110
  ! ~ !  parent:      29:cd9bb2be7593
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3111
  !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3112
  !   !  date:        Thu Jan 01 00:00:30 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3113
  !   !  summary:     (30) expand
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3114
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3115
  o !    changeset:   28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3116
  !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3117
  ! ~ !  parent:      26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3118
  !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3119
  !   !  date:        Thu Jan 01 00:00:28 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3120
  !   !  summary:     (28) merge zero known
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3121
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3122
  o !    changeset:   26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3123
  !\ \   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3124
  ! ! !  parent:      25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3125
  ! ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3126
  ! ! !  date:        Thu Jan 01 00:00:26 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3127
  ! ! !  summary:     (26) merge one known; far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3128
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3129
  ! o !  changeset:   25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3130
  ! !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3131
  ! ! !  parent:      24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3132
  ! ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3133
  ! ! !  date:        Thu Jan 01 00:00:25 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3134
  ! ! !  summary:     (25) merge one known; far left
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3135
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3136
  ! o !    changeset:   24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3137
  ! !\ \   parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3138
  ! ! ~ !  parent:      23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3139
  ! !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3140
  ! !   !  date:        Thu Jan 01 00:00:24 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3141
  ! !   !  summary:     (24) merge one known; immediate right
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3142
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3143
  ! o !    changeset:   23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3144
  ! !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3145
  ! ! ~ !  parent:      22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3146
  ! !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3147
  ! !   !  date:        Thu Jan 01 00:00:23 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3148
  ! !   !  summary:     (23) merge one known; immediate left
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3149
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3150
  ! o !  changeset:   22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3151
  !/!/   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3152
  ! !    parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3153
  ! !    user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3154
  ! !    date:        Thu Jan 01 00:00:22 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3155
  ! !    summary:     (22) merge two known; one far left, one far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3156
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3157
  ! o    changeset:   21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3158
  ! !\   parent:      19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3159
  ! ! !  parent:      20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3160
  ! ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3161
  ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3162
  ! ! !  summary:     (21) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3163
  ! ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3164
  +---o  changeset:   20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3165
  ! ! |  parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3166
  ! ! ~  parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3167
  ! !    user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3168
  ! !    date:        Thu Jan 01 00:00:20 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3169
  ! !    summary:     (20) merge two known; two far right
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3170
  ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3171
  ! o    changeset:   19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3172
  ! |\   parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3173
  ! ~ ~  parent:      17:44765d7c06e0
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3174
  !      user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3175
  !      date:        Thu Jan 01 00:00:19 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3176
  !      summary:     (19) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3177
  !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3178
  o    changeset:   18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3179
  |\   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3180
  ~ ~  parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3181
       user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3182
       date:        Thu Jan 01 00:00:18 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3183
       summary:     (18) merge two known; two far left
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3184
  
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3185
All but the first 3 lines:
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3186
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3187
  $ cat << EOF >> $HGRCPATH
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3188
  > [experimental]
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3189
  > graphstyle.parent = !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3190
  > graphstyle.grandparent = -3.
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3191
  > graphstyle.missing =
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3192
  > EOF
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3193
  $ hg log -G -r '36:18 & file("a")' -m
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3194
  @  changeset:   36:08a19a744424
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3195
  !  branch:      branch
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3196
  !  tag:         tip
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3197
  .  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3198
  .  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3199
  .  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3200
  .  date:        Thu Jan 01 00:00:36 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3201
  .  summary:     (36) buggy merge: identical parents
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3202
  .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3203
  o    changeset:   32:d06dffa21a31
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3204
  !\   parent:      27:886ed638191b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3205
  ! !  parent:      31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3206
  ! .  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3207
  ! .  date:        Thu Jan 01 00:00:32 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3208
  ! .  summary:     (32) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3209
  ! .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3210
  o !  changeset:   31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3211
  !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3212
  ! !  parent:      30:6e11cd4b648f
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3213
  ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3214
  ! !  date:        Thu Jan 01 00:00:31 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3215
  ! !  summary:     (31) expand
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3216
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3217
  o !    changeset:   30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3218
  !\ \   parent:      28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3219
  ! ~ !  parent:      29:cd9bb2be7593
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3220
  !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3221
  !   !  date:        Thu Jan 01 00:00:30 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3222
  !   !  summary:     (30) expand
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3223
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3224
  o !    changeset:   28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3225
  !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3226
  ! ~ !  parent:      26:7f25b6c2f0b9
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3227
  !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3228
  !   !  date:        Thu Jan 01 00:00:28 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3229
  !   !  summary:     (28) merge zero known
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3230
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3231
  o !    changeset:   26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3232
  !\ \   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3233
  ! ! !  parent:      25:91da8ed57247
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3234
  ! ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3235
  ! ! !  date:        Thu Jan 01 00:00:26 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3236
  ! ! !  summary:     (26) merge one known; far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3237
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3238
  ! o !  changeset:   25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3239
  ! !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3240
  ! ! !  parent:      24:a9c19a3d96b7
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3241
  ! ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3242
  ! ! !  date:        Thu Jan 01 00:00:25 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3243
  ! ! !  summary:     (25) merge one known; far left
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3244
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3245
  ! o !    changeset:   24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3246
  ! !\ \   parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3247
  ! ! ~ !  parent:      23:a01cddf0766d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3248
  ! !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3249
  ! !   !  date:        Thu Jan 01 00:00:24 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3250
  ! !   !  summary:     (24) merge one known; immediate right
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3251
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3252
  ! o !    changeset:   23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3253
  ! !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3254
  ! ! ~ !  parent:      22:e0d9cccacb5d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3255
  ! !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3256
  ! !   !  date:        Thu Jan 01 00:00:23 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3257
  ! !   !  summary:     (23) merge one known; immediate left
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3258
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3259
  ! o !  changeset:   22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3260
  !/!/   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3261
  ! !    parent:      21:d42a756af44d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3262
  ! !    user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3263
  ! !    date:        Thu Jan 01 00:00:22 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3264
  ! !    summary:     (22) merge two known; one far left, one far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3265
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3266
  ! o    changeset:   21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3267
  ! !\   parent:      19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3268
  ! ! !  parent:      20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3269
  ! ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3270
  ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3271
  ! ! !  summary:     (21) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3272
  ! ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3273
  +---o  changeset:   20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3274
  ! ! |  parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3275
  ! ! ~  parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3276
  ! !    user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3277
  ! !    date:        Thu Jan 01 00:00:20 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3278
  ! !    summary:     (20) merge two known; two far right
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3279
  ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3280
  ! o    changeset:   19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3281
  ! |\   parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3282
  ! ~ ~  parent:      17:44765d7c06e0
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3283
  !      user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3284
  !      date:        Thu Jan 01 00:00:19 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3285
  !      summary:     (19) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3286
  !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3287
  o    changeset:   18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3288
  |\   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3289
  ~ ~  parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3290
       user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3291
       date:        Thu Jan 01 00:00:18 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3292
       summary:     (18) merge two known; two far left
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3293
  
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  3294
  $ cd ..
28891
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3295
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3296
Change graph shorten, test better with graphstyle.missing not none
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3297
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3298
  $ cd repo
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3299
  $ cat << EOF >> $HGRCPATH
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3300
  > [experimental]
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3301
  > graphstyle.parent = |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3302
  > graphstyle.grandparent = :
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3303
  > graphstyle.missing = '
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3304
  > graphshorten = true
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3305
  > EOF
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3306
  $ hg log -G -r 'file("a")' -m -T '{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3307
  @  36 (36) buggy merge: identical parents
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3308
  o    32 (32) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3309
  |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3310
  o :  31 (31) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3311
  |\:
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3312
  o :    30 (30) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3313
  |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3314
  o \ \    28 (28) merge zero known
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3315
  |\ \ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3316
  o \ \ \    26 (26) merge one known; far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3317
  |\ \ \ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3318
  | o-----+  25 (25) merge one known; far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3319
  | o ' ' :    24 (24) merge one known; immediate right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3320
  | |\ \ \ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3321
  | o---+ ' :  23 (23) merge one known; immediate left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3322
  | o-------+  22 (22) merge two known; one far left, one far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3323
  |/ / / / /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3324
  | ' ' ' o    21 (21) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3325
  | ' ' ' |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3326
  +-+-------o  20 (20) merge two known; two far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3327
  | ' ' ' o    19 (19) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3328
  | ' ' ' |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3329
  o---+---+ |  18 (18) merge two known; two far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3330
   / / / / /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3331
  ' ' ' | o    17 (17) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3332
  ' ' ' | |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3333
  +-+-------o  16 (16) merge two known; one immediate right, one near right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3334
  ' ' ' o |    15 (15) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3335
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3336
  +-------o |  14 (14) merge two known; one immediate right, one far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3337
  ' ' ' | |/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3338
  ' ' ' o |    13 (13) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3339
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3340
  ' +---+---o  12 (12) merge two known; one immediate right, one far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3341
  ' ' ' | o    11 (11) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3342
  ' ' ' | |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3343
  +---------o  10 (10) merge two known; one immediate left, one near right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3344
  ' ' ' | |/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3345
  ' ' ' o |    9 (9) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3346
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3347
  +-------o |  8 (8) merge two known; one immediate left, one far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3348
  ' ' ' |/ /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3349
  ' ' ' o |    7 (7) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3350
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3351
  ' ' ' +---o  6 (6) merge two known; one immediate left, one far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3352
  ' ' ' | '/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3353
  ' ' ' o '    5 (5) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3354
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3355
  ' +---o ' '  4 (4) merge two known; one immediate left, one immediate right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3356
  ' ' ' '/ /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3357
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3358
behavior with newlines
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3359
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3360
  $ hg log -G -r ::2 -T '{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3361
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3362
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3363
  o  0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3364
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3365
  $ hg log -G -r ::2 -T '{rev} {desc}\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3366
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3367
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3368
  o  0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3369
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3370
  $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3371
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3372
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3373
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3374
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3375
  o  0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3376
  
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3377
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3378
  $ hg log -G -r ::2 -T '\n{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3379
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3380
  |  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3381
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3382
  |  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3383
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3384
     0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3385
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3386
  $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3387
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3388
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3389
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3390
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3391
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3392
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3393
  o  0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3394
  
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3395
  
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3396
  $ cd ..
28998
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3397
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3398
When inserting extra line nodes to handle more than 2 parents, ensure that
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3399
the right node styles are used (issue5174):
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3400
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3401
  $ hg init repo-issue5174
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3402
  $ cd repo-issue5174
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3403
  $ echo a > f0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3404
  $ hg ci -Aqm 0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3405
  $ echo a > f1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3406
  $ hg ci -Aqm 1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3407
  $ echo a > f2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3408
  $ hg ci -Aqm 2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3409
  $ hg co ".^"
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3410
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3411
  $ echo a > f3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3412
  $ hg ci -Aqm 3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3413
  $ hg co ".^^"
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3414
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3415
  $ echo a > f4
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3416
  $ hg ci -Aqm 4
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3417
  $ hg merge -r 2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3418
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3419
  (branch merge, don't forget to commit)
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3420
  $ hg ci -qm 5
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3421
  $ hg merge -r 3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3422
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3423
  (branch merge, don't forget to commit)
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3424
  $ hg ci -qm 6
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3425
  $ hg log -G -r '0 | 1 | 2 | 6'
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3426
  @    changeset:   6:851fe89689ad
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3427
  :\   tag:         tip
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3428
  : :  parent:      5:4f1e3cf15f5d
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3429
  : :  parent:      3:b74ba7084d2d
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3430
  : :  user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3431
  : :  date:        Thu Jan 01 00:00:00 1970 +0000
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3432
  : :  summary:     6
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3433
  : :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3434
  : \
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3435
  : :\
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3436
  : o :  changeset:   2:3e6599df4cce
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3437
  : :/   user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3438
  : :    date:        Thu Jan 01 00:00:00 1970 +0000
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3439
  : :    summary:     2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3440
  : :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3441
  : o  changeset:   1:bd9a55143933
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3442
  :/   user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3443
  :    date:        Thu Jan 01 00:00:00 1970 +0000
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3444
  :    summary:     1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3445
  :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3446
  o  changeset:   0:870a5edc339c
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3447
     user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3448
     date:        Thu Jan 01 00:00:00 1970 +0000
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3449
     summary:     0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3450
  
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3451
31558
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3452
  $ cd ..
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3453
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3454
Multiple roots (issue5440):
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3455
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3456
  $ hg init multiroots
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3457
  $ cd multiroots
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3458
  $ cat <<EOF > .hg/hgrc
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3459
  > [ui]
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3460
  > logtemplate = '{rev} {desc}\n\n'
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3461
  > EOF
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3462
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3463
  $ touch foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3464
  $ hg ci -Aqm foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3465
  $ hg co -q null
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3466
  $ touch bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3467
  $ hg ci -Aqm bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3468
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3469
  $ hg log -Gr null:
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3470
  @  1 bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3471
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3472
  | o  0 foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3473
  |/
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3474
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3475
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3476
  $ hg log -Gr null+0
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3477
  o  0 foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3478
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3479
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3480
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3481
  $ hg log -Gr null+1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3482
  @  1 bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3483
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3484
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3485
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3486
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31044
diff changeset
  3487
  $ cd ..