annotate tests/test-glog.t @ 35950:7b2b82f891bf stable

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