annotate tests/test-glog.t @ 22067:14306a686e71

test-check-commit-hg.t: automatically test all 'draft() and ::.' changesets We introduce a test-check-commit-hg.t file that will happily run the check-commit file on all draft changeset under the working directory. This should help newcomers to catch up with the rules. (And will helps old timer from time to time).
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 06 Aug 2014 01:40:51 -0700
parents 739095270f48
children 1dd178277cf5
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
17180
ae0629161090 graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents: 17120
diff changeset
85 > from mercurial import extensions, revset, commands, cmdutil
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 17207
diff changeset
86 >
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
87 > def uisetup(ui):
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
88 > def printrevset(orig, ui, repo, *pats, **opts):
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
89 > if opts.get('print_revset'):
17180
ae0629161090 graphlog: extract revset/support functions into cmdutil
Patrick Mezard <patrick@mezard.eu>
parents: 17120
diff changeset
90 > expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1]
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
91 > if expr:
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
92 > tree = revset.parse(expr)[0]
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
93 > else:
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
94 > tree = []
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
95 > ui.write('%r\n' % (opts.get('rev', []),))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
96 > ui.write(revset.prettyformat(tree) + '\n')
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
97 > return 0
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
98 > return orig(ui, repo, *pats, **opts)
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
99 > entry = extensions.wrapcommand(commands.table, 'log', printrevset)
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
100 > entry[1].append(('', 'print-revset', False,
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
101 > 'print generated revset and exit (DEPRECATED)'))
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
102 > EOF
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
103
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
104 $ echo "[extensions]" >> $HGRCPATH
16146
267cebac84c3 test-glog.t: use printrevset extension to trace rewritten revsets
Patrick Mezard <patrick@mezard.eu>
parents: 14133
diff changeset
105 $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
106
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
107 $ hg init repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
108 $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
109
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
110 Empty repo:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
111
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
112 $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
113
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
114
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
115 Building DAG:
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
116
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
117 $ commit 0 "root"
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
118 $ commit 1 "collapse" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
119 $ commit 2 "collapse" 1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
120 $ commit 3 "collapse" 2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
121 $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
122 $ commit 5 "expand" 3 4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
123 $ commit 6 "merge two known; one immediate left, one far left" 2 5
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
124 $ commit 7 "expand" 2 5
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
125 $ commit 8 "merge two known; one immediate left, one far right" 0 7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
126 $ commit 9 "expand" 7 8
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
127 $ commit 10 "merge two known; one immediate left, one near right" 0 6
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
128 $ commit 11 "expand" 6 10
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
129 $ commit 12 "merge two known; one immediate right, one far left" 1 9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
130 $ commit 13 "expand" 9 11
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
131 $ commit 14 "merge two known; one immediate right, one far right" 0 12
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
132 $ commit 15 "expand" 13 14
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
133 $ commit 16 "merge two known; one immediate right, one near right" 0 1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
134 $ commit 17 "expand" 12 16
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
135 $ commit 18 "merge two known; two far left" 1 15
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
136 $ commit 19 "expand" 15 17
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
137 $ commit 20 "merge two known; two far right" 0 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
138 $ commit 21 "expand" 19 20
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
139 $ commit 22 "merge two known; one far left, one far right" 18 21
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
140 $ commit 23 "merge one known; immediate left" 1 22
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
141 $ commit 24 "merge one known; immediate right" 0 23
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
142 $ commit 25 "merge one known; far left" 21 24
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
143 $ commit 26 "merge one known; far right" 18 25
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
144 $ commit 27 "collapse" 21
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
145 $ commit 28 "merge zero known" 1 26
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
146 $ commit 29 "regular commit" 0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
147 $ commit 30 "expand" 28 29
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
148 $ commit 31 "expand" 21 30
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
149 $ commit 32 "expand" 27 31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
150 $ commit 33 "head" 18
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
151 $ commit 34 "head" 32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
152
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
153
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
154 $ hg log -G -q
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
155 @ 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
156 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
157 | o 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
158 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
159 o | 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
160 |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
161 | o \ 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
162 | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
163 | | o \ 30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
164 | | |\ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
165 | | | o | 29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
166 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
167 | | o | | 28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
168 | | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
169 o | | | | | 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
170 |/ / / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
171 | | o---+ 26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
172 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
173 +---o | | 25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
174 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
175 | | o | | 24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
176 | | |\| |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
177 | | o | | 23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
178 | |/| | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
179 +---o---+ 22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
180 | | / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
181 o | | | 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
182 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
183 | o---+-+ 20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
184 | / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
185 o | | | 19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
186 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
187 +---+---o 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
188 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
189 | o | | 17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
190 | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
191 | | o---+ 16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
192 | | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
193 o | | | 15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
194 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
195 | o-----+ 14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
196 | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
197 o | | | 13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
198 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
199 +---o | | 12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
200 | | |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
201 | o | | 11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
202 | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
203 | | o---+ 10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
204 | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
205 o | | | 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
206 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
207 | o-----+ 8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
208 |/ / / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
209 o | | | 7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
210 |\ \ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
211 +---o | | 6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
212 | |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
213 | o | | 5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
214 | |\ \ \
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
215 | | o | | 4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
216 | |/|/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
217 | o / / 3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
218 |/ / /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
219 o / / 2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
220 |/ /
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
221 o / 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
222 |/
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
223 o 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
224
4344
345ed833854d Add graphlog extension
Joel Rosdahl <joel@rosdahl.net>
parents:
diff changeset
225
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
226 $ hg log -G
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
227 @ changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
228 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
229 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
230 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
231 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
232 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
233 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
234 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
235 | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
236 | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
237 | | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
238 | | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
239 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
240 o | changeset: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
241 |\ \ parent: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
242 | | | parent: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
243 | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
244 | | | date: Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
245 | | | summary: (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
246 | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
247 | o | changeset: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
248 | |\ \ parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
249 | | | | parent: 30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
250 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
251 | | | | date: Thu Jan 01 00:00:31 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
252 | | | | summary: (31) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
253 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
254 | | o | changeset: 30:6e11cd4b648f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
255 | | |\ \ parent: 28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
256 | | | | | parent: 29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
257 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
258 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
259 | | | | | summary: (30) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
260 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
261 | | | o | changeset: 29:cd9bb2be7593
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
262 | | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
263 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
264 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
265 | | | | | summary: (29) regular commit
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
266 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
267 | | o | | changeset: 28:44ecd0b9ae99
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
268 | | |\ \ \ parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
269 | | | | | | parent: 26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
270 | | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
271 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
272 | | | | | | summary: (28) merge zero known
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
273 | | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
274 o | | | | | changeset: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
275 |/ / / / / parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
276 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
277 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
278 | | | | | summary: (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
279 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
280 | | o---+ changeset: 26:7f25b6c2f0b9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
281 | | | | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
282 | | | | | parent: 25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
283 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
284 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
285 | | | | | summary: (26) merge one known; far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
286 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
287 +---o | | changeset: 25:91da8ed57247
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
288 | | | | | parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
289 | | | | | parent: 24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
290 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
291 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
292 | | | | | summary: (25) merge one known; far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
293 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
294 | | o | | changeset: 24:a9c19a3d96b7
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
295 | | |\| | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
296 | | | | | parent: 23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
297 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
298 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
299 | | | | | summary: (24) merge one known; immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
300 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
301 | | o | | changeset: 23:a01cddf0766d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
302 | |/| | | parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
303 | | | | | parent: 22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
304 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
305 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
306 | | | | | summary: (23) merge one known; immediate left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
307 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
308 +---o---+ changeset: 22:e0d9cccacb5d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
309 | | | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
310 | | / / parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
311 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
312 | | | | date: Thu Jan 01 00:00:22 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
313 | | | | summary: (22) merge two known; one far left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
314 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
315 o | | | changeset: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
316 |\ \ \ \ parent: 19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
317 | | | | | parent: 20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
318 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
319 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
320 | | | | | summary: (21) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
321 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
322 | o---+-+ changeset: 20:d30ed6450e32
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
323 | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
324 | / / / parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
325 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
326 | | | | date: Thu Jan 01 00:00:20 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
327 | | | | summary: (20) merge two known; two far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
328 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
329 o | | | changeset: 19:31ddc2c1573b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
330 |\ \ \ \ parent: 15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
331 | | | | | parent: 17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
332 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
333 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
334 | | | | | summary: (19) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
335 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
336 +---+---o changeset: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
337 | | | | parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
338 | | | | parent: 15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
339 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
340 | | | | date: Thu Jan 01 00:00:18 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
341 | | | | summary: (18) merge two known; two far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
342 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
343 | o | | changeset: 17:44765d7c06e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
344 | |\ \ \ parent: 12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
345 | | | | | parent: 16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
346 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
347 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
348 | | | | | summary: (17) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
349 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
350 | | o---+ changeset: 16:3677d192927d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
351 | | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
352 | | |/ / parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
353 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
354 | | | | date: Thu Jan 01 00:00:16 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
355 | | | | summary: (16) merge two known; one immediate right, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
356 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
357 o | | | changeset: 15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
358 |\ \ \ \ parent: 13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
359 | | | | | parent: 14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
360 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
361 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
362 | | | | | summary: (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
363 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
364 | o-----+ changeset: 14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
365 | | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
366 | |/ / / parent: 12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
367 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
368 | | | | date: Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
369 | | | | summary: (14) merge two known; one immediate right, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
370 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
371 o | | | changeset: 13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
372 |\ \ \ \ parent: 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
373 | | | | | parent: 11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
374 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
375 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
376 | | | | | summary: (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
377 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
378 +---o | | changeset: 12:86b91144a6e9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
379 | | |/ / parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
380 | | | | parent: 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
381 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
382 | | | | date: Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
383 | | | | summary: (12) merge two known; one immediate right, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
384 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
385 | o | | changeset: 11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
386 | |\ \ \ parent: 6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
387 | | | | | parent: 10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
388 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
389 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
390 | | | | | summary: (11) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
391 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
392 | | o---+ changeset: 10:74c64d036d72
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
393 | | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
394 | |/ / / parent: 6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
395 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
396 | | | | date: Thu Jan 01 00:00:10 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
397 | | | | summary: (10) merge two known; one immediate left, one near right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
398 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
399 o | | | changeset: 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
400 |\ \ \ \ parent: 7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
401 | | | | | parent: 8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
402 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
403 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
404 | | | | | summary: (9) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
405 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
406 | o-----+ changeset: 8:7a0b11f71937
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
407 | | | | | parent: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
408 |/ / / / parent: 7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
409 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
410 | | | | date: Thu Jan 01 00:00:08 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
411 | | | | summary: (8) merge two known; one immediate left, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
412 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
413 o | | | changeset: 7:b632bb1b1224
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
414 |\ \ \ \ parent: 2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
415 | | | | | parent: 5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
416 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
417 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
418 | | | | | summary: (7) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
419 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
420 +---o | | changeset: 6:b105a072e251
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
421 | |/ / / parent: 2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
422 | | | | parent: 5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
423 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
424 | | | | date: Thu Jan 01 00:00:06 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
425 | | | | summary: (6) merge two known; one immediate left, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
426 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
427 | o | | changeset: 5:4409d547b708
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
428 | |\ \ \ parent: 3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
429 | | | | | parent: 4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
430 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
431 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
432 | | | | | summary: (5) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
433 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
434 | | o | | changeset: 4:26a8bac39d9f
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
435 | |/|/ / parent: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
436 | | | | parent: 3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
437 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
438 | | | | date: Thu Jan 01 00:00:04 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
439 | | | | summary: (4) merge two known; one immediate left, one immediate right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
440 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
441 | o | | changeset: 3:27eef8ed80b4
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
442 |/ / / user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
443 | | | date: Thu Jan 01 00:00:03 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
444 | | | summary: (3) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
445 | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
446 o | | changeset: 2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
447 |/ / user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
448 | | date: Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
449 | | summary: (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
450 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
451 o | changeset: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
452 |/ user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
453 | date: Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
454 | summary: (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
455 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
456 o changeset: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
457 user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
458 date: Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
459 summary: (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
460
5939
56e8a54bf71d graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents: 4735
diff changeset
461
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
462 File glog:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
463 $ hg log -G a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
464 @ changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
465 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
466 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
467 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
468 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
469 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
470 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
471 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
472 | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
473 | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
474 | | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
475 | | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
476 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
477 o | changeset: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
478 |\ \ parent: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
479 | | | parent: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
480 | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
481 | | | date: Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
482 | | | summary: (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
483 | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
484 | o | changeset: 31:621d83e11f67
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
485 | |\ \ parent: 21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
486 | | | | parent: 30:6e11cd4b648f
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
487 | | | | user: test
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
488 | | | | date: Thu Jan 01 00:00:31 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
489 | | | | summary: (31) expand
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
490 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
491 | | o | changeset: 30:6e11cd4b648f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
492 | | |\ \ parent: 28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
493 | | | | | parent: 29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
494 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
495 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
496 | | | | | summary: (30) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
497 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
498 | | | o | changeset: 29:cd9bb2be7593
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
499 | | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
500 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
501 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
502 | | | | | summary: (29) regular commit
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
503 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
504 | | o | | changeset: 28:44ecd0b9ae99
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
505 | | |\ \ \ parent: 1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
506 | | | | | | parent: 26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
507 | | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
508 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
509 | | | | | | summary: (28) merge zero known
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
510 | | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
511 o | | | | | changeset: 27:886ed638191b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
512 |/ / / / / parent: 21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
513 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
514 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
515 | | | | | summary: (27) collapse
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
516 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
517 | | o---+ changeset: 26:7f25b6c2f0b9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
518 | | | | | parent: 18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
519 | | | | | parent: 25:91da8ed57247
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
520 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
521 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
522 | | | | | summary: (26) merge one known; far right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
523 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
524 +---o | | changeset: 25:91da8ed57247
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
525 | | | | | parent: 21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
526 | | | | | parent: 24:a9c19a3d96b7
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
527 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
528 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
529 | | | | | summary: (25) merge one known; far left
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
530 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
531 | | o | | changeset: 24:a9c19a3d96b7
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
532 | | |\| | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
533 | | | | | parent: 23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
534 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
535 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
536 | | | | | summary: (24) merge one known; immediate right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
537 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
538 | | o | | changeset: 23:a01cddf0766d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
539 | |/| | | parent: 1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
540 | | | | | parent: 22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
541 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
542 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
543 | | | | | summary: (23) merge one known; immediate left
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
544 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
545 +---o---+ changeset: 22:e0d9cccacb5d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
546 | | | | parent: 18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
547 | | / / parent: 21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
548 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
549 | | | | date: Thu Jan 01 00:00:22 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
550 | | | | summary: (22) merge two known; one far left, one far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
551 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
552 o | | | changeset: 21:d42a756af44d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
553 |\ \ \ \ parent: 19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
554 | | | | | parent: 20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
555 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
556 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
557 | | | | | summary: (21) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
558 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
559 | o---+-+ changeset: 20:d30ed6450e32
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
560 | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
561 | / / / parent: 18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
562 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
563 | | | | date: Thu Jan 01 00:00:20 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
564 | | | | summary: (20) merge two known; two far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
565 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
566 o | | | changeset: 19:31ddc2c1573b
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
567 |\ \ \ \ parent: 15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
568 | | | | | parent: 17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
569 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
570 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
571 | | | | | summary: (19) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
572 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
573 +---+---o changeset: 18:1aa84d96232a
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
574 | | | | parent: 1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
575 | | | | parent: 15:1dda3f72782d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
576 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
577 | | | | date: Thu Jan 01 00:00:18 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
578 | | | | summary: (18) merge two known; two far left
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
579 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
580 | o | | changeset: 17:44765d7c06e0
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
581 | |\ \ \ parent: 12:86b91144a6e9
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
582 | | | | | parent: 16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
583 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
584 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
585 | | | | | summary: (17) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
586 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
587 | | o---+ changeset: 16:3677d192927d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
588 | | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
589 | | |/ / parent: 1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
590 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
591 | | | | date: Thu Jan 01 00:00:16 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
592 | | | | summary: (16) merge two known; one immediate right, one near right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
593 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
594 o | | | changeset: 15:1dda3f72782d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
595 |\ \ \ \ parent: 13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
596 | | | | | parent: 14:8eac370358ef
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
597 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
598 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
599 | | | | | summary: (15) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
600 | | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
601 | o-----+ changeset: 14:8eac370358ef
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
602 | | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
603 | |/ / / parent: 12:86b91144a6e9
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
604 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
605 | | | | date: Thu Jan 01 00:00:14 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
606 | | | | summary: (14) merge two known; one immediate right, one far right
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
607 | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
608 o | | | changeset: 13:22d8966a97e3
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
609 |\ \ \ \ parent: 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
610 | | | | | parent: 11:832d76e6bdf2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
611 | | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
612 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
613 | | | | | summary: (13) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
614 | | | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
615 +---o | | changeset: 12:86b91144a6e9
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
616 | | |/ / parent: 1:6db2ef61d156
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
617 | | | | parent: 9:7010c0af0a35
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
618 | | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
619 | | | | date: Thu Jan 01 00:00:12 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
620 | | | | summary: (12) merge two known; one immediate right, one far left
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
621 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
622 | o | | changeset: 11:832d76e6bdf2
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
623 | |\ \ \ parent: 6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
624 | | | | | parent: 10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
625 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
626 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
627 | | | | | summary: (11) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
628 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
629 | | o---+ changeset: 10:74c64d036d72
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
630 | | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
631 | |/ / / parent: 6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
632 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
633 | | | | date: Thu Jan 01 00:00:10 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
634 | | | | summary: (10) merge two known; one immediate left, one near right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
635 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
636 o | | | changeset: 9:7010c0af0a35
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
637 |\ \ \ \ parent: 7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
638 | | | | | parent: 8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
639 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
640 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
641 | | | | | summary: (9) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
642 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
643 | o-----+ changeset: 8:7a0b11f71937
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
644 | | | | | parent: 0:e6eb3150255d
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
645 |/ / / / parent: 7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
646 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
647 | | | | date: Thu Jan 01 00:00:08 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
648 | | | | summary: (8) merge two known; one immediate left, one far right
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
649 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
650 o | | | changeset: 7:b632bb1b1224
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
651 |\ \ \ \ parent: 2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
652 | | | | | parent: 5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
653 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
654 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
655 | | | | | summary: (7) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
656 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
657 +---o | | changeset: 6:b105a072e251
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
658 | |/ / / parent: 2:3d9a33b8d1e1
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
659 | | | | parent: 5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
660 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
661 | | | | date: Thu Jan 01 00:00:06 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
662 | | | | summary: (6) merge two known; one immediate left, one far left
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
663 | | | |
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
664 | o | | changeset: 5:4409d547b708
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
665 | |\ \ \ parent: 3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
666 | | | | | parent: 4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
667 | | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
668 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
669 | | | | | summary: (5) expand
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
670 | | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
671 | | o | | changeset: 4:26a8bac39d9f
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
672 | |/|/ / parent: 1:6db2ef61d156
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
673 | | | | parent: 3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
674 | | | | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
675 | | | | date: Thu Jan 01 00:00:04 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
676 | | | | summary: (4) merge two known; one immediate left, one immediate right
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
677 | | | |
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
678 | o | | changeset: 3:27eef8ed80b4
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
679 |/ / / user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
680 | | | date: Thu Jan 01 00:00:03 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
681 | | | summary: (3) collapse
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
682 | | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
683 o | | changeset: 2:3d9a33b8d1e1
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
684 |/ / user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
685 | | date: Thu Jan 01 00:00:02 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
686 | | summary: (2) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
687 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
688 o | changeset: 1:6db2ef61d156
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
689 |/ user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
690 | date: Thu Jan 01 00:00:01 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
691 | summary: (1) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
692 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
693 o changeset: 0:e6eb3150255d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
694 user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
695 date: Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
696 summary: (0) root
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
697
7383
b501c7f3c2ad graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6969
diff changeset
698
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
699 File glog per revset:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
700
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
701 $ hg log -G -r 'file("a")'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
702 @ changeset: 34:fea3ac5810e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
703 | tag: tip
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
704 | parent: 32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
705 | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
706 | date: Thu Jan 01 00:00:34 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
707 | summary: (34) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
708 |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
709 | o changeset: 33:68608f5145f9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
710 | | parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
711 | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
712 | | date: Thu Jan 01 00:00:33 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
713 | | summary: (33) head
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
714 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
715 o | changeset: 32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
716 |\ \ parent: 27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
717 | | | parent: 31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
718 | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
719 | | | date: Thu Jan 01 00:00:32 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
720 | | | summary: (32) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
721 | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
722 | o | changeset: 31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
723 | |\ \ parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
724 | | | | parent: 30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
725 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
726 | | | | date: Thu Jan 01 00:00:31 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
727 | | | | summary: (31) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
728 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
729 | | o | changeset: 30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
730 | | |\ \ parent: 28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
731 | | | | | parent: 29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
732 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
733 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
734 | | | | | summary: (30) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
735 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
736 | | | o | changeset: 29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
737 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
738 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
739 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
740 | | | | | summary: (29) regular commit
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
741 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
742 | | o | | changeset: 28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
743 | | |\ \ \ parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
744 | | | | | | parent: 26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
745 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
746 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
747 | | | | | | summary: (28) merge zero known
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
748 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
749 o | | | | | changeset: 27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
750 |/ / / / / parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
751 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
752 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
753 | | | | | summary: (27) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
754 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
755 | | o---+ changeset: 26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
756 | | | | | parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
757 | | | | | parent: 25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
758 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
759 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
760 | | | | | summary: (26) merge one known; far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
761 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
762 +---o | | changeset: 25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
763 | | | | | parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
764 | | | | | parent: 24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
765 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
766 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
767 | | | | | summary: (25) merge one known; far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
768 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
769 | | o | | changeset: 24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
770 | | |\| | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
771 | | | | | parent: 23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
772 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
773 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
774 | | | | | summary: (24) merge one known; immediate right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
775 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
776 | | o | | changeset: 23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
777 | |/| | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
778 | | | | | parent: 22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
779 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
780 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
781 | | | | | summary: (23) merge one known; immediate left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
782 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
783 +---o---+ changeset: 22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
784 | | | | parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
785 | | / / parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
786 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
787 | | | | date: Thu Jan 01 00:00:22 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
788 | | | | summary: (22) merge two known; one far left, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
789 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
790 o | | | changeset: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
791 |\ \ \ \ parent: 19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
792 | | | | | parent: 20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
793 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
794 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
795 | | | | | summary: (21) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
796 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
797 | o---+-+ changeset: 20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
798 | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
799 | / / / parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
800 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
801 | | | | date: Thu Jan 01 00:00:20 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
802 | | | | summary: (20) merge two known; two far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
803 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
804 o | | | changeset: 19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
805 |\ \ \ \ parent: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
806 | | | | | parent: 17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
807 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
808 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
809 | | | | | summary: (19) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
810 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
811 +---+---o changeset: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
812 | | | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
813 | | | | parent: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
814 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
815 | | | | date: Thu Jan 01 00:00:18 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
816 | | | | summary: (18) merge two known; two far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
817 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
818 | o | | changeset: 17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
819 | |\ \ \ parent: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
820 | | | | | parent: 16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
821 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
822 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
823 | | | | | summary: (17) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
824 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
825 | | o---+ changeset: 16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
826 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
827 | | |/ / parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
828 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
829 | | | | date: Thu Jan 01 00:00:16 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
830 | | | | summary: (16) merge two known; one immediate right, one near right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
831 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
832 o | | | changeset: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
833 |\ \ \ \ parent: 13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
834 | | | | | parent: 14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
835 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
836 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
837 | | | | | summary: (15) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
838 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
839 | o-----+ changeset: 14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
840 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
841 | |/ / / parent: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
842 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
843 | | | | date: Thu Jan 01 00:00:14 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
844 | | | | summary: (14) merge two known; one immediate right, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
845 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
846 o | | | changeset: 13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
847 |\ \ \ \ parent: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
848 | | | | | parent: 11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
849 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
850 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
851 | | | | | summary: (13) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
852 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
853 +---o | | changeset: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
854 | | |/ / parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
855 | | | | parent: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
856 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
857 | | | | date: Thu Jan 01 00:00:12 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
858 | | | | summary: (12) merge two known; one immediate right, one far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
859 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
860 | o | | changeset: 11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
861 | |\ \ \ parent: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
862 | | | | | parent: 10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
863 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
864 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
865 | | | | | summary: (11) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
866 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
867 | | o---+ changeset: 10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
868 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
869 | |/ / / parent: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
870 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
871 | | | | date: Thu Jan 01 00:00:10 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
872 | | | | summary: (10) merge two known; one immediate left, one near right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
873 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
874 o | | | changeset: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
875 |\ \ \ \ parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
876 | | | | | parent: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
877 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
878 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
879 | | | | | summary: (9) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
880 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
881 | o-----+ changeset: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
882 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
883 |/ / / / parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
884 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
885 | | | | date: Thu Jan 01 00:00:08 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
886 | | | | summary: (8) merge two known; one immediate left, one far right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
887 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
888 o | | | changeset: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
889 |\ \ \ \ parent: 2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
890 | | | | | parent: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
891 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
892 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
893 | | | | | summary: (7) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
894 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
895 +---o | | changeset: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
896 | |/ / / parent: 2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
897 | | | | parent: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
898 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
899 | | | | date: Thu Jan 01 00:00:06 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
900 | | | | summary: (6) merge two known; one immediate left, one far left
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
901 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
902 | o | | changeset: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
903 | |\ \ \ parent: 3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
904 | | | | | parent: 4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
905 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
906 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
907 | | | | | summary: (5) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
908 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
909 | | o | | changeset: 4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
910 | |/|/ / parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
911 | | | | parent: 3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
912 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
913 | | | | date: Thu Jan 01 00:00:04 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
914 | | | | summary: (4) merge two known; one immediate left, one immediate right
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
915 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
916 | o | | changeset: 3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
917 |/ / / user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
918 | | | date: Thu Jan 01 00:00:03 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
919 | | | summary: (3) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
920 | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
921 o | | changeset: 2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
922 |/ / user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
923 | | date: Thu Jan 01 00:00:02 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
924 | | summary: (2) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
925 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
926 o | changeset: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
927 |/ user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
928 | date: Thu Jan 01 00:00:01 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
929 | summary: (1) collapse
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
930 |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
931 o changeset: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
932 user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
933 date: Thu Jan 01 00:00:00 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
934 summary: (0) root
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
935
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
936
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
938 File glog per revset (only merges):
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
939
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
940 $ hg log -G -r 'file("a")' -m
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
941 o changeset: 32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
942 |\ parent: 27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
943 | | parent: 31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
944 | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
945 | | 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
946 | | summary: (32) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
947 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
948 o | changeset: 31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
949 |\| parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
950 | | parent: 30:6e11cd4b648f
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:31 1970 +0000
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
953 | | summary: (31) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
954 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
955 o | changeset: 30:6e11cd4b648f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
956 |\ \ parent: 28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
957 | | | parent: 29:cd9bb2be7593
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
958 | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
959 | | | 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
960 | | | summary: (30) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
961 | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
962 o | | changeset: 28:44ecd0b9ae99
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
963 |\ \ \ parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
964 | | | | parent: 26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
965 | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
966 | | | | 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
967 | | | | summary: (28) merge zero known
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
968 | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
969 o | | | changeset: 26:7f25b6c2f0b9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
970 |\ \ \ \ parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
971 | | | | | parent: 25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
972 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
973 | | | | | 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
974 | | | | | 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
975 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
976 | o-----+ changeset: 25:91da8ed57247
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
977 | | | | | parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
978 | | | | | parent: 24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
979 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
980 | | | | | 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
981 | | | | | 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
982 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
983 | o | | | changeset: 24:a9c19a3d96b7
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
984 | |\ \ \ \ parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
985 | | | | | | parent: 23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
986 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
987 | | | | | | 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
988 | | | | | | 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
989 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
990 | o---+ | | changeset: 23:a01cddf0766d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
991 | | | | | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
992 | | | | | | parent: 22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
993 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
994 | | | | | | 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
995 | | | | | | 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
996 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
997 | o-------+ changeset: 22:e0d9cccacb5d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
998 | | | | | | parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
999 |/ / / / / parent: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1000 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1001 | | | | | 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
1002 | | | | | 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
1003 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1004 | | | | o changeset: 21:d42a756af44d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1005 | | | | |\ parent: 19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1006 | | | | | | parent: 20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1007 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1008 | | | | | | 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
1009 | | | | | | summary: (21) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1010 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1011 +-+-------o changeset: 20:d30ed6450e32
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1012 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1013 | | | | | parent: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1014 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1015 | | | | | 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
1016 | | | | | 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
1017 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1018 | | | | o changeset: 19:31ddc2c1573b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1019 | | | | |\ parent: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1020 | | | | | | parent: 17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1021 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1022 | | | | | | 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
1023 | | | | | | summary: (19) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1024 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1025 o---+---+ | changeset: 18:1aa84d96232a
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1026 | | | | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1027 / / / / / parent: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1028 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1029 | | | | | 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
1030 | | | | | 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
1031 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1032 | | | | o changeset: 17:44765d7c06e0
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1033 | | | | |\ parent: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1034 | | | | | | parent: 16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1035 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1036 | | | | | | 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
1037 | | | | | | summary: (17) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1038 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1039 +-+-------o changeset: 16:3677d192927d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1040 | | | | | parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1041 | | | | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1042 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1043 | | | | | 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
1044 | | | | | 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
1045 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1046 | | | o | changeset: 15:1dda3f72782d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1047 | | | |\ \ parent: 13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1048 | | | | | | parent: 14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1049 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1050 | | | | | | 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
1051 | | | | | | summary: (15) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1052 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1053 +-------o | changeset: 14:8eac370358ef
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1054 | | | | |/ parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1055 | | | | | parent: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1056 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1057 | | | | | 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
1058 | | | | | 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
1059 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1060 | | | o | changeset: 13:22d8966a97e3
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1061 | | | |\ \ parent: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1062 | | | | | | parent: 11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1063 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1064 | | | | | | 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
1065 | | | | | | summary: (13) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1066 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1067 | +---+---o changeset: 12:86b91144a6e9
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1068 | | | | | parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1069 | | | | | parent: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1070 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1071 | | | | | 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
1072 | | | | | 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
1073 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1074 | | | | o changeset: 11:832d76e6bdf2
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1075 | | | | |\ parent: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1076 | | | | | | parent: 10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1077 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1078 | | | | | | 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
1079 | | | | | | summary: (11) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1080 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1081 +---------o changeset: 10:74c64d036d72
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1082 | | | | |/ parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1083 | | | | | parent: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1084 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1085 | | | | | 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
1086 | | | | | 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
1087 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1088 | | | o | changeset: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1089 | | | |\ \ parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1090 | | | | | | parent: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1091 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1092 | | | | | | 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
1093 | | | | | | summary: (9) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1094 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1095 +-------o | changeset: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1096 | | | |/ / parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1097 | | | | | parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1098 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1099 | | | | | 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
1100 | | | | | 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
1101 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1102 | | | o | changeset: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1103 | | | |\ \ parent: 2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1104 | | | | | | parent: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1105 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1106 | | | | | | 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
1107 | | | | | | summary: (7) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1108 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1109 | | | +---o changeset: 6:b105a072e251
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1110 | | | | |/ parent: 2:3d9a33b8d1e1
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1111 | | | | | parent: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1112 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1113 | | | | | 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
1114 | | | | | 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
1115 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1116 | | | o | changeset: 5:4409d547b708
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1117 | | | |\ \ parent: 3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1118 | | | | | | parent: 4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1119 | | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1120 | | | | | | 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
1121 | | | | | | summary: (5) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1122 | | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1123 | +---o | | changeset: 4:26a8bac39d9f
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1124 | | | |/ / parent: 1:6db2ef61d156
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1125 | | | | | parent: 3:27eef8ed80b4
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1126 | | | | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1127 | | | | | 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
1128 | | | | | 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
1129 | | | | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1130
13631
29c800ee54cf graphlog: give meaningful error if more than one file is given
Klaus Koch <kuk42@gmx.net>
parents: 12951
diff changeset
1131
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1132 Empty revision range - display nothing:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1133 $ hg log -G -r 1..0
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1134
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1135 $ cd ..
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1136
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1137 #if no-outer-repo
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1138
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1139 From outer space:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1140 $ hg log -G -l1 repo
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1141 @ changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1142 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1143 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1144 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1145 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1146 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1147 |
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1148 $ hg log -G -l1 repo/a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1149 @ changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1150 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1151 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1152 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1153 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1154 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1155 |
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1156 $ hg log -G -l1 repo/missing
9728
acb1c59b4514 tests: glog with style and file parameter (issue1896)
Joel Rosdahl <joel@rosdahl.net>
parents: 9176
diff changeset
1157
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1158 #endif
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
1159
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1160 File log with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1161 $ hg init flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1162 $ cd flog
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1163 $ echo one >one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1164 $ hg add one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1165 $ hg commit -mone
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1166 $ echo two >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1167 $ hg add two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1168 $ hg commit -mtwo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1169 $ echo more >two
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1170 $ hg commit -mmore
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1171 $ hg log -G two
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1172 @ changeset: 2:12c28321755b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1173 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1174 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1175 | date: Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1176 | summary: more
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1177 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1178 o changeset: 1:5ac72c0599bf
14042
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
1179 | user: test
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
1180 | date: Thu Jan 01 00:00:00 1970 +0000
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
1181 | summary: two
9966c95b8c4f graphmod: use revsets internally
Alexander Solovyov <alexander@solovyov.net>
parents: 13631
diff changeset
1182 |
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1183
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12365
diff changeset
1184 Issue1896: File log with explicit style
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1185 $ hg log -G --style=default one
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1186 o changeset: 0:3d578b4a1f53
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1187 user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1188 date: Thu Jan 01 00:00:00 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1189 summary: one
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1190
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1191 Issue2395: glog --style header and footer
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1192 $ hg log -G --style=xml one
12579
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1193 <?xml version="1.0"?>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1194 <log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1195 o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1196 <author email="test">test</author>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1197 <date>1970-01-01T00:00:00+00:00</date>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1198 <msg xml:space="preserve">one</msg>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1199 </logentry>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1200 </log>
aa1faedeac5a graphlog: style with header and footer (issue2395)
Mads Kiilerich <mads@kiilerich.com>
parents: 12399
diff changeset
1201
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1202 $ cd ..
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1203
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1204 Incoming and outgoing:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1205
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1206 $ hg clone -U -r31 repo repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1207 adding changesets
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1208 adding manifests
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1209 adding file changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1210 added 31 changesets with 31 changes to 1 files
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1211 $ cd repo2
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
1212
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1213 $ hg incoming --graph ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1214 comparing with ../repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1215 searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1216 o changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1217 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1218 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1219 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1220 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1221 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1222 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1223 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1224 | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1225 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1226 | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1227 | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1228 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1229 o changeset: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1230 | parent: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1231 | parent: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1232 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1233 | date: Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1234 | summary: (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1235 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1236 o changeset: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1237 parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1238 user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1239 date: Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1240 summary: (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1241
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1242 $ cd ..
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1243
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1244 $ hg -R repo outgoing --graph repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1245 comparing with repo2
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1246 searching for changes
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1247 @ changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1248 | tag: tip
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1249 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1250 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1251 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1252 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1253 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1254 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1255 | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1256 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1257 | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1258 | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1259 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1260 o changeset: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1261 | parent: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1262 | parent: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1263 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1264 | date: Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1265 | summary: (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1266 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1267 o changeset: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1268 parent: 21:d42a756af44d
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1269 user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1270 date: Thu Jan 01 00:00:27 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1271 summary: (27) collapse
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1272
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
1273
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1274 File + limit with revs != cset revs:
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1275 $ cd repo
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1276 $ touch b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1277 $ hg ci -Aqm0
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1278 $ hg log -G -l2 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1279 o changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1280 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1281 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1282 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1283 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1284 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1285 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1286 | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1287 | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1288 | | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1289 | | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1290 | |
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
1291
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1292 File + limit + -ra:b, (b - a) < limit:
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1293 $ hg log -G -l3000 -r32:tip a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1294 o changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1295 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1296 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1297 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1298 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1299 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1300 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1301 | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1302 | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1303 | | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1304 | | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1305 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1306 o | changeset: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1307 |\ \ parent: 27:886ed638191b
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1308 | | | parent: 31:621d83e11f67
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1309 | | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1310 | | | date: Thu Jan 01 00:00:32 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1311 | | | summary: (32) expand
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1312 | | |
10084
4c844f16bf39 graphlog: fix output when both a limit and a path are provided
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9728
diff changeset
1313
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1314 Point out a common and an uncommon unshown parent
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1315
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1316 $ hg log -G -r 'rev(8) or rev(9)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1317 o changeset: 9:7010c0af0a35
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1318 |\ parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1319 | | parent: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1320 | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1321 | | 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
1322 | | summary: (9) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1323 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1324 o | changeset: 8:7a0b11f71937
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1325 |\| parent: 0:e6eb3150255d
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1326 | | parent: 7:b632bb1b1224
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1327 | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1328 | | 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
1329 | | 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
1330 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1331
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1332 File + limit + -ra:b, b < tip:
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1333
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1334 $ hg log -G -l1 -r32:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1335 o changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1336 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1337 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1338 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1339 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1340 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1341
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1342 file(File) + limit + -ra:b, b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1343
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1344 $ hg log -G -l1 -r32:34 -r 'file("a")'
14133
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1345 o changeset: 34:fea3ac5810e0
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1346 | parent: 32:d06dffa21a31
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1347 | user: test
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1348 | date: Thu Jan 01 00:00:34 1970 +0000
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1349 | summary: (34) head
28085b82f801 graphlog: always sort revisions topologically
Patrick Mezard <pmezard@gmail.com>
parents: 14132
diff changeset
1350 |
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1351
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1352 limit(file(File) and a::b), b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1353
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1354 $ hg log -G -r 'limit(file("a") and 32::34, 1)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1355 o changeset: 32:d06dffa21a31
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1356 |\ parent: 27:886ed638191b
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1357 | | parent: 31:621d83e11f67
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1358 | | user: test
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1359 | | 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
1360 | | summary: (32) expand
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1361 | |
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1362
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1363 File + limit + -ra:b, b < tip:
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1364
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1365 $ hg log -G -r 'limit(file("a") and 34::32, 1)'
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1366
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1367 File + limit + -ra:b, b < tip, (b - a) < limit:
14043
1c1e1232abdc graphlog: make use of graphmod's revset support
Alexander Solovyov <alexander@solovyov.net>
parents: 14042
diff changeset
1368
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1369 $ hg log -G -l10 -r33:34 a
12003
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1370 o changeset: 34:fea3ac5810e0
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1371 | parent: 32:d06dffa21a31
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1372 | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1373 | date: Thu Jan 01 00:00:34 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1374 | summary: (34) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1375 |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1376 | o changeset: 33:68608f5145f9
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1377 | | parent: 18:1aa84d96232a
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1378 | | user: test
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1379 | | date: Thu Jan 01 00:00:33 1970 +0000
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1380 | | summary: (33) head
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1381 | |
a092b91a27c4 tests: unify test-glog
Adrian Buehlmann <adrian@cadifra.com>
parents: 11448
diff changeset
1382
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1383 Do not crash or produce strange graphs if history is buggy
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1384
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1385 $ hg branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1386 marked working directory as branch branch
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1387 (branches are permanent and global, did you want a bookmark?)
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1388 $ commit 36 "buggy merge: identical parents" 35 35
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
1389 $ hg log -G -l5
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1390 @ changeset: 36:08a19a744424
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1391 | branch: branch
12951
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1392 | tag: tip
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1393 | parent: 35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1394 | parent: 35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1395 | user: test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1396 | date: Thu Jan 01 00:00:36 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1397 | summary: (36) buggy merge: identical parents
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1398 |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1399 o changeset: 35:9159c3644c5e
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1400 | user: test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1401 | date: Thu Jan 01 00:00:00 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1402 | summary: 0
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1403 |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1404 o changeset: 34:fea3ac5810e0
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1405 | parent: 32:d06dffa21a31
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1406 | user: test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1407 | date: Thu Jan 01 00:00:34 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1408 | summary: (34) head
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1409 |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1410 | o changeset: 33:68608f5145f9
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1411 | | parent: 18:1aa84d96232a
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1412 | | user: test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1413 | | date: Thu Jan 01 00:00:33 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1414 | | summary: (33) head
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1415 | |
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1416 o | changeset: 32:d06dffa21a31
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1417 |\ \ parent: 27:886ed638191b
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1418 | | | parent: 31:621d83e11f67
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1419 | | | user: test
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1420 | | | date: Thu Jan 01 00:00:32 1970 +0000
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1421 | | | summary: (32) expand
101366ad816c graphmod: safer code when a changeset has two identical parents
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
1422 | | |
14081
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
1423
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
1424 Test log -G options
8670e3694b85 graphlog: fix log -G option types when translating to revset
Patrick Mezard <pmezard@gmail.com>
parents: 14043
diff changeset
1425
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1426 $ testlog() {
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1427 > hg log -G --print-revset "$@"
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1428 > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1429 > | sed 's/.*nodetag/nodetag/' > log.nodes
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1430 > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1431 > | sed 's/.*nodetag/nodetag/' > glog.nodes
16484
bf877ebed866 tests: hide diff -u saying 'No differences encountered' on solaris
Mads Kiilerich <mads@kiilerich.com>
parents: 16434
diff changeset
1432 > diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1433 > }
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1434
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1435 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
1436
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1437 $ 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
1438 ['27', '25', '21', '34', '32', '31']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1439 []
16170
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1440 --- log.nodes * (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1441 +++ glog.nodes * (glob)
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1442 @@ -1,6 +1,6 @@
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1443 -nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1444 -nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1445 -nodetag 21
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1446 nodetag 34
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1447 nodetag 32
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1448 nodetag 31
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1449 +nodetag 27
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1450 +nodetag 25
ef2373ea3d24 glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents: 16161
diff changeset
1451 +nodetag 21
16148
184cc3c3e0a6 graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16147
diff changeset
1452 $ testlog -u test -u not-a-user
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1453 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1454 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1455 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1456 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1457 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1458 ('symbol', 'user')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1459 ('string', 'test'))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1460 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1461 ('symbol', 'user')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1462 ('string', 'not-a-user')))))
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1463 $ testlog -b not-a-branch
16405
17deb6bbfbab graphlog: refactor revset() to return revisions
Patrick Mezard <patrick@mezard.eu>
parents: 16316
diff changeset
1464 abort: unknown revision 'not-a-branch'!
16149
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1465 abort: unknown revision 'not-a-branch'!
6acbbb0c7381 graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16148
diff changeset
1466 abort: unknown revision 'not-a-branch'!
16407
49ef1c382965 graphlog: support changeset identifiers in --branch
Patrick Mezard <patrick@mezard.eu>
parents: 16405
diff changeset
1467 $ 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
1468 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1469 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1470 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1471 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1472 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1473 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1474 ('symbol', 'branch')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1475 ('string', 'default'))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1476 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1477 ('symbol', 'branch')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1478 ('string', 'branch')))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1479 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1480 ('symbol', 'branch')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1481 ('string', 'branch')))))
16150
0424f3c7d7ac graphlog: multiple --keyword must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16149
diff changeset
1482 $ testlog -k expand -k merge
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1483 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1484 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1485 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1486 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1487 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1488 ('symbol', 'keyword')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1489 ('string', 'expand'))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1490 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1491 ('symbol', 'keyword')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1492 ('string', 'merge')))))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
1493 $ testlog --only-merges
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1494 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1495 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1496 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1497 ('symbol', 'merge')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1498 None))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
1499 $ testlog --no-merges
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1500 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1501 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1502 (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1503 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1504 ('symbol', 'merge')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1505 None)))
16183
112a70c56d6a test-glog: rewrite more tests using testlog() function
Patrick Mezard <patrick@mezard.eu>
parents: 16182
diff changeset
1506 $ testlog --date '2 0 to 4 0'
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1507 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1508 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1509 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1510 ('symbol', 'date')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1511 ('string', '2 0 to 4 0')))
14083
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
1512 $ hg log -G -d 'brace ) in a date'
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
1513 abort: invalid date: 'brace ) in a date'
2520ebfd9f5c graphlog: escape log -G single value option arguments
Patrick Mezard <pmezard@gmail.com>
parents: 14082
diff changeset
1514 [255]
16172
db75321c7a0e test-glog: test multiple --prune values
Patrick Mezard <patrick@mezard.eu>
parents: 16171
diff changeset
1515 $ testlog --prune 31 --prune 32
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1516 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1517 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1518 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1519 (and
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1520 (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1521 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1522 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1523 ('string', '31')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1524 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1525 ('symbol', 'ancestors')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1526 ('string', '31')))))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1527 (not
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1528 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1529 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1530 ('string', '32')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1531 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1532 ('symbol', 'ancestors')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1533 ('string', '32'))))))))
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1534
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1535 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
1536 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
1537
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1538 $ cd ..
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1539 $ hg init follow
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1540 $ cd follow
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1541 $ testlog --follow
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1542 []
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1543 []
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1544 $ echo a > a
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1545 $ echo aa > aa
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1546 $ echo f > f
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1547 $ 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
1548 $ hg cp a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1549 $ hg cp f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1550 $ hg ci -m "copy a b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1551 $ mkdir dir
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1552 $ hg mv b dir
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1553 $ echo g >> g
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1554 $ echo f >> f
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1555 $ hg ci -m "mv b dir/b"
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1556 $ hg mv a b
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1557 $ hg cp -f f g
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1558 $ echo a > d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1559 $ hg add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1560 $ 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
1561 $ hg mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1562 $ 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
1563 $ 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
1564 @ (4) mv dir/b e
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1565 |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1566 o (3) mv a b; add d
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1567 |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1568 o (2) mv b dir/b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1569 |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1570 o (1) copy a b
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1571 |
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1572 o (0) add a
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1573
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1574
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
1575 $ testlog a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1576 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1577 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1578 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1579 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1580 ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1581 ('string', 'a'))))
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
1582 $ testlog a b
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1583 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1584 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1585 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1586 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1587 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1588 ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1589 ('string', 'a'))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1590 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1591 ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1592 ('string', 'b')))))
16160
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
1593
1bfc7ba8b404 graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents: 16159
diff changeset
1594 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
1595
16159
ec33539b61f6 graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents: 16158
diff changeset
1596 $ testlog a c
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1597 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1598 (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1599 (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1600 ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1601 (list
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1602 (list
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1603 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1604 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1605 ('string', 'd:relpath'))
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1606 ('string', 'p:a'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1607 ('string', 'p:c'))))
16161
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
1608
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
1609 Test multiple --include/--exclude/paths
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
1610
5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents: 16160
diff changeset
1611 $ 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
1612 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1613 (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1614 (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1615 ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1616 (list
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1617 (list
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1618 (list
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1619 (list
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1620 (list
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1621 (list
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1622 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1623 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1624 ('string', 'd:relpath'))
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1625 ('string', 'p:a'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1626 ('string', 'p:e'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1627 ('string', 'i:a'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1628 ('string', 'i:e'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1629 ('string', 'x:b'))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1630 ('string', 'x:e'))))
16171
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1631
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1632 Test glob expansion of pats
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1633
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1634 $ expandglobs=`python -c "import mercurial.util; \
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1635 > print mercurial.util.expandglobs and 'true' or 'false'"`
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1636 $ if [ $expandglobs = "true" ]; then
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1637 > testlog 'a*';
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1638 > else
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1639 > testlog a*;
336e61875335 graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 16170
diff changeset
1640 > fi;
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1641 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1642 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1643 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1644 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1645 ('symbol', 'filelog')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1646 ('string', 'aa'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1647
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1648 Test --follow on a non-existent directory
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1649
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1650 $ testlog -f dir
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1651 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
1652 abort: cannot follow file not in parent revision: "dir"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1653 abort: cannot follow file not in parent revision: "dir"
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1654
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1655 Test --follow on a directory
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1656
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1657 $ hg up -q '.^'
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1658 $ testlog -f dir
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1659 []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1660 (group
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1661 (func
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1662 ('symbol', '_matchfiles')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1663 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1664 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1665 ('string', 'r:')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1666 ('string', 'd:relpath'))
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1667 ('string', 'p:dir'))))
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1668 $ hg up -q tip
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1669
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1670 Test --follow on file not in parent revision
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1671
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1672 $ testlog -f a
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1673 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
1674 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
1675 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
1676
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1677 Test --follow and patterns
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1678
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1679 $ testlog -f 'glob:*'
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1680 []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1681 (group
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1682 (func
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1683 ('symbol', '_matchfiles')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1684 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1685 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1686 ('string', 'r:')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1687 ('string', 'd:relpath'))
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1688 ('string', 'p:glob:*'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1689
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1690 Test --follow on a single rename
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1691
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1692 $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1693 $ testlog -f a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1694 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1695 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1696 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1697 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1698 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1699 ('string', 'a'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1700
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1701 Test --follow and multiple renames
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1702
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1703 $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1704 $ testlog -f e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1705 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1706 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1707 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1708 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1709 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1710 ('string', 'e'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1711
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1712 Test --follow and multiple filelog heads
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1713
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1714 $ hg up -q 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1715 $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1716 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1717 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1718 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1719 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1720 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1721 ('string', 'g'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1722 $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1723 nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1724 nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1725 nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1726 $ hg up -q tip
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1727 $ testlog -f g
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1728 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1729 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1730 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1731 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1732 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1733 ('string', 'g'))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1734 $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1735 nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1736 nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1737 nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1738
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1739 Test --follow and multiple files
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1740
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1741 $ testlog -f g e
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1742 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1743 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1744 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1745 (or
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1746 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1747 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1748 ('string', 'g'))
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1749 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1750 ('symbol', 'follow')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1751 ('string', 'e')))))
16173
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1752 $ cat log.nodes
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1753 nodetag 4
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1754 nodetag 3
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1755 nodetag 2
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1756 nodetag 1
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1757 nodetag 0
9178d284b880 graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents: 16172
diff changeset
1758
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1759 Test --follow-first
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1760
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1761 $ hg up -q 3
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1762 $ echo ee > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1763 $ hg ci -Am "add another e" e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1764 created new head
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1765 $ hg merge --tool internal:other 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1766 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
1767 (branch merge, don't forget to commit)
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1768 $ echo merge > e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1769 $ hg ci -m "merge 5 and 4"
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1770 $ testlog --follow-first
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1771 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1772 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1773 (func
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
1774 ('symbol', '_firstancestors')
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
1775 ('symbol', '6')))
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1776
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1777 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
1778
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1779 $ 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
1780 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1781 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1782 (group
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1783 (func
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1784 ('symbol', '_followfirst')
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1785 ('string', 'e'))))
16174
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1786 $ 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
1787 @ 6 merge 5 and 4
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1788 |\
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1789 o | 5 add another e
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1790 | |
0a73c4bd9f47 graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents: 16173
diff changeset
1791
16180
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1792 Test --copies
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1793
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1794 $ hg log -G --copies --template "{rev} {desc|firstline} \
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1795 > copies: {file_copies_switch}\n"
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1796 @ 6 merge 5 and 4 copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1797 |\
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1798 | o 5 add another e copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1799 | |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1800 o | 4 mv dir/b e copies: e (dir/b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1801 |/
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1802 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
1803 |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1804 o 2 mv b dir/b copies: dir/b (b)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1805 |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1806 o 1 copy a b copies: b (a)g (f)
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1807 |
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1808 o 0 add a copies:
46a96cc830c2 graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents: 16174
diff changeset
1809
16181
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
1810 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
1811
1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents: 16180
diff changeset
1812 $ hg up -q 4
16182
bd12ef347680 match: consider filesets as "anypats"
Patrick Mezard <patrick@mezard.eu>
parents: 16181
diff changeset
1813 $ testlog "set:copied()"
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1814 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1815 (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1816 (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1817 ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1818 (list
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1819 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1820 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1821 ('string', 'd:relpath'))
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1822 ('string', 'p:set:copied()'))))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1823 $ testlog --include "set:copied()"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1824 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1825 (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1826 (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1827 ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1828 (list
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1829 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1830 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1831 ('string', 'd:relpath'))
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1832 ('string', 'i:set:copied()'))))
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1833 $ testlog -r "sort(file('set:copied()'), -rev)"
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1834 ["sort(file('set:copied()'), -rev)"]
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1835 []
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1836
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1837 Test --removed
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1838
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1839 $ testlog --removed
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1840 []
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1841 []
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1842 $ testlog --removed a
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1843 []
16315
f89284d72a61 test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents: 16186
diff changeset
1844 (group
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1845 (func
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1846 ('symbol', '_matchfiles')
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1847 (list
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1848 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1849 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
1850 ('string', 'd:relpath'))
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1851 ('string', 'p:a'))))
16184
6863caf01daa graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents: 16183
diff changeset
1852 $ testlog --removed --follow a
21998
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1853 []
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1854 (group
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1855 (func
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1856 ('symbol', '_matchfiles')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1857 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1858 (list
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1859 ('string', 'r:')
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1860 ('string', 'd:relpath'))
739095270f48 log: allow patterns with -f
Durham Goode <durham@fb.com>
parents: 21127
diff changeset
1861 ('string', 'p:a'))))
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1862
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1863 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
1864
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1865 $ hg up -q 3
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1866 $ hg log -G --git --patch b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1867 o changeset: 1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1868 | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1869 | 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
1870 | summary: copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1871 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1872 | diff --git a/a b/b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1873 | copy from a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1874 | copy to b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1875 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1876
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1877 $ hg log -G --git --stat b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1878 o changeset: 1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1879 | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1880 | 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
1881 | summary: copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1882 |
20972
4e2fb0ad00a9 diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents: 20699
diff changeset
1883 | b | 0
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1884 | 1 files changed, 0 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1885 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1886
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1887 $ hg log -G --git --patch --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1888 o changeset: 1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1889 | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1890 | 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
1891 | summary: copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1892 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1893 | diff --git a/a b/b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1894 | copy from a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1895 | copy to b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1896 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1897 o changeset: 0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1898 user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1899 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
1900 summary: add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1901
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1902 diff --git a/a b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1903 new file mode 100644
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1904 --- /dev/null
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1905 +++ b/a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1906 @@ -0,0 +1,1 @@
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1907 +a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1908
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1909
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1910 $ hg log -G --git --stat --follow b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1911 o changeset: 1:216d4c92cf98
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1912 | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1913 | 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
1914 | summary: copy a b
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1915 |
20972
4e2fb0ad00a9 diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents: 20699
diff changeset
1916 | b | 0
16186
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1917 | 1 files changed, 0 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1918 |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1919 o changeset: 0:f8035bb17114
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1920 user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1921 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
1922 summary: add a
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1923
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1924 a | 1 +
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1925 1 files changed, 1 insertions(+), 0 deletions(-)
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1926
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1927
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1928 $ hg up -q 6
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1929 $ 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
1930 @ changeset: 6:fc281d8ff18d
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1931 |\ tag: tip
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1932 | | parent: 5:99b31f1c2782
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1933 | | parent: 4:17d952250a9d
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1934 | | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1935 | | 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
1936 | | summary: merge 5 and 4
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1937 | |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1938 | | diff --git a/e b/e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1939 | | --- a/e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1940 | | +++ b/e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1941 | | @@ -1,1 +1,1 @@
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1942 | | -ee
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1943 | | +merge
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1944 | |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1945 o | changeset: 5:99b31f1c2782
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1946 | | parent: 3:5918b8d165d1
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1947 | | user: test
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1948 | | 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
1949 | | summary: add another e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1950 | |
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1951 | | diff --git a/e b/e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1952 | | new file mode 100644
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1953 | | --- /dev/null
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1954 | | +++ b/e
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1955 | | @@ -0,0 +1,1 @@
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1956 | | +ee
af3e67354beb graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents: 16184
diff changeset
1957 | |
16316
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1958
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1959 Test old-style --rev
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1960
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1961 $ hg tag 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1962 $ testlog -r 'foo-bar'
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1963 ['foo-bar']
0f1e621d3d3b graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents: 16315
diff changeset
1964 []
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1965
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1966 Test --follow and forward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1967
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1968 $ hg up -q 6
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1969 $ echo g > g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1970 $ hg ci -Am 'add g' g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1971 created new head
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1972 $ hg up -q 2
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1973 $ hg log -G --template "{rev} {desc|firstline}\n"
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1974 o 8 add g
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1975 |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1976 | o 7 Added tag foo-bar for changeset fc281d8ff18d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1977 |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1978 o 6 merge 5 and 4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1979 |\
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1980 | o 5 add another e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1981 | |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1982 o | 4 mv dir/b e
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1983 |/
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1984 o 3 mv a b; add d
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1985 |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1986 @ 2 mv b dir/b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1987 |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1988 o 1 copy a b
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1989 |
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1990 o 0 add a
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1991
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1992 $ testlog --follow -r6 -r8 -r5 -r7 -r4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1993 ['6', '8', '5', '7', '4']
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1994 (group
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1995 (func
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1996 ('symbol', 'descendants')
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1997 ('symbol', '6')))
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1998 --- log.nodes * (glob)
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
1999 +++ glog.nodes * (glob)
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2000 @@ -1,3 +1,3 @@
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2001 -nodetag 6
21127
69402eb72115 log: changed implementation to use graphlog code
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20972
diff changeset
2002 -nodetag 7
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2003 nodetag 8
21127
69402eb72115 log: changed implementation to use graphlog code
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20972
diff changeset
2004 +nodetag 7
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2005 +nodetag 6
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2006
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2007 Test --follow-first and forward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2008
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2009 $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2010 ['6', '8', '5', '7', '4']
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2011 (group
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2012 (func
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2013 ('symbol', '_firstdescendants')
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2014 ('symbol', '6')))
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2015 --- log.nodes * (glob)
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2016 +++ glog.nodes * (glob)
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2017 @@ -1,3 +1,3 @@
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2018 -nodetag 6
21127
69402eb72115 log: changed implementation to use graphlog code
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20972
diff changeset
2019 -nodetag 7
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2020 nodetag 8
21127
69402eb72115 log: changed implementation to use graphlog code
Lucas Moscovicz <lmoscovicz@fb.com>
parents: 20972
diff changeset
2021 +nodetag 7
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2022 +nodetag 6
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2023
16408
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2024 Test --follow and backward --rev
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2025
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2026 $ testlog --follow -r6 -r5 -r7 -r8 -r4
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2027 ['6', '5', '7', '8', '4']
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2028 (group
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2029 (func
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2030 ('symbol', 'ancestors')
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2031 ('symbol', '6')))
d74099ac2ac1 graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16407
diff changeset
2032
16409
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2033 Test --follow-first and backward --rev
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2034
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2035 $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2036 ['6', '5', '7', '8', '4']
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2037 (group
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2038 (func
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2039 ('symbol', '_firstancestors')
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents: 16408
diff changeset
2040 ('symbol', '6')))
16411
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2041
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2042 Test subdir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2043
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2044 $ hg up -q 3
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2045 $ cd dir
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2046 $ testlog .
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2047 []
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2048 (group
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2049 (func
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2050 ('symbol', '_matchfiles')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2051 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2052 (list
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2053 ('string', 'r:')
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2054 ('string', 'd:relpath'))
4c2edcd84175 graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents: 16409
diff changeset
2055 ('string', 'p:.'))))
16434
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2056 $ testlog ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2057 []
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2058 (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2059 (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2060 (func
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2061 ('symbol', 'filelog')
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2062 ('string', '../b'))))
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2063 $ testlog -f ../b
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2064 []
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2065 (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2066 (group
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2067 (func
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2068 ('symbol', 'follow')
8b62a77d0895 graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents: 16431
diff changeset
2069 ('string', 'b'))))
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2070 $ cd ..
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2071
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2072 Test --hidden
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2073 (enable obsolete)
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2074
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2075 $ cat > ${TESTTMP}/obs.py << EOF
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2076 > import mercurial.obsolete
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2077 > mercurial.obsolete._enabled = True
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2078 > EOF
18208
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2079 $ echo '[extensions]' >> $HGRCPATH
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2080 $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2081
f0059ba239cb test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17434
diff changeset
2082 $ hg debugobsolete `hg id --debug -i -r 8`
16431
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2083 $ testlog
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2084 []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2085 []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2086 $ testlog --hidden
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2087 []
c85098cdd7df graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents: 16411
diff changeset
2088 []
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2089 $ 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
2090 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
2091 |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2092 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
2093 |\
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2094 | 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
2095 | |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2096 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
2097 |/
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2098 @ 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
2099 |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2100 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
2101 |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2102 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
2103 |
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2104 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
2105
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
2106
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2107 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
2108
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2109 $ 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
2110 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
2111 |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2112 o 1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2113 |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2114 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
2115
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2116
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2117 Extra newlines must be preserved
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2118
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2119 $ 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
2120 o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2121 | 2 mv b dir/b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2122 |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2123 o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2124 | 1 copy a b
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2125 |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2126 o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2127 0 add a
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2128
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2129
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2130 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
2131
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2132 $ 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
2133 o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2134 |
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2135 o
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2136 |
17434
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2137 o
038f4f0439d7 test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17347
diff changeset
2138
17120
01d847e0fdc9 graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents: 17014
diff changeset
2139
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2140 issue3772
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2141
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2142 $ 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
2143 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
2144 | user: test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents: 20117
diff changeset
2145 | 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
2146 | 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
2147 |
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2148 o changeset: -1:000000000000
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2149 user:
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2150 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
2151
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19060
diff changeset
2152 $ 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
2153 o changeset: -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
2154 user:
275224c6e89c tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents: 18467
diff changeset
2155 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
2156
18467
e441657b372b graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents: 18208
diff changeset
2157
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16484
diff changeset
2158 $ cd ..