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