Show More
| @@ -1,195 +1,139 b'' | |||||
| 1 | # Revision graph generator for Mercurial |
|
1 | # Revision graph generator for Mercurial | |
| 2 | # |
|
2 | # | |
| 3 | # Copyright 2008 Dirkjan Ochtman <dirkjan@ochtman.nl> |
|
3 | # Copyright 2008 Dirkjan Ochtman <dirkjan@ochtman.nl> | |
| 4 | # Copyright 2007 Joel Rosdahl <joel@rosdahl.net> |
|
4 | # Copyright 2007 Joel Rosdahl <joel@rosdahl.net> | |
| 5 | # |
|
5 | # | |
| 6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
| 7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
| 8 |
|
8 | |||
| 9 | """supports walking the history as DAGs suitable for graphical output |
|
9 | """supports walking the history as DAGs suitable for graphical output | |
| 10 |
|
10 | |||
| 11 | The most basic format we use is that of:: |
|
11 | The most basic format we use is that of:: | |
| 12 |
|
12 | |||
| 13 | (id, type, data, [parentids]) |
|
13 | (id, type, data, [parentids]) | |
| 14 |
|
14 | |||
| 15 | The node and parent ids are arbitrary integers which identify a node in the |
|
15 | The node and parent ids are arbitrary integers which identify a node in the | |
| 16 | context of the graph returned. Type is a constant specifying the node type. |
|
16 | context of the graph returned. Type is a constant specifying the node type. | |
| 17 | Data depends on type. |
|
17 | Data depends on type. | |
| 18 | """ |
|
18 | """ | |
| 19 |
|
19 | |||
| 20 | from mercurial.node import nullrev |
|
20 | from mercurial.node import nullrev | |
| 21 |
|
21 | |||
| 22 | CHANGESET = 'C' |
|
22 | CHANGESET = 'C' | |
| 23 |
|
23 | |||
| 24 | def dagwalker(repo, revs): |
|
24 | def dagwalker(repo, revs): | |
| 25 | """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples |
|
25 | """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples | |
| 26 |
|
26 | |||
| 27 | This generator function walks through revisions (which should be ordered |
|
27 | This generator function walks through revisions (which should be ordered | |
| 28 | from bigger to lower). It returns a tuple for each node. The node and parent |
|
28 | from bigger to lower). It returns a tuple for each node. The node and parent | |
| 29 | ids are arbitrary integers which identify a node in the context of the graph |
|
29 | ids are arbitrary integers which identify a node in the context of the graph | |
| 30 | returned. |
|
30 | returned. | |
| 31 | """ |
|
31 | """ | |
| 32 | if not revs: |
|
32 | if not revs: | |
| 33 | return |
|
33 | return | |
| 34 |
|
34 | |||
| 35 | cl = repo.changelog |
|
35 | cl = repo.changelog | |
| 36 | lowestrev = min(revs) |
|
36 | lowestrev = min(revs) | |
| 37 | gpcache = {} |
|
37 | gpcache = {} | |
| 38 |
|
38 | |||
| 39 | knownrevs = set(revs) |
|
39 | knownrevs = set(revs) | |
| 40 | for rev in revs: |
|
40 | for rev in revs: | |
| 41 | ctx = repo[rev] |
|
41 | ctx = repo[rev] | |
| 42 | parents = sorted(set([p.rev() for p in ctx.parents() |
|
42 | parents = sorted(set([p.rev() for p in ctx.parents() | |
| 43 | if p.rev() in knownrevs])) |
|
43 | if p.rev() in knownrevs])) | |
| 44 | mpars = [p.rev() for p in ctx.parents() if |
|
44 | mpars = [p.rev() for p in ctx.parents() if | |
| 45 | p.rev() != nullrev and p.rev() not in parents] |
|
45 | p.rev() != nullrev and p.rev() not in parents] | |
| 46 |
|
46 | |||
| 47 | for mpar in mpars: |
|
47 | for mpar in mpars: | |
| 48 |
gp = gpcache.get(mpar) |
|
48 | gp = gpcache.get(mpar) | |
| 49 | gpcache[mpar] = gp |
|
|||
| 50 | if gp is None: |
|
49 | if gp is None: | |
|
|
50 | gp = gpcache[mpar] = grandparent(cl, lowestrev, revs, mpar) | |||
|
|
51 | if not gp: | |||
| 51 | parents.append(mpar) |
|
52 | parents.append(mpar) | |
| 52 |
el |
|
53 | else: | |
| 53 |
parents. |
|
54 | parents.extend(g for g in gp if g not in parents) | |
| 54 |
|
55 | |||
| 55 | yield (ctx.rev(), CHANGESET, ctx, parents) |
|
56 | yield (ctx.rev(), CHANGESET, ctx, parents) | |
| 56 |
|
57 | |||
| 57 | def nodes(repo, nodes): |
|
58 | def nodes(repo, nodes): | |
| 58 | """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples |
|
59 | """cset DAG generator yielding (id, CHANGESET, ctx, [parentids]) tuples | |
| 59 |
|
60 | |||
| 60 | This generator function walks the given nodes. It only returns parents |
|
61 | This generator function walks the given nodes. It only returns parents | |
| 61 | that are in nodes, too. |
|
62 | that are in nodes, too. | |
| 62 | """ |
|
63 | """ | |
| 63 | include = set(nodes) |
|
64 | include = set(nodes) | |
| 64 | for node in nodes: |
|
65 | for node in nodes: | |
| 65 | ctx = repo[node] |
|
66 | ctx = repo[node] | |
| 66 | parents = set([p.rev() for p in ctx.parents() if p.node() in include]) |
|
67 | parents = set([p.rev() for p in ctx.parents() if p.node() in include]) | |
| 67 | yield (ctx.rev(), CHANGESET, ctx, sorted(parents)) |
|
68 | yield (ctx.rev(), CHANGESET, ctx, sorted(parents)) | |
| 68 |
|
69 | |||
| 69 | def colored(dag): |
|
70 | def colored(dag): | |
| 70 | """annotates a DAG with colored edge information |
|
71 | """annotates a DAG with colored edge information | |
| 71 |
|
72 | |||
| 72 | For each DAG node this function emits tuples:: |
|
73 | For each DAG node this function emits tuples:: | |
| 73 |
|
74 | |||
| 74 | (id, type, data, (col, color), [(col, nextcol, color)]) |
|
75 | (id, type, data, (col, color), [(col, nextcol, color)]) | |
| 75 |
|
76 | |||
| 76 | with the following new elements: |
|
77 | with the following new elements: | |
| 77 |
|
78 | |||
| 78 | - Tuple (col, color) with column and color index for the current node |
|
79 | - Tuple (col, color) with column and color index for the current node | |
| 79 | - A list of tuples indicating the edges between the current node and its |
|
80 | - A list of tuples indicating the edges between the current node and its | |
| 80 | parents. |
|
81 | parents. | |
| 81 | """ |
|
82 | """ | |
| 82 | seen = [] |
|
83 | seen = [] | |
| 83 | colors = {} |
|
84 | colors = {} | |
| 84 | newcolor = 1 |
|
85 | newcolor = 1 | |
| 85 | for (cur, type, data, parents) in dag: |
|
86 | for (cur, type, data, parents) in dag: | |
| 86 |
|
87 | |||
| 87 | # Compute seen and next |
|
88 | # Compute seen and next | |
| 88 | if cur not in seen: |
|
89 | if cur not in seen: | |
| 89 | seen.append(cur) # new head |
|
90 | seen.append(cur) # new head | |
| 90 | colors[cur] = newcolor |
|
91 | colors[cur] = newcolor | |
| 91 | newcolor += 1 |
|
92 | newcolor += 1 | |
| 92 |
|
93 | |||
| 93 | col = seen.index(cur) |
|
94 | col = seen.index(cur) | |
| 94 | color = colors.pop(cur) |
|
95 | color = colors.pop(cur) | |
| 95 | next = seen[:] |
|
96 | next = seen[:] | |
| 96 |
|
97 | |||
| 97 | # Add parents to next |
|
98 | # Add parents to next | |
| 98 | addparents = [p for p in parents if p not in next] |
|
99 | addparents = [p for p in parents if p not in next] | |
| 99 | next[col:col + 1] = addparents |
|
100 | next[col:col + 1] = addparents | |
| 100 |
|
101 | |||
| 101 | # Set colors for the parents |
|
102 | # Set colors for the parents | |
| 102 | for i, p in enumerate(addparents): |
|
103 | for i, p in enumerate(addparents): | |
| 103 | if not i: |
|
104 | if not i: | |
| 104 | colors[p] = color |
|
105 | colors[p] = color | |
| 105 | else: |
|
106 | else: | |
| 106 | colors[p] = newcolor |
|
107 | colors[p] = newcolor | |
| 107 | newcolor += 1 |
|
108 | newcolor += 1 | |
| 108 |
|
109 | |||
| 109 | # Add edges to the graph |
|
110 | # Add edges to the graph | |
| 110 | edges = [] |
|
111 | edges = [] | |
| 111 | for ecol, eid in enumerate(seen): |
|
112 | for ecol, eid in enumerate(seen): | |
| 112 | if eid in next: |
|
113 | if eid in next: | |
| 113 | edges.append((ecol, next.index(eid), colors[eid])) |
|
114 | edges.append((ecol, next.index(eid), colors[eid])) | |
| 114 | elif eid == cur: |
|
115 | elif eid == cur: | |
| 115 | for p in parents: |
|
116 | for p in parents: | |
| 116 | edges.append((ecol, next.index(p), color)) |
|
117 | edges.append((ecol, next.index(p), color)) | |
| 117 |
|
118 | |||
| 118 | # Yield and move on |
|
119 | # Yield and move on | |
| 119 | yield (cur, type, data, (col, color), edges) |
|
120 | yield (cur, type, data, (col, color), edges) | |
| 120 | seen = next |
|
121 | seen = next | |
| 121 |
|
122 | |||
| 122 |
|
||||
| 123 | def grandparent(cl, lowestrev, roots, head): |
|
123 | def grandparent(cl, lowestrev, roots, head): | |
| 124 | """Return closest 'root' rev in topological path from 'roots' to 'head'. |
|
124 | """Return all ancestors of head in roots which revision is | |
| 125 |
|
125 | greater or equal to lowestrev. | ||
| 126 | Derived from revlog.revlog.nodesbetween, but only returns next rev |
|
|||
| 127 | of topologically sorted list of all nodes N that satisfy of these |
|
|||
| 128 | constraints: |
|
|||
| 129 |
|
||||
| 130 | 1. N is a descendant of some node in 'roots' |
|
|||
| 131 | 2. N is an ancestor of 'head' |
|
|||
| 132 | 3. N is some node in 'roots' or nullrev |
|
|||
| 133 |
|
||||
| 134 | Every node is considered to be both a descendant and an ancestor |
|
|||
| 135 | of itself, so every reachable node in 'roots' and 'head' will be |
|
|||
| 136 | included in 'nodes'. |
|
|||
| 137 | """ |
|
126 | """ | |
| 138 | ancestors = set() |
|
127 | pending = set([head]) | |
| 139 | # Start at the top and keep marking parents until we're done. |
|
128 | seen = set() | |
| 140 |
|
|
129 | kept = set() | |
| 141 | revstotag.discard(nullrev) |
|
|||
| 142 | llowestrev = max(nullrev, lowestrev) |
|
130 | llowestrev = max(nullrev, lowestrev) | |
| 143 |
|
131 | while pending: | ||
| 144 | while revstotag: |
|
132 | r = pending.pop() | |
| 145 | r = revstotag.pop() |
|
133 | if r >= llowestrev and r not in seen: | |
| 146 | # A node's revision number represents its place in a |
|
134 | if r in roots: | |
| 147 | # topologically sorted list of nodes. |
|
135 | kept.add(r) | |
| 148 |
|
|
136 | else: | |
| 149 | if r not in ancestors: |
|
137 | pending.update([p for p in cl.parentrevs(r)]) | |
| 150 | # If we are possibly a descendent of one of the roots |
|
138 | seen.add(r) | |
| 151 | # and we haven't already been marked as an ancestor |
|
139 | return sorted(kept) | |
| 152 | ancestors.add(r) # Mark as ancestor |
|
|||
| 153 | # Add non-nullrev parents to list of nodes to tag. |
|
|||
| 154 | revstotag.update([p for p in cl.parentrevs(r)]) |
|
|||
| 155 |
|
||||
| 156 | if not ancestors: |
|
|||
| 157 | return |
|
|||
| 158 | # Now that we have our set of ancestors, we want to remove any |
|
|||
| 159 | # roots that are not ancestors. |
|
|||
| 160 |
|
||||
| 161 | # If one of the roots was nullrev, everything is included anyway. |
|
|||
| 162 | if lowestrev > nullrev: |
|
|||
| 163 | # But, since we weren't, let's recompute the lowest rev to not |
|
|||
| 164 | # include roots that aren't ancestors. |
|
|||
| 165 |
|
||||
| 166 | # Filter out roots that aren't ancestors of heads |
|
|||
| 167 | _roots = ancestors.intersection(roots) |
|
|||
| 168 | if not _roots: |
|
|||
| 169 | return |
|
|||
| 170 | # Recompute the lowest revision |
|
|||
| 171 | lowestrev = min(roots) |
|
|||
| 172 | else: |
|
|||
| 173 | # We are descending from nullrev, and don't need to care about |
|
|||
| 174 | # any other roots. |
|
|||
| 175 | lowestrev = nullrev |
|
|||
| 176 | _roots = [nullrev] |
|
|||
| 177 |
|
||||
| 178 | # The roots are just the descendants. |
|
|||
| 179 | # Don't start at nullrev since we don't want nullrev in our output list, |
|
|||
| 180 | # and if nullrev shows up in descedents, empty parents will look like |
|
|||
| 181 | # they're descendents. |
|
|||
| 182 | lowestrevisnullrev = (lowestrev == nullrev) |
|
|||
| 183 | for r in xrange(head - 1, max(lowestrev, -1) - 1, -1): |
|
|||
| 184 | if lowestrevisnullrev or r in _roots: |
|
|||
| 185 | pass |
|
|||
| 186 | elif _roots.issuperset(cl.parentrevs(r)): |
|
|||
| 187 | # A node is a descendent if either of its parents are |
|
|||
| 188 | # descendents. (We seeded the dependents list with the roots |
|
|||
| 189 | # up there, remember?) |
|
|||
| 190 | _roots.add(r) |
|
|||
| 191 | else: |
|
|||
| 192 | continue |
|
|||
| 193 | if r in ancestors: |
|
|||
| 194 | # Only include nodes that are both descendents and ancestors. |
|
|||
| 195 | return r |
|
|||
| @@ -1,1430 +1,1455 b'' | |||||
| 1 | @ (34) head |
|
1 | @ (34) head | |
| 2 | | |
|
2 | | | |
| 3 | | o (33) head |
|
3 | | o (33) head | |
| 4 | | | |
|
4 | | | | |
| 5 | o | (32) expand |
|
5 | o | (32) expand | |
| 6 | |\ \ |
|
6 | |\ \ | |
| 7 | | o \ (31) expand |
|
7 | | o \ (31) expand | |
| 8 | | |\ \ |
|
8 | | |\ \ | |
| 9 | | | o \ (30) expand |
|
9 | | | o \ (30) expand | |
| 10 | | | |\ \ |
|
10 | | | |\ \ | |
| 11 | | | | o | (29) regular commit |
|
11 | | | | o | (29) regular commit | |
| 12 | | | | | | |
|
12 | | | | | | | |
| 13 | | | o | | (28) merge zero known |
|
13 | | | o | | (28) merge zero known | |
| 14 | | | |\ \ \ |
|
14 | | | |\ \ \ | |
| 15 | o | | | | | (27) collapse |
|
15 | o | | | | | (27) collapse | |
| 16 | |/ / / / / |
|
16 | |/ / / / / | |
| 17 | | | o---+ (26) merge one known; far right |
|
17 | | | o---+ (26) merge one known; far right | |
| 18 | | | | | | |
|
18 | | | | | | | |
| 19 | +---o | | (25) merge one known; far left |
|
19 | +---o | | (25) merge one known; far left | |
| 20 | | | | | | |
|
20 | | | | | | | |
| 21 | | | o | | (24) merge one known; immediate right |
|
21 | | | o | | (24) merge one known; immediate right | |
| 22 | | | |\| | |
|
22 | | | |\| | | |
| 23 | | | o | | (23) merge one known; immediate left |
|
23 | | | o | | (23) merge one known; immediate left | |
| 24 | | |/| | | |
|
24 | | |/| | | | |
| 25 | +---o---+ (22) merge two known; one far left, one far right |
|
25 | +---o---+ (22) merge two known; one far left, one far right | |
| 26 | | | / / |
|
26 | | | / / | |
| 27 | o | | | (21) expand |
|
27 | o | | | (21) expand | |
| 28 | |\ \ \ \ |
|
28 | |\ \ \ \ | |
| 29 | | o---+-+ (20) merge two known; two far right |
|
29 | | o---+-+ (20) merge two known; two far right | |
| 30 | | / / / |
|
30 | | / / / | |
| 31 | o | | | (19) expand |
|
31 | o | | | (19) expand | |
| 32 | |\ \ \ \ |
|
32 | |\ \ \ \ | |
| 33 | +---+---o (18) merge two known; two far left |
|
33 | +---+---o (18) merge two known; two far left | |
| 34 | | | | | |
|
34 | | | | | | |
| 35 | | o | | (17) expand |
|
35 | | o | | (17) expand | |
| 36 | | |\ \ \ |
|
36 | | |\ \ \ | |
| 37 | | | o---+ (16) merge two known; one immediate right, one near right |
|
37 | | | o---+ (16) merge two known; one immediate right, one near right | |
| 38 | | | |/ / |
|
38 | | | |/ / | |
| 39 | o | | | (15) expand |
|
39 | o | | | (15) expand | |
| 40 | |\ \ \ \ |
|
40 | |\ \ \ \ | |
| 41 | | o-----+ (14) merge two known; one immediate right, one far right |
|
41 | | o-----+ (14) merge two known; one immediate right, one far right | |
| 42 | | |/ / / |
|
42 | | |/ / / | |
| 43 | o | | | (13) expand |
|
43 | o | | | (13) expand | |
| 44 | |\ \ \ \ |
|
44 | |\ \ \ \ | |
| 45 | +---o | | (12) merge two known; one immediate right, one far left |
|
45 | +---o | | (12) merge two known; one immediate right, one far left | |
| 46 | | | |/ / |
|
46 | | | |/ / | |
| 47 | | o | | (11) expand |
|
47 | | o | | (11) expand | |
| 48 | | |\ \ \ |
|
48 | | |\ \ \ | |
| 49 | | | o---+ (10) merge two known; one immediate left, one near right |
|
49 | | | o---+ (10) merge two known; one immediate left, one near right | |
| 50 | | |/ / / |
|
50 | | |/ / / | |
| 51 | o | | | (9) expand |
|
51 | o | | | (9) expand | |
| 52 | |\ \ \ \ |
|
52 | |\ \ \ \ | |
| 53 | | o-----+ (8) merge two known; one immediate left, one far right |
|
53 | | o-----+ (8) merge two known; one immediate left, one far right | |
| 54 | |/ / / / |
|
54 | |/ / / / | |
| 55 | o | | | (7) expand |
|
55 | o | | | (7) expand | |
| 56 | |\ \ \ \ |
|
56 | |\ \ \ \ | |
| 57 | +---o | | (6) merge two known; one immediate left, one far left |
|
57 | +---o | | (6) merge two known; one immediate left, one far left | |
| 58 | | |/ / / |
|
58 | | |/ / / | |
| 59 | | o | | (5) expand |
|
59 | | o | | (5) expand | |
| 60 | | |\ \ \ |
|
60 | | |\ \ \ | |
| 61 | | | o | | (4) merge two known; one immediate left, one immediate right |
|
61 | | | o | | (4) merge two known; one immediate left, one immediate right | |
| 62 | | |/|/ / |
|
62 | | |/|/ / | |
| 63 | | o / / (3) collapse |
|
63 | | o / / (3) collapse | |
| 64 | |/ / / |
|
64 | |/ / / | |
| 65 | o / / (2) collapse |
|
65 | o / / (2) collapse | |
| 66 | |/ / |
|
66 | |/ / | |
| 67 | o / (1) collapse |
|
67 | o / (1) collapse | |
| 68 | |/ |
|
68 | |/ | |
| 69 | o (0) root |
|
69 | o (0) root | |
| 70 |
|
70 | |||
| 71 |
|
71 | |||
| 72 | $ "$TESTDIR/hghave" no-outer-repo || exit 80 |
|
72 | $ "$TESTDIR/hghave" no-outer-repo || exit 80 | |
| 73 |
|
73 | |||
| 74 | $ commit() |
|
74 | $ commit() | |
| 75 | > { |
|
75 | > { | |
| 76 | > rev=$1 |
|
76 | > rev=$1 | |
| 77 | > msg=$2 |
|
77 | > msg=$2 | |
| 78 | > shift 2 |
|
78 | > shift 2 | |
| 79 | > if [ "$#" -gt 0 ]; then |
|
79 | > if [ "$#" -gt 0 ]; then | |
| 80 | > hg debugsetparents "$@" |
|
80 | > hg debugsetparents "$@" | |
| 81 | > fi |
|
81 | > fi | |
| 82 | > echo $rev > a |
|
82 | > echo $rev > a | |
| 83 | > hg commit -Aqd "$rev 0" -m "($rev) $msg" |
|
83 | > hg commit -Aqd "$rev 0" -m "($rev) $msg" | |
| 84 | > } |
|
84 | > } | |
| 85 |
|
85 | |||
| 86 | $ echo "[extensions]" >> $HGRCPATH |
|
86 | $ echo "[extensions]" >> $HGRCPATH | |
| 87 | $ echo "graphlog=" >> $HGRCPATH |
|
87 | $ echo "graphlog=" >> $HGRCPATH | |
| 88 |
|
88 | |||
| 89 | $ hg init repo |
|
89 | $ hg init repo | |
| 90 | $ cd repo |
|
90 | $ cd repo | |
| 91 |
|
91 | |||
| 92 | Empty repo: |
|
92 | Empty repo: | |
| 93 |
|
93 | |||
| 94 | $ hg glog |
|
94 | $ hg glog | |
| 95 |
|
95 | |||
| 96 |
|
96 | |||
| 97 | Building DAG: |
|
97 | Building DAG: | |
| 98 |
|
98 | |||
| 99 | $ commit 0 "root" |
|
99 | $ commit 0 "root" | |
| 100 | $ commit 1 "collapse" 0 |
|
100 | $ commit 1 "collapse" 0 | |
| 101 | $ commit 2 "collapse" 1 |
|
101 | $ commit 2 "collapse" 1 | |
| 102 | $ commit 3 "collapse" 2 |
|
102 | $ commit 3 "collapse" 2 | |
| 103 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
103 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 | |
| 104 | $ commit 5 "expand" 3 4 |
|
104 | $ commit 5 "expand" 3 4 | |
| 105 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
105 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 | |
| 106 | $ commit 7 "expand" 2 5 |
|
106 | $ commit 7 "expand" 2 5 | |
| 107 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
107 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 | |
| 108 | $ commit 9 "expand" 7 8 |
|
108 | $ commit 9 "expand" 7 8 | |
| 109 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
109 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 | |
| 110 | $ commit 11 "expand" 6 10 |
|
110 | $ commit 11 "expand" 6 10 | |
| 111 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
111 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 | |
| 112 | $ commit 13 "expand" 9 11 |
|
112 | $ commit 13 "expand" 9 11 | |
| 113 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
113 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 | |
| 114 | $ commit 15 "expand" 13 14 |
|
114 | $ commit 15 "expand" 13 14 | |
| 115 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
115 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 | |
| 116 | $ commit 17 "expand" 12 16 |
|
116 | $ commit 17 "expand" 12 16 | |
| 117 | $ commit 18 "merge two known; two far left" 1 15 |
|
117 | $ commit 18 "merge two known; two far left" 1 15 | |
| 118 | $ commit 19 "expand" 15 17 |
|
118 | $ commit 19 "expand" 15 17 | |
| 119 | $ commit 20 "merge two known; two far right" 0 18 |
|
119 | $ commit 20 "merge two known; two far right" 0 18 | |
| 120 | $ commit 21 "expand" 19 20 |
|
120 | $ commit 21 "expand" 19 20 | |
| 121 | $ commit 22 "merge two known; one far left, one far right" 18 21 |
|
121 | $ commit 22 "merge two known; one far left, one far right" 18 21 | |
| 122 | $ commit 23 "merge one known; immediate left" 1 22 |
|
122 | $ commit 23 "merge one known; immediate left" 1 22 | |
| 123 | $ commit 24 "merge one known; immediate right" 0 23 |
|
123 | $ commit 24 "merge one known; immediate right" 0 23 | |
| 124 | $ commit 25 "merge one known; far left" 21 24 |
|
124 | $ commit 25 "merge one known; far left" 21 24 | |
| 125 | $ commit 26 "merge one known; far right" 18 25 |
|
125 | $ commit 26 "merge one known; far right" 18 25 | |
| 126 | $ commit 27 "collapse" 21 |
|
126 | $ commit 27 "collapse" 21 | |
| 127 | $ commit 28 "merge zero known" 1 26 |
|
127 | $ commit 28 "merge zero known" 1 26 | |
| 128 | $ commit 29 "regular commit" 0 |
|
128 | $ commit 29 "regular commit" 0 | |
| 129 | $ commit 30 "expand" 28 29 |
|
129 | $ commit 30 "expand" 28 29 | |
| 130 | $ commit 31 "expand" 21 30 |
|
130 | $ commit 31 "expand" 21 30 | |
| 131 | $ commit 32 "expand" 27 31 |
|
131 | $ commit 32 "expand" 27 31 | |
| 132 | $ commit 33 "head" 18 |
|
132 | $ commit 33 "head" 18 | |
| 133 | $ commit 34 "head" 32 |
|
133 | $ commit 34 "head" 32 | |
| 134 |
|
134 | |||
| 135 |
|
135 | |||
| 136 | $ hg glog -q |
|
136 | $ hg glog -q | |
| 137 | @ 34:fea3ac5810e0 |
|
137 | @ 34:fea3ac5810e0 | |
| 138 | | |
|
138 | | | |
| 139 | | o 33:68608f5145f9 |
|
139 | | o 33:68608f5145f9 | |
| 140 | | | |
|
140 | | | | |
| 141 | o | 32:d06dffa21a31 |
|
141 | o | 32:d06dffa21a31 | |
| 142 | |\ \ |
|
142 | |\ \ | |
| 143 | | o \ 31:621d83e11f67 |
|
143 | | o \ 31:621d83e11f67 | |
| 144 | | |\ \ |
|
144 | | |\ \ | |
| 145 | | | o \ 30:6e11cd4b648f |
|
145 | | | o \ 30:6e11cd4b648f | |
| 146 | | | |\ \ |
|
146 | | | |\ \ | |
| 147 | | | | o | 29:cd9bb2be7593 |
|
147 | | | | o | 29:cd9bb2be7593 | |
| 148 | | | | | | |
|
148 | | | | | | | |
| 149 | | | o | | 28:44ecd0b9ae99 |
|
149 | | | o | | 28:44ecd0b9ae99 | |
| 150 | | | |\ \ \ |
|
150 | | | |\ \ \ | |
| 151 | o | | | | | 27:886ed638191b |
|
151 | o | | | | | 27:886ed638191b | |
| 152 | |/ / / / / |
|
152 | |/ / / / / | |
| 153 | | | o---+ 26:7f25b6c2f0b9 |
|
153 | | | o---+ 26:7f25b6c2f0b9 | |
| 154 | | | | | | |
|
154 | | | | | | | |
| 155 | +---o | | 25:91da8ed57247 |
|
155 | +---o | | 25:91da8ed57247 | |
| 156 | | | | | | |
|
156 | | | | | | | |
| 157 | | | o | | 24:a9c19a3d96b7 |
|
157 | | | o | | 24:a9c19a3d96b7 | |
| 158 | | | |\| | |
|
158 | | | |\| | | |
| 159 | | | o | | 23:a01cddf0766d |
|
159 | | | o | | 23:a01cddf0766d | |
| 160 | | |/| | | |
|
160 | | |/| | | | |
| 161 | +---o---+ 22:e0d9cccacb5d |
|
161 | +---o---+ 22:e0d9cccacb5d | |
| 162 | | | / / |
|
162 | | | / / | |
| 163 | o | | | 21:d42a756af44d |
|
163 | o | | | 21:d42a756af44d | |
| 164 | |\ \ \ \ |
|
164 | |\ \ \ \ | |
| 165 | | o---+-+ 20:d30ed6450e32 |
|
165 | | o---+-+ 20:d30ed6450e32 | |
| 166 | | / / / |
|
166 | | / / / | |
| 167 | o | | | 19:31ddc2c1573b |
|
167 | o | | | 19:31ddc2c1573b | |
| 168 | |\ \ \ \ |
|
168 | |\ \ \ \ | |
| 169 | +---+---o 18:1aa84d96232a |
|
169 | +---+---o 18:1aa84d96232a | |
| 170 | | | | | |
|
170 | | | | | | |
| 171 | | o | | 17:44765d7c06e0 |
|
171 | | o | | 17:44765d7c06e0 | |
| 172 | | |\ \ \ |
|
172 | | |\ \ \ | |
| 173 | | | o---+ 16:3677d192927d |
|
173 | | | o---+ 16:3677d192927d | |
| 174 | | | |/ / |
|
174 | | | |/ / | |
| 175 | o | | | 15:1dda3f72782d |
|
175 | o | | | 15:1dda3f72782d | |
| 176 | |\ \ \ \ |
|
176 | |\ \ \ \ | |
| 177 | | o-----+ 14:8eac370358ef |
|
177 | | o-----+ 14:8eac370358ef | |
| 178 | | |/ / / |
|
178 | | |/ / / | |
| 179 | o | | | 13:22d8966a97e3 |
|
179 | o | | | 13:22d8966a97e3 | |
| 180 | |\ \ \ \ |
|
180 | |\ \ \ \ | |
| 181 | +---o | | 12:86b91144a6e9 |
|
181 | +---o | | 12:86b91144a6e9 | |
| 182 | | | |/ / |
|
182 | | | |/ / | |
| 183 | | o | | 11:832d76e6bdf2 |
|
183 | | o | | 11:832d76e6bdf2 | |
| 184 | | |\ \ \ |
|
184 | | |\ \ \ | |
| 185 | | | o---+ 10:74c64d036d72 |
|
185 | | | o---+ 10:74c64d036d72 | |
| 186 | | |/ / / |
|
186 | | |/ / / | |
| 187 | o | | | 9:7010c0af0a35 |
|
187 | o | | | 9:7010c0af0a35 | |
| 188 | |\ \ \ \ |
|
188 | |\ \ \ \ | |
| 189 | | o-----+ 8:7a0b11f71937 |
|
189 | | o-----+ 8:7a0b11f71937 | |
| 190 | |/ / / / |
|
190 | |/ / / / | |
| 191 | o | | | 7:b632bb1b1224 |
|
191 | o | | | 7:b632bb1b1224 | |
| 192 | |\ \ \ \ |
|
192 | |\ \ \ \ | |
| 193 | +---o | | 6:b105a072e251 |
|
193 | +---o | | 6:b105a072e251 | |
| 194 | | |/ / / |
|
194 | | |/ / / | |
| 195 | | o | | 5:4409d547b708 |
|
195 | | o | | 5:4409d547b708 | |
| 196 | | |\ \ \ |
|
196 | | |\ \ \ | |
| 197 | | | o | | 4:26a8bac39d9f |
|
197 | | | o | | 4:26a8bac39d9f | |
| 198 | | |/|/ / |
|
198 | | |/|/ / | |
| 199 | | o / / 3:27eef8ed80b4 |
|
199 | | o / / 3:27eef8ed80b4 | |
| 200 | |/ / / |
|
200 | |/ / / | |
| 201 | o / / 2:3d9a33b8d1e1 |
|
201 | o / / 2:3d9a33b8d1e1 | |
| 202 | |/ / |
|
202 | |/ / | |
| 203 | o / 1:6db2ef61d156 |
|
203 | o / 1:6db2ef61d156 | |
| 204 | |/ |
|
204 | |/ | |
| 205 | o 0:e6eb3150255d |
|
205 | o 0:e6eb3150255d | |
| 206 |
|
206 | |||
| 207 |
|
207 | |||
| 208 | $ hg glog |
|
208 | $ hg glog | |
| 209 | @ changeset: 34:fea3ac5810e0 |
|
209 | @ changeset: 34:fea3ac5810e0 | |
| 210 | | tag: tip |
|
210 | | tag: tip | |
| 211 | | parent: 32:d06dffa21a31 |
|
211 | | parent: 32:d06dffa21a31 | |
| 212 | | user: test |
|
212 | | user: test | |
| 213 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
213 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 214 | | summary: (34) head |
|
214 | | summary: (34) head | |
| 215 | | |
|
215 | | | |
| 216 | | o changeset: 33:68608f5145f9 |
|
216 | | o changeset: 33:68608f5145f9 | |
| 217 | | | parent: 18:1aa84d96232a |
|
217 | | | parent: 18:1aa84d96232a | |
| 218 | | | user: test |
|
218 | | | user: test | |
| 219 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
219 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 220 | | | summary: (33) head |
|
220 | | | summary: (33) head | |
| 221 | | | |
|
221 | | | | |
| 222 | o | changeset: 32:d06dffa21a31 |
|
222 | o | changeset: 32:d06dffa21a31 | |
| 223 | |\ \ parent: 27:886ed638191b |
|
223 | |\ \ parent: 27:886ed638191b | |
| 224 | | | | parent: 31:621d83e11f67 |
|
224 | | | | parent: 31:621d83e11f67 | |
| 225 | | | | user: test |
|
225 | | | | user: test | |
| 226 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
226 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 227 | | | | summary: (32) expand |
|
227 | | | | summary: (32) expand | |
| 228 | | | | |
|
228 | | | | | |
| 229 | | o | changeset: 31:621d83e11f67 |
|
229 | | o | changeset: 31:621d83e11f67 | |
| 230 | | |\ \ parent: 21:d42a756af44d |
|
230 | | |\ \ parent: 21:d42a756af44d | |
| 231 | | | | | parent: 30:6e11cd4b648f |
|
231 | | | | | parent: 30:6e11cd4b648f | |
| 232 | | | | | user: test |
|
232 | | | | | user: test | |
| 233 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
233 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
| 234 | | | | | summary: (31) expand |
|
234 | | | | | summary: (31) expand | |
| 235 | | | | | |
|
235 | | | | | | |
| 236 | | | o | changeset: 30:6e11cd4b648f |
|
236 | | | o | changeset: 30:6e11cd4b648f | |
| 237 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
237 | | | |\ \ parent: 28:44ecd0b9ae99 | |
| 238 | | | | | | parent: 29:cd9bb2be7593 |
|
238 | | | | | | parent: 29:cd9bb2be7593 | |
| 239 | | | | | | user: test |
|
239 | | | | | | user: test | |
| 240 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
240 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
| 241 | | | | | | summary: (30) expand |
|
241 | | | | | | summary: (30) expand | |
| 242 | | | | | | |
|
242 | | | | | | | |
| 243 | | | | o | changeset: 29:cd9bb2be7593 |
|
243 | | | | o | changeset: 29:cd9bb2be7593 | |
| 244 | | | | | | parent: 0:e6eb3150255d |
|
244 | | | | | | parent: 0:e6eb3150255d | |
| 245 | | | | | | user: test |
|
245 | | | | | | user: test | |
| 246 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
246 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
| 247 | | | | | | summary: (29) regular commit |
|
247 | | | | | | summary: (29) regular commit | |
| 248 | | | | | | |
|
248 | | | | | | | |
| 249 | | | o | | changeset: 28:44ecd0b9ae99 |
|
249 | | | o | | changeset: 28:44ecd0b9ae99 | |
| 250 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
250 | | | |\ \ \ parent: 1:6db2ef61d156 | |
| 251 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
251 | | | | | | | parent: 26:7f25b6c2f0b9 | |
| 252 | | | | | | | user: test |
|
252 | | | | | | | user: test | |
| 253 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
253 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
| 254 | | | | | | | summary: (28) merge zero known |
|
254 | | | | | | | summary: (28) merge zero known | |
| 255 | | | | | | | |
|
255 | | | | | | | | |
| 256 | o | | | | | changeset: 27:886ed638191b |
|
256 | o | | | | | changeset: 27:886ed638191b | |
| 257 | |/ / / / / parent: 21:d42a756af44d |
|
257 | |/ / / / / parent: 21:d42a756af44d | |
| 258 | | | | | | user: test |
|
258 | | | | | | user: test | |
| 259 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
259 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 260 | | | | | | summary: (27) collapse |
|
260 | | | | | | summary: (27) collapse | |
| 261 | | | | | | |
|
261 | | | | | | | |
| 262 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
262 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
| 263 | | | | | | parent: 18:1aa84d96232a |
|
263 | | | | | | parent: 18:1aa84d96232a | |
| 264 | | | | | | parent: 25:91da8ed57247 |
|
264 | | | | | | parent: 25:91da8ed57247 | |
| 265 | | | | | | user: test |
|
265 | | | | | | user: test | |
| 266 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
266 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
| 267 | | | | | | summary: (26) merge one known; far right |
|
267 | | | | | | summary: (26) merge one known; far right | |
| 268 | | | | | | |
|
268 | | | | | | | |
| 269 | +---o | | changeset: 25:91da8ed57247 |
|
269 | +---o | | changeset: 25:91da8ed57247 | |
| 270 | | | | | | parent: 21:d42a756af44d |
|
270 | | | | | | parent: 21:d42a756af44d | |
| 271 | | | | | | parent: 24:a9c19a3d96b7 |
|
271 | | | | | | parent: 24:a9c19a3d96b7 | |
| 272 | | | | | | user: test |
|
272 | | | | | | user: test | |
| 273 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
273 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
| 274 | | | | | | summary: (25) merge one known; far left |
|
274 | | | | | | summary: (25) merge one known; far left | |
| 275 | | | | | | |
|
275 | | | | | | | |
| 276 | | | o | | changeset: 24:a9c19a3d96b7 |
|
276 | | | o | | changeset: 24:a9c19a3d96b7 | |
| 277 | | | |\| | parent: 0:e6eb3150255d |
|
277 | | | |\| | parent: 0:e6eb3150255d | |
| 278 | | | | | | parent: 23:a01cddf0766d |
|
278 | | | | | | parent: 23:a01cddf0766d | |
| 279 | | | | | | user: test |
|
279 | | | | | | user: test | |
| 280 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
280 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
| 281 | | | | | | summary: (24) merge one known; immediate right |
|
281 | | | | | | summary: (24) merge one known; immediate right | |
| 282 | | | | | | |
|
282 | | | | | | | |
| 283 | | | o | | changeset: 23:a01cddf0766d |
|
283 | | | o | | changeset: 23:a01cddf0766d | |
| 284 | | |/| | | parent: 1:6db2ef61d156 |
|
284 | | |/| | | parent: 1:6db2ef61d156 | |
| 285 | | | | | | parent: 22:e0d9cccacb5d |
|
285 | | | | | | parent: 22:e0d9cccacb5d | |
| 286 | | | | | | user: test |
|
286 | | | | | | user: test | |
| 287 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
287 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 288 | | | | | | summary: (23) merge one known; immediate left |
|
288 | | | | | | summary: (23) merge one known; immediate left | |
| 289 | | | | | | |
|
289 | | | | | | | |
| 290 | +---o---+ changeset: 22:e0d9cccacb5d |
|
290 | +---o---+ changeset: 22:e0d9cccacb5d | |
| 291 | | | | | parent: 18:1aa84d96232a |
|
291 | | | | | parent: 18:1aa84d96232a | |
| 292 | | | / / parent: 21:d42a756af44d |
|
292 | | | / / parent: 21:d42a756af44d | |
| 293 | | | | | user: test |
|
293 | | | | | user: test | |
| 294 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
294 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 295 | | | | | summary: (22) merge two known; one far left, one far right |
|
295 | | | | | summary: (22) merge two known; one far left, one far right | |
| 296 | | | | | |
|
296 | | | | | | |
| 297 | o | | | changeset: 21:d42a756af44d |
|
297 | o | | | changeset: 21:d42a756af44d | |
| 298 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
298 | |\ \ \ \ parent: 19:31ddc2c1573b | |
| 299 | | | | | | parent: 20:d30ed6450e32 |
|
299 | | | | | | parent: 20:d30ed6450e32 | |
| 300 | | | | | | user: test |
|
300 | | | | | | user: test | |
| 301 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
301 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 302 | | | | | | summary: (21) expand |
|
302 | | | | | | summary: (21) expand | |
| 303 | | | | | | |
|
303 | | | | | | | |
| 304 | | o---+-+ changeset: 20:d30ed6450e32 |
|
304 | | o---+-+ changeset: 20:d30ed6450e32 | |
| 305 | | | | | parent: 0:e6eb3150255d |
|
305 | | | | | parent: 0:e6eb3150255d | |
| 306 | | / / / parent: 18:1aa84d96232a |
|
306 | | / / / parent: 18:1aa84d96232a | |
| 307 | | | | | user: test |
|
307 | | | | | user: test | |
| 308 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
308 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 309 | | | | | summary: (20) merge two known; two far right |
|
309 | | | | | summary: (20) merge two known; two far right | |
| 310 | | | | | |
|
310 | | | | | | |
| 311 | o | | | changeset: 19:31ddc2c1573b |
|
311 | o | | | changeset: 19:31ddc2c1573b | |
| 312 | |\ \ \ \ parent: 15:1dda3f72782d |
|
312 | |\ \ \ \ parent: 15:1dda3f72782d | |
| 313 | | | | | | parent: 17:44765d7c06e0 |
|
313 | | | | | | parent: 17:44765d7c06e0 | |
| 314 | | | | | | user: test |
|
314 | | | | | | user: test | |
| 315 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
315 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 316 | | | | | | summary: (19) expand |
|
316 | | | | | | summary: (19) expand | |
| 317 | | | | | | |
|
317 | | | | | | | |
| 318 | +---+---o changeset: 18:1aa84d96232a |
|
318 | +---+---o changeset: 18:1aa84d96232a | |
| 319 | | | | | parent: 1:6db2ef61d156 |
|
319 | | | | | parent: 1:6db2ef61d156 | |
| 320 | | | | | parent: 15:1dda3f72782d |
|
320 | | | | | parent: 15:1dda3f72782d | |
| 321 | | | | | user: test |
|
321 | | | | | user: test | |
| 322 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
322 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 323 | | | | | summary: (18) merge two known; two far left |
|
323 | | | | | summary: (18) merge two known; two far left | |
| 324 | | | | | |
|
324 | | | | | | |
| 325 | | o | | changeset: 17:44765d7c06e0 |
|
325 | | o | | changeset: 17:44765d7c06e0 | |
| 326 | | |\ \ \ parent: 12:86b91144a6e9 |
|
326 | | |\ \ \ parent: 12:86b91144a6e9 | |
| 327 | | | | | | parent: 16:3677d192927d |
|
327 | | | | | | parent: 16:3677d192927d | |
| 328 | | | | | | user: test |
|
328 | | | | | | user: test | |
| 329 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
329 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 330 | | | | | | summary: (17) expand |
|
330 | | | | | | summary: (17) expand | |
| 331 | | | | | | |
|
331 | | | | | | | |
| 332 | | | o---+ changeset: 16:3677d192927d |
|
332 | | | o---+ changeset: 16:3677d192927d | |
| 333 | | | | | | parent: 0:e6eb3150255d |
|
333 | | | | | | parent: 0:e6eb3150255d | |
| 334 | | | |/ / parent: 1:6db2ef61d156 |
|
334 | | | |/ / parent: 1:6db2ef61d156 | |
| 335 | | | | | user: test |
|
335 | | | | | user: test | |
| 336 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
336 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 337 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
337 | | | | | summary: (16) merge two known; one immediate right, one near right | |
| 338 | | | | | |
|
338 | | | | | | |
| 339 | o | | | changeset: 15:1dda3f72782d |
|
339 | o | | | changeset: 15:1dda3f72782d | |
| 340 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
340 | |\ \ \ \ parent: 13:22d8966a97e3 | |
| 341 | | | | | | parent: 14:8eac370358ef |
|
341 | | | | | | parent: 14:8eac370358ef | |
| 342 | | | | | | user: test |
|
342 | | | | | | user: test | |
| 343 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
343 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 344 | | | | | | summary: (15) expand |
|
344 | | | | | | summary: (15) expand | |
| 345 | | | | | | |
|
345 | | | | | | | |
| 346 | | o-----+ changeset: 14:8eac370358ef |
|
346 | | o-----+ changeset: 14:8eac370358ef | |
| 347 | | | | | | parent: 0:e6eb3150255d |
|
347 | | | | | | parent: 0:e6eb3150255d | |
| 348 | | |/ / / parent: 12:86b91144a6e9 |
|
348 | | |/ / / parent: 12:86b91144a6e9 | |
| 349 | | | | | user: test |
|
349 | | | | | user: test | |
| 350 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
350 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 351 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
351 | | | | | summary: (14) merge two known; one immediate right, one far right | |
| 352 | | | | | |
|
352 | | | | | | |
| 353 | o | | | changeset: 13:22d8966a97e3 |
|
353 | o | | | changeset: 13:22d8966a97e3 | |
| 354 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
354 | |\ \ \ \ parent: 9:7010c0af0a35 | |
| 355 | | | | | | parent: 11:832d76e6bdf2 |
|
355 | | | | | | parent: 11:832d76e6bdf2 | |
| 356 | | | | | | user: test |
|
356 | | | | | | user: test | |
| 357 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
357 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 358 | | | | | | summary: (13) expand |
|
358 | | | | | | summary: (13) expand | |
| 359 | | | | | | |
|
359 | | | | | | | |
| 360 | +---o | | changeset: 12:86b91144a6e9 |
|
360 | +---o | | changeset: 12:86b91144a6e9 | |
| 361 | | | |/ / parent: 1:6db2ef61d156 |
|
361 | | | |/ / parent: 1:6db2ef61d156 | |
| 362 | | | | | parent: 9:7010c0af0a35 |
|
362 | | | | | parent: 9:7010c0af0a35 | |
| 363 | | | | | user: test |
|
363 | | | | | user: test | |
| 364 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
364 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 365 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
365 | | | | | summary: (12) merge two known; one immediate right, one far left | |
| 366 | | | | | |
|
366 | | | | | | |
| 367 | | o | | changeset: 11:832d76e6bdf2 |
|
367 | | o | | changeset: 11:832d76e6bdf2 | |
| 368 | | |\ \ \ parent: 6:b105a072e251 |
|
368 | | |\ \ \ parent: 6:b105a072e251 | |
| 369 | | | | | | parent: 10:74c64d036d72 |
|
369 | | | | | | parent: 10:74c64d036d72 | |
| 370 | | | | | | user: test |
|
370 | | | | | | user: test | |
| 371 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
371 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 372 | | | | | | summary: (11) expand |
|
372 | | | | | | summary: (11) expand | |
| 373 | | | | | | |
|
373 | | | | | | | |
| 374 | | | o---+ changeset: 10:74c64d036d72 |
|
374 | | | o---+ changeset: 10:74c64d036d72 | |
| 375 | | | | | | parent: 0:e6eb3150255d |
|
375 | | | | | | parent: 0:e6eb3150255d | |
| 376 | | |/ / / parent: 6:b105a072e251 |
|
376 | | |/ / / parent: 6:b105a072e251 | |
| 377 | | | | | user: test |
|
377 | | | | | user: test | |
| 378 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
378 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 379 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
379 | | | | | summary: (10) merge two known; one immediate left, one near right | |
| 380 | | | | | |
|
380 | | | | | | |
| 381 | o | | | changeset: 9:7010c0af0a35 |
|
381 | o | | | changeset: 9:7010c0af0a35 | |
| 382 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
382 | |\ \ \ \ parent: 7:b632bb1b1224 | |
| 383 | | | | | | parent: 8:7a0b11f71937 |
|
383 | | | | | | parent: 8:7a0b11f71937 | |
| 384 | | | | | | user: test |
|
384 | | | | | | user: test | |
| 385 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
385 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 386 | | | | | | summary: (9) expand |
|
386 | | | | | | summary: (9) expand | |
| 387 | | | | | | |
|
387 | | | | | | | |
| 388 | | o-----+ changeset: 8:7a0b11f71937 |
|
388 | | o-----+ changeset: 8:7a0b11f71937 | |
| 389 | | | | | | parent: 0:e6eb3150255d |
|
389 | | | | | | parent: 0:e6eb3150255d | |
| 390 | |/ / / / parent: 7:b632bb1b1224 |
|
390 | |/ / / / parent: 7:b632bb1b1224 | |
| 391 | | | | | user: test |
|
391 | | | | | user: test | |
| 392 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
392 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 393 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
393 | | | | | summary: (8) merge two known; one immediate left, one far right | |
| 394 | | | | | |
|
394 | | | | | | |
| 395 | o | | | changeset: 7:b632bb1b1224 |
|
395 | o | | | changeset: 7:b632bb1b1224 | |
| 396 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
396 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
| 397 | | | | | | parent: 5:4409d547b708 |
|
397 | | | | | | parent: 5:4409d547b708 | |
| 398 | | | | | | user: test |
|
398 | | | | | | user: test | |
| 399 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
399 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 400 | | | | | | summary: (7) expand |
|
400 | | | | | | summary: (7) expand | |
| 401 | | | | | | |
|
401 | | | | | | | |
| 402 | +---o | | changeset: 6:b105a072e251 |
|
402 | +---o | | changeset: 6:b105a072e251 | |
| 403 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
403 | | |/ / / parent: 2:3d9a33b8d1e1 | |
| 404 | | | | | parent: 5:4409d547b708 |
|
404 | | | | | parent: 5:4409d547b708 | |
| 405 | | | | | user: test |
|
405 | | | | | user: test | |
| 406 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
406 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 407 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
407 | | | | | summary: (6) merge two known; one immediate left, one far left | |
| 408 | | | | | |
|
408 | | | | | | |
| 409 | | o | | changeset: 5:4409d547b708 |
|
409 | | o | | changeset: 5:4409d547b708 | |
| 410 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
410 | | |\ \ \ parent: 3:27eef8ed80b4 | |
| 411 | | | | | | parent: 4:26a8bac39d9f |
|
411 | | | | | | parent: 4:26a8bac39d9f | |
| 412 | | | | | | user: test |
|
412 | | | | | | user: test | |
| 413 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
413 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 414 | | | | | | summary: (5) expand |
|
414 | | | | | | summary: (5) expand | |
| 415 | | | | | | |
|
415 | | | | | | | |
| 416 | | | o | | changeset: 4:26a8bac39d9f |
|
416 | | | o | | changeset: 4:26a8bac39d9f | |
| 417 | | |/|/ / parent: 1:6db2ef61d156 |
|
417 | | |/|/ / parent: 1:6db2ef61d156 | |
| 418 | | | | | parent: 3:27eef8ed80b4 |
|
418 | | | | | parent: 3:27eef8ed80b4 | |
| 419 | | | | | user: test |
|
419 | | | | | user: test | |
| 420 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
420 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 421 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
421 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
| 422 | | | | | |
|
422 | | | | | | |
| 423 | | o | | changeset: 3:27eef8ed80b4 |
|
423 | | o | | changeset: 3:27eef8ed80b4 | |
| 424 | |/ / / user: test |
|
424 | |/ / / user: test | |
| 425 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
425 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 426 | | | | summary: (3) collapse |
|
426 | | | | summary: (3) collapse | |
| 427 | | | | |
|
427 | | | | | |
| 428 | o | | changeset: 2:3d9a33b8d1e1 |
|
428 | o | | changeset: 2:3d9a33b8d1e1 | |
| 429 | |/ / user: test |
|
429 | |/ / user: test | |
| 430 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
430 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 431 | | | summary: (2) collapse |
|
431 | | | summary: (2) collapse | |
| 432 | | | |
|
432 | | | | |
| 433 | o | changeset: 1:6db2ef61d156 |
|
433 | o | changeset: 1:6db2ef61d156 | |
| 434 | |/ user: test |
|
434 | |/ user: test | |
| 435 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
435 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 436 | | summary: (1) collapse |
|
436 | | summary: (1) collapse | |
| 437 | | |
|
437 | | | |
| 438 | o changeset: 0:e6eb3150255d |
|
438 | o changeset: 0:e6eb3150255d | |
| 439 | user: test |
|
439 | user: test | |
| 440 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
440 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 441 | summary: (0) root |
|
441 | summary: (0) root | |
| 442 |
|
442 | |||
| 443 |
|
443 | |||
| 444 | File glog: |
|
444 | File glog: | |
| 445 | $ hg glog a |
|
445 | $ hg glog a | |
| 446 | @ changeset: 34:fea3ac5810e0 |
|
446 | @ changeset: 34:fea3ac5810e0 | |
| 447 | | tag: tip |
|
447 | | tag: tip | |
| 448 | | parent: 32:d06dffa21a31 |
|
448 | | parent: 32:d06dffa21a31 | |
| 449 | | user: test |
|
449 | | user: test | |
| 450 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
450 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 451 | | summary: (34) head |
|
451 | | summary: (34) head | |
| 452 | | |
|
452 | | | |
| 453 | | o changeset: 33:68608f5145f9 |
|
453 | | o changeset: 33:68608f5145f9 | |
| 454 | | | parent: 18:1aa84d96232a |
|
454 | | | parent: 18:1aa84d96232a | |
| 455 | | | user: test |
|
455 | | | user: test | |
| 456 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
456 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 457 | | | summary: (33) head |
|
457 | | | summary: (33) head | |
| 458 | | | |
|
458 | | | | |
| 459 | o | changeset: 32:d06dffa21a31 |
|
459 | o | changeset: 32:d06dffa21a31 | |
| 460 | |\ \ parent: 27:886ed638191b |
|
460 | |\ \ parent: 27:886ed638191b | |
| 461 | | | | parent: 31:621d83e11f67 |
|
461 | | | | parent: 31:621d83e11f67 | |
| 462 | | | | user: test |
|
462 | | | | user: test | |
| 463 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
463 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 464 | | | | summary: (32) expand |
|
464 | | | | summary: (32) expand | |
| 465 | | | | |
|
465 | | | | | |
| 466 | | o | changeset: 31:621d83e11f67 |
|
466 | | o | changeset: 31:621d83e11f67 | |
| 467 | | |\ \ parent: 21:d42a756af44d |
|
467 | | |\ \ parent: 21:d42a756af44d | |
| 468 | | | | | parent: 30:6e11cd4b648f |
|
468 | | | | | parent: 30:6e11cd4b648f | |
| 469 | | | | | user: test |
|
469 | | | | | user: test | |
| 470 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
470 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
| 471 | | | | | summary: (31) expand |
|
471 | | | | | summary: (31) expand | |
| 472 | | | | | |
|
472 | | | | | | |
| 473 | | | o | changeset: 30:6e11cd4b648f |
|
473 | | | o | changeset: 30:6e11cd4b648f | |
| 474 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
474 | | | |\ \ parent: 28:44ecd0b9ae99 | |
| 475 | | | | | | parent: 29:cd9bb2be7593 |
|
475 | | | | | | parent: 29:cd9bb2be7593 | |
| 476 | | | | | | user: test |
|
476 | | | | | | user: test | |
| 477 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
477 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
| 478 | | | | | | summary: (30) expand |
|
478 | | | | | | summary: (30) expand | |
| 479 | | | | | | |
|
479 | | | | | | | |
| 480 | | | | o | changeset: 29:cd9bb2be7593 |
|
480 | | | | o | changeset: 29:cd9bb2be7593 | |
| 481 | | | | | | parent: 0:e6eb3150255d |
|
481 | | | | | | parent: 0:e6eb3150255d | |
| 482 | | | | | | user: test |
|
482 | | | | | | user: test | |
| 483 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
483 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
| 484 | | | | | | summary: (29) regular commit |
|
484 | | | | | | summary: (29) regular commit | |
| 485 | | | | | | |
|
485 | | | | | | | |
| 486 | | | o | | changeset: 28:44ecd0b9ae99 |
|
486 | | | o | | changeset: 28:44ecd0b9ae99 | |
| 487 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
487 | | | |\ \ \ parent: 1:6db2ef61d156 | |
| 488 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
488 | | | | | | | parent: 26:7f25b6c2f0b9 | |
| 489 | | | | | | | user: test |
|
489 | | | | | | | user: test | |
| 490 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
490 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
| 491 | | | | | | | summary: (28) merge zero known |
|
491 | | | | | | | summary: (28) merge zero known | |
| 492 | | | | | | | |
|
492 | | | | | | | | |
| 493 | o | | | | | changeset: 27:886ed638191b |
|
493 | o | | | | | changeset: 27:886ed638191b | |
| 494 | |/ / / / / parent: 21:d42a756af44d |
|
494 | |/ / / / / parent: 21:d42a756af44d | |
| 495 | | | | | | user: test |
|
495 | | | | | | user: test | |
| 496 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
496 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 497 | | | | | | summary: (27) collapse |
|
497 | | | | | | summary: (27) collapse | |
| 498 | | | | | | |
|
498 | | | | | | | |
| 499 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
499 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
| 500 | | | | | | parent: 18:1aa84d96232a |
|
500 | | | | | | parent: 18:1aa84d96232a | |
| 501 | | | | | | parent: 25:91da8ed57247 |
|
501 | | | | | | parent: 25:91da8ed57247 | |
| 502 | | | | | | user: test |
|
502 | | | | | | user: test | |
| 503 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
503 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
| 504 | | | | | | summary: (26) merge one known; far right |
|
504 | | | | | | summary: (26) merge one known; far right | |
| 505 | | | | | | |
|
505 | | | | | | | |
| 506 | +---o | | changeset: 25:91da8ed57247 |
|
506 | +---o | | changeset: 25:91da8ed57247 | |
| 507 | | | | | | parent: 21:d42a756af44d |
|
507 | | | | | | parent: 21:d42a756af44d | |
| 508 | | | | | | parent: 24:a9c19a3d96b7 |
|
508 | | | | | | parent: 24:a9c19a3d96b7 | |
| 509 | | | | | | user: test |
|
509 | | | | | | user: test | |
| 510 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
510 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
| 511 | | | | | | summary: (25) merge one known; far left |
|
511 | | | | | | summary: (25) merge one known; far left | |
| 512 | | | | | | |
|
512 | | | | | | | |
| 513 | | | o | | changeset: 24:a9c19a3d96b7 |
|
513 | | | o | | changeset: 24:a9c19a3d96b7 | |
| 514 | | | |\| | parent: 0:e6eb3150255d |
|
514 | | | |\| | parent: 0:e6eb3150255d | |
| 515 | | | | | | parent: 23:a01cddf0766d |
|
515 | | | | | | parent: 23:a01cddf0766d | |
| 516 | | | | | | user: test |
|
516 | | | | | | user: test | |
| 517 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
517 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
| 518 | | | | | | summary: (24) merge one known; immediate right |
|
518 | | | | | | summary: (24) merge one known; immediate right | |
| 519 | | | | | | |
|
519 | | | | | | | |
| 520 | | | o | | changeset: 23:a01cddf0766d |
|
520 | | | o | | changeset: 23:a01cddf0766d | |
| 521 | | |/| | | parent: 1:6db2ef61d156 |
|
521 | | |/| | | parent: 1:6db2ef61d156 | |
| 522 | | | | | | parent: 22:e0d9cccacb5d |
|
522 | | | | | | parent: 22:e0d9cccacb5d | |
| 523 | | | | | | user: test |
|
523 | | | | | | user: test | |
| 524 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
524 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 525 | | | | | | summary: (23) merge one known; immediate left |
|
525 | | | | | | summary: (23) merge one known; immediate left | |
| 526 | | | | | | |
|
526 | | | | | | | |
| 527 | +---o---+ changeset: 22:e0d9cccacb5d |
|
527 | +---o---+ changeset: 22:e0d9cccacb5d | |
| 528 | | | | | parent: 18:1aa84d96232a |
|
528 | | | | | parent: 18:1aa84d96232a | |
| 529 | | | / / parent: 21:d42a756af44d |
|
529 | | | / / parent: 21:d42a756af44d | |
| 530 | | | | | user: test |
|
530 | | | | | user: test | |
| 531 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
531 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 532 | | | | | summary: (22) merge two known; one far left, one far right |
|
532 | | | | | summary: (22) merge two known; one far left, one far right | |
| 533 | | | | | |
|
533 | | | | | | |
| 534 | o | | | changeset: 21:d42a756af44d |
|
534 | o | | | changeset: 21:d42a756af44d | |
| 535 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
535 | |\ \ \ \ parent: 19:31ddc2c1573b | |
| 536 | | | | | | parent: 20:d30ed6450e32 |
|
536 | | | | | | parent: 20:d30ed6450e32 | |
| 537 | | | | | | user: test |
|
537 | | | | | | user: test | |
| 538 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
538 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 539 | | | | | | summary: (21) expand |
|
539 | | | | | | summary: (21) expand | |
| 540 | | | | | | |
|
540 | | | | | | | |
| 541 | | o---+-+ changeset: 20:d30ed6450e32 |
|
541 | | o---+-+ changeset: 20:d30ed6450e32 | |
| 542 | | | | | parent: 0:e6eb3150255d |
|
542 | | | | | parent: 0:e6eb3150255d | |
| 543 | | / / / parent: 18:1aa84d96232a |
|
543 | | / / / parent: 18:1aa84d96232a | |
| 544 | | | | | user: test |
|
544 | | | | | user: test | |
| 545 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
545 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 546 | | | | | summary: (20) merge two known; two far right |
|
546 | | | | | summary: (20) merge two known; two far right | |
| 547 | | | | | |
|
547 | | | | | | |
| 548 | o | | | changeset: 19:31ddc2c1573b |
|
548 | o | | | changeset: 19:31ddc2c1573b | |
| 549 | |\ \ \ \ parent: 15:1dda3f72782d |
|
549 | |\ \ \ \ parent: 15:1dda3f72782d | |
| 550 | | | | | | parent: 17:44765d7c06e0 |
|
550 | | | | | | parent: 17:44765d7c06e0 | |
| 551 | | | | | | user: test |
|
551 | | | | | | user: test | |
| 552 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
552 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 553 | | | | | | summary: (19) expand |
|
553 | | | | | | summary: (19) expand | |
| 554 | | | | | | |
|
554 | | | | | | | |
| 555 | +---+---o changeset: 18:1aa84d96232a |
|
555 | +---+---o changeset: 18:1aa84d96232a | |
| 556 | | | | | parent: 1:6db2ef61d156 |
|
556 | | | | | parent: 1:6db2ef61d156 | |
| 557 | | | | | parent: 15:1dda3f72782d |
|
557 | | | | | parent: 15:1dda3f72782d | |
| 558 | | | | | user: test |
|
558 | | | | | user: test | |
| 559 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
559 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 560 | | | | | summary: (18) merge two known; two far left |
|
560 | | | | | summary: (18) merge two known; two far left | |
| 561 | | | | | |
|
561 | | | | | | |
| 562 | | o | | changeset: 17:44765d7c06e0 |
|
562 | | o | | changeset: 17:44765d7c06e0 | |
| 563 | | |\ \ \ parent: 12:86b91144a6e9 |
|
563 | | |\ \ \ parent: 12:86b91144a6e9 | |
| 564 | | | | | | parent: 16:3677d192927d |
|
564 | | | | | | parent: 16:3677d192927d | |
| 565 | | | | | | user: test |
|
565 | | | | | | user: test | |
| 566 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
566 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 567 | | | | | | summary: (17) expand |
|
567 | | | | | | summary: (17) expand | |
| 568 | | | | | | |
|
568 | | | | | | | |
| 569 | | | o---+ changeset: 16:3677d192927d |
|
569 | | | o---+ changeset: 16:3677d192927d | |
| 570 | | | | | | parent: 0:e6eb3150255d |
|
570 | | | | | | parent: 0:e6eb3150255d | |
| 571 | | | |/ / parent: 1:6db2ef61d156 |
|
571 | | | |/ / parent: 1:6db2ef61d156 | |
| 572 | | | | | user: test |
|
572 | | | | | user: test | |
| 573 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
573 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 574 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
574 | | | | | summary: (16) merge two known; one immediate right, one near right | |
| 575 | | | | | |
|
575 | | | | | | |
| 576 | o | | | changeset: 15:1dda3f72782d |
|
576 | o | | | changeset: 15:1dda3f72782d | |
| 577 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
577 | |\ \ \ \ parent: 13:22d8966a97e3 | |
| 578 | | | | | | parent: 14:8eac370358ef |
|
578 | | | | | | parent: 14:8eac370358ef | |
| 579 | | | | | | user: test |
|
579 | | | | | | user: test | |
| 580 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
580 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 581 | | | | | | summary: (15) expand |
|
581 | | | | | | summary: (15) expand | |
| 582 | | | | | | |
|
582 | | | | | | | |
| 583 | | o-----+ changeset: 14:8eac370358ef |
|
583 | | o-----+ changeset: 14:8eac370358ef | |
| 584 | | | | | | parent: 0:e6eb3150255d |
|
584 | | | | | | parent: 0:e6eb3150255d | |
| 585 | | |/ / / parent: 12:86b91144a6e9 |
|
585 | | |/ / / parent: 12:86b91144a6e9 | |
| 586 | | | | | user: test |
|
586 | | | | | user: test | |
| 587 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
587 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 588 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
588 | | | | | summary: (14) merge two known; one immediate right, one far right | |
| 589 | | | | | |
|
589 | | | | | | |
| 590 | o | | | changeset: 13:22d8966a97e3 |
|
590 | o | | | changeset: 13:22d8966a97e3 | |
| 591 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
591 | |\ \ \ \ parent: 9:7010c0af0a35 | |
| 592 | | | | | | parent: 11:832d76e6bdf2 |
|
592 | | | | | | parent: 11:832d76e6bdf2 | |
| 593 | | | | | | user: test |
|
593 | | | | | | user: test | |
| 594 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
594 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 595 | | | | | | summary: (13) expand |
|
595 | | | | | | summary: (13) expand | |
| 596 | | | | | | |
|
596 | | | | | | | |
| 597 | +---o | | changeset: 12:86b91144a6e9 |
|
597 | +---o | | changeset: 12:86b91144a6e9 | |
| 598 | | | |/ / parent: 1:6db2ef61d156 |
|
598 | | | |/ / parent: 1:6db2ef61d156 | |
| 599 | | | | | parent: 9:7010c0af0a35 |
|
599 | | | | | parent: 9:7010c0af0a35 | |
| 600 | | | | | user: test |
|
600 | | | | | user: test | |
| 601 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
601 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 602 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
602 | | | | | summary: (12) merge two known; one immediate right, one far left | |
| 603 | | | | | |
|
603 | | | | | | |
| 604 | | o | | changeset: 11:832d76e6bdf2 |
|
604 | | o | | changeset: 11:832d76e6bdf2 | |
| 605 | | |\ \ \ parent: 6:b105a072e251 |
|
605 | | |\ \ \ parent: 6:b105a072e251 | |
| 606 | | | | | | parent: 10:74c64d036d72 |
|
606 | | | | | | parent: 10:74c64d036d72 | |
| 607 | | | | | | user: test |
|
607 | | | | | | user: test | |
| 608 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
608 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 609 | | | | | | summary: (11) expand |
|
609 | | | | | | summary: (11) expand | |
| 610 | | | | | | |
|
610 | | | | | | | |
| 611 | | | o---+ changeset: 10:74c64d036d72 |
|
611 | | | o---+ changeset: 10:74c64d036d72 | |
| 612 | | | | | | parent: 0:e6eb3150255d |
|
612 | | | | | | parent: 0:e6eb3150255d | |
| 613 | | |/ / / parent: 6:b105a072e251 |
|
613 | | |/ / / parent: 6:b105a072e251 | |
| 614 | | | | | user: test |
|
614 | | | | | user: test | |
| 615 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
615 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 616 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
616 | | | | | summary: (10) merge two known; one immediate left, one near right | |
| 617 | | | | | |
|
617 | | | | | | |
| 618 | o | | | changeset: 9:7010c0af0a35 |
|
618 | o | | | changeset: 9:7010c0af0a35 | |
| 619 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
619 | |\ \ \ \ parent: 7:b632bb1b1224 | |
| 620 | | | | | | parent: 8:7a0b11f71937 |
|
620 | | | | | | parent: 8:7a0b11f71937 | |
| 621 | | | | | | user: test |
|
621 | | | | | | user: test | |
| 622 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
622 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 623 | | | | | | summary: (9) expand |
|
623 | | | | | | summary: (9) expand | |
| 624 | | | | | | |
|
624 | | | | | | | |
| 625 | | o-----+ changeset: 8:7a0b11f71937 |
|
625 | | o-----+ changeset: 8:7a0b11f71937 | |
| 626 | | | | | | parent: 0:e6eb3150255d |
|
626 | | | | | | parent: 0:e6eb3150255d | |
| 627 | |/ / / / parent: 7:b632bb1b1224 |
|
627 | |/ / / / parent: 7:b632bb1b1224 | |
| 628 | | | | | user: test |
|
628 | | | | | user: test | |
| 629 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
629 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 630 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
630 | | | | | summary: (8) merge two known; one immediate left, one far right | |
| 631 | | | | | |
|
631 | | | | | | |
| 632 | o | | | changeset: 7:b632bb1b1224 |
|
632 | o | | | changeset: 7:b632bb1b1224 | |
| 633 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
633 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
| 634 | | | | | | parent: 5:4409d547b708 |
|
634 | | | | | | parent: 5:4409d547b708 | |
| 635 | | | | | | user: test |
|
635 | | | | | | user: test | |
| 636 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
636 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 637 | | | | | | summary: (7) expand |
|
637 | | | | | | summary: (7) expand | |
| 638 | | | | | | |
|
638 | | | | | | | |
| 639 | +---o | | changeset: 6:b105a072e251 |
|
639 | +---o | | changeset: 6:b105a072e251 | |
| 640 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
640 | | |/ / / parent: 2:3d9a33b8d1e1 | |
| 641 | | | | | parent: 5:4409d547b708 |
|
641 | | | | | parent: 5:4409d547b708 | |
| 642 | | | | | user: test |
|
642 | | | | | user: test | |
| 643 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
643 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 644 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
644 | | | | | summary: (6) merge two known; one immediate left, one far left | |
| 645 | | | | | |
|
645 | | | | | | |
| 646 | | o | | changeset: 5:4409d547b708 |
|
646 | | o | | changeset: 5:4409d547b708 | |
| 647 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
647 | | |\ \ \ parent: 3:27eef8ed80b4 | |
| 648 | | | | | | parent: 4:26a8bac39d9f |
|
648 | | | | | | parent: 4:26a8bac39d9f | |
| 649 | | | | | | user: test |
|
649 | | | | | | user: test | |
| 650 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
650 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 651 | | | | | | summary: (5) expand |
|
651 | | | | | | summary: (5) expand | |
| 652 | | | | | | |
|
652 | | | | | | | |
| 653 | | | o | | changeset: 4:26a8bac39d9f |
|
653 | | | o | | changeset: 4:26a8bac39d9f | |
| 654 | | |/|/ / parent: 1:6db2ef61d156 |
|
654 | | |/|/ / parent: 1:6db2ef61d156 | |
| 655 | | | | | parent: 3:27eef8ed80b4 |
|
655 | | | | | parent: 3:27eef8ed80b4 | |
| 656 | | | | | user: test |
|
656 | | | | | user: test | |
| 657 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
657 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 658 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
658 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
| 659 | | | | | |
|
659 | | | | | | |
| 660 | | o | | changeset: 3:27eef8ed80b4 |
|
660 | | o | | changeset: 3:27eef8ed80b4 | |
| 661 | |/ / / user: test |
|
661 | |/ / / user: test | |
| 662 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
662 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 663 | | | | summary: (3) collapse |
|
663 | | | | summary: (3) collapse | |
| 664 | | | | |
|
664 | | | | | |
| 665 | o | | changeset: 2:3d9a33b8d1e1 |
|
665 | o | | changeset: 2:3d9a33b8d1e1 | |
| 666 | |/ / user: test |
|
666 | |/ / user: test | |
| 667 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
667 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 668 | | | summary: (2) collapse |
|
668 | | | summary: (2) collapse | |
| 669 | | | |
|
669 | | | | |
| 670 | o | changeset: 1:6db2ef61d156 |
|
670 | o | changeset: 1:6db2ef61d156 | |
| 671 | |/ user: test |
|
671 | |/ user: test | |
| 672 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
672 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 673 | | summary: (1) collapse |
|
673 | | summary: (1) collapse | |
| 674 | | |
|
674 | | | |
| 675 | o changeset: 0:e6eb3150255d |
|
675 | o changeset: 0:e6eb3150255d | |
| 676 | user: test |
|
676 | user: test | |
| 677 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
677 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 678 | summary: (0) root |
|
678 | summary: (0) root | |
| 679 |
|
679 | |||
| 680 |
|
680 | |||
| 681 | File glog per revset: |
|
681 | File glog per revset: | |
| 682 |
|
682 | |||
| 683 | $ hg glog -r 'file("a")' |
|
683 | $ hg glog -r 'file("a")' | |
| 684 | @ changeset: 34:fea3ac5810e0 |
|
684 | @ changeset: 34:fea3ac5810e0 | |
| 685 | | tag: tip |
|
685 | | tag: tip | |
| 686 | | parent: 32:d06dffa21a31 |
|
686 | | parent: 32:d06dffa21a31 | |
| 687 | | user: test |
|
687 | | user: test | |
| 688 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
688 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 689 | | summary: (34) head |
|
689 | | summary: (34) head | |
| 690 | | |
|
690 | | | |
| 691 | | o changeset: 33:68608f5145f9 |
|
691 | | o changeset: 33:68608f5145f9 | |
| 692 | | | parent: 18:1aa84d96232a |
|
692 | | | parent: 18:1aa84d96232a | |
| 693 | | | user: test |
|
693 | | | user: test | |
| 694 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
694 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 695 | | | summary: (33) head |
|
695 | | | summary: (33) head | |
| 696 | | | |
|
696 | | | | |
| 697 | o | changeset: 32:d06dffa21a31 |
|
697 | o | changeset: 32:d06dffa21a31 | |
| 698 | |\ \ parent: 27:886ed638191b |
|
698 | |\ \ parent: 27:886ed638191b | |
| 699 | | | | parent: 31:621d83e11f67 |
|
699 | | | | parent: 31:621d83e11f67 | |
| 700 | | | | user: test |
|
700 | | | | user: test | |
| 701 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
701 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 702 | | | | summary: (32) expand |
|
702 | | | | summary: (32) expand | |
| 703 | | | | |
|
703 | | | | | |
| 704 | | o | changeset: 31:621d83e11f67 |
|
704 | | o | changeset: 31:621d83e11f67 | |
| 705 | | |\ \ parent: 21:d42a756af44d |
|
705 | | |\ \ parent: 21:d42a756af44d | |
| 706 | | | | | parent: 30:6e11cd4b648f |
|
706 | | | | | parent: 30:6e11cd4b648f | |
| 707 | | | | | user: test |
|
707 | | | | | user: test | |
| 708 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
708 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
| 709 | | | | | summary: (31) expand |
|
709 | | | | | summary: (31) expand | |
| 710 | | | | | |
|
710 | | | | | | |
| 711 | | | o | changeset: 30:6e11cd4b648f |
|
711 | | | o | changeset: 30:6e11cd4b648f | |
| 712 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
712 | | | |\ \ parent: 28:44ecd0b9ae99 | |
| 713 | | | | | | parent: 29:cd9bb2be7593 |
|
713 | | | | | | parent: 29:cd9bb2be7593 | |
| 714 | | | | | | user: test |
|
714 | | | | | | user: test | |
| 715 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
715 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
| 716 | | | | | | summary: (30) expand |
|
716 | | | | | | summary: (30) expand | |
| 717 | | | | | | |
|
717 | | | | | | | |
| 718 | | | | o | changeset: 29:cd9bb2be7593 |
|
718 | | | | o | changeset: 29:cd9bb2be7593 | |
| 719 | | | | | | parent: 0:e6eb3150255d |
|
719 | | | | | | parent: 0:e6eb3150255d | |
| 720 | | | | | | user: test |
|
720 | | | | | | user: test | |
| 721 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
721 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
| 722 | | | | | | summary: (29) regular commit |
|
722 | | | | | | summary: (29) regular commit | |
| 723 | | | | | | |
|
723 | | | | | | | |
| 724 | | | o | | changeset: 28:44ecd0b9ae99 |
|
724 | | | o | | changeset: 28:44ecd0b9ae99 | |
| 725 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
725 | | | |\ \ \ parent: 1:6db2ef61d156 | |
| 726 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
726 | | | | | | | parent: 26:7f25b6c2f0b9 | |
| 727 | | | | | | | user: test |
|
727 | | | | | | | user: test | |
| 728 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
728 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
| 729 | | | | | | | summary: (28) merge zero known |
|
729 | | | | | | | summary: (28) merge zero known | |
| 730 | | | | | | | |
|
730 | | | | | | | | |
| 731 | o | | | | | changeset: 27:886ed638191b |
|
731 | o | | | | | changeset: 27:886ed638191b | |
| 732 | |/ / / / / parent: 21:d42a756af44d |
|
732 | |/ / / / / parent: 21:d42a756af44d | |
| 733 | | | | | | user: test |
|
733 | | | | | | user: test | |
| 734 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
734 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 735 | | | | | | summary: (27) collapse |
|
735 | | | | | | summary: (27) collapse | |
| 736 | | | | | | |
|
736 | | | | | | | |
| 737 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
737 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
| 738 | | | | | | parent: 18:1aa84d96232a |
|
738 | | | | | | parent: 18:1aa84d96232a | |
| 739 | | | | | | parent: 25:91da8ed57247 |
|
739 | | | | | | parent: 25:91da8ed57247 | |
| 740 | | | | | | user: test |
|
740 | | | | | | user: test | |
| 741 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
741 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
| 742 | | | | | | summary: (26) merge one known; far right |
|
742 | | | | | | summary: (26) merge one known; far right | |
| 743 | | | | | | |
|
743 | | | | | | | |
| 744 | +---o | | changeset: 25:91da8ed57247 |
|
744 | +---o | | changeset: 25:91da8ed57247 | |
| 745 | | | | | | parent: 21:d42a756af44d |
|
745 | | | | | | parent: 21:d42a756af44d | |
| 746 | | | | | | parent: 24:a9c19a3d96b7 |
|
746 | | | | | | parent: 24:a9c19a3d96b7 | |
| 747 | | | | | | user: test |
|
747 | | | | | | user: test | |
| 748 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
748 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
| 749 | | | | | | summary: (25) merge one known; far left |
|
749 | | | | | | summary: (25) merge one known; far left | |
| 750 | | | | | | |
|
750 | | | | | | | |
| 751 | | | o | | changeset: 24:a9c19a3d96b7 |
|
751 | | | o | | changeset: 24:a9c19a3d96b7 | |
| 752 | | | |\| | parent: 0:e6eb3150255d |
|
752 | | | |\| | parent: 0:e6eb3150255d | |
| 753 | | | | | | parent: 23:a01cddf0766d |
|
753 | | | | | | parent: 23:a01cddf0766d | |
| 754 | | | | | | user: test |
|
754 | | | | | | user: test | |
| 755 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
755 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
| 756 | | | | | | summary: (24) merge one known; immediate right |
|
756 | | | | | | summary: (24) merge one known; immediate right | |
| 757 | | | | | | |
|
757 | | | | | | | |
| 758 | | | o | | changeset: 23:a01cddf0766d |
|
758 | | | o | | changeset: 23:a01cddf0766d | |
| 759 | | |/| | | parent: 1:6db2ef61d156 |
|
759 | | |/| | | parent: 1:6db2ef61d156 | |
| 760 | | | | | | parent: 22:e0d9cccacb5d |
|
760 | | | | | | parent: 22:e0d9cccacb5d | |
| 761 | | | | | | user: test |
|
761 | | | | | | user: test | |
| 762 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
762 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 763 | | | | | | summary: (23) merge one known; immediate left |
|
763 | | | | | | summary: (23) merge one known; immediate left | |
| 764 | | | | | | |
|
764 | | | | | | | |
| 765 | +---o---+ changeset: 22:e0d9cccacb5d |
|
765 | +---o---+ changeset: 22:e0d9cccacb5d | |
| 766 | | | | | parent: 18:1aa84d96232a |
|
766 | | | | | parent: 18:1aa84d96232a | |
| 767 | | | / / parent: 21:d42a756af44d |
|
767 | | | / / parent: 21:d42a756af44d | |
| 768 | | | | | user: test |
|
768 | | | | | user: test | |
| 769 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
769 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 770 | | | | | summary: (22) merge two known; one far left, one far right |
|
770 | | | | | summary: (22) merge two known; one far left, one far right | |
| 771 | | | | | |
|
771 | | | | | | |
| 772 | o | | | changeset: 21:d42a756af44d |
|
772 | o | | | changeset: 21:d42a756af44d | |
| 773 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
773 | |\ \ \ \ parent: 19:31ddc2c1573b | |
| 774 | | | | | | parent: 20:d30ed6450e32 |
|
774 | | | | | | parent: 20:d30ed6450e32 | |
| 775 | | | | | | user: test |
|
775 | | | | | | user: test | |
| 776 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
776 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 777 | | | | | | summary: (21) expand |
|
777 | | | | | | summary: (21) expand | |
| 778 | | | | | | |
|
778 | | | | | | | |
| 779 | | o---+-+ changeset: 20:d30ed6450e32 |
|
779 | | o---+-+ changeset: 20:d30ed6450e32 | |
| 780 | | | | | parent: 0:e6eb3150255d |
|
780 | | | | | parent: 0:e6eb3150255d | |
| 781 | | / / / parent: 18:1aa84d96232a |
|
781 | | / / / parent: 18:1aa84d96232a | |
| 782 | | | | | user: test |
|
782 | | | | | user: test | |
| 783 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
783 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 784 | | | | | summary: (20) merge two known; two far right |
|
784 | | | | | summary: (20) merge two known; two far right | |
| 785 | | | | | |
|
785 | | | | | | |
| 786 | o | | | changeset: 19:31ddc2c1573b |
|
786 | o | | | changeset: 19:31ddc2c1573b | |
| 787 | |\ \ \ \ parent: 15:1dda3f72782d |
|
787 | |\ \ \ \ parent: 15:1dda3f72782d | |
| 788 | | | | | | parent: 17:44765d7c06e0 |
|
788 | | | | | | parent: 17:44765d7c06e0 | |
| 789 | | | | | | user: test |
|
789 | | | | | | user: test | |
| 790 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
790 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 791 | | | | | | summary: (19) expand |
|
791 | | | | | | summary: (19) expand | |
| 792 | | | | | | |
|
792 | | | | | | | |
| 793 | +---+---o changeset: 18:1aa84d96232a |
|
793 | +---+---o changeset: 18:1aa84d96232a | |
| 794 | | | | | parent: 1:6db2ef61d156 |
|
794 | | | | | parent: 1:6db2ef61d156 | |
| 795 | | | | | parent: 15:1dda3f72782d |
|
795 | | | | | parent: 15:1dda3f72782d | |
| 796 | | | | | user: test |
|
796 | | | | | user: test | |
| 797 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
797 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 798 | | | | | summary: (18) merge two known; two far left |
|
798 | | | | | summary: (18) merge two known; two far left | |
| 799 | | | | | |
|
799 | | | | | | |
| 800 | | o | | changeset: 17:44765d7c06e0 |
|
800 | | o | | changeset: 17:44765d7c06e0 | |
| 801 | | |\ \ \ parent: 12:86b91144a6e9 |
|
801 | | |\ \ \ parent: 12:86b91144a6e9 | |
| 802 | | | | | | parent: 16:3677d192927d |
|
802 | | | | | | parent: 16:3677d192927d | |
| 803 | | | | | | user: test |
|
803 | | | | | | user: test | |
| 804 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
804 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 805 | | | | | | summary: (17) expand |
|
805 | | | | | | summary: (17) expand | |
| 806 | | | | | | |
|
806 | | | | | | | |
| 807 | | | o---+ changeset: 16:3677d192927d |
|
807 | | | o---+ changeset: 16:3677d192927d | |
| 808 | | | | | | parent: 0:e6eb3150255d |
|
808 | | | | | | parent: 0:e6eb3150255d | |
| 809 | | | |/ / parent: 1:6db2ef61d156 |
|
809 | | | |/ / parent: 1:6db2ef61d156 | |
| 810 | | | | | user: test |
|
810 | | | | | user: test | |
| 811 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
811 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 812 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
812 | | | | | summary: (16) merge two known; one immediate right, one near right | |
| 813 | | | | | |
|
813 | | | | | | |
| 814 | o | | | changeset: 15:1dda3f72782d |
|
814 | o | | | changeset: 15:1dda3f72782d | |
| 815 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
815 | |\ \ \ \ parent: 13:22d8966a97e3 | |
| 816 | | | | | | parent: 14:8eac370358ef |
|
816 | | | | | | parent: 14:8eac370358ef | |
| 817 | | | | | | user: test |
|
817 | | | | | | user: test | |
| 818 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
818 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 819 | | | | | | summary: (15) expand |
|
819 | | | | | | summary: (15) expand | |
| 820 | | | | | | |
|
820 | | | | | | | |
| 821 | | o-----+ changeset: 14:8eac370358ef |
|
821 | | o-----+ changeset: 14:8eac370358ef | |
| 822 | | | | | | parent: 0:e6eb3150255d |
|
822 | | | | | | parent: 0:e6eb3150255d | |
| 823 | | |/ / / parent: 12:86b91144a6e9 |
|
823 | | |/ / / parent: 12:86b91144a6e9 | |
| 824 | | | | | user: test |
|
824 | | | | | user: test | |
| 825 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
825 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 826 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
826 | | | | | summary: (14) merge two known; one immediate right, one far right | |
| 827 | | | | | |
|
827 | | | | | | |
| 828 | o | | | changeset: 13:22d8966a97e3 |
|
828 | o | | | changeset: 13:22d8966a97e3 | |
| 829 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
829 | |\ \ \ \ parent: 9:7010c0af0a35 | |
| 830 | | | | | | parent: 11:832d76e6bdf2 |
|
830 | | | | | | parent: 11:832d76e6bdf2 | |
| 831 | | | | | | user: test |
|
831 | | | | | | user: test | |
| 832 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
832 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 833 | | | | | | summary: (13) expand |
|
833 | | | | | | summary: (13) expand | |
| 834 | | | | | | |
|
834 | | | | | | | |
| 835 | +---o | | changeset: 12:86b91144a6e9 |
|
835 | +---o | | changeset: 12:86b91144a6e9 | |
| 836 | | | |/ / parent: 1:6db2ef61d156 |
|
836 | | | |/ / parent: 1:6db2ef61d156 | |
| 837 | | | | | parent: 9:7010c0af0a35 |
|
837 | | | | | parent: 9:7010c0af0a35 | |
| 838 | | | | | user: test |
|
838 | | | | | user: test | |
| 839 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
839 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 840 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
840 | | | | | summary: (12) merge two known; one immediate right, one far left | |
| 841 | | | | | |
|
841 | | | | | | |
| 842 | | o | | changeset: 11:832d76e6bdf2 |
|
842 | | o | | changeset: 11:832d76e6bdf2 | |
| 843 | | |\ \ \ parent: 6:b105a072e251 |
|
843 | | |\ \ \ parent: 6:b105a072e251 | |
| 844 | | | | | | parent: 10:74c64d036d72 |
|
844 | | | | | | parent: 10:74c64d036d72 | |
| 845 | | | | | | user: test |
|
845 | | | | | | user: test | |
| 846 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
846 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 847 | | | | | | summary: (11) expand |
|
847 | | | | | | summary: (11) expand | |
| 848 | | | | | | |
|
848 | | | | | | | |
| 849 | | | o---+ changeset: 10:74c64d036d72 |
|
849 | | | o---+ changeset: 10:74c64d036d72 | |
| 850 | | | | | | parent: 0:e6eb3150255d |
|
850 | | | | | | parent: 0:e6eb3150255d | |
| 851 | | |/ / / parent: 6:b105a072e251 |
|
851 | | |/ / / parent: 6:b105a072e251 | |
| 852 | | | | | user: test |
|
852 | | | | | user: test | |
| 853 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
853 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 854 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
854 | | | | | summary: (10) merge two known; one immediate left, one near right | |
| 855 | | | | | |
|
855 | | | | | | |
| 856 | o | | | changeset: 9:7010c0af0a35 |
|
856 | o | | | changeset: 9:7010c0af0a35 | |
| 857 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
857 | |\ \ \ \ parent: 7:b632bb1b1224 | |
| 858 | | | | | | parent: 8:7a0b11f71937 |
|
858 | | | | | | parent: 8:7a0b11f71937 | |
| 859 | | | | | | user: test |
|
859 | | | | | | user: test | |
| 860 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
860 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 861 | | | | | | summary: (9) expand |
|
861 | | | | | | summary: (9) expand | |
| 862 | | | | | | |
|
862 | | | | | | | |
| 863 | | o-----+ changeset: 8:7a0b11f71937 |
|
863 | | o-----+ changeset: 8:7a0b11f71937 | |
| 864 | | | | | | parent: 0:e6eb3150255d |
|
864 | | | | | | parent: 0:e6eb3150255d | |
| 865 | |/ / / / parent: 7:b632bb1b1224 |
|
865 | |/ / / / parent: 7:b632bb1b1224 | |
| 866 | | | | | user: test |
|
866 | | | | | user: test | |
| 867 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
867 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 868 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
868 | | | | | summary: (8) merge two known; one immediate left, one far right | |
| 869 | | | | | |
|
869 | | | | | | |
| 870 | o | | | changeset: 7:b632bb1b1224 |
|
870 | o | | | changeset: 7:b632bb1b1224 | |
| 871 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
871 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
| 872 | | | | | | parent: 5:4409d547b708 |
|
872 | | | | | | parent: 5:4409d547b708 | |
| 873 | | | | | | user: test |
|
873 | | | | | | user: test | |
| 874 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
874 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 875 | | | | | | summary: (7) expand |
|
875 | | | | | | summary: (7) expand | |
| 876 | | | | | | |
|
876 | | | | | | | |
| 877 | +---o | | changeset: 6:b105a072e251 |
|
877 | +---o | | changeset: 6:b105a072e251 | |
| 878 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
878 | | |/ / / parent: 2:3d9a33b8d1e1 | |
| 879 | | | | | parent: 5:4409d547b708 |
|
879 | | | | | parent: 5:4409d547b708 | |
| 880 | | | | | user: test |
|
880 | | | | | user: test | |
| 881 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
881 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 882 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
882 | | | | | summary: (6) merge two known; one immediate left, one far left | |
| 883 | | | | | |
|
883 | | | | | | |
| 884 | | o | | changeset: 5:4409d547b708 |
|
884 | | o | | changeset: 5:4409d547b708 | |
| 885 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
885 | | |\ \ \ parent: 3:27eef8ed80b4 | |
| 886 | | | | | | parent: 4:26a8bac39d9f |
|
886 | | | | | | parent: 4:26a8bac39d9f | |
| 887 | | | | | | user: test |
|
887 | | | | | | user: test | |
| 888 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
888 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 889 | | | | | | summary: (5) expand |
|
889 | | | | | | summary: (5) expand | |
| 890 | | | | | | |
|
890 | | | | | | | |
| 891 | | | o | | changeset: 4:26a8bac39d9f |
|
891 | | | o | | changeset: 4:26a8bac39d9f | |
| 892 | | |/|/ / parent: 1:6db2ef61d156 |
|
892 | | |/|/ / parent: 1:6db2ef61d156 | |
| 893 | | | | | parent: 3:27eef8ed80b4 |
|
893 | | | | | parent: 3:27eef8ed80b4 | |
| 894 | | | | | user: test |
|
894 | | | | | user: test | |
| 895 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
895 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 896 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
896 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
| 897 | | | | | |
|
897 | | | | | | |
| 898 | | o | | changeset: 3:27eef8ed80b4 |
|
898 | | o | | changeset: 3:27eef8ed80b4 | |
| 899 | |/ / / user: test |
|
899 | |/ / / user: test | |
| 900 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
900 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 901 | | | | summary: (3) collapse |
|
901 | | | | summary: (3) collapse | |
| 902 | | | | |
|
902 | | | | | |
| 903 | o | | changeset: 2:3d9a33b8d1e1 |
|
903 | o | | changeset: 2:3d9a33b8d1e1 | |
| 904 | |/ / user: test |
|
904 | |/ / user: test | |
| 905 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
905 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 906 | | | summary: (2) collapse |
|
906 | | | summary: (2) collapse | |
| 907 | | | |
|
907 | | | | |
| 908 | o | changeset: 1:6db2ef61d156 |
|
908 | o | changeset: 1:6db2ef61d156 | |
| 909 | |/ user: test |
|
909 | |/ user: test | |
| 910 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
910 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 911 | | summary: (1) collapse |
|
911 | | summary: (1) collapse | |
| 912 | | |
|
912 | | | |
| 913 | o changeset: 0:e6eb3150255d |
|
913 | o changeset: 0:e6eb3150255d | |
| 914 | user: test |
|
914 | user: test | |
| 915 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
915 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 916 | summary: (0) root |
|
916 | summary: (0) root | |
| 917 |
|
917 | |||
| 918 |
|
918 | |||
| 919 |
|
919 | |||
| 920 | File glog per revset (only merges): |
|
920 | File glog per revset (only merges): | |
| 921 |
|
921 | |||
| 922 | $ hg log -G -r 'file("a")' -m |
|
922 | $ hg log -G -r 'file("a")' -m | |
| 923 | o changeset: 32:d06dffa21a31 |
|
923 | o changeset: 32:d06dffa21a31 | |
| 924 | |\ parent: 27:886ed638191b |
|
924 | |\ parent: 27:886ed638191b | |
| 925 | | | parent: 31:621d83e11f67 |
|
925 | | | parent: 31:621d83e11f67 | |
| 926 | | | user: test |
|
926 | | | user: test | |
| 927 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
927 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 928 | | | summary: (32) expand |
|
928 | | | summary: (32) expand | |
| 929 | | | |
|
929 | | | | |
| 930 | o | changeset: 31:621d83e11f67 |
|
930 | o | changeset: 31:621d83e11f67 | |
| 931 | |\| parent: 21:d42a756af44d |
|
931 | |\| parent: 21:d42a756af44d | |
| 932 | | | parent: 30:6e11cd4b648f |
|
932 | | | parent: 30:6e11cd4b648f | |
| 933 | | | user: test |
|
933 | | | user: test | |
| 934 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
934 | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
| 935 | | | summary: (31) expand |
|
935 | | | summary: (31) expand | |
| 936 | | | |
|
936 | | | | |
| 937 | o | changeset: 30:6e11cd4b648f |
|
937 | o | changeset: 30:6e11cd4b648f | |
| 938 | |\ \ parent: 28:44ecd0b9ae99 |
|
938 | |\ \ parent: 28:44ecd0b9ae99 | |
| 939 | | | | parent: 29:cd9bb2be7593 |
|
939 | | | | parent: 29:cd9bb2be7593 | |
| 940 | | | | user: test |
|
940 | | | | user: test | |
| 941 | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
941 | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
| 942 | | | | summary: (30) expand |
|
942 | | | | summary: (30) expand | |
| 943 | | | | |
|
943 | | | | | |
| 944 | o | | changeset: 28:44ecd0b9ae99 |
|
944 | o | | changeset: 28:44ecd0b9ae99 | |
| 945 | |\ \ \ parent: 1:6db2ef61d156 |
|
945 | |\ \ \ parent: 1:6db2ef61d156 | |
| 946 | | | | | parent: 26:7f25b6c2f0b9 |
|
946 | | | | | parent: 26:7f25b6c2f0b9 | |
| 947 | | | | | user: test |
|
947 | | | | | user: test | |
| 948 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
948 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
| 949 | | | | | summary: (28) merge zero known |
|
949 | | | | | summary: (28) merge zero known | |
| 950 | | | | | |
|
950 | | | | | | |
| 951 | o | | | changeset: 26:7f25b6c2f0b9 |
|
951 | o | | | changeset: 26:7f25b6c2f0b9 | |
| 952 | |\ \ \ \ parent: 18:1aa84d96232a |
|
952 | |\ \ \ \ parent: 18:1aa84d96232a | |
| 953 | | | | | | parent: 25:91da8ed57247 |
|
953 | | | | | | parent: 25:91da8ed57247 | |
| 954 | | | | | | user: test |
|
954 | | | | | | user: test | |
| 955 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
955 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
| 956 | | | | | | summary: (26) merge one known; far right |
|
956 | | | | | | summary: (26) merge one known; far right | |
| 957 | | | | | | |
|
957 | | | | | | | |
| 958 | | o-----+ changeset: 25:91da8ed57247 |
|
958 | | o-----+ changeset: 25:91da8ed57247 | |
| 959 | | | | | | parent: 21:d42a756af44d |
|
959 | | | | | | parent: 21:d42a756af44d | |
| 960 | | | | | | parent: 24:a9c19a3d96b7 |
|
960 | | | | | | parent: 24:a9c19a3d96b7 | |
| 961 | | | | | | user: test |
|
961 | | | | | | user: test | |
| 962 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
962 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
| 963 | | | | | | summary: (25) merge one known; far left |
|
963 | | | | | | summary: (25) merge one known; far left | |
| 964 | | | | | | |
|
964 | | | | | | | |
| 965 | | o | | | changeset: 24:a9c19a3d96b7 |
|
965 | | o | | | changeset: 24:a9c19a3d96b7 | |
| 966 | | |\ \ \ \ parent: 0:e6eb3150255d |
|
966 | | |\ \ \ \ parent: 0:e6eb3150255d | |
| 967 | | | | | | | parent: 23:a01cddf0766d |
|
967 | | | | | | | parent: 23:a01cddf0766d | |
| 968 | | | | | | | user: test |
|
968 | | | | | | | user: test | |
| 969 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
969 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
| 970 | | | | | | | summary: (24) merge one known; immediate right |
|
970 | | | | | | | summary: (24) merge one known; immediate right | |
| 971 | | | | | | | |
|
971 | | | | | | | | |
| 972 | | o---+ | | changeset: 23:a01cddf0766d |
|
972 | | o---+ | | changeset: 23:a01cddf0766d | |
| 973 | | | | | | | parent: 1:6db2ef61d156 |
|
973 | | | | | | | parent: 1:6db2ef61d156 | |
| 974 | | | | | | | parent: 22:e0d9cccacb5d |
|
974 | | | | | | | parent: 22:e0d9cccacb5d | |
| 975 | | | | | | | user: test |
|
975 | | | | | | | user: test | |
| 976 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
976 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 977 | | | | | | | summary: (23) merge one known; immediate left |
|
977 | | | | | | | summary: (23) merge one known; immediate left | |
| 978 | | | | | | | |
|
978 | | | | | | | | |
| 979 | | o-------+ changeset: 22:e0d9cccacb5d |
|
979 | | o-------+ changeset: 22:e0d9cccacb5d | |
| 980 | | | | | | | parent: 18:1aa84d96232a |
|
980 | | | | | | | parent: 18:1aa84d96232a | |
| 981 | |/ / / / / parent: 21:d42a756af44d |
|
981 | |/ / / / / parent: 21:d42a756af44d | |
| 982 | | | | | | user: test |
|
982 | | | | | | user: test | |
| 983 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
983 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 984 | | | | | | summary: (22) merge two known; one far left, one far right |
|
984 | | | | | | summary: (22) merge two known; one far left, one far right | |
| 985 | | | | | | |
|
985 | | | | | | | |
| 986 | | | | | o changeset: 21:d42a756af44d |
|
986 | | | | | o changeset: 21:d42a756af44d | |
| 987 | | | | | |\ parent: 19:31ddc2c1573b |
|
987 | | | | | |\ parent: 19:31ddc2c1573b | |
| 988 | | | | | | | parent: 20:d30ed6450e32 |
|
988 | | | | | | | parent: 20:d30ed6450e32 | |
| 989 | | | | | | | user: test |
|
989 | | | | | | | user: test | |
| 990 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
990 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 991 | | | | | | | summary: (21) expand |
|
991 | | | | | | | summary: (21) expand | |
| 992 | | | | | | | |
|
992 | | | | | | | | |
| 993 | +-+-------o changeset: 20:d30ed6450e32 |
|
993 | +-+-------o changeset: 20:d30ed6450e32 | |
| 994 | | | | | | parent: 0:e6eb3150255d |
|
994 | | | | | | parent: 0:e6eb3150255d | |
| 995 | | | | | | parent: 18:1aa84d96232a |
|
995 | | | | | | parent: 18:1aa84d96232a | |
| 996 | | | | | | user: test |
|
996 | | | | | | user: test | |
| 997 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
997 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 998 | | | | | | summary: (20) merge two known; two far right |
|
998 | | | | | | summary: (20) merge two known; two far right | |
| 999 | | | | | | |
|
999 | | | | | | | |
| 1000 | | | | | o changeset: 19:31ddc2c1573b |
|
1000 | | | | | o changeset: 19:31ddc2c1573b | |
| 1001 | | | | | |\ parent: 15:1dda3f72782d |
|
1001 | | | | | |\ parent: 15:1dda3f72782d | |
| 1002 | | | | | | | parent: 17:44765d7c06e0 |
|
1002 | | | | | | | parent: 17:44765d7c06e0 | |
| 1003 | | | | | | | user: test |
|
1003 | | | | | | | user: test | |
| 1004 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
1004 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 1005 | | | | | | | summary: (19) expand |
|
1005 | | | | | | | summary: (19) expand | |
| 1006 | | | | | | | |
|
1006 | | | | | | | | |
| 1007 | o---+---+ | changeset: 18:1aa84d96232a |
|
1007 | o---+---+ | changeset: 18:1aa84d96232a | |
| 1008 | | | | | | parent: 1:6db2ef61d156 |
|
1008 | | | | | | parent: 1:6db2ef61d156 | |
| 1009 | / / / / / parent: 15:1dda3f72782d |
|
1009 | / / / / / parent: 15:1dda3f72782d | |
| 1010 | | | | | | user: test |
|
1010 | | | | | | user: test | |
| 1011 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
1011 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 1012 | | | | | | summary: (18) merge two known; two far left |
|
1012 | | | | | | summary: (18) merge two known; two far left | |
| 1013 | | | | | | |
|
1013 | | | | | | | |
| 1014 | | | | | o changeset: 17:44765d7c06e0 |
|
1014 | | | | | o changeset: 17:44765d7c06e0 | |
| 1015 | | | | | |\ parent: 12:86b91144a6e9 |
|
1015 | | | | | |\ parent: 12:86b91144a6e9 | |
| 1016 | | | | | | | parent: 16:3677d192927d |
|
1016 | | | | | | | parent: 16:3677d192927d | |
| 1017 | | | | | | | user: test |
|
1017 | | | | | | | user: test | |
| 1018 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
1018 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 1019 | | | | | | | summary: (17) expand |
|
1019 | | | | | | | summary: (17) expand | |
| 1020 | | | | | | | |
|
1020 | | | | | | | | |
| 1021 | +-+-------o changeset: 16:3677d192927d |
|
1021 | +-+-------o changeset: 16:3677d192927d | |
| 1022 | | | | | | parent: 0:e6eb3150255d |
|
1022 | | | | | | parent: 0:e6eb3150255d | |
| 1023 | | | | | | parent: 1:6db2ef61d156 |
|
1023 | | | | | | parent: 1:6db2ef61d156 | |
| 1024 | | | | | | user: test |
|
1024 | | | | | | user: test | |
| 1025 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
1025 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 1026 | | | | | | summary: (16) merge two known; one immediate right, one near right |
|
1026 | | | | | | summary: (16) merge two known; one immediate right, one near right | |
| 1027 | | | | | | |
|
1027 | | | | | | | |
| 1028 | | | | o | changeset: 15:1dda3f72782d |
|
1028 | | | | o | changeset: 15:1dda3f72782d | |
| 1029 | | | | |\ \ parent: 13:22d8966a97e3 |
|
1029 | | | | |\ \ parent: 13:22d8966a97e3 | |
| 1030 | | | | | | | parent: 14:8eac370358ef |
|
1030 | | | | | | | parent: 14:8eac370358ef | |
| 1031 | | | | | | | user: test |
|
1031 | | | | | | | user: test | |
| 1032 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
1032 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 1033 | | | | | | | summary: (15) expand |
|
1033 | | | | | | | summary: (15) expand | |
| 1034 | | | | | | | |
|
1034 | | | | | | | | |
| 1035 | +-------o | changeset: 14:8eac370358ef |
|
1035 | +-------o | changeset: 14:8eac370358ef | |
| 1036 | | | | | |/ parent: 0:e6eb3150255d |
|
1036 | | | | | |/ parent: 0:e6eb3150255d | |
| 1037 | | | | | | parent: 12:86b91144a6e9 |
|
1037 | | | | | | parent: 12:86b91144a6e9 | |
| 1038 | | | | | | user: test |
|
1038 | | | | | | user: test | |
| 1039 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
1039 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 1040 | | | | | | summary: (14) merge two known; one immediate right, one far right |
|
1040 | | | | | | summary: (14) merge two known; one immediate right, one far right | |
| 1041 | | | | | | |
|
1041 | | | | | | | |
| 1042 | | | | o | changeset: 13:22d8966a97e3 |
|
1042 | | | | o | changeset: 13:22d8966a97e3 | |
| 1043 | | | | |\ \ parent: 9:7010c0af0a35 |
|
1043 | | | | |\ \ parent: 9:7010c0af0a35 | |
| 1044 | | | | | | | parent: 11:832d76e6bdf2 |
|
1044 | | | | | | | parent: 11:832d76e6bdf2 | |
| 1045 | | | | | | | user: test |
|
1045 | | | | | | | user: test | |
| 1046 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
1046 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 1047 | | | | | | | summary: (13) expand |
|
1047 | | | | | | | summary: (13) expand | |
| 1048 | | | | | | | |
|
1048 | | | | | | | | |
| 1049 | | +---+---o changeset: 12:86b91144a6e9 |
|
1049 | | +---+---o changeset: 12:86b91144a6e9 | |
| 1050 | | | | | | parent: 1:6db2ef61d156 |
|
1050 | | | | | | parent: 1:6db2ef61d156 | |
| 1051 | | | | | | parent: 9:7010c0af0a35 |
|
1051 | | | | | | parent: 9:7010c0af0a35 | |
| 1052 | | | | | | user: test |
|
1052 | | | | | | user: test | |
| 1053 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
1053 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 1054 | | | | | | summary: (12) merge two known; one immediate right, one far left |
|
1054 | | | | | | summary: (12) merge two known; one immediate right, one far left | |
| 1055 | | | | | | |
|
1055 | | | | | | | |
| 1056 | | | | | o changeset: 11:832d76e6bdf2 |
|
1056 | | | | | o changeset: 11:832d76e6bdf2 | |
| 1057 | | | | | |\ parent: 6:b105a072e251 |
|
1057 | | | | | |\ parent: 6:b105a072e251 | |
| 1058 | | | | | | | parent: 10:74c64d036d72 |
|
1058 | | | | | | | parent: 10:74c64d036d72 | |
| 1059 | | | | | | | user: test |
|
1059 | | | | | | | user: test | |
| 1060 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
1060 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 1061 | | | | | | | summary: (11) expand |
|
1061 | | | | | | | summary: (11) expand | |
| 1062 | | | | | | | |
|
1062 | | | | | | | | |
| 1063 | +---------o changeset: 10:74c64d036d72 |
|
1063 | +---------o changeset: 10:74c64d036d72 | |
| 1064 | | | | | |/ parent: 0:e6eb3150255d |
|
1064 | | | | | |/ parent: 0:e6eb3150255d | |
| 1065 | | | | | | parent: 6:b105a072e251 |
|
1065 | | | | | | parent: 6:b105a072e251 | |
| 1066 | | | | | | user: test |
|
1066 | | | | | | user: test | |
| 1067 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
1067 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 1068 | | | | | | summary: (10) merge two known; one immediate left, one near right |
|
1068 | | | | | | summary: (10) merge two known; one immediate left, one near right | |
| 1069 | | | | | | |
|
1069 | | | | | | | |
| 1070 | | | | o | changeset: 9:7010c0af0a35 |
|
1070 | | | | o | changeset: 9:7010c0af0a35 | |
| 1071 | | | | |\ \ parent: 7:b632bb1b1224 |
|
1071 | | | | |\ \ parent: 7:b632bb1b1224 | |
| 1072 | | | | | | | parent: 8:7a0b11f71937 |
|
1072 | | | | | | | parent: 8:7a0b11f71937 | |
| 1073 | | | | | | | user: test |
|
1073 | | | | | | | user: test | |
| 1074 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1074 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 1075 | | | | | | | summary: (9) expand |
|
1075 | | | | | | | summary: (9) expand | |
| 1076 | | | | | | | |
|
1076 | | | | | | | | |
| 1077 | +-------o | changeset: 8:7a0b11f71937 |
|
1077 | +-------o | changeset: 8:7a0b11f71937 | |
| 1078 | | | | |/ / parent: 0:e6eb3150255d |
|
1078 | | | | |/ / parent: 0:e6eb3150255d | |
| 1079 | | | | | | parent: 7:b632bb1b1224 |
|
1079 | | | | | | parent: 7:b632bb1b1224 | |
| 1080 | | | | | | user: test |
|
1080 | | | | | | user: test | |
| 1081 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1081 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 1082 | | | | | | summary: (8) merge two known; one immediate left, one far right |
|
1082 | | | | | | summary: (8) merge two known; one immediate left, one far right | |
| 1083 | | | | | | |
|
1083 | | | | | | | |
| 1084 | | | | o | changeset: 7:b632bb1b1224 |
|
1084 | | | | o | changeset: 7:b632bb1b1224 | |
| 1085 | | | | |\ \ parent: 2:3d9a33b8d1e1 |
|
1085 | | | | |\ \ parent: 2:3d9a33b8d1e1 | |
| 1086 | | | | | | | parent: 5:4409d547b708 |
|
1086 | | | | | | | parent: 5:4409d547b708 | |
| 1087 | | | | | | | user: test |
|
1087 | | | | | | | user: test | |
| 1088 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
1088 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 1089 | | | | | | | summary: (7) expand |
|
1089 | | | | | | | summary: (7) expand | |
| 1090 | | | | | | | |
|
1090 | | | | | | | | |
| 1091 | | | | +---o changeset: 6:b105a072e251 |
|
1091 | | | | +---o changeset: 6:b105a072e251 | |
| 1092 | | | | | |/ parent: 2:3d9a33b8d1e1 |
|
1092 | | | | | |/ parent: 2:3d9a33b8d1e1 | |
| 1093 | | | | | | parent: 5:4409d547b708 |
|
1093 | | | | | | parent: 5:4409d547b708 | |
| 1094 | | | | | | user: test |
|
1094 | | | | | | user: test | |
| 1095 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
1095 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 1096 | | | | | | summary: (6) merge two known; one immediate left, one far left |
|
1096 | | | | | | summary: (6) merge two known; one immediate left, one far left | |
| 1097 | | | | | | |
|
1097 | | | | | | | |
| 1098 | | | | o | changeset: 5:4409d547b708 |
|
1098 | | | | o | changeset: 5:4409d547b708 | |
| 1099 | | | | |\ \ parent: 3:27eef8ed80b4 |
|
1099 | | | | |\ \ parent: 3:27eef8ed80b4 | |
| 1100 | | | | | | | parent: 4:26a8bac39d9f |
|
1100 | | | | | | | parent: 4:26a8bac39d9f | |
| 1101 | | | | | | | user: test |
|
1101 | | | | | | | user: test | |
| 1102 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
1102 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 1103 | | | | | | | summary: (5) expand |
|
1103 | | | | | | | summary: (5) expand | |
| 1104 | | | | | | | |
|
1104 | | | | | | | | |
| 1105 | | +---o | | changeset: 4:26a8bac39d9f |
|
1105 | | +---o | | changeset: 4:26a8bac39d9f | |
| 1106 | | | | |/ / parent: 1:6db2ef61d156 |
|
1106 | | | | |/ / parent: 1:6db2ef61d156 | |
| 1107 | | | | | | parent: 3:27eef8ed80b4 |
|
1107 | | | | | | parent: 3:27eef8ed80b4 | |
| 1108 | | | | | | user: test |
|
1108 | | | | | | user: test | |
| 1109 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1109 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 1110 | | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
1110 | | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
| 1111 | | | | | | |
|
1111 | | | | | | | |
| 1112 |
|
1112 | |||
| 1113 |
|
1113 | |||
| 1114 | Empty revision range - display nothing: |
|
1114 | Empty revision range - display nothing: | |
| 1115 | $ hg glog -r 1..0 |
|
1115 | $ hg glog -r 1..0 | |
| 1116 |
|
1116 | |||
| 1117 | From outer space: |
|
1117 | From outer space: | |
| 1118 | $ cd .. |
|
1118 | $ cd .. | |
| 1119 | $ hg glog -l1 repo |
|
1119 | $ hg glog -l1 repo | |
| 1120 | @ changeset: 34:fea3ac5810e0 |
|
1120 | @ changeset: 34:fea3ac5810e0 | |
| 1121 | | tag: tip |
|
1121 | | tag: tip | |
| 1122 | | parent: 32:d06dffa21a31 |
|
1122 | | parent: 32:d06dffa21a31 | |
| 1123 | | user: test |
|
1123 | | user: test | |
| 1124 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1124 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1125 | | summary: (34) head |
|
1125 | | summary: (34) head | |
| 1126 | | |
|
1126 | | | |
| 1127 | $ hg glog -l1 repo/a |
|
1127 | $ hg glog -l1 repo/a | |
| 1128 | @ changeset: 34:fea3ac5810e0 |
|
1128 | @ changeset: 34:fea3ac5810e0 | |
| 1129 | | tag: tip |
|
1129 | | tag: tip | |
| 1130 | | parent: 32:d06dffa21a31 |
|
1130 | | parent: 32:d06dffa21a31 | |
| 1131 | | user: test |
|
1131 | | user: test | |
| 1132 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1132 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1133 | | summary: (34) head |
|
1133 | | summary: (34) head | |
| 1134 | | |
|
1134 | | | |
| 1135 | $ hg glog -l1 repo/missing |
|
1135 | $ hg glog -l1 repo/missing | |
| 1136 |
|
1136 | |||
| 1137 | File log with revs != cset revs: |
|
1137 | File log with revs != cset revs: | |
| 1138 | $ hg init flog |
|
1138 | $ hg init flog | |
| 1139 | $ cd flog |
|
1139 | $ cd flog | |
| 1140 | $ echo one >one |
|
1140 | $ echo one >one | |
| 1141 | $ hg add one |
|
1141 | $ hg add one | |
| 1142 | $ hg commit -mone |
|
1142 | $ hg commit -mone | |
| 1143 | $ echo two >two |
|
1143 | $ echo two >two | |
| 1144 | $ hg add two |
|
1144 | $ hg add two | |
| 1145 | $ hg commit -mtwo |
|
1145 | $ hg commit -mtwo | |
| 1146 | $ echo more >two |
|
1146 | $ echo more >two | |
| 1147 | $ hg commit -mmore |
|
1147 | $ hg commit -mmore | |
| 1148 | $ hg glog two |
|
1148 | $ hg glog two | |
| 1149 | @ changeset: 2:12c28321755b |
|
1149 | @ changeset: 2:12c28321755b | |
| 1150 | | tag: tip |
|
1150 | | tag: tip | |
| 1151 | | user: test |
|
1151 | | user: test | |
| 1152 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1152 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 1153 | | summary: more |
|
1153 | | summary: more | |
| 1154 | | |
|
1154 | | | |
| 1155 | o changeset: 1:5ac72c0599bf |
|
1155 | o changeset: 1:5ac72c0599bf | |
| 1156 | | user: test |
|
1156 | | user: test | |
| 1157 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1157 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 1158 | | summary: two |
|
1158 | | summary: two | |
| 1159 | | |
|
1159 | | | |
| 1160 |
|
1160 | |||
| 1161 | Issue1896: File log with explicit style |
|
1161 | Issue1896: File log with explicit style | |
| 1162 | $ hg glog --style=default one |
|
1162 | $ hg glog --style=default one | |
| 1163 | o changeset: 0:3d578b4a1f53 |
|
1163 | o changeset: 0:3d578b4a1f53 | |
| 1164 | user: test |
|
1164 | user: test | |
| 1165 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1165 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 1166 | summary: one |
|
1166 | summary: one | |
| 1167 |
|
1167 | |||
| 1168 | Issue2395: glog --style header and footer |
|
1168 | Issue2395: glog --style header and footer | |
| 1169 | $ hg glog --style=xml one |
|
1169 | $ hg glog --style=xml one | |
| 1170 | <?xml version="1.0"?> |
|
1170 | <?xml version="1.0"?> | |
| 1171 | <log> |
|
1171 | <log> | |
| 1172 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> |
|
1172 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> | |
| 1173 | <author email="test">test</author> |
|
1173 | <author email="test">test</author> | |
| 1174 | <date>1970-01-01T00:00:00+00:00</date> |
|
1174 | <date>1970-01-01T00:00:00+00:00</date> | |
| 1175 | <msg xml:space="preserve">one</msg> |
|
1175 | <msg xml:space="preserve">one</msg> | |
| 1176 | </logentry> |
|
1176 | </logentry> | |
| 1177 | </log> |
|
1177 | </log> | |
| 1178 |
|
1178 | |||
| 1179 | $ cd .. |
|
1179 | $ cd .. | |
| 1180 |
|
1180 | |||
| 1181 | Incoming and outgoing: |
|
1181 | Incoming and outgoing: | |
| 1182 |
|
1182 | |||
| 1183 | $ hg clone -U -r31 repo repo2 |
|
1183 | $ hg clone -U -r31 repo repo2 | |
| 1184 | adding changesets |
|
1184 | adding changesets | |
| 1185 | adding manifests |
|
1185 | adding manifests | |
| 1186 | adding file changes |
|
1186 | adding file changes | |
| 1187 | added 31 changesets with 31 changes to 1 files |
|
1187 | added 31 changesets with 31 changes to 1 files | |
| 1188 | $ cd repo2 |
|
1188 | $ cd repo2 | |
| 1189 |
|
1189 | |||
| 1190 | $ hg incoming --graph ../repo |
|
1190 | $ hg incoming --graph ../repo | |
| 1191 | comparing with ../repo |
|
1191 | comparing with ../repo | |
| 1192 | searching for changes |
|
1192 | searching for changes | |
| 1193 | o changeset: 34:fea3ac5810e0 |
|
1193 | o changeset: 34:fea3ac5810e0 | |
| 1194 | | tag: tip |
|
1194 | | tag: tip | |
| 1195 | | parent: 32:d06dffa21a31 |
|
1195 | | parent: 32:d06dffa21a31 | |
| 1196 | | user: test |
|
1196 | | user: test | |
| 1197 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1197 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1198 | | summary: (34) head |
|
1198 | | summary: (34) head | |
| 1199 | | |
|
1199 | | | |
| 1200 | | o changeset: 33:68608f5145f9 |
|
1200 | | o changeset: 33:68608f5145f9 | |
| 1201 | | parent: 18:1aa84d96232a |
|
1201 | | parent: 18:1aa84d96232a | |
| 1202 | | user: test |
|
1202 | | user: test | |
| 1203 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1203 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1204 | | summary: (33) head |
|
1204 | | summary: (33) head | |
| 1205 | | |
|
1205 | | | |
| 1206 | o changeset: 32:d06dffa21a31 |
|
1206 | o changeset: 32:d06dffa21a31 | |
| 1207 | | parent: 27:886ed638191b |
|
1207 | | parent: 27:886ed638191b | |
| 1208 | | parent: 31:621d83e11f67 |
|
1208 | | parent: 31:621d83e11f67 | |
| 1209 | | user: test |
|
1209 | | user: test | |
| 1210 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1210 | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 1211 | | summary: (32) expand |
|
1211 | | summary: (32) expand | |
| 1212 | | |
|
1212 | | | |
| 1213 | o changeset: 27:886ed638191b |
|
1213 | o changeset: 27:886ed638191b | |
| 1214 | parent: 21:d42a756af44d |
|
1214 | parent: 21:d42a756af44d | |
| 1215 | user: test |
|
1215 | user: test | |
| 1216 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1216 | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 1217 | summary: (27) collapse |
|
1217 | summary: (27) collapse | |
| 1218 |
|
1218 | |||
| 1219 | $ cd .. |
|
1219 | $ cd .. | |
| 1220 |
|
1220 | |||
| 1221 | $ hg -R repo outgoing --graph repo2 |
|
1221 | $ hg -R repo outgoing --graph repo2 | |
| 1222 | comparing with repo2 |
|
1222 | comparing with repo2 | |
| 1223 | searching for changes |
|
1223 | searching for changes | |
| 1224 | @ changeset: 34:fea3ac5810e0 |
|
1224 | @ changeset: 34:fea3ac5810e0 | |
| 1225 | | tag: tip |
|
1225 | | tag: tip | |
| 1226 | | parent: 32:d06dffa21a31 |
|
1226 | | parent: 32:d06dffa21a31 | |
| 1227 | | user: test |
|
1227 | | user: test | |
| 1228 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1228 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1229 | | summary: (34) head |
|
1229 | | summary: (34) head | |
| 1230 | | |
|
1230 | | | |
| 1231 | | o changeset: 33:68608f5145f9 |
|
1231 | | o changeset: 33:68608f5145f9 | |
| 1232 | | parent: 18:1aa84d96232a |
|
1232 | | parent: 18:1aa84d96232a | |
| 1233 | | user: test |
|
1233 | | user: test | |
| 1234 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1234 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1235 | | summary: (33) head |
|
1235 | | summary: (33) head | |
| 1236 | | |
|
1236 | | | |
| 1237 | o changeset: 32:d06dffa21a31 |
|
1237 | o changeset: 32:d06dffa21a31 | |
| 1238 | | parent: 27:886ed638191b |
|
1238 | | parent: 27:886ed638191b | |
| 1239 | | parent: 31:621d83e11f67 |
|
1239 | | parent: 31:621d83e11f67 | |
| 1240 | | user: test |
|
1240 | | user: test | |
| 1241 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1241 | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 1242 | | summary: (32) expand |
|
1242 | | summary: (32) expand | |
| 1243 | | |
|
1243 | | | |
| 1244 | o changeset: 27:886ed638191b |
|
1244 | o changeset: 27:886ed638191b | |
| 1245 | parent: 21:d42a756af44d |
|
1245 | parent: 21:d42a756af44d | |
| 1246 | user: test |
|
1246 | user: test | |
| 1247 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1247 | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 1248 | summary: (27) collapse |
|
1248 | summary: (27) collapse | |
| 1249 |
|
1249 | |||
| 1250 |
|
1250 | |||
| 1251 | File + limit with revs != cset revs: |
|
1251 | File + limit with revs != cset revs: | |
| 1252 | $ cd repo |
|
1252 | $ cd repo | |
| 1253 | $ touch b |
|
1253 | $ touch b | |
| 1254 | $ hg ci -Aqm0 |
|
1254 | $ hg ci -Aqm0 | |
| 1255 | $ hg glog -l2 a |
|
1255 | $ hg glog -l2 a | |
| 1256 | o changeset: 34:fea3ac5810e0 |
|
1256 | o changeset: 34:fea3ac5810e0 | |
| 1257 | | parent: 32:d06dffa21a31 |
|
1257 | | parent: 32:d06dffa21a31 | |
| 1258 | | user: test |
|
1258 | | user: test | |
| 1259 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1259 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1260 | | summary: (34) head |
|
1260 | | summary: (34) head | |
| 1261 | | |
|
1261 | | | |
| 1262 | | o changeset: 33:68608f5145f9 |
|
1262 | | o changeset: 33:68608f5145f9 | |
| 1263 | | | parent: 18:1aa84d96232a |
|
1263 | | | parent: 18:1aa84d96232a | |
| 1264 | | | user: test |
|
1264 | | | user: test | |
| 1265 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1265 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1266 | | | summary: (33) head |
|
1266 | | | summary: (33) head | |
| 1267 | | | |
|
1267 | | | | |
| 1268 |
|
1268 | |||
| 1269 | File + limit + -ra:b, (b - a) < limit: |
|
1269 | File + limit + -ra:b, (b - a) < limit: | |
| 1270 | $ hg glog -l3000 -r32:tip a |
|
1270 | $ hg glog -l3000 -r32:tip a | |
| 1271 | o changeset: 34:fea3ac5810e0 |
|
1271 | o changeset: 34:fea3ac5810e0 | |
| 1272 | | parent: 32:d06dffa21a31 |
|
1272 | | parent: 32:d06dffa21a31 | |
| 1273 | | user: test |
|
1273 | | user: test | |
| 1274 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1274 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1275 | | summary: (34) head |
|
1275 | | summary: (34) head | |
| 1276 | | |
|
1276 | | | |
| 1277 | | o changeset: 33:68608f5145f9 |
|
1277 | | o changeset: 33:68608f5145f9 | |
| 1278 | | | parent: 18:1aa84d96232a |
|
1278 | | | parent: 18:1aa84d96232a | |
| 1279 | | | user: test |
|
1279 | | | user: test | |
| 1280 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1280 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1281 | | | summary: (33) head |
|
1281 | | | summary: (33) head | |
| 1282 | | | |
|
1282 | | | | |
| 1283 | o | changeset: 32:d06dffa21a31 |
|
1283 | o | changeset: 32:d06dffa21a31 | |
| 1284 | |\ \ parent: 27:886ed638191b |
|
1284 | |\ \ parent: 27:886ed638191b | |
| 1285 | | | | parent: 31:621d83e11f67 |
|
1285 | | | | parent: 31:621d83e11f67 | |
| 1286 | | | | user: test |
|
1286 | | | | user: test | |
| 1287 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1287 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 1288 | | | | summary: (32) expand |
|
1288 | | | | summary: (32) expand | |
| 1289 | | | | |
|
1289 | | | | | |
| 1290 |
|
1290 | |||
| 1291 | Point out a common and an uncommon unshown parent |
|
1291 | Point out a common and an uncommon unshown parent | |
| 1292 |
|
1292 | |||
| 1293 | $ hg glog -r 'rev(8) or rev(9)' |
|
1293 | $ hg glog -r 'rev(8) or rev(9)' | |
| 1294 | o changeset: 9:7010c0af0a35 |
|
1294 | o changeset: 9:7010c0af0a35 | |
| 1295 | |\ parent: 7:b632bb1b1224 |
|
1295 | |\ parent: 7:b632bb1b1224 | |
| 1296 | | | parent: 8:7a0b11f71937 |
|
1296 | | | parent: 8:7a0b11f71937 | |
| 1297 | | | user: test |
|
1297 | | | user: test | |
| 1298 | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1298 | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 1299 | | | summary: (9) expand |
|
1299 | | | summary: (9) expand | |
| 1300 | | | |
|
1300 | | | | |
| 1301 | o | changeset: 8:7a0b11f71937 |
|
1301 | o | changeset: 8:7a0b11f71937 | |
| 1302 | |\| parent: 0:e6eb3150255d |
|
1302 | |\| parent: 0:e6eb3150255d | |
| 1303 | | | parent: 7:b632bb1b1224 |
|
1303 | | | parent: 7:b632bb1b1224 | |
| 1304 | | | user: test |
|
1304 | | | user: test | |
| 1305 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1305 | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 1306 | | | summary: (8) merge two known; one immediate left, one far right |
|
1306 | | | summary: (8) merge two known; one immediate left, one far right | |
| 1307 | | | |
|
1307 | | | | |
| 1308 |
|
1308 | |||
| 1309 | File + limit + -ra:b, b < tip: |
|
1309 | File + limit + -ra:b, b < tip: | |
| 1310 |
|
1310 | |||
| 1311 | $ hg glog -l1 -r32:34 a |
|
1311 | $ hg glog -l1 -r32:34 a | |
| 1312 | o changeset: 34:fea3ac5810e0 |
|
1312 | o changeset: 34:fea3ac5810e0 | |
| 1313 | | parent: 32:d06dffa21a31 |
|
1313 | | parent: 32:d06dffa21a31 | |
| 1314 | | user: test |
|
1314 | | user: test | |
| 1315 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1315 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1316 | | summary: (34) head |
|
1316 | | summary: (34) head | |
| 1317 | | |
|
1317 | | | |
| 1318 |
|
1318 | |||
| 1319 | file(File) + limit + -ra:b, b < tip: |
|
1319 | file(File) + limit + -ra:b, b < tip: | |
| 1320 |
|
1320 | |||
| 1321 | $ hg glog -l1 -r32:34 -r 'file("a")' |
|
1321 | $ hg glog -l1 -r32:34 -r 'file("a")' | |
| 1322 | o changeset: 34:fea3ac5810e0 |
|
1322 | o changeset: 34:fea3ac5810e0 | |
| 1323 | | parent: 32:d06dffa21a31 |
|
1323 | | parent: 32:d06dffa21a31 | |
| 1324 | | user: test |
|
1324 | | user: test | |
| 1325 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1325 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1326 | | summary: (34) head |
|
1326 | | summary: (34) head | |
| 1327 | | |
|
1327 | | | |
| 1328 |
|
1328 | |||
| 1329 | limit(file(File) and a::b), b < tip: |
|
1329 | limit(file(File) and a::b), b < tip: | |
| 1330 |
|
1330 | |||
| 1331 | $ hg glog -r 'limit(file("a") and 32::34, 1)' |
|
1331 | $ hg glog -r 'limit(file("a") and 32::34, 1)' | |
| 1332 | o changeset: 32:d06dffa21a31 |
|
1332 | o changeset: 32:d06dffa21a31 | |
| 1333 | |\ parent: 27:886ed638191b |
|
1333 | |\ parent: 27:886ed638191b | |
| 1334 | | | parent: 31:621d83e11f67 |
|
1334 | | | parent: 31:621d83e11f67 | |
| 1335 | | | user: test |
|
1335 | | | user: test | |
| 1336 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1336 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 1337 | | | summary: (32) expand |
|
1337 | | | summary: (32) expand | |
| 1338 | | | |
|
1338 | | | | |
| 1339 |
|
1339 | |||
| 1340 | File + limit + -ra:b, b < tip: |
|
1340 | File + limit + -ra:b, b < tip: | |
| 1341 |
|
1341 | |||
| 1342 | $ hg glog -r 'limit(file("a") and 34::32, 1)' |
|
1342 | $ hg glog -r 'limit(file("a") and 34::32, 1)' | |
| 1343 |
|
1343 | |||
| 1344 | File + limit + -ra:b, b < tip, (b - a) < limit: |
|
1344 | File + limit + -ra:b, b < tip, (b - a) < limit: | |
| 1345 |
|
1345 | |||
| 1346 | $ hg glog -l10 -r33:34 a |
|
1346 | $ hg glog -l10 -r33:34 a | |
| 1347 | o changeset: 34:fea3ac5810e0 |
|
1347 | o changeset: 34:fea3ac5810e0 | |
| 1348 | | parent: 32:d06dffa21a31 |
|
1348 | | parent: 32:d06dffa21a31 | |
| 1349 | | user: test |
|
1349 | | user: test | |
| 1350 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1350 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1351 | | summary: (34) head |
|
1351 | | summary: (34) head | |
| 1352 | | |
|
1352 | | | |
| 1353 | | o changeset: 33:68608f5145f9 |
|
1353 | | o changeset: 33:68608f5145f9 | |
| 1354 | | | parent: 18:1aa84d96232a |
|
1354 | | | parent: 18:1aa84d96232a | |
| 1355 | | | user: test |
|
1355 | | | user: test | |
| 1356 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1356 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1357 | | | summary: (33) head |
|
1357 | | | summary: (33) head | |
| 1358 | | | |
|
1358 | | | | |
| 1359 |
|
1359 | |||
| 1360 | Do not crash or produce strange graphs if history is buggy |
|
1360 | Do not crash or produce strange graphs if history is buggy | |
| 1361 |
|
1361 | |||
| 1362 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
1362 | $ commit 36 "buggy merge: identical parents" 35 35 | |
| 1363 | $ hg glog -l5 |
|
1363 | $ hg glog -l5 | |
| 1364 | @ changeset: 36:95fa8febd08a |
|
1364 | @ changeset: 36:95fa8febd08a | |
| 1365 | | tag: tip |
|
1365 | | tag: tip | |
| 1366 | | parent: 35:9159c3644c5e |
|
1366 | | parent: 35:9159c3644c5e | |
| 1367 | | parent: 35:9159c3644c5e |
|
1367 | | parent: 35:9159c3644c5e | |
| 1368 | | user: test |
|
1368 | | user: test | |
| 1369 | | date: Thu Jan 01 00:00:36 1970 +0000 |
|
1369 | | date: Thu Jan 01 00:00:36 1970 +0000 | |
| 1370 | | summary: (36) buggy merge: identical parents |
|
1370 | | summary: (36) buggy merge: identical parents | |
| 1371 | | |
|
1371 | | | |
| 1372 | o changeset: 35:9159c3644c5e |
|
1372 | o changeset: 35:9159c3644c5e | |
| 1373 | | user: test |
|
1373 | | user: test | |
| 1374 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1374 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 1375 | | summary: 0 |
|
1375 | | summary: 0 | |
| 1376 | | |
|
1376 | | | |
| 1377 | o changeset: 34:fea3ac5810e0 |
|
1377 | o changeset: 34:fea3ac5810e0 | |
| 1378 | | parent: 32:d06dffa21a31 |
|
1378 | | parent: 32:d06dffa21a31 | |
| 1379 | | user: test |
|
1379 | | user: test | |
| 1380 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1380 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 1381 | | summary: (34) head |
|
1381 | | summary: (34) head | |
| 1382 | | |
|
1382 | | | |
| 1383 | | o changeset: 33:68608f5145f9 |
|
1383 | | o changeset: 33:68608f5145f9 | |
| 1384 | | | parent: 18:1aa84d96232a |
|
1384 | | | parent: 18:1aa84d96232a | |
| 1385 | | | user: test |
|
1385 | | | user: test | |
| 1386 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1386 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 1387 | | | summary: (33) head |
|
1387 | | | summary: (33) head | |
| 1388 | | | |
|
1388 | | | | |
| 1389 | o | changeset: 32:d06dffa21a31 |
|
1389 | o | changeset: 32:d06dffa21a31 | |
| 1390 | |\ \ parent: 27:886ed638191b |
|
1390 | |\ \ parent: 27:886ed638191b | |
| 1391 | | | | parent: 31:621d83e11f67 |
|
1391 | | | | parent: 31:621d83e11f67 | |
| 1392 | | | | user: test |
|
1392 | | | | user: test | |
| 1393 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1393 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 1394 | | | | summary: (32) expand |
|
1394 | | | | summary: (32) expand | |
| 1395 | | | | |
|
1395 | | | | | |
| 1396 |
|
1396 | |||
| 1397 | Test log -G options |
|
1397 | Test log -G options | |
| 1398 |
|
1398 | |||
| 1399 | $ hg log -G -u 'something nice' |
|
1399 | $ hg log -G -u 'something nice' | |
| 1400 | $ hg log -G -b 'something nice' |
|
1400 | $ hg log -G -b 'something nice' | |
| 1401 | abort: unknown revision 'something nice'! |
|
1401 | abort: unknown revision 'something nice'! | |
| 1402 | [255] |
|
1402 | [255] | |
| 1403 | $ hg log -G -k 'something nice' |
|
1403 | $ hg log -G -k 'something nice' | |
| 1404 | $ hg log -G --only-branch 'something nice' |
|
1404 | $ hg log -G --only-branch 'something nice' | |
| 1405 | abort: unknown revision 'something nice'! |
|
1405 | abort: unknown revision 'something nice'! | |
| 1406 | [255] |
|
1406 | [255] | |
| 1407 | $ hg log -G --include 'some file' --exclude 'another file' |
|
1407 | $ hg log -G --include 'some file' --exclude 'another file' | |
| 1408 | $ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l |
|
1408 | $ hg log -G --follow --template 'nodetag {rev}\n' | grep nodetag | wc -l | |
| 1409 | \s*36 (re) |
|
1409 | \s*36 (re) | |
| 1410 | $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l |
|
1410 | $ hg log -G --removed --template 'nodetag {rev}\n' | grep nodetag | wc -l | |
| 1411 | \s*0 (re) |
|
1411 | \s*0 (re) | |
| 1412 | $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l |
|
1412 | $ hg log -G --only-merges --template 'nodetag {rev}\n' | grep nodetag | wc -l | |
| 1413 | \s*28 (re) |
|
1413 | \s*28 (re) | |
| 1414 |
$ hg log -G --no-merges --template 'nodetag {rev}\n' |
|
1414 | $ hg log -G --no-merges --template 'nodetag {rev}\n' | |
| 1415 | \s*9 (re) |
|
1415 | o nodetag 35 | |
|
|
1416 | | | |||
|
|
1417 | o nodetag 34 | |||
|
|
1418 | |\ | |||
|
|
1419 | | \ | |||
|
|
1420 | | |\ | |||
|
|
1421 | | | \ | |||
|
|
1422 | | | |\ | |||
|
|
1423 | | | | \ | |||
|
|
1424 | | | | |\ | |||
|
|
1425 | | | | | \ | |||
|
|
1426 | | | | | |\ | |||
|
|
1427 | +-+-+-+-----o nodetag 33 | |||
|
|
1428 | | | | | | | | |||
|
|
1429 | +---------o nodetag 29 | |||
|
|
1430 | | | | | | | |||
|
|
1431 | +-+-+---o nodetag 27 | |||
|
|
1432 | | | | |/ | |||
|
|
1433 | | | | o nodetag 3 | |||
|
|
1434 | | | |/ | |||
|
|
1435 | | | o nodetag 2 | |||
|
|
1436 | | |/ | |||
|
|
1437 | | o nodetag 1 | |||
|
|
1438 | |/ | |||
|
|
1439 | o nodetag 0 | |||
|
|
1440 | ||||
| 1416 | $ hg log -G -d 'brace ) in a date' |
|
1441 | $ hg log -G -d 'brace ) in a date' | |
| 1417 | abort: invalid date: 'brace ) in a date' |
|
1442 | abort: invalid date: 'brace ) in a date' | |
| 1418 | [255] |
|
1443 | [255] | |
| 1419 | $ hg log -G -P 32 --template '{rev}\n' |
|
1444 | $ hg log -G -P 32 --template '{rev}\n' | |
| 1420 | @ 36 |
|
1445 | @ 36 | |
| 1421 | | |
|
1446 | | | |
| 1422 | o 35 |
|
1447 | o 35 | |
| 1423 | | |
|
1448 | | | |
| 1424 | o 34 |
|
1449 | o 34 | |
| 1425 | | |
|
1450 | | | |
| 1426 | | o 33 |
|
1451 | | o 33 | |
| 1427 | | | |
|
1452 | | | | |
| 1428 | $ hg log -G --follow a |
|
1453 | $ hg log -G --follow a | |
| 1429 | abort: -G/--graph option is incompatible with --follow with file argument |
|
1454 | abort: -G/--graph option is incompatible with --follow with file argument | |
| 1430 | [255] |
|
1455 | [255] | |
General Comments 0
You need to be logged in to leave comments.
Login now