tests/test-glog.t
author Pulkit Goyal <7895pulkit@gmail.com>
Fri, 02 Jun 2017 16:57:21 +0530
changeset 32753 264b86cf2092
parent 32462 bb18728ea617
child 33542 b11e8c67fb0f
permissions -rw-r--r--
py3: convert bool variables to bytes
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
31024
0b8356705de6 revset: split language services to revsetlang module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 29929
diff changeset
    85
  > from mercurial import extensions, revsetlang, commands, cmdutil
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 17207
diff changeset
    86
  > 
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    87
  > def uisetup(ui):
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    88
  >     def printrevset(orig, ui, repo, *pats, **opts):
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    89
  >         if opts.get('print_revset'):
17180
ae0629161090 graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents: 17120
diff changeset
    90
  >             expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1]
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
    91
  >             if expr:
31024
0b8356705de6 revset: split language services to revsetlang module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 29929
diff changeset
    92
  >                 tree = revsetlang.parse(expr)
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
    93
  >             else:
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
    94
  >                 tree = []
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
    95
  >             ui.write('%r\n' % (opts.get('rev', []),))
31024
0b8356705de6 revset: split language services to revsetlang module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 29929
diff changeset
    96
  >             ui.write(revsetlang.prettyformat(tree) + '\n')
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    97
  >             return 0
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    98
  >         return orig(ui, repo, *pats, **opts)
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
    99
  >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   100
  >     entry[1].append(('', 'print-revset', False,
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   101
  >                      'print generated revset and exit (DEPRECATED)'))
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   102
  > EOF
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   103
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   104
  $ echo "[extensions]" >> $HGRCPATH
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
   105
  $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   106
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   107
  $ hg init repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   108
  $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   109
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   110
Empty repo:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   111
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   112
  $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   113
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   114
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   115
Building DAG:
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   116
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   117
  $ commit 0 "root"
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   118
  $ commit 1 "collapse" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   119
  $ commit 2 "collapse" 1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   120
  $ commit 3 "collapse" 2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   121
  $ 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
   122
  $ commit 5 "expand" 3 4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   123
  $ 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
   124
  $ commit 7 "expand" 2 5
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   125
  $ 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
   126
  $ commit 9 "expand" 7 8
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   127
  $ 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
   128
  $ commit 11 "expand" 6 10
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   129
  $ 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
   130
  $ commit 13 "expand" 9 11
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   131
  $ 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
   132
  $ commit 15 "expand" 13 14
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   133
  $ 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
   134
  $ commit 17 "expand" 12 16
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   135
  $ commit 18 "merge two known; two far left" 1 15
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   136
  $ commit 19 "expand" 15 17
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   137
  $ commit 20 "merge two known; two far right" 0 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   138
  $ commit 21 "expand" 19 20
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   139
  $ 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
   140
  $ commit 23 "merge one known; immediate left" 1 22
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   141
  $ commit 24 "merge one known; immediate right" 0 23
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   142
  $ commit 25 "merge one known; far left" 21 24
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   143
  $ commit 26 "merge one known; far right" 18 25
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   144
  $ commit 27 "collapse" 21
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   145
  $ commit 28 "merge zero known" 1 26
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   146
  $ commit 29 "regular commit" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   147
  $ commit 30 "expand" 28 29
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   148
  $ commit 31 "expand" 21 30
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   149
  $ commit 32 "expand" 27 31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   150
  $ commit 33 "head" 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   151
  $ commit 34 "head" 32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   152
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   153
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   154
  $ hg log -G -q
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   155
  @  34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   156
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   157
  | o  33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   158
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   159
  o |    32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   160
  |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   161
  | o \    31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   162
  | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   163
  | | o \    30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   164
  | | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   165
  | | | o |  29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   166
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   167
  | | o | |    28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   168
  | | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   169
  o | | | | |  27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   170
  |/ / / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   171
  | | o---+  26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   172
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   173
  +---o | |  25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   174
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   175
  | | o | |  24:a9c19a3d96b7
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 | |  23:a01cddf0766d
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---+  22:e0d9cccacb5d
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 | | |    21:d42a756af44d
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---+-+  20:d30ed6450e32
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 | | |    19:31ddc2c1573b
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  18:1aa84d96232a
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 | |    17:44765d7c06e0
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---+  16:3677d192927d
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 | | |    15:1dda3f72782d
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-----+  14:8eac370358ef
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 | | |    13:22d8966a97e3
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 | |  12:86b91144a6e9
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 | |    11:832d76e6bdf2
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---+  10:74c64d036d72
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 | | |    9:7010c0af0a35
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-----+  8:7a0b11f71937
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 | | |    7:b632bb1b1224
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 | |  6:b105a072e251
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 | |    5:4409d547b708
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 | |  4:26a8bac39d9f
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 / /  3:27eef8ed80b4
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 / /  2:3d9a33b8d1e1
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 /  1:6db2ef61d156
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  0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   224
  
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
   225
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   226
  $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   227
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   228
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   229
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   230
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   231
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   232
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   233
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   234
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   235
  | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   236
  | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   237
  | |  date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   238
  | |  summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   239
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   240
  o |    changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   241
  |\ \   parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   242
  | | |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   243
  | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   244
  | | |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   245
  | | |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   246
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   247
  | o |    changeset:   31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   248
  | |\ \   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   249
  | | | |  parent:      30:6e11cd4b648f
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:31 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   252
  | | | |  summary:     (31) expand
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:   30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   255
  | | |\ \   parent:      28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   256
  | | | | |  parent:      29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   257
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   258
  | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   259
  | | | | |  summary:     (30) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   260
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   261
  | | | o |  changeset:   29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   262
  | | | | |  parent:      0:e6eb3150255d
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:29 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   265
  | | | | |  summary:     (29) regular commit
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:   28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   268
  | | |\ \ \   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   269
  | | | | | |  parent:      26:7f25b6c2f0b9
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:28 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   272
  | | | | | |  summary:     (28) merge zero known
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:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   275
  |/ / / / /   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   276
  | | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   277
  | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   278
  | | | | |    summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   279
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   280
  | | o---+  changeset:   26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   281
  | | | | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   282
  | | | | |  parent:      25:91da8ed57247
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:26 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   285
  | | | | |  summary:     (26) merge one known; far right
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:   25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   288
  | | | | |  parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   289
  | | | | |  parent:      24:a9c19a3d96b7
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:25 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   292
  | | | | |  summary:     (25) merge one known; far left
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:   24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   295
  | | |\| |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   296
  | | | | |  parent:      23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   297
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   298
  | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   299
  | | | | |  summary:     (24) merge one known; immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   300
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   301
  | | o | |  changeset:   23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   302
  | |/| | |  parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   303
  | | | | |  parent:      22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   304
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   305
  | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   306
  | | | | |  summary:     (23) merge one known; immediate left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   307
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   308
  +---o---+  changeset:   22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   309
  | |   | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   310
  | |  / /   parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   311
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   312
  | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   313
  | | | |    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
   314
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   315
  o | | |    changeset:   21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   316
  |\ \ \ \   parent:      19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   317
  | | | | |  parent:      20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   318
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   319
  | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   320
  | | | | |  summary:     (21) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   321
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   322
  | o---+-+  changeset:   20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   323
  |   | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   324
  |  / / /   parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   325
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   326
  | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   327
  | | | |    summary:     (20) merge two known; two far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   328
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   329
  o | | |    changeset:   19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   330
  |\ \ \ \   parent:      15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   331
  | | | | |  parent:      17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   332
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   333
  | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   334
  | | | | |  summary:     (19) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   335
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   336
  +---+---o  changeset:   18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   337
  | | | |    parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   338
  | | | |    parent:      15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   339
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   340
  | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   341
  | | | |    summary:     (18) merge two known; two far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   342
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   343
  | o | |    changeset:   17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   344
  | |\ \ \   parent:      12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   345
  | | | | |  parent:      16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   346
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   347
  | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   348
  | | | | |  summary:     (17) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   349
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   350
  | | o---+  changeset:   16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   351
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   352
  | | |/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   353
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   354
  | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   355
  | | | |    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
   356
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   357
  o | | |    changeset:   15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   358
  |\ \ \ \   parent:      13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   359
  | | | | |  parent:      14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   360
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   361
  | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   362
  | | | | |  summary:     (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   363
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   364
  | o-----+  changeset:   14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   365
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   366
  | |/ / /   parent:      12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   367
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   368
  | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   369
  | | | |    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
   370
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   371
  o | | |    changeset:   13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   372
  |\ \ \ \   parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   373
  | | | | |  parent:      11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   374
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   375
  | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   376
  | | | | |  summary:     (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   377
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   378
  +---o | |  changeset:   12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   379
  | | |/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   380
  | | | |    parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   381
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   382
  | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   383
  | | | |    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
   384
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   385
  | o | |    changeset:   11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   386
  | |\ \ \   parent:      6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   387
  | | | | |  parent:      10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   388
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   389
  | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   390
  | | | | |  summary:     (11) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   391
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   392
  | | o---+  changeset:   10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   393
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   394
  | |/ / /   parent:      6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   395
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   396
  | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   397
  | | | |    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
   398
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   399
  o | | |    changeset:   9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   400
  |\ \ \ \   parent:      7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   401
  | | | | |  parent:      8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   402
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   403
  | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   404
  | | | | |  summary:     (9) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   405
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   406
  | o-----+  changeset:   8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   407
  | | | | |  parent:      0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   408
  |/ / / /   parent:      7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   409
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   410
  | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   411
  | | | |    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
   412
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   413
  o | | |    changeset:   7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   414
  |\ \ \ \   parent:      2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   415
  | | | | |  parent:      5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   416
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   417
  | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   418
  | | | | |  summary:     (7) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   419
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   420
  +---o | |  changeset:   6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   421
  | |/ / /   parent:      2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   422
  | | | |    parent:      5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   423
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   424
  | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   425
  | | | |    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
   426
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   427
  | o | |    changeset:   5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   428
  | |\ \ \   parent:      3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   429
  | | | | |  parent:      4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   430
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   431
  | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   432
  | | | | |  summary:     (5) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   433
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   434
  | | o | |  changeset:   4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   435
  | |/|/ /   parent:      1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   436
  | | | |    parent:      3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   437
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   438
  | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   439
  | | | |    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
   440
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   441
  | o | |  changeset:   3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   442
  |/ / /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   443
  | | |    date:        Thu Jan 01 00:00:03 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   444
  | | |    summary:     (3) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   445
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   446
  o | |  changeset:   2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   447
  |/ /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   448
  | |    date:        Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   449
  | |    summary:     (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   450
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   451
  o |  changeset:   1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   452
  |/   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   453
  |    date:        Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   454
  |    summary:     (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   455
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   456
  o  changeset:   0:e6eb3150255d
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:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   459
     summary:     (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   460
  
5939
56e8a54bf71d graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents: 4735
diff changeset
   461
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   462
File glog:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   463
  $ hg log -G a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   464
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   465
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   466
  |  parent:      32:d06dffa21a31
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:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   469
  |  summary:     (34) head
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:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   472
  | |  parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   473
  | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   474
  | |  date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   475
  | |  summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   476
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   477
  o |    changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   478
  |\ \   parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   479
  | | |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   480
  | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   481
  | | |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   482
  | | |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   483
  | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   484
  | o |    changeset:   31:621d83e11f67
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   485
  | |\ \   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   486
  | | | |  parent:      30:6e11cd4b648f
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   487
  | | | |  user:        test
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   488
  | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   489
  | | | |  summary:     (31) expand
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   490
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   491
  | | o |    changeset:   30:6e11cd4b648f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   492
  | | |\ \   parent:      28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   493
  | | | | |  parent:      29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   494
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   495
  | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   496
  | | | | |  summary:     (30) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   497
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   498
  | | | o |  changeset:   29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   499
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   500
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   501
  | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   502
  | | | | |  summary:     (29) regular commit
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   503
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   504
  | | o | |    changeset:   28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   505
  | | |\ \ \   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   506
  | | | | | |  parent:      26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   507
  | | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   508
  | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   509
  | | | | | |  summary:     (28) merge zero known
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   510
  | | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   511
  o | | | | |  changeset:   27:886ed638191b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   512
  |/ / / / /   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   513
  | | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   514
  | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   515
  | | | | |    summary:     (27) collapse
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   516
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   517
  | | o---+  changeset:   26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   518
  | | | | |  parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   519
  | | | | |  parent:      25:91da8ed57247
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:26 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   522
  | | | | |  summary:     (26) merge one known; far right
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:   25:91da8ed57247
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   525
  | | | | |  parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   526
  | | | | |  parent:      24:a9c19a3d96b7
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:25 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   529
  | | | | |  summary:     (25) merge one known; far left
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:   24:a9c19a3d96b7
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   532
  | | |\| |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   533
  | | | | |  parent:      23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   534
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   535
  | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   536
  | | | | |  summary:     (24) merge one known; immediate right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   537
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   538
  | | o | |  changeset:   23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   539
  | |/| | |  parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   540
  | | | | |  parent:      22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   541
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   542
  | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   543
  | | | | |  summary:     (23) merge one known; immediate left
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   544
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   545
  +---o---+  changeset:   22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   546
  | |   | |  parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   547
  | |  / /   parent:      21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   548
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   549
  | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   550
  | | | |    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
   551
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   552
  o | | |    changeset:   21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   553
  |\ \ \ \   parent:      19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   554
  | | | | |  parent:      20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   555
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   556
  | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   557
  | | | | |  summary:     (21) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   558
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   559
  | o---+-+  changeset:   20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   560
  |   | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   561
  |  / / /   parent:      18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   562
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   563
  | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   564
  | | | |    summary:     (20) merge two known; two far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   565
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   566
  o | | |    changeset:   19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   567
  |\ \ \ \   parent:      15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   568
  | | | | |  parent:      17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   569
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   570
  | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   571
  | | | | |  summary:     (19) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   572
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   573
  +---+---o  changeset:   18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   574
  | | | |    parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   575
  | | | |    parent:      15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   576
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   577
  | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   578
  | | | |    summary:     (18) merge two known; two far left
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   579
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   580
  | o | |    changeset:   17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   581
  | |\ \ \   parent:      12:86b91144a6e9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   582
  | | | | |  parent:      16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   583
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   584
  | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   585
  | | | | |  summary:     (17) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   586
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   587
  | | o---+  changeset:   16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   588
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   589
  | | |/ /   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   590
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   591
  | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   592
  | | | |    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
   593
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   594
  o | | |    changeset:   15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   595
  |\ \ \ \   parent:      13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   596
  | | | | |  parent:      14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   597
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   598
  | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   599
  | | | | |  summary:     (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   600
  | | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   601
  | o-----+  changeset:   14:8eac370358ef
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   602
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   603
  | |/ / /   parent:      12:86b91144a6e9
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   604
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   605
  | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   606
  | | | |    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
   607
  | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   608
  o | | |    changeset:   13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   609
  |\ \ \ \   parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   610
  | | | | |  parent:      11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   611
  | | | | |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   612
  | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   613
  | | | | |  summary:     (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   614
  | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   615
  +---o | |  changeset:   12:86b91144a6e9
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   616
  | | |/ /   parent:      1:6db2ef61d156
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   617
  | | | |    parent:      9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   618
  | | | |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   619
  | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   620
  | | | |    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
   621
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   622
  | o | |    changeset:   11:832d76e6bdf2
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   623
  | |\ \ \   parent:      6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   624
  | | | | |  parent:      10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   625
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   626
  | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   627
  | | | | |  summary:     (11) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   628
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   629
  | | o---+  changeset:   10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   630
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   631
  | |/ / /   parent:      6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   632
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   633
  | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   634
  | | | |    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
   635
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   636
  o | | |    changeset:   9:7010c0af0a35
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   637
  |\ \ \ \   parent:      7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   638
  | | | | |  parent:      8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   639
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   640
  | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   641
  | | | | |  summary:     (9) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   642
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   643
  | o-----+  changeset:   8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   644
  | | | | |  parent:      0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   645
  |/ / / /   parent:      7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   646
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   647
  | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   648
  | | | |    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
   649
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   650
  o | | |    changeset:   7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   651
  |\ \ \ \   parent:      2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   652
  | | | | |  parent:      5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   653
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   654
  | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   655
  | | | | |  summary:     (7) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   656
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   657
  +---o | |  changeset:   6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   658
  | |/ / /   parent:      2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   659
  | | | |    parent:      5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   660
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   661
  | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   662
  | | | |    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
   663
  | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   664
  | o | |    changeset:   5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   665
  | |\ \ \   parent:      3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   666
  | | | | |  parent:      4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   667
  | | | | |  user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   668
  | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   669
  | | | | |  summary:     (5) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   670
  | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   671
  | | o | |  changeset:   4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   672
  | |/|/ /   parent:      1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   673
  | | | |    parent:      3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   674
  | | | |    user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   675
  | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   676
  | | | |    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
   677
  | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   678
  | o | |  changeset:   3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   679
  |/ / /   user:        test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   680
  | | |    date:        Thu Jan 01 00:00:03 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
   681
  | | |    summary:     (3) collapse
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   682
  | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   683
  o | |  changeset:   2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   684
  |/ /   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   685
  | |    date:        Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   686
  | |    summary:     (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   687
  | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   688
  o |  changeset:   1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   689
  |/   user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   690
  |    date:        Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   691
  |    summary:     (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   692
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   693
  o  changeset:   0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   694
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   695
     date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   696
     summary:     (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   697
  
7383
b501c7f3c2ad graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6969
diff changeset
   698
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   699
File glog per revset:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   700
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
   701
  $ 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
   702
  @  changeset:   34:fea3ac5810e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   703
  |  tag:         tip
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   704
  |  parent:      32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   705
  |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   706
  |  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
   707
  |  summary:     (34) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   708
  |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   709
  | o  changeset:   33:68608f5145f9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   710
  | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   711
  | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   712
  | |  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
   713
  | |  summary:     (33) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   714
  | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   715
  o |    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   716
  |\ \   parent:      27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   717
  | | |  parent:      31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   718
  | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   719
  | | |  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
   720
  | | |  summary:     (32) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   721
  | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   722
  | o |    changeset:   31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   723
  | |\ \   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   724
  | | | |  parent:      30:6e11cd4b648f
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:31 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   727
  | | | |  summary:     (31) expand
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:   30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   730
  | | |\ \   parent:      28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   731
  | | | | |  parent:      29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   732
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   733
  | | | | |  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
   734
  | | | | |  summary:     (30) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   735
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   736
  | | | o |  changeset:   29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   737
  | | | | |  parent:      0:e6eb3150255d
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:29 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   740
  | | | | |  summary:     (29) regular commit
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:   28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   743
  | | |\ \ \   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   744
  | | | | | |  parent:      26:7f25b6c2f0b9
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:28 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   747
  | | | | | |  summary:     (28) merge zero known
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:   27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   750
  |/ / / / /   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   751
  | | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   752
  | | | | |    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
   753
  | | | | |    summary:     (27) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   754
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   755
  | | o---+  changeset:   26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   756
  | | | | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   757
  | | | | |  parent:      25:91da8ed57247
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:26 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   760
  | | | | |  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
   761
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   762
  +---o | |  changeset:   25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   763
  | | | | |  parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   764
  | | | | |  parent:      24:a9c19a3d96b7
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:25 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   767
  | | | | |  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
   768
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   769
  | | o | |  changeset:   24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   770
  | | |\| |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   771
  | | | | |  parent:      23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   772
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   773
  | | | | |  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
   774
  | | | | |  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
   775
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   776
  | | o | |  changeset:   23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   777
  | |/| | |  parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   778
  | | | | |  parent:      22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   779
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   780
  | | | | |  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
   781
  | | | | |  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
   782
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   783
  +---o---+  changeset:   22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   784
  | |   | |  parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   785
  | |  / /   parent:      21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   786
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   787
  | | | |    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
   788
  | | | |    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
   789
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   790
  o | | |    changeset:   21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   791
  |\ \ \ \   parent:      19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   792
  | | | | |  parent:      20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   793
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   794
  | | | | |  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
   795
  | | | | |  summary:     (21) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   796
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   797
  | o---+-+  changeset:   20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   798
  |   | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   799
  |  / / /   parent:      18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   800
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   801
  | | | |    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
   802
  | | | |    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
   803
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   804
  o | | |    changeset:   19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   805
  |\ \ \ \   parent:      15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   806
  | | | | |  parent:      17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   807
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   808
  | | | | |  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
   809
  | | | | |  summary:     (19) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   810
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   811
  +---+---o  changeset:   18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   812
  | | | |    parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   813
  | | | |    parent:      15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   814
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   815
  | | | |    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
   816
  | | | |    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
   817
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   818
  | o | |    changeset:   17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   819
  | |\ \ \   parent:      12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   820
  | | | | |  parent:      16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   821
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   822
  | | | | |  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
   823
  | | | | |  summary:     (17) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   824
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   825
  | | o---+  changeset:   16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   826
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   827
  | | |/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   828
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   829
  | | | |    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
   830
  | | | |    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
   831
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   832
  o | | |    changeset:   15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   833
  |\ \ \ \   parent:      13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   834
  | | | | |  parent:      14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   835
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   836
  | | | | |  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
   837
  | | | | |  summary:     (15) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   838
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   839
  | o-----+  changeset:   14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   840
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   841
  | |/ / /   parent:      12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   842
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   843
  | | | |    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
   844
  | | | |    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
   845
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   846
  o | | |    changeset:   13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   847
  |\ \ \ \   parent:      9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   848
  | | | | |  parent:      11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   849
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   850
  | | | | |  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
   851
  | | | | |  summary:     (13) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   852
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   853
  +---o | |  changeset:   12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   854
  | | |/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   855
  | | | |    parent:      9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   856
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   857
  | | | |    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
   858
  | | | |    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
   859
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   860
  | o | |    changeset:   11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   861
  | |\ \ \   parent:      6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   862
  | | | | |  parent:      10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   863
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   864
  | | | | |  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
   865
  | | | | |  summary:     (11) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   866
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   867
  | | o---+  changeset:   10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   868
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   869
  | |/ / /   parent:      6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   870
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   871
  | | | |    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
   872
  | | | |    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
   873
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   874
  o | | |    changeset:   9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   875
  |\ \ \ \   parent:      7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   876
  | | | | |  parent:      8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   877
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   878
  | | | | |  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
   879
  | | | | |  summary:     (9) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   880
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   881
  | o-----+  changeset:   8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   882
  | | | | |  parent:      0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   883
  |/ / / /   parent:      7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   884
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   885
  | | | |    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
   886
  | | | |    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
   887
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   888
  o | | |    changeset:   7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   889
  |\ \ \ \   parent:      2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   890
  | | | | |  parent:      5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   891
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   892
  | | | | |  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
   893
  | | | | |  summary:     (7) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   894
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   895
  +---o | |  changeset:   6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   896
  | |/ / /   parent:      2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   897
  | | | |    parent:      5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   898
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   899
  | | | |    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
   900
  | | | |    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
   901
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   902
  | o | |    changeset:   5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   903
  | |\ \ \   parent:      3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   904
  | | | | |  parent:      4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   905
  | | | | |  user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   906
  | | | | |  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
   907
  | | | | |  summary:     (5) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   908
  | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   909
  | | o | |  changeset:   4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   910
  | |/|/ /   parent:      1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   911
  | | | |    parent:      3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   912
  | | | |    user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   913
  | | | |    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
   914
  | | | |    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
   915
  | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   916
  | o | |  changeset:   3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   917
  |/ / /   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   918
  | | |    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
   919
  | | |    summary:     (3) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   920
  | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   921
  o | |  changeset:   2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   922
  |/ /   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   923
  | |    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
   924
  | |    summary:     (2) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   925
  | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   926
  o |  changeset:   1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   927
  |/   user:        test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   928
  |    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
   929
  |    summary:     (1) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   930
  |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   931
  o  changeset:   0:e6eb3150255d
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:00 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   934
     summary:     (0) root
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   935
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   936
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   938
File glog per revset (only merges):
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
   939
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   940
  $ 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
   941
  o    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
   942
  |\   parent:      27:886ed638191b
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   943
  | :  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   944
  | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   945
  | :  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
   946
  | :  summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   947
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   948
  o :  changeset:   31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   949
  |\:  parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   950
  | :  parent:      30:6e11cd4b648f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   951
  | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   952
  | :  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
   953
  | :  summary:     (31) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   954
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   955
  o :    changeset:   30:6e11cd4b648f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   956
  |\ \   parent:      28:44ecd0b9ae99
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   957
  | ~ :  parent:      29:cd9bb2be7593
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   958
  |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   959
  |   :  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
   960
  |   :  summary:     (30) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   961
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   962
  o :    changeset:   28:44ecd0b9ae99
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   963
  |\ \   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   964
  | ~ :  parent:      26:7f25b6c2f0b9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   965
  |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   966
  |   :  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
   967
  |   :  summary:     (28) merge zero known
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   968
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   969
  o :    changeset:   26:7f25b6c2f0b9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   970
  |\ \   parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   971
  | | :  parent:      25:91da8ed57247
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   972
  | | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   973
  | | :  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
   974
  | | :  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
   975
  | | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   976
  | o :  changeset:   25:91da8ed57247
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   977
  | |\:  parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   978
  | | :  parent:      24:a9c19a3d96b7
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   979
  | | :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   980
  | | :  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
   981
  | | :  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
   982
  | | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   983
  | o :    changeset:   24:a9c19a3d96b7
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   984
  | |\ \   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   985
  | | ~ :  parent:      23:a01cddf0766d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   986
  | |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   987
  | |   :  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
   988
  | |   :  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
   989
  | |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   990
  | o :    changeset:   23:a01cddf0766d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   991
  | |\ \   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   992
  | | ~ :  parent:      22:e0d9cccacb5d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   993
  | |   :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   994
  | |   :  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
   995
  | |   :  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
   996
  | |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   997
  | o :  changeset:   22:e0d9cccacb5d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   998
  |/:/   parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
   999
  | :    parent:      21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1000
  | :    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1001
  | :    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
  1002
  | :    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
  1003
  | :
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1004
  | o    changeset:   21:d42a756af44d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1005
  | |\   parent:      19:31ddc2c1573b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1006
  | | |  parent:      20:d30ed6450e32
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1007
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1008
  | | |  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
  1009
  | | |  summary:     (21) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1010
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1011
  +---o  changeset:   20:d30ed6450e32
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1012
  | | |  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1013
  | | ~  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1014
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1015
  | |    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
  1016
  | |    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
  1017
  | |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1018
  | o    changeset:   19:31ddc2c1573b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1019
  | |\   parent:      15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1020
  | | |  parent:      17:44765d7c06e0
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1021
  | | |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1022
  | | |  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
  1023
  | | |  summary:     (19) expand
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1024
  | | |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1025
  o | |  changeset:   18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1026
  |\| |  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1027
  ~ | |  parent:      15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1028
    | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1029
    | |  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
  1030
    | |  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
  1031
   / /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1032
  | o    changeset:   17:44765d7c06e0
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1033
  | |\   parent:      12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1034
  | | |  parent:      16:3677d192927d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1035
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1036
  | | |  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
  1037
  | | |  summary:     (17) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1038
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1039
  | | o    changeset:   16:3677d192927d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1040
  | | |\   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1041
  | | ~ ~  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1042
  | |      user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1043
  | |      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
  1044
  | |      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
  1045
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1046
  o |    changeset:   15:1dda3f72782d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1047
  |\ \   parent:      13:22d8966a97e3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1048
  | | |  parent:      14:8eac370358ef
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1049
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1050
  | | |  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
  1051
  | | |  summary:     (15) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1052
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1053
  | o |  changeset:   14:8eac370358ef
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1054
  | |\|  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1055
  | ~ |  parent:      12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1056
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1057
  |   |  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
  1058
  |   |  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
  1059
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1060
  o |    changeset:   13:22d8966a97e3
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1061
  |\ \   parent:      9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1062
  | | |  parent:      11:832d76e6bdf2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1063
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1064
  | | |  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
  1065
  | | |  summary:     (13) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1066
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1067
  +---o  changeset:   12:86b91144a6e9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1068
  | | |  parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1069
  | | ~  parent:      9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1070
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1071
  | |    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
  1072
  | |    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
  1073
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1074
  | o    changeset:   11:832d76e6bdf2
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1075
  | |\   parent:      6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1076
  | | |  parent:      10:74c64d036d72
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1077
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1078
  | | |  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
  1079
  | | |  summary:     (11) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1080
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1081
  | | o  changeset:   10:74c64d036d72
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1082
  | |/|  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1083
  | | ~  parent:      6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1084
  | |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1085
  | |    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
  1086
  | |    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
  1087
  | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1088
  o |    changeset:   9:7010c0af0a35
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1089
  |\ \   parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1090
  | | |  parent:      8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1091
  | | |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1092
  | | |  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
  1093
  | | |  summary:     (9) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1094
  | | |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1095
  | o |  changeset:   8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1096
  |/| |  parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1097
  | ~ |  parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1098
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1099
  |   |  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
  1100
  |   |  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
  1101
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1102
  o |    changeset:   7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1103
  |\ \   parent:      2:3d9a33b8d1e1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1104
  | ~ |  parent:      5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1105
  |   |  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1106
  |   |  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
  1107
  |   |  summary:     (7) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1108
  |  /
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1109
  | o  changeset:   6:b105a072e251
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1110
  |/|  parent:      2:3d9a33b8d1e1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1111
  | ~  parent:      5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1112
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1113
  |    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
  1114
  |    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
  1115
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1116
  o    changeset:   5:4409d547b708
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1117
  |\   parent:      3:27eef8ed80b4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1118
  | ~  parent:      4:26a8bac39d9f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1119
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1120
  |    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
  1121
  |    summary:     (5) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1122
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1123
  o    changeset:   4:26a8bac39d9f
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1124
  |\   parent:      1:6db2ef61d156
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1125
  ~ ~  parent:      3:27eef8ed80b4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1126
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1127
       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
  1128
       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
  1129
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1130
13631
29c800ee54cf graphlog: give meaningful error if more than one file is given
Klaus Koch <kuk42@gmx.net>
parents: 12951
diff changeset
  1131
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1132
Empty revision range - display nothing:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1133
  $ hg log -G -r 1..0
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1134
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1135
  $ cd ..
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1136
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1137
#if no-outer-repo
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1138
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1139
From outer space:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1140
  $ hg log -G -l1 repo
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1141
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1142
  |  tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1143
  ~  parent:      32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1144
     user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1145
     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
  1146
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1147
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1148
  $ hg log -G -l1 repo/a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1149
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1150
  |  tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1151
  ~  parent:      32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1152
     user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1153
     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
  1154
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1155
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1156
  $ 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
  1157
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1158
#endif
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
  1159
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1160
File log with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1161
  $ hg init flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1162
  $ cd flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1163
  $ echo one >one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1164
  $ hg add one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1165
  $ hg commit -mone
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1166
  $ echo two >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1167
  $ hg add two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1168
  $ hg commit -mtwo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1169
  $ echo more >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1170
  $ hg commit -mmore
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1171
  $ hg log -G two
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1172
  @  changeset:   2:12c28321755b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1173
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1174
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1175
  |  date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1176
  |  summary:     more
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1177
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1178
  o  changeset:   1:5ac72c0599bf
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
  1179
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1180
  ~  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
  1181
     summary:     two
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1182
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1183
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12365
diff changeset
  1184
Issue1896: File log with explicit style
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1185
  $ hg log -G --style=default one
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1186
  o  changeset:   0:3d578b4a1f53
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1187
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1188
     date:        Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1189
     summary:     one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1190
  
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1191
Issue2395: glog --style header and footer
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1192
  $ hg log -G --style=xml one
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1193
  <?xml version="1.0"?>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1194
  <log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1195
  o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1196
     <author email="test">test</author>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1197
     <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
  1198
     <msg xml:space="preserve">one</msg>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1199
     </logentry>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1200
  </log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
  1201
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1202
  $ cd ..
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1203
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1204
Incoming and outgoing:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1205
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1206
  $ hg clone -U -r31 repo repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1207
  adding changesets
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1208
  adding manifests
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1209
  adding file changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1210
  added 31 changesets with 31 changes to 1 files
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1211
  $ 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
  1212
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1213
  $ hg incoming --graph ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1214
  comparing with ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1215
  searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1216
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1217
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1218
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1219
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1220
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1221
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1222
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1223
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1224
  |    parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1225
  |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1226
  |    date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1227
  |    summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1228
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1229
  o  changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1230
  |  parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1231
  |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1232
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1233
  |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1234
  |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1235
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1236
  o  changeset:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1237
     parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1238
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1239
     date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1240
     summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1241
  
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1242
  $ cd ..
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
  $ hg -R repo outgoing --graph repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1245
  comparing with repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1246
  searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1247
  @  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1248
  |  tag:         tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1249
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1250
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1251
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1252
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1253
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1254
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1255
  |    parent:      18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1256
  |    user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1257
  |    date:        Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1258
  |    summary:     (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1259
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1260
  o  changeset:   32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1261
  |  parent:      27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1262
  |  parent:      31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1263
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1264
  |  date:        Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1265
  |  summary:     (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1266
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1267
  o  changeset:   27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1268
     parent:      21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1269
     user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1270
     date:        Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1271
     summary:     (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1272
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1273
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1274
File + limit with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1275
  $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1276
  $ touch b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1277
  $ hg ci -Aqm0
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1278
  $ hg log -G -l2 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1279
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1280
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1281
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1282
     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
  1283
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1284
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1285
  o  changeset:   33:68608f5145f9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1286
  |  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1287
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1288
     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
  1289
     summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1290
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1291
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1292
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
  1293
  $ hg log -G -l3000 -r32:tip a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1294
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1295
  |  parent:      32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1296
  |  user:        test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1297
  |  date:        Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1298
  |  summary:     (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1299
  |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1300
  | o  changeset:   33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1301
  | |  parent:      18:1aa84d96232a
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:33 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1304
  |    summary:     (33) 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:   32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1307
  |\   parent:      27:886ed638191b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1308
  ~ ~  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1309
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1310
       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
  1311
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1312
  
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
  1313
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1314
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
  1315
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1316
  $ 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
  1317
  o    changeset:   9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1318
  |\   parent:      7:b632bb1b1224
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1319
  | ~  parent:      8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1320
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1321
  |    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
  1322
  |    summary:     (9) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1323
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1324
  o    changeset:   8:7a0b11f71937
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1325
  |\   parent:      0:e6eb3150255d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1326
  ~ ~  parent:      7:b632bb1b1224
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1327
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1328
       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
  1329
       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
  1330
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1331
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1332
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
  1333
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1334
  $ hg log -G -l1 -r32:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1335
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1336
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1337
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1338
     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
  1339
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1340
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1341
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1342
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
  1343
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1344
  $ 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
  1345
  o  changeset:   34:fea3ac5810e0
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
  1346
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1347
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1348
     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
  1349
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1350
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1351
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1352
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
  1353
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1354
  $ 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
  1355
  o    changeset:   32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1356
  |\   parent:      27:886ed638191b
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1357
  ~ ~  parent:      31:621d83e11f67
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:32 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1360
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1361
  
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1362
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
  1363
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 -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
  1366
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1367
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
  1368
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  1369
  $ hg log -G -l10 -r33:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1370
  o  changeset:   34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1371
  |  parent:      32:d06dffa21a31
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1372
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1373
     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
  1374
     summary:     (34) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1375
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1376
  o  changeset:   33:68608f5145f9
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1377
  |  parent:      18:1aa84d96232a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1378
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1379
     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
  1380
     summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1381
  
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
  1382
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1383
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
  1384
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1385
  $ hg branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1386
  marked working directory as branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1387
  (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
  1388
  $ 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
  1389
  $ hg log -G -l5
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1390
  @  changeset:   36:08a19a744424
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1391
  |  branch:      branch
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1392
  |  tag:         tip
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1393
  |  parent:      35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1394
  |  parent:      35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1395
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1396
  |  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
  1397
  |  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
  1398
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1399
  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
  1400
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1401
  |  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
  1402
  |  summary:     0
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1403
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1404
  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
  1405
  |  parent:      32:d06dffa21a31
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1406
  |  user:        test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1407
  |  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
  1408
  |  summary:     (34) head
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1409
  |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
  1410
  | 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
  1411
  | |  parent:      18:1aa84d96232a
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1412
  | ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1413
  |    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
  1414
  |    summary:     (33) head
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1415
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1416
  o    changeset:   32:d06dffa21a31
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1417
  |\   parent:      27:886ed638191b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1418
  ~ ~  parent:      31:621d83e11f67
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1419
       user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1420
       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
  1421
       summary:     (32) expand
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1422
  
14081
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1423
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1424
Test log -G options
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
  1425
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1426
  $ testlog() {
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1427
  >   hg log -G --print-revset "$@"
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1428
  >   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
  1429
  >     | sed 's/.*nodetag/nodetag/' > log.nodes
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1430
  >   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
  1431
  >     | 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
  1432
  >   (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
  1433
  >     | grep '^[-+@ ]' || :
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1434
  > }
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1435
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1436
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
  1437
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1438
  $ 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
  1439
  ['27', '25', '21', '34', '32', '31']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1440
  []
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1441
  --- log.nodes	* (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1442
  +++ glog.nodes	* (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1443
  @@ -1,6 +1,6 @@
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1444
  -nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1445
  -nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1446
  -nodetag 21
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1447
   nodetag 34
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1448
   nodetag 32
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1449
   nodetag 31
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1450
  +nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1451
  +nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
  1452
  +nodetag 21
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
  1453
  $ testlog -u test -u not-a-user
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1454
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1455
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1456
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1457
      (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1458
        (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1459
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1460
            ('symbol', 'user')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1461
            ('string', 'test'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1462
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1463
            ('symbol', 'user')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1464
            ('string', 'not-a-user'))))))
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1465
  $ testlog -b not-a-branch
16405
17deb6bbfbab graphlog: refactor revset() to return revisions
Patrick Mezard <patrick@mezard.eu>
parents: 16316
diff changeset
  1466
  abort: unknown revision 'not-a-branch'!
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1467
  abort: unknown revision 'not-a-branch'!
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
  1468
  abort: unknown revision 'not-a-branch'!
16407
49ef1c382965 graphlog: support changeset identifiers in --branch
Patrick Mezard <patrick@mezard.eu>
parents: 16405
diff changeset
  1469
  $ 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
  1470
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1471
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1472
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1473
      (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1474
        (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1475
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1476
            ('symbol', 'branch')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1477
            ('string', 'default'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1478
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1479
            ('symbol', 'branch')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1480
            ('string', 'branch'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1481
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1482
            ('symbol', 'branch')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1483
            ('string', 'branch'))))))
16150
0424f3c7d7ac graphlog: multiple --keyword must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16149
diff changeset
  1484
  $ testlog -k expand -k merge
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1485
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1486
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1487
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1488
      (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1489
        (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1490
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1491
            ('symbol', 'keyword')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1492
            ('string', 'expand'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1493
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1494
            ('symbol', 'keyword')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1495
            ('string', 'merge'))))))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
  1496
  $ testlog --only-merges
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1497
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1498
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1499
    (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1500
      ('symbol', 'merge')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1501
      None))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
  1502
  $ testlog --no-merges
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1503
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1504
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1505
    (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1506
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1507
        ('symbol', 'merge')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1508
        None)))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
  1509
  $ testlog --date '2 0 to 4 0'
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1510
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1511
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1512
    (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1513
      ('symbol', 'date')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1514
      ('string', '2 0 to 4 0')))
14083
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
  1515
  $ hg log -G -d 'brace ) in a date'
32462
bb18728ea617 util: raise ParseError when parsing dates (BC)
Boris Feld <boris.feld@octobus.net>
parents: 32045
diff changeset
  1516
  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
  1517
  [255]
16172
db75321c7a0e test-glog: test multiple --prune values
Patrick Mezard <patrick@mezard.eu>
parents: 16171
diff changeset
  1518
  $ testlog --prune 31 --prune 32
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1519
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1520
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1521
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1522
      (and
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1523
        (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1524
          (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1525
            (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1526
              (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1527
                ('string', '31')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1528
                (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1529
                  ('symbol', 'ancestors')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1530
                  ('string', '31'))))))
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1531
        (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1532
          (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1533
            (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1534
              (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1535
                ('string', '32')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1536
                (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1537
                  ('symbol', 'ancestors')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1538
                  ('string', '32')))))))))
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1539
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1540
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
  1541
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
  1542
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1543
  $ cd ..
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1544
  $ hg init follow
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1545
  $ cd follow
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1546
  $ testlog --follow
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1547
  []
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1548
  []
24059
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1549
  $ testlog -rnull
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1550
  ['null']
8d295ce6e488 graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents: 23955
diff changeset
  1551
  []
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1552
  $ echo a > a
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1553
  $ echo aa > aa
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1554
  $ echo f > f
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1555
  $ 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
  1556
  $ hg cp a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1557
  $ hg cp f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1558
  $ hg ci -m "copy a b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1559
  $ mkdir dir
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1560
  $ hg mv b dir
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1561
  $ echo g >> g
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1562
  $ echo f >> f
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1563
  $ hg ci -m "mv b dir/b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1564
  $ hg mv a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1565
  $ hg cp -f f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1566
  $ echo a > d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1567
  $ hg add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1568
  $ 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
  1569
  $ hg mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1570
  $ 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
  1571
  $ 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
  1572
  @  (4) mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1573
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1574
  o  (3) mv a b; add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1575
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1576
  o  (2) mv b dir/b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1577
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1578
  o  (1) copy a b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1579
  |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1580
  o  (0) add a
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1581
  
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1582
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1583
  $ testlog a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1584
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1585
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1586
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1587
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1588
        ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1589
        ('string', 'a'))))
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1590
  $ testlog a b
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1591
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1592
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1593
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1594
      (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1595
        (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1596
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1597
            ('symbol', 'filelog')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1598
            ('string', 'a'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1599
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1600
            ('symbol', 'filelog')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1601
            ('string', 'b'))))))
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1602
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
  1603
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
  1604
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
  1605
  $ testlog a c
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1606
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1607
  (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1608
    (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1609
      ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1610
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1611
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1612
        ('string', 'd:relpath')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1613
        ('string', 'p:a')
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1614
        ('string', 'p:c'))))
16161
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1615
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1616
Test multiple --include/--exclude/paths
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1617
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
  1618
  $ 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
  1619
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1620
  (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1621
    (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1622
      ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1623
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1624
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1625
        ('string', 'd:relpath')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1626
        ('string', 'p:a')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1627
        ('string', 'p:e')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1628
        ('string', 'i:a')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1629
        ('string', 'i:e')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1630
        ('string', 'x:b')
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1631
        ('string', 'x:e'))))
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1632
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1633
Test glob expansion of pats
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1634
22947
c63a09b6b337 tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents: 22860
diff changeset
  1635
  $ expandglobs=`$PYTHON -c "import mercurial.util; \
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1636
  >   print mercurial.util.expandglobs and 'true' or 'false'"`
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1637
  $ if [ $expandglobs = "true" ]; then
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1638
  >    testlog 'a*';
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1639
  > else
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1640
  >    testlog a*;
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
  1641
  > fi;
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1642
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1643
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1644
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1645
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1646
        ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1647
        ('string', 'aa'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1648
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1649
Test --follow on a non-existent directory
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1650
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1651
  $ testlog -f dir
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1652
  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
  1653
  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
  1654
  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
  1655
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1656
Test --follow on a directory
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1657
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1658
  $ hg up -q '.^'
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1659
  $ testlog -f dir
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1660
  []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1661
  (group
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1662
    (and
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1663
      (func
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1664
        ('symbol', 'ancestors')
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1665
        ('symbol', '.'))
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1666
      (func
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1667
        ('symbol', '_matchfiles')
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1668
        (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1669
          ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1670
          ('string', 'd:relpath')
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1671
          ('string', 'p:dir')))))
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1672
  $ hg up -q tip
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1673
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1674
Test --follow on file not in parent revision
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1675
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1676
  $ testlog -f a
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1677
  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
  1678
  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
  1679
  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
  1680
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1681
Test --follow and patterns
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1682
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1683
  $ testlog -f 'glob:*'
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1684
  []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1685
  (group
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1686
    (and
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1687
      (func
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1688
        ('symbol', 'ancestors')
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1689
        ('symbol', '.'))
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1690
      (func
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1691
        ('symbol', '_matchfiles')
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1692
        (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1693
          ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1694
          ('string', 'd:relpath')
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1695
          ('string', 'p:glob:*')))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1696
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1697
Test --follow on a single rename
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1698
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1699
  $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1700
  $ testlog -f a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1701
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1702
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1703
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1704
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1705
        ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1706
        ('string', 'a'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1707
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1708
Test --follow and multiple renames
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1709
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1710
  $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1711
  $ testlog -f e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1712
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1713
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1714
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1715
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1716
        ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1717
        ('string', 'e'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1718
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1719
Test --follow and multiple filelog heads
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1720
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1721
  $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1722
  $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1723
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1724
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1725
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1726
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1727
        ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1728
        ('string', 'g'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1729
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1730
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1731
  nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1732
  nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1733
  $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1734
  $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1735
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1736
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1737
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1738
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1739
        ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1740
        ('string', 'g'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1741
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1742
  nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1743
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1744
  nodetag 0
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 multiple files
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 g e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1749
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1750
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1751
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1752
      (or
29929
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1753
        (list
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1754
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1755
            ('symbol', 'follow')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1756
            ('string', 'g'))
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1757
          (func
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1758
            ('symbol', 'follow')
b3845cab4ddc revset: wrap arguments of 'or' by 'list' node
Yuya Nishihara <yuya@tcha.org>
parents: 29184
diff changeset
  1759
            ('string', 'e'))))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1760
  $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1761
  nodetag 4
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1762
  nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1763
  nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1764
  nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1765
  nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
  1766
24064
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1767
Test --follow null parent
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1768
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1769
  $ hg up -q null
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1770
  $ testlog -f
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1771
  []
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1772
  []
c260887cdbcd log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents: 24059
diff changeset
  1773
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1774
Test --follow-first
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1775
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1776
  $ hg up -q 3
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1777
  $ echo ee > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1778
  $ hg ci -Am "add another e" e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1779
  created new head
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1780
  $ hg merge --tool internal:other 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1781
  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
  1782
  (branch merge, don't forget to commit)
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1783
  $ echo merge > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1784
  $ hg ci -m "merge 5 and 4"
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1785
  $ testlog --follow-first
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1786
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1787
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1788
    (func
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  1789
      ('symbol', '_firstancestors')
23955
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  1790
      (func
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  1791
        ('symbol', 'rev')
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  1792
        ('symbol', '6'))))
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1793
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1794
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
  1795
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1796
  $ 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
  1797
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1798
  (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1799
    (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1800
      (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1801
        ('symbol', '_followfirst')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1802
        ('string', 'e'))))
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1803
  $ 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
  1804
  @    6 merge 5 and 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1805
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1806
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1807
  o  5 add another e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1808
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1809
  ~
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
  1810
16180
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1811
Test --copies
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1812
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1813
  $ hg log -G --copies --template "{rev} {desc|firstline} \
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1814
  >   copies: {file_copies_switch}\n"
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1815
  @    6 merge 5 and 4   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1816
  |\
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1817
  | o  5 add another e   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1818
  | |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1819
  o |  4 mv dir/b e   copies: e (dir/b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1820
  |/
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1821
  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
  1822
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1823
  o  2 mv b dir/b   copies: dir/b (b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1824
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1825
  o  1 copy a b   copies: b (a)g (f)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1826
  |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1827
  o  0 add a   copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
  1828
  
16181
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
  1829
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
  1830
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
  1831
  $ hg up -q 4
16182
bd12ef347680 match: consider filesets as "anypats"
Patrick Mezard <patrick@mezard.eu>
parents: 16181
diff changeset
  1832
  $ testlog "set:copied()"
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1833
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1834
  (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1835
    (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1836
      ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1837
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1838
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1839
        ('string', 'd:relpath')
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1840
        ('string', 'p:set:copied()'))))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1841
  $ testlog --include "set:copied()"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1842
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1843
  (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1844
    (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1845
      ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1846
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1847
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1848
        ('string', 'd:relpath')
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1849
        ('string', 'i:set:copied()'))))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1850
  $ testlog -r "sort(file('set:copied()'), -rev)"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1851
  ["sort(file('set:copied()'), -rev)"]
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1852
  []
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1853
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1854
Test --removed
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1855
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1856
  $ testlog --removed
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1857
  []
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1858
  []
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1859
  $ testlog --removed a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1860
  []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
  1861
  (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1862
    (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1863
      ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1864
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1865
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1866
        ('string', 'd:relpath')
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1867
        ('string', 'p:a'))))
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
  1868
  $ testlog --removed --follow a
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1869
  []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1870
  (group
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1871
    (and
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1872
      (func
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1873
        ('symbol', 'ancestors')
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1874
        ('symbol', '.'))
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1875
      (func
23500
9601229ed361 log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents: 22955
diff changeset
  1876
        ('symbol', '_matchfiles')
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
  1877
        (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1878
          ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  1879
          ('string', 'd:relpath')
23501
424d669118d3 log: fix log revset instability
Durham Goode <durham@fb.com>
parents: 23500
diff changeset
  1880
          ('string', 'p:a')))))
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1881
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1882
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
  1883
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1884
  $ hg up -q 3
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1885
  $ hg log -G --git --patch b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1886
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1887
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1888
  ~  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
  1889
     summary:     copy a b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1890
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1891
     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
  1892
     copy from a
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1893
     copy to b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1894
  
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1895
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1896
  $ hg log -G --git --stat b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1897
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1898
  |  user:        test
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1899
  ~  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
  1900
     summary:     copy a b
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1901
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1902
      b |  0
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1903
      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
  1904
  
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1905
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1906
  $ hg log -G --git --patch --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1907
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1908
  |  user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1909
  |  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
  1910
  |  summary:     copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1911
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1912
  |  diff --git a/a b/b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1913
  |  copy from a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1914
  |  copy to b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1915
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1916
  o  changeset:   0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1917
     user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1918
     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
  1919
     summary:     add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1920
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1921
     diff --git a/a b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1922
     new file mode 100644
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1923
     --- /dev/null
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1924
     +++ b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1925
     @@ -0,0 +1,1 @@
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1926
     +a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1927
  
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 log -G --git --stat --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1930
  o  changeset:   1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1931
  |  user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1932
  |  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
  1933
  |  summary:     copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1934
  |
20972
4e2fb0ad00a9 diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents: 20699
diff changeset
  1935
  |   b |  0
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1936
  |   1 files changed, 0 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1937
  |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1938
  o  changeset:   0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1939
     user:        test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1940
     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
  1941
     summary:     add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1942
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1943
      a |  1 +
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1944
      1 files changed, 1 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1945
  
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1946
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1947
  $ hg up -q 6
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1948
  $ 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
  1949
  @    changeset:   6:fc281d8ff18d
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
  1950
  |\   tag:         tip
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1951
  | ~  parent:      5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1952
  |    parent:      4:17d952250a9d
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1953
  |    user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1954
  |    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
  1955
  |    summary:     merge 5 and 4
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1956
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1957
  |    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
  1958
  |    --- a/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1959
  |    +++ b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1960
  |    @@ -1,1 +1,1 @@
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1961
  |    -ee
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1962
  |    +merge
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1963
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1964
  o  changeset:   5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1965
  |  parent:      3:5918b8d165d1
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1966
  ~  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1967
     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
  1968
     summary:     add another e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1969
  
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1970
     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
  1971
     new file mode 100644
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1972
     --- /dev/null
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1973
     +++ b/e
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1974
     @@ -0,0 +1,1 @@
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1975
     +ee
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  1976
  
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1977
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1978
Test old-style --rev
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1979
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1980
  $ hg tag 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1981
  $ testlog -r 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1982
  ['foo-bar']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
  1983
  []
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1984
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1985
Test --follow and forward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1986
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1987
  $ hg up -q 6
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1988
  $ echo g > g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1989
  $ hg ci -Am 'add g' g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1990
  created new head
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1991
  $ hg up -q 2
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1992
  $ hg log -G --template "{rev} {desc|firstline}\n"
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1993
  o  8 add g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1994
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1995
  | o  7 Added tag foo-bar for changeset fc281d8ff18d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1996
  |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1997
  o    6 merge 5 and 4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1998
  |\
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  1999
  | o  5 add another e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2000
  | |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2001
  o |  4 mv dir/b e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2002
  |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2003
  o  3 mv a b; add d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2004
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2005
  @  2 mv b dir/b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2006
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2007
  o  1 copy a b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2008
  |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2009
  o  0 add a
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2010
  
25665
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2011
  $ 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
  2012
  $ 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
  2013
  changessincelatesttag: 1
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2014
  $ rm -r archive
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2015
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2016
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
  2017
  $ 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
  2018
  $ 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
  2019
  changessincelatesttag: 5
dc05a10e1e45 archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents: 25265
diff changeset
  2020
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2021
  $ 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
  2022
  # 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
  2023
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2024
  # 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
  2025
  #      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
  2026
  # 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
  2027
  # Parent  0000000000000000000000000000000000000000
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2028
  add a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2029
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2030
  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
  2031
  --- /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
  2032
  +++ 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
  2033
  @@ -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
  2034
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2035
  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
  2036
  --- /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
  2037
  +++ 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
  2038
  @@ -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
  2039
  +aa
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2040
  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
  2041
  --- /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
  2042
  +++ 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
  2043
  @@ -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
  2044
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2045
  # 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
  2046
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2047
  # 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
  2048
  #      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
  2049
  # 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
  2050
  # Parent  f8035bb17114da16215af3436ec5222428ace8ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2051
  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
  2052
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2053
  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
  2054
  --- /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
  2055
  +++ 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
  2056
  @@ -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
  2057
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2058
  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
  2059
  --- /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
  2060
  +++ 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
  2061
  @@ -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
  2062
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2063
  # 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
  2064
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2065
  # 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
  2066
  #      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
  2067
  # 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
  2068
  # Parent  216d4c92cf98ff2b4641d508b76b529f3d424c92
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2069
  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
  2070
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2071
  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
  2072
  --- 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
  2073
  +++ /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
  2074
  @@ -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
  2075
  -a
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 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
  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/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
  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 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
  2082
  --- 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
  2083
  +++ 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
  2084
  @@ -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
  2085
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2086
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2087
  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
  2088
  --- 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
  2089
  +++ 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
  2090
  @@ -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
  2091
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2092
  +g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2093
  # 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
  2094
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2095
  # 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
  2096
  #      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
  2097
  # 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
  2098
  # Parent  bb573313a9e8349099b6ea2b2fb1fc7f424446f3
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2099
  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
  2100
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2101
  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
  2102
  --- 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
  2103
  +++ /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
  2104
  @@ -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
  2105
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2106
  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
  2107
  --- /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
  2108
  +++ 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
  2109
  @@ -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
  2110
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2111
  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
  2112
  --- /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
  2113
  +++ 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
  2114
  @@ -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
  2115
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2116
  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
  2117
  --- 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
  2118
  +++ 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
  2119
  @@ -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
  2120
   f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2121
  -g
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2122
  +f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2123
  # 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
  2124
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2125
  # 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
  2126
  #      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
  2127
  # 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
  2128
  # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2129
  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
  2130
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2131
  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
  2132
  --- 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
  2133
  +++ /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
  2134
  @@ -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
  2135
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2136
  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
  2137
  --- /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
  2138
  +++ 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
  2139
  @@ -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
  2140
  +a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2141
  # 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
  2142
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2143
  # 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
  2144
  #      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
  2145
  # 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
  2146
  # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2147
  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
  2148
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2149
  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
  2150
  --- /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
  2151
  +++ 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
  2152
  @@ -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
  2153
  +ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2154
  # 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
  2155
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2156
  # 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
  2157
  #      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
  2158
  # 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
  2159
  # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2160
  # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2161
  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
  2162
  
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2163
  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
  2164
  --- 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
  2165
  +++ /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
  2166
  @@ -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
  2167
  -a
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2168
  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
  2169
  --- 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
  2170
  +++ 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
  2171
  @@ -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
  2172
  -ee
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2173
  +merge
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2174
  # 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
  2175
  # User test
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2176
  # 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
  2177
  #      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
  2178
  # 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
  2179
  # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2180
  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
  2181
  
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 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
  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/.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
  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
  +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
  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 24c2e826ddebf80f9dcd60b856bdb8e6715c5449
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2192
  # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2193
  add g
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 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
  2196
  --- 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
  2197
  +++ 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
  2198
  @@ -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
  2199
  -f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2200
  -f
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2201
  +g
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2202
  $ testlog --follow -r6 -r8 -r5 -r7 -r4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2203
  ['6', '8', '5', '7', '4']
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2204
  (group
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2205
    (func
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2206
      ('symbol', 'descendants')
23955
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2207
      (func
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2208
        ('symbol', 'rev')
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2209
        ('symbol', '6'))))
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2210
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2211
Test --follow-first and forward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2212
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2213
  $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2214
  ['6', '8', '5', '7', '4']
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2215
  (group
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2216
    (func
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2217
      ('symbol', '_firstdescendants')
23955
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2218
      (func
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2219
        ('symbol', 'rev')
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2220
        ('symbol', '6'))))
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2221
  --- log.nodes	* (glob)
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2222
  +++ glog.nodes	* (glob)
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2223
  @@ -1,3 +1,3 @@
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2224
  -nodetag 6
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2225
   nodetag 8
22860
1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21998
diff changeset
  2226
   nodetag 7
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2227
  +nodetag 6
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2228
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2229
Test --follow and backward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2230
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2231
  $ testlog --follow -r6 -r5 -r7 -r8 -r4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2232
  ['6', '5', '7', '8', '4']
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2233
  (group
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2234
    (func
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2235
      ('symbol', 'ancestors')
23955
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2236
      (func
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2237
        ('symbol', 'rev')
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2238
        ('symbol', '6'))))
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
  2239
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2240
Test --follow-first and backward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2241
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2242
  $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2243
  ['6', '5', '7', '8', '4']
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2244
  (group
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2245
    (func
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
  2246
      ('symbol', '_firstancestors')
23955
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2247
      (func
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2248
        ('symbol', 'rev')
8a29897d42d2 log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents: 23501
diff changeset
  2249
        ('symbol', '6'))))
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2250
24200
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2251
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
  2252
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2253
  $ 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
  2254
  o  1:216d4c92cf98
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2255
  |
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2256
  o  0:f8035bb17114
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2257
  
8e1f1673aa9a graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents: 24189
diff changeset
  2258
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2259
Test subdir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2260
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2261
  $ hg up -q 3
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2262
  $ cd dir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2263
  $ testlog .
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2264
  []
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2265
  (group
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2266
    (func
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2267
      ('symbol', '_matchfiles')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2268
      (list
27987
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  2269
        ('string', 'r:')
b19d8d5d6b51 revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents: 27556
diff changeset
  2270
        ('string', 'd:relpath')
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
  2271
        ('string', 'p:.'))))
16434
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2272
  $ testlog ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2273
  []
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2274
  (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2275
    (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2276
      (func
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2277
        ('symbol', 'filelog')
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2278
        ('string', '../b'))))
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2279
  $ testlog -f ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2280
  []
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2281
  (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2282
    (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2283
      (func
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2284
        ('symbol', 'follow')
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
  2285
        ('string', 'b'))))
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2286
  $ cd ..
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2287
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2288
Test --hidden
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2289
 (enable obsolete)
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2290
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22947
diff changeset
  2291
  $ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22947
diff changeset
  2292
  > [experimental]
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22947
diff changeset
  2293
  > evolution=createmarkers
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2294
  > EOF
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2295
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
  2296
  $ hg debugobsolete `hg id --debug -i -r 8`
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2297
  $ testlog
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2298
  []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2299
  []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2300
  $ testlog --hidden
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2301
  []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
  2302
  []
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2303
  $ 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
  2304
  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
  2305
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2306
  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
  2307
  |\
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2308
  | 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
  2309
  | |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2310
  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
  2311
  |/
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2312
  @  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
  2313
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2314
  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
  2315
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2316
  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
  2317
  |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2318
  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
  2319
  
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
  2320
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2321
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
  2322
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2323
  $ 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
  2324
  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
  2325
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2326
  o  1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2327
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2328
  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
  2329
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2330
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2331
Extra newlines must be preserved
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2332
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2333
  $ 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
  2334
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2335
  |  2 mv b dir/b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2336
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2337
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2338
  |  1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2339
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2340
  o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2341
     0 add a
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2342
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2343
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2344
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
  2345
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2346
  $ 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
  2347
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2348
  |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2349
  o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2350
  |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2351
  o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
  2352
  
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
  2353
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2354
issue3772
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2355
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2356
  $ 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
  2357
  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
  2358
  |  user:        test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
  2359
  |  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
  2360
  |  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
  2361
  |
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2362
  o  changeset:   -1:000000000000
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2363
     user:
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2364
     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
  2365
  
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
  2366
  $ 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
  2367
  o  changeset:   -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2368
     user:
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
  2369
     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
  2370
  
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
  2371
24202
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2372
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
  2373
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2374
  $ hg log -G -r 'all()' | tail -6
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2375
  |
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2376
  o  changeset:   0:f8035bb17114
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2377
     user:        test
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2378
     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
  2379
     summary:     add a
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2380
  
2de9ee016425 revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents: 24200
diff changeset
  2381
25265
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2382
  $ 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
  2383
  |
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2384
  o  changeset:   0:f8035bb17114
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2385
     user:        test
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2386
     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
  2387
     summary:     add a
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2388
  
e16456831516 revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents: 24202
diff changeset
  2389
25765
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2390
working-directory revision
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2391
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2392
  $ hg log -G -qr '. + wdir()'
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2393
  o  2147483647:ffffffffffff
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2394
  |
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2395
  @  3:5918b8d165d1
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2396
  |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2397
  ~
25765
5e1b0739611c revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents: 25675
diff changeset
  2398
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2399
node template with changeset_printer:
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2400
32045
3eceeede26e9 graphlog: optionally strip quotes from graphnode template (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 31552
diff changeset
  2401
  $ 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
  2402
  7  7:02dbb8e276b8
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2403
  |
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2404
  6    6:fc281d8ff18d
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2405
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2406
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2407
  5  5:99b31f1c2782
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2408
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2409
  ~
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2410
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2411
node template with changeset_templater (shared cache variable):
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2412
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2413
  $ 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
  2414
  > --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
  2415
  o  7 foo-bar+1
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2416
  |
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2417
  #    6 foo-bar+0
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2418
  |\
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2419
  | ~
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2420
  o  5 null+5
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2421
  |
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2422
  ~
27216
8117e2cd959e graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents: 25765
diff changeset
  2423
28428
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2424
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
  2425
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2426
  $ 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
  2427
  > --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
  2428
  [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
  2429
  |
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28617
diff changeset
  2430
  ~
28428
6a4a4ca21907 graphlog: bring back color to node symbol template
Yuya Nishihara <yuya@tcha.org>
parents: 27987
diff changeset
  2431
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
  2432
  $ cd ..
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2433
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2434
change graph edge styling
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2435
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2436
  $ cd repo
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2437
  $ cat << EOF >> $HGRCPATH
28617
1a1e4350b560 graphmod: move the graphstyle options to experimental
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 28601
diff changeset
  2438
  > [experimental]
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2439
  > graphstyle.parent = |
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2440
  > graphstyle.grandparent = :
28601
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2441
  > graphstyle.missing =
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2442
  > EOF
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2443
  $ 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
  2444
  @  changeset:   36:08a19a744424
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2445
  :  branch:      branch
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2446
  :  tag:         tip
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2447
  :  parent:      35:9159c3644c5e
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2448
  :  parent:      35:9159c3644c5e
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2449
  :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2450
  :  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
  2451
  :  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
  2452
  :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2453
  o    changeset:   32:d06dffa21a31
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2454
  |\   parent:      27:886ed638191b
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2455
  | :  parent:      31:621d83e11f67
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2456
  | :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2457
  | :  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
  2458
  | :  summary:     (32) expand
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2459
  | :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2460
  o :  changeset:   31:621d83e11f67
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2461
  |\:  parent:      21:d42a756af44d
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2462
  | :  parent:      30:6e11cd4b648f
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2463
  | :  user:        test
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2464
  | :  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
  2465
  | :  summary:     (31) expand
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2466
  | :
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2467
  o :    changeset:   30:6e11cd4b648f
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2468
  |\ \   parent:      28:44ecd0b9ae99
28601
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2469
  | ~ :  parent:      29:cd9bb2be7593
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2470
  |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2471
  |   :  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
  2472
  |   :  summary:     (30) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2473
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2474
  o :    changeset:   28:44ecd0b9ae99
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2475
  |\ \   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2476
  | ~ :  parent:      26:7f25b6c2f0b9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2477
  |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2478
  |   :  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
  2479
  |   :  summary:     (28) merge zero known
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2480
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2481
  o :    changeset:   26:7f25b6c2f0b9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2482
  |\ \   parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2483
  | | :  parent:      25:91da8ed57247
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2484
  | | :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2485
  | | :  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
  2486
  | | :  summary:     (26) merge one known; far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2487
  | | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2488
  | o :  changeset:   25:91da8ed57247
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2489
  | |\:  parent:      21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2490
  | | :  parent:      24:a9c19a3d96b7
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2491
  | | :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2492
  | | :  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
  2493
  | | :  summary:     (25) merge one known; far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2494
  | | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2495
  | o :    changeset:   24:a9c19a3d96b7
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2496
  | |\ \   parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2497
  | | ~ :  parent:      23:a01cddf0766d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2498
  | |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2499
  | |   :  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
  2500
  | |   :  summary:     (24) merge one known; immediate right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2501
  | |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2502
  | o :    changeset:   23:a01cddf0766d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2503
  | |\ \   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2504
  | | ~ :  parent:      22:e0d9cccacb5d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2505
  | |   :  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2506
  | |   :  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
  2507
  | |   :  summary:     (23) merge one known; immediate left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2508
  | |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2509
  | o :  changeset:   22:e0d9cccacb5d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2510
  |/:/   parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2511
  | :    parent:      21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2512
  | :    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2513
  | :    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
  2514
  | :    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
  2515
  | :
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2516
  | o    changeset:   21:d42a756af44d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2517
  | |\   parent:      19:31ddc2c1573b
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2518
  | | |  parent:      20:d30ed6450e32
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2519
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2520
  | | |  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
  2521
  | | |  summary:     (21) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2522
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2523
  +---o  changeset:   20:d30ed6450e32
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2524
  | | |  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2525
  | | ~  parent:      18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2526
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2527
  | |    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
  2528
  | |    summary:     (20) merge two known; two far right
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2529
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2530
  | o    changeset:   19:31ddc2c1573b
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2531
  | |\   parent:      15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2532
  | | |  parent:      17:44765d7c06e0
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2533
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2534
  | | |  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
  2535
  | | |  summary:     (19) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2536
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2537
  o | |  changeset:   18:1aa84d96232a
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2538
  |\| |  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2539
  ~ | |  parent:      15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2540
    | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2541
    | |  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
  2542
    | |  summary:     (18) merge two known; two far left
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2543
   / /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2544
  | o    changeset:   17:44765d7c06e0
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2545
  | |\   parent:      12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2546
  | | |  parent:      16:3677d192927d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2547
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2548
  | | |  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
  2549
  | | |  summary:     (17) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2550
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2551
  | | o    changeset:   16:3677d192927d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2552
  | | |\   parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2553
  | | ~ ~  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2554
  | |      user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2555
  | |      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
  2556
  | |      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
  2557
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2558
  o |    changeset:   15:1dda3f72782d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2559
  |\ \   parent:      13:22d8966a97e3
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2560
  | | |  parent:      14:8eac370358ef
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2561
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2562
  | | |  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
  2563
  | | |  summary:     (15) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2564
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2565
  | o |  changeset:   14:8eac370358ef
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2566
  | |\|  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2567
  | ~ |  parent:      12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2568
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2569
  |   |  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
  2570
  |   |  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
  2571
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2572
  o |    changeset:   13:22d8966a97e3
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2573
  |\ \   parent:      9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2574
  | | |  parent:      11:832d76e6bdf2
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2575
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2576
  | | |  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
  2577
  | | |  summary:     (13) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2578
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2579
  +---o  changeset:   12:86b91144a6e9
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2580
  | | |  parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2581
  | | ~  parent:      9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2582
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2583
  | |    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
  2584
  | |    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
  2585
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2586
  | o    changeset:   11:832d76e6bdf2
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2587
  | |\   parent:      6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2588
  | | |  parent:      10:74c64d036d72
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2589
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2590
  | | |  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
  2591
  | | |  summary:     (11) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2592
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2593
  | | o  changeset:   10:74c64d036d72
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2594
  | |/|  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2595
  | | ~  parent:      6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2596
  | |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2597
  | |    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
  2598
  | |    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
  2599
  | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2600
  o |    changeset:   9:7010c0af0a35
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2601
  |\ \   parent:      7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2602
  | | |  parent:      8:7a0b11f71937
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2603
  | | |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2604
  | | |  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
  2605
  | | |  summary:     (9) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2606
  | | |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2607
  | o |  changeset:   8:7a0b11f71937
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2608
  |/| |  parent:      0:e6eb3150255d
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2609
  | ~ |  parent:      7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2610
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2611
  |   |  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
  2612
  |   |  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
  2613
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2614
  o |    changeset:   7:b632bb1b1224
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2615
  |\ \   parent:      2:3d9a33b8d1e1
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2616
  | ~ |  parent:      5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2617
  |   |  user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2618
  |   |  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
  2619
  |   |  summary:     (7) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2620
  |  /
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2621
  | o  changeset:   6:b105a072e251
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2622
  |/|  parent:      2:3d9a33b8d1e1
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2623
  | ~  parent:      5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2624
  |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2625
  |    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
  2626
  |    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
  2627
  |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2628
  o    changeset:   5:4409d547b708
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2629
  |\   parent:      3:27eef8ed80b4
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2630
  | ~  parent:      4:26a8bac39d9f
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2631
  |    user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2632
  |    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
  2633
  |    summary:     (5) expand
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2634
  |
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2635
  o    changeset:   4:26a8bac39d9f
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2636
  |\   parent:      1:6db2ef61d156
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2637
  ~ ~  parent:      3:27eef8ed80b4
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2638
       user:        test
cd10171d6c71 graphmod: allow edges to end early
Martijn Pieters <mjpieters@fb.com>
parents: 28600
diff changeset
  2639
       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
  2640
       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
  2641
  
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  2642
28999
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2643
Setting HGPLAIN ignores graphmod styling:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2644
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2645
  $ 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
  2646
  @  changeset:   36:08a19a744424
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2647
  |  branch:      branch
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2648
  |  tag:         tip
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2649
  |  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2650
  |  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2651
  |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2652
  |  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
  2653
  |  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
  2654
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2655
  o    changeset:   32:d06dffa21a31
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2656
  |\   parent:      27:886ed638191b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2657
  | |  parent:      31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2658
  | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2659
  | |  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
  2660
  | |  summary:     (32) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2661
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2662
  o |  changeset:   31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2663
  |\|  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2664
  | |  parent:      30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2665
  | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2666
  | |  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
  2667
  | |  summary:     (31) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2668
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2669
  o |    changeset:   30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2670
  |\ \   parent:      28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2671
  | | |  parent:      29:cd9bb2be7593
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2672
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2673
  | | |  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
  2674
  | | |  summary:     (30) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2675
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2676
  o | |    changeset:   28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2677
  |\ \ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2678
  | | | |  parent:      26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2679
  | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2680
  | | | |  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
  2681
  | | | |  summary:     (28) merge zero known
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2682
  | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2683
  o | | |    changeset:   26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2684
  |\ \ \ \   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2685
  | | | | |  parent:      25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2686
  | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2687
  | | | | |  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
  2688
  | | | | |  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
  2689
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2690
  | o-----+  changeset:   25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2691
  | | | | |  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2692
  | | | | |  parent:      24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2693
  | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2694
  | | | | |  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
  2695
  | | | | |  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
  2696
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2697
  | o | | |    changeset:   24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2698
  | |\ \ \ \   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2699
  | | | | | |  parent:      23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2700
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2701
  | | | | | |  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
  2702
  | | | | | |  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
  2703
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2704
  | o---+ | |  changeset:   23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2705
  | | | | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2706
  | | | | | |  parent:      22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2707
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2708
  | | | | | |  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
  2709
  | | | | | |  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
  2710
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2711
  | o-------+  changeset:   22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2712
  | | | | | |  parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2713
  |/ / / / /   parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2714
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2715
  | | | | |    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
  2716
  | | | | |    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
  2717
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2718
  | | | | o    changeset:   21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2719
  | | | | |\   parent:      19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2720
  | | | | | |  parent:      20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2721
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2722
  | | | | | |  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
  2723
  | | | | | |  summary:     (21) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2724
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2725
  +-+-------o  changeset:   20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2726
  | | | | |    parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2727
  | | | | |    parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2728
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2729
  | | | | |    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
  2730
  | | | | |    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
  2731
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2732
  | | | | o    changeset:   19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2733
  | | | | |\   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2734
  | | | | | |  parent:      17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2735
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2736
  | | | | | |  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
  2737
  | | | | | |  summary:     (19) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2738
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2739
  o---+---+ |  changeset:   18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2740
    | | | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2741
   / / / / /   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2742
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2743
  | | | | |    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
  2744
  | | | | |    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
  2745
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2746
  | | | | o    changeset:   17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2747
  | | | | |\   parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2748
  | | | | | |  parent:      16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2749
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2750
  | | | | | |  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
  2751
  | | | | | |  summary:     (17) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2752
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2753
  +-+-------o  changeset:   16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2754
  | | | | |    parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2755
  | | | | |    parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2756
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2757
  | | | | |    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
  2758
  | | | | |    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
  2759
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2760
  | | | o |    changeset:   15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2761
  | | | |\ \   parent:      13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2762
  | | | | | |  parent:      14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2763
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2764
  | | | | | |  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
  2765
  | | | | | |  summary:     (15) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2766
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2767
  +-------o |  changeset:   14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2768
  | | | | |/   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2769
  | | | | |    parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2770
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2771
  | | | | |    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
  2772
  | | | | |    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
  2773
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2774
  | | | o |    changeset:   13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2775
  | | | |\ \   parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2776
  | | | | | |  parent:      11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2777
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2778
  | | | | | |  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
  2779
  | | | | | |  summary:     (13) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2780
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2781
  | +---+---o  changeset:   12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2782
  | | | | |    parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2783
  | | | | |    parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2784
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2785
  | | | | |    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
  2786
  | | | | |    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
  2787
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2788
  | | | | o    changeset:   11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2789
  | | | | |\   parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2790
  | | | | | |  parent:      10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2791
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2792
  | | | | | |  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
  2793
  | | | | | |  summary:     (11) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2794
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2795
  +---------o  changeset:   10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2796
  | | | | |/   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2797
  | | | | |    parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2798
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2799
  | | | | |    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
  2800
  | | | | |    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
  2801
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2802
  | | | o |    changeset:   9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2803
  | | | |\ \   parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2804
  | | | | | |  parent:      8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2805
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2806
  | | | | | |  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
  2807
  | | | | | |  summary:     (9) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2808
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2809
  +-------o |  changeset:   8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2810
  | | | |/ /   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2811
  | | | | |    parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2812
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2813
  | | | | |    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
  2814
  | | | | |    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
  2815
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2816
  | | | o |    changeset:   7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2817
  | | | |\ \   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2818
  | | | | | |  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2819
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2820
  | | | | | |  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
  2821
  | | | | | |  summary:     (7) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2822
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2823
  | | | +---o  changeset:   6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2824
  | | | | |/   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2825
  | | | | |    parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2826
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2827
  | | | | |    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
  2828
  | | | | |    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
  2829
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2830
  | | | o |    changeset:   5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2831
  | | | |\ \   parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2832
  | | | | | |  parent:      4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2833
  | | | | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2834
  | | | | | |  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
  2835
  | | | | | |  summary:     (5) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2836
  | | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2837
  | +---o | |  changeset:   4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2838
  | | | |/ /   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2839
  | | | | |    parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2840
  | | | | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2841
  | | | | |    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
  2842
  | | | | |    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
  2843
  | | | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2844
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2845
.. unless HGPLAINEXCEPT=graph is set:
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2846
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2847
  $ 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
  2848
  @  changeset:   36:08a19a744424
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2849
  :  branch:      branch
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2850
  :  tag:         tip
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2851
  :  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2852
  :  parent:      35:9159c3644c5e
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2853
  :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2854
  :  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
  2855
  :  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
  2856
  :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2857
  o    changeset:   32:d06dffa21a31
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2858
  |\   parent:      27:886ed638191b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2859
  | :  parent:      31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2860
  | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2861
  | :  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
  2862
  | :  summary:     (32) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2863
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2864
  o :  changeset:   31:621d83e11f67
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2865
  |\:  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2866
  | :  parent:      30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2867
  | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2868
  | :  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
  2869
  | :  summary:     (31) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2870
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2871
  o :    changeset:   30:6e11cd4b648f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2872
  |\ \   parent:      28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2873
  | ~ :  parent:      29:cd9bb2be7593
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2874
  |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2875
  |   :  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
  2876
  |   :  summary:     (30) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2877
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2878
  o :    changeset:   28:44ecd0b9ae99
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2879
  |\ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2880
  | ~ :  parent:      26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2881
  |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2882
  |   :  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
  2883
  |   :  summary:     (28) merge zero known
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2884
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2885
  o :    changeset:   26:7f25b6c2f0b9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2886
  |\ \   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2887
  | | :  parent:      25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2888
  | | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2889
  | | :  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
  2890
  | | :  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
  2891
  | | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2892
  | o :  changeset:   25:91da8ed57247
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2893
  | |\:  parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2894
  | | :  parent:      24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2895
  | | :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2896
  | | :  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
  2897
  | | :  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
  2898
  | | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2899
  | o :    changeset:   24:a9c19a3d96b7
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2900
  | |\ \   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2901
  | | ~ :  parent:      23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2902
  | |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2903
  | |   :  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
  2904
  | |   :  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
  2905
  | |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2906
  | o :    changeset:   23:a01cddf0766d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2907
  | |\ \   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2908
  | | ~ :  parent:      22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2909
  | |   :  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2910
  | |   :  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
  2911
  | |   :  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
  2912
  | |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2913
  | o :  changeset:   22:e0d9cccacb5d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2914
  |/:/   parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2915
  | :    parent:      21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2916
  | :    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2917
  | :    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
  2918
  | :    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
  2919
  | :
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2920
  | o    changeset:   21:d42a756af44d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2921
  | |\   parent:      19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2922
  | | |  parent:      20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2923
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2924
  | | |  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
  2925
  | | |  summary:     (21) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2926
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2927
  +---o  changeset:   20:d30ed6450e32
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2928
  | | |  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2929
  | | ~  parent:      18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2930
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2931
  | |    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
  2932
  | |    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
  2933
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2934
  | o    changeset:   19:31ddc2c1573b
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2935
  | |\   parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2936
  | | |  parent:      17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2937
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2938
  | | |  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
  2939
  | | |  summary:     (19) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2940
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2941
  o | |  changeset:   18:1aa84d96232a
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2942
  |\| |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2943
  ~ | |  parent:      15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2944
    | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2945
    | |  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
  2946
    | |  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
  2947
   / /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2948
  | o    changeset:   17:44765d7c06e0
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2949
  | |\   parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2950
  | | |  parent:      16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2951
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2952
  | | |  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
  2953
  | | |  summary:     (17) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2954
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2955
  | | o    changeset:   16:3677d192927d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2956
  | | |\   parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2957
  | | ~ ~  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2958
  | |      user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2959
  | |      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
  2960
  | |      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
  2961
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2962
  o |    changeset:   15:1dda3f72782d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2963
  |\ \   parent:      13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2964
  | | |  parent:      14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2965
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2966
  | | |  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
  2967
  | | |  summary:     (15) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2968
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2969
  | o |  changeset:   14:8eac370358ef
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2970
  | |\|  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2971
  | ~ |  parent:      12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2972
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2973
  |   |  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
  2974
  |   |  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
  2975
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2976
  o |    changeset:   13:22d8966a97e3
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2977
  |\ \   parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2978
  | | |  parent:      11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2979
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2980
  | | |  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
  2981
  | | |  summary:     (13) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2982
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2983
  +---o  changeset:   12:86b91144a6e9
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2984
  | | |  parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2985
  | | ~  parent:      9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2986
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2987
  | |    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
  2988
  | |    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
  2989
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2990
  | o    changeset:   11:832d76e6bdf2
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2991
  | |\   parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2992
  | | |  parent:      10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2993
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2994
  | | |  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
  2995
  | | |  summary:     (11) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2996
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2997
  | | o  changeset:   10:74c64d036d72
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2998
  | |/|  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  2999
  | | ~  parent:      6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3000
  | |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3001
  | |    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
  3002
  | |    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
  3003
  | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3004
  o |    changeset:   9:7010c0af0a35
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3005
  |\ \   parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3006
  | | |  parent:      8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3007
  | | |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3008
  | | |  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
  3009
  | | |  summary:     (9) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3010
  | | |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3011
  | o |  changeset:   8:7a0b11f71937
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3012
  |/| |  parent:      0:e6eb3150255d
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3013
  | ~ |  parent:      7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3014
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3015
  |   |  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
  3016
  |   |  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
  3017
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3018
  o |    changeset:   7:b632bb1b1224
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3019
  |\ \   parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3020
  | ~ |  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3021
  |   |  user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3022
  |   |  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
  3023
  |   |  summary:     (7) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3024
  |  /
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3025
  | o  changeset:   6:b105a072e251
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3026
  |/|  parent:      2:3d9a33b8d1e1
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3027
  | ~  parent:      5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3028
  |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3029
  |    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
  3030
  |    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
  3031
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3032
  o    changeset:   5:4409d547b708
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3033
  |\   parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3034
  | ~  parent:      4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3035
  |    user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3036
  |    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
  3037
  |    summary:     (5) expand
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3038
  |
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3039
  o    changeset:   4:26a8bac39d9f
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3040
  |\   parent:      1:6db2ef61d156
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3041
  ~ ~  parent:      3:27eef8ed80b4
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3042
       user:        test
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3043
       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
  3044
       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
  3045
  
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3046
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
  3047
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
  3048
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
  3049
the parent edge styling.
28999
790c076cd4a2 graphmod: disable graph styling when HGPLAIN is set (issue5212)
Martijn Pieters <mjpieters@fb.com>
parents: 28998
diff changeset
  3050
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3051
Last 3 lines:
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3052
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3053
  $ cat << EOF >> $HGRCPATH
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3054
  > [experimental]
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3055
  > graphstyle.parent = !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3056
  > graphstyle.grandparent = 3.
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3057
  > graphstyle.missing =
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3058
  > EOF
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3059
  $ hg log -G -r '36:18 & file("a")' -m
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3060
  @  changeset:   36:08a19a744424
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3061
  !  branch:      branch
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3062
  !  tag:         tip
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3063
  !  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3064
  !  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3065
  !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3066
  .  date:        Thu Jan 01 00:00:36 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3067
  .  summary:     (36) buggy merge: identical parents
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3068
  .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3069
  o    changeset:   32:d06dffa21a31
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3070
  !\   parent:      27:886ed638191b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3071
  ! !  parent:      31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3072
  ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3073
  ! .  date:        Thu Jan 01 00:00:32 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3074
  ! .  summary:     (32) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3075
  ! .
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3076
  o !  changeset:   31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3077
  !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3078
  ! !  parent:      30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3079
  ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3080
  ! !  date:        Thu Jan 01 00:00:31 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3081
  ! !  summary:     (31) expand
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3082
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3083
  o !    changeset:   30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3084
  !\ \   parent:      28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3085
  ! ~ !  parent:      29:cd9bb2be7593
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3086
  !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3087
  !   !  date:        Thu Jan 01 00:00:30 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3088
  !   !  summary:     (30) expand
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3089
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3090
  o !    changeset:   28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3091
  !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3092
  ! ~ !  parent:      26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3093
  !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3094
  !   !  date:        Thu Jan 01 00:00:28 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3095
  !   !  summary:     (28) merge zero known
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3096
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3097
  o !    changeset:   26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3098
  !\ \   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3099
  ! ! !  parent:      25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3100
  ! ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3101
  ! ! !  date:        Thu Jan 01 00:00:26 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3102
  ! ! !  summary:     (26) merge one known; far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3103
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3104
  ! o !  changeset:   25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3105
  ! !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3106
  ! ! !  parent:      24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3107
  ! ! !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3108
  ! ! !  date:        Thu Jan 01 00:00:25 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3109
  ! ! !  summary:     (25) merge one known; far left
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3110
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3111
  ! o !    changeset:   24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3112
  ! !\ \   parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3113
  ! ! ~ !  parent:      23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3114
  ! !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3115
  ! !   !  date:        Thu Jan 01 00:00:24 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3116
  ! !   !  summary:     (24) merge one known; immediate right
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3117
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3118
  ! o !    changeset:   23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3119
  ! !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3120
  ! ! ~ !  parent:      22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3121
  ! !   !  user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3122
  ! !   !  date:        Thu Jan 01 00:00:23 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3123
  ! !   !  summary:     (23) merge one known; immediate left
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3124
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3125
  ! o !  changeset:   22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3126
  !/!/   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3127
  ! !    parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3128
  ! !    user:        test
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3129
  ! !    date:        Thu Jan 01 00:00:22 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3130
  ! !    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
  3131
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3132
  ! o    changeset:   21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3133
  ! !\   parent:      19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3134
  ! ! !  parent:      20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3135
  ! ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3136
  ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3137
  ! ! !  summary:     (21) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3138
  ! ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3139
  +---o  changeset:   20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3140
  ! ! |  parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3141
  ! ! ~  parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3142
  ! !    user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3143
  ! !    date:        Thu Jan 01 00:00:20 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3144
  ! !    summary:     (20) merge two known; two far right
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3145
  ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3146
  ! o    changeset:   19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3147
  ! |\   parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3148
  ! ~ ~  parent:      17:44765d7c06e0
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3149
  !      user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3150
  !      date:        Thu Jan 01 00:00:19 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3151
  !      summary:     (19) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3152
  !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3153
  o    changeset:   18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3154
  |\   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3155
  ~ ~  parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3156
       user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3157
       date:        Thu Jan 01 00:00:18 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3158
       summary:     (18) merge two known; two far left
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3159
  
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3160
All but the first 3 lines:
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3161
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3162
  $ cat << EOF >> $HGRCPATH
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3163
  > [experimental]
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3164
  > graphstyle.parent = !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3165
  > graphstyle.grandparent = -3.
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3166
  > graphstyle.missing =
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3167
  > EOF
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3168
  $ hg log -G -r '36:18 & file("a")' -m
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3169
  @  changeset:   36:08a19a744424
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3170
  !  branch:      branch
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3171
  !  tag:         tip
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3172
  .  parent:      35:9159c3644c5e
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3173
  .  parent:      35:9159c3644c5e
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:36 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3176
  .  summary:     (36) buggy merge: identical parents
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:   32:d06dffa21a31
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3179
  !\   parent:      27:886ed638191b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3180
  ! !  parent:      31:621d83e11f67
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:32 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3183
  ! .  summary:     (32) expand
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
  o !  changeset:   31:621d83e11f67
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3186
  !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3187
  ! !  parent:      30:6e11cd4b648f
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3188
  ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3189
  ! !  date:        Thu Jan 01 00:00:31 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3190
  ! !  summary:     (31) expand
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3191
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3192
  o !    changeset:   30:6e11cd4b648f
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3193
  !\ \   parent:      28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3194
  ! ~ !  parent:      29:cd9bb2be7593
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3195
  !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3196
  !   !  date:        Thu Jan 01 00:00:30 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3197
  !   !  summary:     (30) expand
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3198
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3199
  o !    changeset:   28:44ecd0b9ae99
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3200
  !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3201
  ! ~ !  parent:      26:7f25b6c2f0b9
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3202
  !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3203
  !   !  date:        Thu Jan 01 00:00:28 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3204
  !   !  summary:     (28) merge zero known
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3205
  !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3206
  o !    changeset:   26:7f25b6c2f0b9
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3207
  !\ \   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3208
  ! ! !  parent:      25:91da8ed57247
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3209
  ! ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3210
  ! ! !  date:        Thu Jan 01 00:00:26 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3211
  ! ! !  summary:     (26) merge one known; far right
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3212
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3213
  ! o !  changeset:   25:91da8ed57247
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3214
  ! !\!  parent:      21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3215
  ! ! !  parent:      24:a9c19a3d96b7
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3216
  ! ! !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3217
  ! ! !  date:        Thu Jan 01 00:00:25 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3218
  ! ! !  summary:     (25) merge one known; far left
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3219
  ! ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3220
  ! o !    changeset:   24:a9c19a3d96b7
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3221
  ! !\ \   parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3222
  ! ! ~ !  parent:      23:a01cddf0766d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3223
  ! !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3224
  ! !   !  date:        Thu Jan 01 00:00:24 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3225
  ! !   !  summary:     (24) merge one known; immediate right
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3226
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3227
  ! o !    changeset:   23:a01cddf0766d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3228
  ! !\ \   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3229
  ! ! ~ !  parent:      22:e0d9cccacb5d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3230
  ! !   !  user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3231
  ! !   !  date:        Thu Jan 01 00:00:23 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3232
  ! !   !  summary:     (23) merge one known; immediate left
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3233
  ! !  /
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3234
  ! o !  changeset:   22:e0d9cccacb5d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3235
  !/!/   parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3236
  ! !    parent:      21:d42a756af44d
29184
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3237
  ! !    user:        test
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3238
  ! !    date:        Thu Jan 01 00:00:22 1970 +0000
09d0022cad83 graphmod: update edgemap in-place
Martijn Pieters <mjpieters@fb.com>
parents: 29134
diff changeset
  3239
  ! !    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
  3240
  ! !
29134
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3241
  ! o    changeset:   21:d42a756af44d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3242
  ! !\   parent:      19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3243
  ! ! !  parent:      20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3244
  ! ! !  user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3245
  ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3246
  ! ! !  summary:     (21) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3247
  ! ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3248
  +---o  changeset:   20:d30ed6450e32
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3249
  ! ! |  parent:      0:e6eb3150255d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3250
  ! ! ~  parent:      18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3251
  ! !    user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3252
  ! !    date:        Thu Jan 01 00:00:20 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3253
  ! !    summary:     (20) merge two known; two far right
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3254
  ! !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3255
  ! o    changeset:   19:31ddc2c1573b
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3256
  ! |\   parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3257
  ! ~ ~  parent:      17:44765d7c06e0
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3258
  !      user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3259
  !      date:        Thu Jan 01 00:00:19 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3260
  !      summary:     (19) expand
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3261
  !
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3262
  o    changeset:   18:1aa84d96232a
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3263
  |\   parent:      1:6db2ef61d156
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3264
  ~ ~  parent:      15:1dda3f72782d
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3265
       user:        test
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3266
       date:        Thu Jan 01 00:00:18 1970 +0000
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3267
       summary:     (18) merge two known; two far left
8d5584d8345b graphmod: partial edge styling
Martijn Pieters <mjpieters@fb.com>
parents: 28999
diff changeset
  3268
  
28600
0d6137891114 graphmod: allow for different styles for different edge types
Martijn Pieters <mjpieters@fb.com>
parents: 28428
diff changeset
  3269
  $ cd ..
28891
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3270
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3271
Change graph shorten, test better with graphstyle.missing not none
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3272
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3273
  $ cd repo
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3274
  $ cat << EOF >> $HGRCPATH
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3275
  > [experimental]
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3276
  > graphstyle.parent = |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3277
  > graphstyle.grandparent = :
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3278
  > graphstyle.missing = '
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3279
  > graphshorten = true
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3280
  > EOF
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3281
  $ hg log -G -r 'file("a")' -m -T '{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3282
  @  36 (36) buggy merge: identical parents
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3283
  o    32 (32) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3284
  |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3285
  o :  31 (31) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3286
  |\:
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3287
  o :    30 (30) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3288
  |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3289
  o \ \    28 (28) merge zero known
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3290
  |\ \ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3291
  o \ \ \    26 (26) merge one known; far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3292
  |\ \ \ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3293
  | o-----+  25 (25) merge one known; far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3294
  | o ' ' :    24 (24) merge one known; immediate right
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
  | o---+ ' :  23 (23) merge one known; immediate left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3297
  | o-------+  22 (22) merge two known; one far left, one far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3298
  |/ / / / /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3299
  | ' ' ' o    21 (21) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3300
  | ' ' ' |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3301
  +-+-------o  20 (20) merge two known; two far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3302
  | ' ' ' o    19 (19) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3303
  | ' ' ' |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3304
  o---+---+ |  18 (18) merge two known; two far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3305
   / / / / /
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3306
  ' ' ' | o    17 (17) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3307
  ' ' ' | |\
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3308
  +-+-------o  16 (16) merge two known; one immediate right, one near right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3309
  ' ' ' o |    15 (15) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3310
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3311
  +-------o |  14 (14) merge two known; one immediate right, one far right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3312
  ' ' ' | |/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3313
  ' ' ' o |    13 (13) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3314
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3315
  ' +---+---o  12 (12) merge two known; one immediate right, one far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3316
  ' ' ' | o    11 (11) expand
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  10 (10) merge two known; one immediate left, one near right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3319
  ' ' ' | |/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3320
  ' ' ' o |    9 (9) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3321
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3322
  +-------o |  8 (8) merge two known; one immediate 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 |    7 (7) 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  6 (6) merge two known; one immediate left, one far left
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3327
  ' ' ' | '/
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3328
  ' ' ' o '    5 (5) expand
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3329
  ' ' ' |\ \
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3330
  ' +---o ' '  4 (4) merge two known; one immediate left, one immediate right
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3331
  ' ' ' '/ /
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
behavior with newlines
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3334
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3335
  $ hg log -G -r ::2 -T '{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3336
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3337
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3338
  o  0 (0) root
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
  $ hg log -G -r ::2 -T '{rev} {desc}\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3341
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3342
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3343
  o  0 (0) root
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
  $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3346
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3347
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3348
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3349
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3350
  o  0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3351
  
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
  $ hg log -G -r ::2 -T '\n{rev} {desc}'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3354
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3355
  |  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3356
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3357
  |  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3358
  o
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3359
     0 (0) root
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3360
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3361
  $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3362
  o  2 (2) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3363
  |
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
  o  1 (1) collapse
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3366
  |
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3367
  |
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
  
ac30adb260ea graphmod: shorten graph
santiagopim <santiagopim@gmail.com>
parents: 28627
diff changeset
  3371
  $ cd ..
28998
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3372
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3373
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
  3374
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
  3375
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3376
  $ hg init repo-issue5174
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3377
  $ cd repo-issue5174
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3378
  $ echo a > f0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3379
  $ hg ci -Aqm 0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3380
  $ echo a > f1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3381
  $ hg ci -Aqm 1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3382
  $ echo a > f2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3383
  $ hg ci -Aqm 2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3384
  $ hg co ".^"
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3385
  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
  3386
  $ echo a > f3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3387
  $ hg ci -Aqm 3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3388
  $ hg co ".^^"
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3389
  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
  3390
  $ echo a > f4
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3391
  $ hg ci -Aqm 4
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3392
  $ hg merge -r 2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3393
  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
  3394
  (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
  3395
  $ hg ci -qm 5
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3396
  $ hg merge -r 3
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3397
  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
  3398
  (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
  3399
  $ hg ci -qm 6
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3400
  $ 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
  3401
  @    changeset:   6:851fe89689ad
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3402
  :\   tag:         tip
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3403
  : :  parent:      5:4f1e3cf15f5d
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3404
  : :  parent:      3:b74ba7084d2d
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3405
  : :  user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3406
  : :  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
  3407
  : :  summary:     6
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3408
  : :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3409
  : \
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3410
  : :\
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3411
  : o :  changeset:   2:3e6599df4cce
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3412
  : :/   user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3413
  : :    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
  3414
  : :    summary:     2
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3415
  : :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3416
  : o  changeset:   1:bd9a55143933
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3417
  :/   user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3418
  :    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
  3419
  :    summary:     1
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3420
  :
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3421
  o  changeset:   0:870a5edc339c
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3422
     user:        test
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3423
     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
  3424
     summary:     0
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3425
  
f303b569134c graphmod: fix seen state handling for > 2 parents (issue5174)
Martijn Pieters <mjpieters@fb.com>
parents: 28891
diff changeset
  3426
31552
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3427
  $ cd ..
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3428
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3429
Multiple roots (issue5440):
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3430
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3431
  $ hg init multiroots
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3432
  $ cd multiroots
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3433
  $ cat <<EOF > .hg/hgrc
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3434
  > [ui]
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3435
  > logtemplate = '{rev} {desc}\n\n'
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3436
  > EOF
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3437
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3438
  $ touch foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3439
  $ hg ci -Aqm foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3440
  $ hg co -q null
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3441
  $ touch bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3442
  $ hg ci -Aqm bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3443
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3444
  $ hg log -Gr null:
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3445
  @  1 bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3446
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3447
  | o  0 foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3448
  |/
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3449
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3450
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3451
  $ hg log -Gr null+0
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3452
  o  0 foo
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3453
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3454
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3455
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3456
  $ hg log -Gr null+1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3457
  @  1 bar
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3458
  |
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3459
  o  -1
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3460
  
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3461
d0b9e9803caf graphlog: draw multiple edges towards null node (issue5440)
Yuya Nishihara <yuya@tcha.org>
parents: 31024
diff changeset
  3462
  $ cd ..