Mercurial > hg
annotate tests/test-glog.t @ 28048:72b02b498b35
docchecker: remove naked except clause
This is fixing for 'naked except clause' check-code rule.
check-code has overlooked this, because a file isn't recognized as one
to be checked (this problem is fixed by subsequent patch).
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 10 Feb 2016 22:44:29 +0900 |
parents | b19d8d5d6b51 |
children | 6a4a4ca21907 |
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: |
25251
235f6490550c
revset: move validation of incomplete parsing to parse() function
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
92 > tree = revset.parse(expr) |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
93 > else: |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
94 > tree = [] |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
95 > ui.write('%r\n' % (opts.get('rev', []),)) |
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 | 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 | 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 | 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 |
27556
1df9b8b2abda
test-glog: avoid check-code violation after next patch
Augie Fackler <raf@durin42.com>
parents:
27216
diff
changeset
|
1432 > (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \ |
1df9b8b2abda
test-glog: avoid check-code violation after next patch
Augie Fackler <raf@durin42.com>
parents:
27216
diff
changeset
|
1433 > | grep '^[-+@ ]' || : |
16148
184cc3c3e0a6
graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16147
diff
changeset
|
1434 > } |
184cc3c3e0a6
graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16147
diff
changeset
|
1435 |
16170
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1436 glog always reorders nodes which explains the difference with log |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1437 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1438 $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1439 ['27', '25', '21', '34', '32', '31'] |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1440 [] |
16170
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1441 --- log.nodes * (glob) |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1442 +++ glog.nodes * (glob) |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1443 @@ -1,6 +1,6 @@ |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1444 -nodetag 27 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1445 -nodetag 25 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1446 -nodetag 21 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1447 nodetag 34 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1448 nodetag 32 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1449 nodetag 31 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1450 +nodetag 27 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1451 +nodetag 25 |
ef2373ea3d24
glog: restore multiple --rev test lost in rebasing
Patrick Mezard <patrick@mezard.eu>
parents:
16161
diff
changeset
|
1452 +nodetag 21 |
16148
184cc3c3e0a6
graphlog: multiple --user must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16147
diff
changeset
|
1453 $ testlog -u test -u not-a-user |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1454 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1455 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1456 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1457 (or |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1458 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1459 ('symbol', 'user') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1460 ('string', 'test')) |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1461 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1462 ('symbol', 'user') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1463 ('string', 'not-a-user'))))) |
16149
6acbbb0c7381
graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16148
diff
changeset
|
1464 $ testlog -b not-a-branch |
16405
17deb6bbfbab
graphlog: refactor revset() to return revisions
Patrick Mezard <patrick@mezard.eu>
parents:
16316
diff
changeset
|
1465 abort: unknown revision 'not-a-branch'! |
16149
6acbbb0c7381
graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16148
diff
changeset
|
1466 abort: unknown revision 'not-a-branch'! |
6acbbb0c7381
graphlog: multiple --branch must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16148
diff
changeset
|
1467 abort: unknown revision 'not-a-branch'! |
16407
49ef1c382965
graphlog: support changeset identifiers in --branch
Patrick Mezard <patrick@mezard.eu>
parents:
16405
diff
changeset
|
1468 $ 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
|
1469 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1472 (or |
25309
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1473 (func |
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1474 ('symbol', 'branch') |
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1475 ('string', 'default')) |
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1476 (func |
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1477 ('symbol', 'branch') |
b333ca94403d
revset: reduce nesting of chained 'or' operations (issue4624)
Yuya Nishihara <yuya@tcha.org>
parents:
25270
diff
changeset
|
1478 ('string', 'branch')) |
16315
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 [] |
24059
8d295ce6e488
graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents:
23955
diff
changeset
|
1544 $ testlog -rnull |
8d295ce6e488
graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents:
23955
diff
changeset
|
1545 ['null'] |
8d295ce6e488
graphlog: remove too early return from getgraphlogrevs() for empty repo
Yuya Nishihara <yuya@tcha.org>
parents:
23955
diff
changeset
|
1546 [] |
16159
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1547 $ echo a > a |
16171
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1548 $ echo aa > aa |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1549 $ echo f > f |
16408
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1550 $ 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
|
1551 $ hg cp a b |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1552 $ hg cp f g |
16159
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1553 $ hg ci -m "copy a b" |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1554 $ mkdir dir |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1555 $ hg mv b dir |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1556 $ echo g >> g |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1557 $ echo f >> f |
16159
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1558 $ hg ci -m "mv b dir/b" |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1559 $ hg mv a b |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1560 $ hg cp -f f g |
16159
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1561 $ echo a > d |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1562 $ hg add d |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1563 $ 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
|
1564 $ hg mv dir/b e |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1565 $ 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
|
1566 $ 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
|
1567 @ (4) mv dir/b e |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1568 | |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1569 o (3) mv a b; add d |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1570 | |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1571 o (2) mv b dir/b |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1572 | |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1573 o (1) copy a b |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1574 | |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1575 o (0) add a |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1576 |
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1577 |
16160
1bfc7ba8b404
graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents:
16159
diff
changeset
|
1578 $ testlog a |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1579 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1580 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1581 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1582 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1583 ('symbol', 'filelog') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1584 ('string', 'a')))) |
16160
1bfc7ba8b404
graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents:
16159
diff
changeset
|
1585 $ testlog a b |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1586 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1587 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1588 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1589 (or |
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', 'a')) |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1593 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1594 ('symbol', 'filelog') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1595 ('string', 'b'))))) |
16160
1bfc7ba8b404
graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents:
16159
diff
changeset
|
1596 |
1bfc7ba8b404
graphlog: imitate log slowpath when inputs are explicit files
Patrick Mezard <patrick@mezard.eu>
parents:
16159
diff
changeset
|
1597 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
|
1598 |
16159
ec33539b61f6
graphlog: paths arguments must be or'ed
Patrick Mezard <patrick@mezard.eu>
parents:
16158
diff
changeset
|
1599 $ testlog a c |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1600 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1601 (group |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1602 (func |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1603 ('symbol', '_matchfiles') |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1604 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1605 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1606 ('string', 'd:relpath') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1607 ('string', 'p:a') |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1608 ('string', 'p:c')))) |
16161
5a627b49b4d9
graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents:
16160
diff
changeset
|
1609 |
5a627b49b4d9
graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents:
16160
diff
changeset
|
1610 Test multiple --include/--exclude/paths |
5a627b49b4d9
graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents:
16160
diff
changeset
|
1611 |
5a627b49b4d9
graphlog: paths/-I/-X handling requires a new revset
Patrick Mezard <patrick@mezard.eu>
parents:
16160
diff
changeset
|
1612 $ 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
|
1613 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1614 (group |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1615 (func |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1616 ('symbol', '_matchfiles') |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1617 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1618 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1619 ('string', 'd:relpath') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1620 ('string', 'p:a') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1621 ('string', 'p:e') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1622 ('string', 'i:a') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1623 ('string', 'i:e') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1624 ('string', 'x:b') |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1625 ('string', 'x:e')))) |
16171
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1626 |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1627 Test glob expansion of pats |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1628 |
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
22860
diff
changeset
|
1629 $ expandglobs=`$PYTHON -c "import mercurial.util; \ |
16171
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1630 > 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
|
1631 $ if [ $expandglobs = "true" ]; then |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1632 > testlog 'a*'; |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1633 > else |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1634 > testlog a*; |
336e61875335
graphlog: restore FILE glob expansion on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
16170
diff
changeset
|
1635 > fi; |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1636 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1637 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1638 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1639 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1640 ('symbol', 'filelog') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1641 ('string', 'aa')))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1642 |
21998 | 1643 Test --follow on a non-existent directory |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1644 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1645 $ testlog -f dir |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1646 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
|
1647 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
|
1648 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
|
1649 |
21998 | 1650 Test --follow on a directory |
1651 | |
1652 $ hg up -q '.^' | |
1653 $ testlog -f dir | |
1654 [] | |
1655 (group | |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1656 (and |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1657 (func |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1658 ('symbol', 'ancestors') |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1659 ('symbol', '.')) |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1660 (func |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1661 ('symbol', '_matchfiles') |
21998 | 1662 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1663 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1664 ('string', 'd:relpath') |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1665 ('string', 'p:dir'))))) |
21998 | 1666 $ hg up -q tip |
1667 | |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1668 Test --follow on file not in parent revision |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1669 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1670 $ testlog -f a |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1671 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
|
1672 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
|
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 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1675 Test --follow and patterns |
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 $ testlog -f 'glob:*' |
21998 | 1678 [] |
1679 (group | |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1680 (and |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1681 (func |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1682 ('symbol', 'ancestors') |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1683 ('symbol', '.')) |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1684 (func |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1685 ('symbol', '_matchfiles') |
21998 | 1686 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1687 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1688 ('string', 'd:relpath') |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1689 ('string', 'p:glob:*'))))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1690 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1691 Test --follow on a single rename |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1692 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1693 $ hg up -q 2 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1694 $ testlog -f a |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1695 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1698 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1699 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1700 ('string', 'a')))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1701 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1702 Test --follow and multiple renames |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1703 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1704 $ hg up -q tip |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1705 $ testlog -f e |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1706 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1709 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1710 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1711 ('string', 'e')))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1712 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1713 Test --follow and multiple filelog heads |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1714 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1715 $ hg up -q 2 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1716 $ testlog -f g |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1717 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1720 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1721 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1722 ('string', 'g')))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1723 $ cat log.nodes |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1724 nodetag 2 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1725 nodetag 1 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1726 nodetag 0 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1727 $ hg up -q tip |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1728 $ testlog -f g |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1729 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1732 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1733 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1734 ('string', 'g')))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1735 $ cat log.nodes |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1736 nodetag 3 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1737 nodetag 2 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1738 nodetag 0 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1739 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1740 Test --follow and multiple files |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1741 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1742 $ testlog -f g e |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1743 [] |
16315
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 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1746 (or |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1747 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1748 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1749 ('string', 'g')) |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1750 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1751 ('symbol', 'follow') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1752 ('string', 'e'))))) |
16173
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1753 $ cat log.nodes |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1754 nodetag 4 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1755 nodetag 3 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1756 nodetag 2 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1757 nodetag 1 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1758 nodetag 0 |
9178d284b880
graphlog: implement --follow with file arguments
Patrick Mezard <patrick@mezard.eu>
parents:
16172
diff
changeset
|
1759 |
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1760 Test --follow null parent |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1761 |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1762 $ hg up -q null |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1763 $ testlog -f |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1764 [] |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1765 [] |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
24059
diff
changeset
|
1766 |
16174
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1767 Test --follow-first |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1768 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1769 $ hg up -q 3 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1770 $ echo ee > e |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1771 $ hg ci -Am "add another e" e |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1772 created new head |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1773 $ hg merge --tool internal:other 4 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1774 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
|
1775 (branch merge, don't forget to commit) |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1776 $ echo merge > e |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1777 $ hg ci -m "merge 5 and 4" |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1778 $ testlog --follow-first |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1779 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1780 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1781 (func |
16409
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
1782 ('symbol', '_firstancestors') |
23955
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
1783 (func |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
1784 ('symbol', 'rev') |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
1785 ('symbol', '6')))) |
16174
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1786 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1787 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
|
1788 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1789 $ 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
|
1790 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1791 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1792 (group |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1793 (func |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1794 ('symbol', '_followfirst') |
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1795 ('string', 'e')))) |
16174
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1796 $ 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
|
1797 @ 6 merge 5 and 4 |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1798 |\ |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1799 o | 5 add another e |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1800 | | |
0a73c4bd9f47
graphlog: implement --follow-first
Patrick Mezard <patrick@mezard.eu>
parents:
16173
diff
changeset
|
1801 |
16180
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1802 Test --copies |
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 $ hg log -G --copies --template "{rev} {desc|firstline} \ |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1805 > copies: {file_copies_switch}\n" |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1806 @ 6 merge 5 and 4 copies: |
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 5 add another e copies: |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1809 | | |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1810 o | 4 mv dir/b e copies: e (dir/b) |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1811 |/ |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1812 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
|
1813 | |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1814 o 2 mv b dir/b copies: dir/b (b) |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1815 | |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1816 o 1 copy a b copies: b (a)g (f) |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1817 | |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1818 o 0 add a copies: |
46a96cc830c2
graphlog: implement --copies
Patrick Mezard <patrick@mezard.eu>
parents:
16174
diff
changeset
|
1819 |
16181
1fd352aa08fc
graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents:
16180
diff
changeset
|
1820 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
|
1821 |
1fd352aa08fc
graphlog: evaluate FILE/-I/-X filesets on the working dir
Patrick Mezard <patrick@mezard.eu>
parents:
16180
diff
changeset
|
1822 $ hg up -q 4 |
16182
bd12ef347680
match: consider filesets as "anypats"
Patrick Mezard <patrick@mezard.eu>
parents:
16181
diff
changeset
|
1823 $ testlog "set:copied()" |
16316
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 |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1829 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1830 ('string', 'd:relpath') |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1831 ('string', 'p:set:copied()')))) |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1832 $ testlog --include "set:copied()" |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1833 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1834 (group |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1835 (func |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1836 ('symbol', '_matchfiles') |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1837 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1838 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1839 ('string', 'd:relpath') |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1840 ('string', 'i:set:copied()')))) |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1841 $ testlog -r "sort(file('set:copied()'), -rev)" |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1842 ["sort(file('set:copied()'), -rev)"] |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1843 [] |
16184
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1844 |
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1845 Test --removed |
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1846 |
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1847 $ testlog --removed |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1848 [] |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1849 [] |
16184
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1850 $ testlog --removed a |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1851 [] |
16315
f89284d72a61
test-glog: pretty print revset expressions
Patrick Mezard <patrick@mezard.eu>
parents:
16186
diff
changeset
|
1852 (group |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1853 (func |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1854 ('symbol', '_matchfiles') |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1855 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1856 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1857 ('string', 'd:relpath') |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1858 ('string', 'p:a')))) |
16184
6863caf01daa
graphlog: fix --removed
Patrick Mezard <patrick@mezard.eu>
parents:
16183
diff
changeset
|
1859 $ testlog --removed --follow a |
21998 | 1860 [] |
1861 (group | |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1862 (and |
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1863 (func |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1864 ('symbol', 'ancestors') |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1865 ('symbol', '.')) |
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1866 (func |
23500
9601229ed361
log: fix log -f slow path to actually follow history
Durham Goode <durham@fb.com>
parents:
22955
diff
changeset
|
1867 ('symbol', '_matchfiles') |
21998 | 1868 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1869 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
1870 ('string', 'd:relpath') |
23501
424d669118d3
log: fix log revset instability
Durham Goode <durham@fb.com>
parents:
23500
diff
changeset
|
1871 ('string', 'p:a'))))) |
16186
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1872 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1873 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
|
1874 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1875 $ hg up -q 3 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1876 $ hg log -G --git --patch b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1877 o changeset: 1:216d4c92cf98 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1878 | user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1879 | 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
|
1880 | summary: copy a b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1881 | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1882 | diff --git a/a b/b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1883 | copy from a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1884 | copy to b |
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 --stat 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 | |
20972
4e2fb0ad00a9
diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents:
20699
diff
changeset
|
1893 | b | 0 |
16186
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1894 | 1 files changed, 0 insertions(+), 0 deletions(-) |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1895 | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1896 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1897 $ hg log -G --git --patch --follow b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1898 o changeset: 1:216d4c92cf98 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1899 | user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1900 | 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
|
1901 | summary: copy a b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1902 | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1903 | diff --git a/a b/b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1904 | copy from a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1905 | copy to b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1906 | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1907 o changeset: 0:f8035bb17114 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1908 user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1909 date: Thu Jan 01 00:00:00 1970 +0000 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1910 summary: add a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1911 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1912 diff --git a/a b/a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1913 new file mode 100644 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1914 --- /dev/null |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1915 +++ b/a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1916 @@ -0,0 +1,1 @@ |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1917 +a |
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 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1920 $ hg log -G --git --stat --follow b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1921 o changeset: 1:216d4c92cf98 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1922 | user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1923 | 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
|
1924 | summary: copy a b |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1925 | |
20972
4e2fb0ad00a9
diff: use second filename for --stat reporting on git patches (issue4221)
Matt Mackall <mpm@selenic.com>
parents:
20699
diff
changeset
|
1926 | b | 0 |
16186
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1927 | 1 files changed, 0 insertions(+), 0 deletions(-) |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1928 | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1929 o changeset: 0:f8035bb17114 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1930 user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1931 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
|
1932 summary: add a |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1933 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1934 a | 1 + |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1935 1 files changed, 1 insertions(+), 0 deletions(-) |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1936 |
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 $ hg up -q 6 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1939 $ 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
|
1940 @ changeset: 6:fc281d8ff18d |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1941 |\ tag: tip |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1942 | | parent: 5:99b31f1c2782 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1943 | | parent: 4:17d952250a9d |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1944 | | user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1945 | | 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
|
1946 | | summary: merge 5 and 4 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1947 | | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1948 | | diff --git a/e b/e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1949 | | --- a/e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1950 | | +++ b/e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1951 | | @@ -1,1 +1,1 @@ |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1952 | | -ee |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1953 | | +merge |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1954 | | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1955 o | changeset: 5:99b31f1c2782 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1956 | | parent: 3:5918b8d165d1 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1957 | | user: test |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1958 | | 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
|
1959 | | summary: add another e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1960 | | |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1961 | | diff --git a/e b/e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1962 | | new file mode 100644 |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1963 | | --- /dev/null |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1964 | | +++ b/e |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1965 | | @@ -0,0 +1,1 @@ |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1966 | | +ee |
af3e67354beb
graphlog: apply file filters --patch/--stat output
Patrick Mezard <patrick@mezard.eu>
parents:
16184
diff
changeset
|
1967 | | |
16316
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1968 |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1969 Test old-style --rev |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1970 |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1971 $ hg tag 'foo-bar' |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1972 $ testlog -r 'foo-bar' |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1973 ['foo-bar'] |
0f1e621d3d3b
graphlog: handle old-style --rev values
Patrick Mezard <patrick@mezard.eu>
parents:
16315
diff
changeset
|
1974 [] |
16408
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 Test --follow and forward --rev |
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 $ hg up -q 6 |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1979 $ echo g > g |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1980 $ hg ci -Am 'add g' g |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1981 created new head |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1982 $ hg up -q 2 |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1983 $ hg log -G --template "{rev} {desc|firstline}\n" |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1984 o 8 add g |
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 | o 7 Added tag foo-bar for changeset fc281d8ff18d |
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 6 merge 5 and 4 |
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 5 add another e |
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 o | 4 mv dir/b e |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1993 |/ |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1994 o 3 mv a b; add d |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1995 | |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1996 @ 2 mv b dir/b |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1997 | |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1998 o 1 copy a b |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
1999 | |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2000 o 0 add a |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2001 |
25665
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2002 $ hg archive -r 7 archive |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2003 $ grep changessincelatesttag archive/.hg_archival.txt |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2004 changessincelatesttag: 1 |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2005 $ rm -r archive |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2006 |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2007 changessincelatesttag with no prior tag |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2008 $ hg archive -r 4 archive |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2009 $ grep changessincelatesttag archive/.hg_archival.txt |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2010 changessincelatesttag: 5 |
dc05a10e1e45
archive: don't assume '.' is being archived for changessincelatesttag
Matt Harbison <matt_harbison@yahoo.com>
parents:
25265
diff
changeset
|
2011 |
22860
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2012 $ hg export 'all()' |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2013 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2014 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2015 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2016 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2017 # Node ID f8035bb17114da16215af3436ec5222428ace8ee |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2018 # Parent 0000000000000000000000000000000000000000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2019 add a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2020 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2021 diff -r 000000000000 -r f8035bb17114 a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2022 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2023 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2024 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2025 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2026 diff -r 000000000000 -r f8035bb17114 aa |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2027 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2028 +++ b/aa Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2029 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2030 +aa |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2031 diff -r 000000000000 -r f8035bb17114 f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2032 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2033 +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2034 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2035 +f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2036 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2037 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2038 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2039 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2040 # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2041 # Parent f8035bb17114da16215af3436ec5222428ace8ee |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2042 copy a b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2043 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2044 diff -r f8035bb17114 -r 216d4c92cf98 b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2045 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2046 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2047 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2048 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2049 diff -r f8035bb17114 -r 216d4c92cf98 g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2050 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2051 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2052 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2053 +f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2054 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2055 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2056 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2057 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2058 # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2059 # Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2060 mv b dir/b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2061 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2062 diff -r 216d4c92cf98 -r bb573313a9e8 b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2063 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2064 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2065 @@ -1,1 +0,0 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2066 -a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2067 diff -r 216d4c92cf98 -r bb573313a9e8 dir/b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2068 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2069 +++ b/dir/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2070 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2071 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2072 diff -r 216d4c92cf98 -r bb573313a9e8 f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2073 --- a/f Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2074 +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2075 @@ -1,1 +1,2 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2076 f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2077 +f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2078 diff -r 216d4c92cf98 -r bb573313a9e8 g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2079 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2080 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2081 @@ -1,1 +1,2 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2082 f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2083 +g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2084 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2085 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2086 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2087 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2088 # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2089 # Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2090 mv a b; add d |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2091 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2092 diff -r bb573313a9e8 -r 5918b8d165d1 a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2093 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2094 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2095 @@ -1,1 +0,0 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2096 -a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2097 diff -r bb573313a9e8 -r 5918b8d165d1 b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2098 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2099 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2100 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2101 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2102 diff -r bb573313a9e8 -r 5918b8d165d1 d |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2103 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2104 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2105 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2106 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2107 diff -r bb573313a9e8 -r 5918b8d165d1 g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2108 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2109 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2110 @@ -1,2 +1,2 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2111 f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2112 -g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2113 +f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2114 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2115 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2116 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2117 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2118 # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2119 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2120 mv dir/b e |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2121 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2122 diff -r 5918b8d165d1 -r 17d952250a9d dir/b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2123 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2124 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2125 @@ -1,1 +0,0 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2126 -a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2127 diff -r 5918b8d165d1 -r 17d952250a9d e |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2128 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2129 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2130 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2131 +a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2132 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2133 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2134 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2135 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2136 # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2137 # Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2138 add another e |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2139 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2140 diff -r 5918b8d165d1 -r 99b31f1c2782 e |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2141 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2142 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2143 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2144 +ee |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2145 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2146 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2147 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2148 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2149 # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2150 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2151 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2152 merge 5 and 4 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2153 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2154 diff -r 99b31f1c2782 -r fc281d8ff18d dir/b |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2155 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2156 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2157 @@ -1,1 +0,0 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2158 -a |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2159 diff -r 99b31f1c2782 -r fc281d8ff18d e |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2160 --- a/e Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2161 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2162 @@ -1,1 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2163 -ee |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2164 +merge |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2165 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2166 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2167 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2168 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2169 # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2170 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2171 Added tag foo-bar for changeset fc281d8ff18d |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2172 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2173 diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2174 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2175 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2176 @@ -0,0 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2177 +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2178 # HG changeset patch |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2179 # User test |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2180 # Date 0 0 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2181 # Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2182 # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2183 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2184 add g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2185 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2186 diff -r fc281d8ff18d -r 24c2e826ddeb g |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2187 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2188 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2189 @@ -1,2 +1,1 @@ |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2190 -f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2191 -f |
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2192 +g |
16408
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2193 $ testlog --follow -r6 -r8 -r5 -r7 -r4 |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2194 ['6', '8', '5', '7', '4'] |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2195 (group |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2196 (func |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2197 ('symbol', 'descendants') |
23955
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2198 (func |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2199 ('symbol', 'rev') |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2200 ('symbol', '6')))) |
16408
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2201 |
16409
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2202 Test --follow-first and forward --rev |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2203 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2204 $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2205 ['6', '8', '5', '7', '4'] |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2206 (group |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2207 (func |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2208 ('symbol', '_firstdescendants') |
23955
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2209 (func |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2210 ('symbol', 'rev') |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2211 ('symbol', '6')))) |
16409
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2212 --- log.nodes * (glob) |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2213 +++ glog.nodes * (glob) |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2214 @@ -1,3 +1,3 @@ |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2215 -nodetag 6 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2216 nodetag 8 |
22860
1dd178277cf5
revset-_descendant: rework the whole sorting and combining logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21998
diff
changeset
|
2217 nodetag 7 |
16409
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2218 +nodetag 6 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2219 |
16408
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2220 Test --follow and backward --rev |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2221 |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2222 $ testlog --follow -r6 -r5 -r7 -r8 -r4 |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2223 ['6', '5', '7', '8', '4'] |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2224 (group |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2225 (func |
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2226 ('symbol', 'ancestors') |
23955
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2227 (func |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2228 ('symbol', 'rev') |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2229 ('symbol', '6')))) |
16408
d74099ac2ac1
graphlog: fix --follow --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16407
diff
changeset
|
2230 |
16409
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2231 Test --follow-first and backward --rev |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2232 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2233 $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2234 ['6', '5', '7', '8', '4'] |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2235 (group |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2236 (func |
2cbd7dd0cc1f
graphlog: fix --follow-first --rev combinations
Patrick Mezard <patrick@mezard.eu>
parents:
16408
diff
changeset
|
2237 ('symbol', '_firstancestors') |
23955
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2238 (func |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2239 ('symbol', 'rev') |
8a29897d42d2
log: use rev() to build revset of --follow option from numeric revision
Yuya Nishihara <yuya@tcha.org>
parents:
23501
diff
changeset
|
2240 ('symbol', '6')))) |
16411
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2241 |
24200
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2242 Test --follow with --rev of graphlog extension |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2243 |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2244 $ hg --config extensions.graphlog= glog -qfr1 |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2245 o 1:216d4c92cf98 |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2246 | |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2247 o 0:f8035bb17114 |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2248 |
8e1f1673aa9a
graphlog: do not bypass commands.log so that -fr works
Yuya Nishihara <yuya@tcha.org>
parents:
24189
diff
changeset
|
2249 |
16411
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2250 Test subdir |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2251 |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2252 $ hg up -q 3 |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2253 $ cd dir |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2254 $ testlog . |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2255 [] |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2256 (group |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2257 (func |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2258 ('symbol', '_matchfiles') |
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2259 (list |
27987
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
2260 ('string', 'r:') |
b19d8d5d6b51
revset: flatten chained 'list' operations (aka function args) (issue5072)
Yuya Nishihara <yuya@tcha.org>
parents:
27556
diff
changeset
|
2261 ('string', 'd:relpath') |
16411
4c2edcd84175
graphlog: correctly handle calls in subdirectories
Patrick Mezard <patrick@mezard.eu>
parents:
16409
diff
changeset
|
2262 ('string', 'p:.')))) |
16434
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2263 $ testlog ../b |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2264 [] |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2265 (group |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2266 (group |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2267 (func |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2268 ('symbol', 'filelog') |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2269 ('string', '../b')))) |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2270 $ testlog -f ../b |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2271 [] |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2272 (group |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2273 (group |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2274 (func |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2275 ('symbol', 'follow') |
8b62a77d0895
graphlog: fix --follow FILE and relative paths
Patrick Mezard <patrick@mezard.eu>
parents:
16431
diff
changeset
|
2276 ('string', 'b')))) |
16431
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2277 $ cd .. |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2278 |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2279 Test --hidden |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17434
diff
changeset
|
2280 (enable obsolete) |
16431
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2281 |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22947
diff
changeset
|
2282 $ cat >> $HGRCPATH << EOF |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22947
diff
changeset
|
2283 > [experimental] |
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22947
diff
changeset
|
2284 > evolution=createmarkers |
16431
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2285 > EOF |
18208
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17434
diff
changeset
|
2286 |
f0059ba239cb
test: use obsolescence marker to test hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17434
diff
changeset
|
2287 $ hg debugobsolete `hg id --debug -i -r 8` |
16431
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2288 $ testlog |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2289 [] |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2290 [] |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2291 $ testlog --hidden |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2292 [] |
c85098cdd7df
graphlog: implement --hidden
Patrick Mezard <patrick@mezard.eu>
parents:
16411
diff
changeset
|
2293 [] |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2294 $ 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
|
2295 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
|
2296 | |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2297 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
|
2298 |\ |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2299 | 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
|
2300 | | |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2301 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
|
2302 |/ |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2303 @ 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
|
2304 | |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2305 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
|
2306 | |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2307 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
|
2308 | |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2309 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
|
2310 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16484
diff
changeset
|
2311 |
17120
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2312 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
|
2313 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2314 $ 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
|
2315 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
|
2316 | |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2317 o 1 copy a b |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2318 | |
17434
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2319 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
|
2320 |
17120
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2321 |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2322 Extra newlines must be preserved |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2323 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2324 $ 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
|
2325 o |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2326 | 2 mv b dir/b |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2327 | |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2328 o |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2329 | 1 copy a b |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2330 | |
17434
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2331 o |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2332 0 add a |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2333 |
17120
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2334 |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2335 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
|
2336 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2337 $ 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
|
2338 o |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2339 | |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2340 o |
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2341 | |
17434
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2342 o |
038f4f0439d7
test: remove invalid hidden rev in graphlog test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17347
diff
changeset
|
2343 |
17120
01d847e0fdc9
graphlog: don't truncate template value at last \n
Mads Kiilerich <mads@kiilerich.com>
parents:
17014
diff
changeset
|
2344 |
18467
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2345 issue3772 |
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2346 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2347 $ hg log -G -r :null |
20699
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
20117
diff
changeset
|
2348 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
|
2349 | user: test |
58c32a9c8e7b
hg log: solves bug regarding hg log -r 0:null (issue4039)
Cristian Zamfir <cristi_zmf@yahoo.com>
parents:
20117
diff
changeset
|
2350 | 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
|
2351 | 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
|
2352 | |
18467
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2353 o changeset: -1:000000000000 |
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2354 user: |
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2355 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
|
2356 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19060
diff
changeset
|
2357 $ 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
|
2358 o changeset: -1:000000000000 |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18467
diff
changeset
|
2359 user: |
275224c6e89c
tests: add regression tests for another revrange edge case
Kevin Bullock <kbullock@ringworld.org>
parents:
18467
diff
changeset
|
2360 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
|
2361 |
18467
e441657b372b
graphmod: don't try to visit nullrev (issue3772)
Bryan O'Sullivan <bryano@fb.com>
parents:
18208
diff
changeset
|
2362 |
24202
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2363 should not draw line down to null due to the magic of fullreposet |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2364 |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2365 $ hg log -G -r 'all()' | tail -6 |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2366 | |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2367 o changeset: 0:f8035bb17114 |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2368 user: test |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2369 date: Thu Jan 01 00:00:00 1970 +0000 |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2370 summary: add a |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2371 |
2de9ee016425
revset: have all() filter out null revision
Yuya Nishihara <yuya@tcha.org>
parents:
24200
diff
changeset
|
2372 |
25265
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2373 $ hg log -G -r 'branch(default)' | tail -6 |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2374 | |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2375 o changeset: 0:f8035bb17114 |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2376 user: test |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2377 date: Thu Jan 01 00:00:00 1970 +0000 |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2378 summary: add a |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2379 |
e16456831516
revset: drop magic of fullreposet membership test (issue4682)
Yuya Nishihara <yuya@tcha.org>
parents:
24202
diff
changeset
|
2380 |
25765
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2381 working-directory revision |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2382 |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2383 $ hg log -G -qr '. + wdir()' |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2384 o 2147483647:ffffffffffff |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2385 | |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2386 @ 3:5918b8d165d1 |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2387 | |
5e1b0739611c
revset: use integer representation of wdir() in revset
Yuya Nishihara <yuya@tcha.org>
parents:
25675
diff
changeset
|
2388 |
27216
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2389 node template with changeset_printer: |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2390 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2391 $ hg log -Gqr 5:7 --config ui.graphnodetemplate='{rev}' |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2392 7 7:02dbb8e276b8 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2393 | |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2394 6 6:fc281d8ff18d |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2395 |\ |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2396 5 | 5:99b31f1c2782 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2397 | | |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2398 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2399 node template with changeset_templater (shared cache variable): |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2400 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2401 $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2402 > --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2403 o 7 foo-bar+1 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2404 | |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2405 # 6 foo-bar+0 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2406 |\ |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2407 o | 5 null+5 |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2408 | | |
8117e2cd959e
graphlog: make node symbol templatable by ui.graphnodetemplate option
Yuya Nishihara <yuya@tcha.org>
parents:
25765
diff
changeset
|
2409 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16484
diff
changeset
|
2410 $ cd .. |