Show More
@@ -1,2120 +1,2125 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 | $ commit() |
|
72 | $ commit() | |
73 | > { |
|
73 | > { | |
74 | > rev=$1 |
|
74 | > rev=$1 | |
75 | > msg=$2 |
|
75 | > msg=$2 | |
76 | > shift 2 |
|
76 | > shift 2 | |
77 | > if [ "$#" -gt 0 ]; then |
|
77 | > if [ "$#" -gt 0 ]; then | |
78 | > hg debugsetparents "$@" |
|
78 | > hg debugsetparents "$@" | |
79 | > fi |
|
79 | > fi | |
80 | > echo $rev > a |
|
80 | > echo $rev > a | |
81 | > hg commit -Aqd "$rev 0" -m "($rev) $msg" |
|
81 | > hg commit -Aqd "$rev 0" -m "($rev) $msg" | |
82 | > } |
|
82 | > } | |
83 |
|
83 | |||
84 | $ cat > printrevset.py <<EOF |
|
84 | $ cat > printrevset.py <<EOF | |
85 | > from mercurial import extensions, revset, commands, cmdutil |
|
85 | > from mercurial import extensions, revset, commands, cmdutil | |
86 | > |
|
86 | > | |
87 | > def uisetup(ui): |
|
87 | > def uisetup(ui): | |
88 | > def printrevset(orig, ui, repo, *pats, **opts): |
|
88 | > def printrevset(orig, ui, repo, *pats, **opts): | |
89 | > if opts.get('print_revset'): |
|
89 | > if opts.get('print_revset'): | |
90 | > expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1] |
|
90 | > expr = cmdutil.getgraphlogrevs(repo, pats, opts)[1] | |
91 | > if expr: |
|
91 | > if expr: | |
92 | > tree = revset.parse(expr)[0] |
|
92 | > tree = revset.parse(expr)[0] | |
93 | > else: |
|
93 | > else: | |
94 | > tree = [] |
|
94 | > tree = [] | |
95 | > ui.write('%r\n' % (opts.get('rev', []),)) |
|
95 | > ui.write('%r\n' % (opts.get('rev', []),)) | |
96 | > ui.write(revset.prettyformat(tree) + '\n') |
|
96 | > ui.write(revset.prettyformat(tree) + '\n') | |
97 | > return 0 |
|
97 | > return 0 | |
98 | > return orig(ui, repo, *pats, **opts) |
|
98 | > return orig(ui, repo, *pats, **opts) | |
99 | > entry = extensions.wrapcommand(commands.table, 'log', printrevset) |
|
99 | > entry = extensions.wrapcommand(commands.table, 'log', printrevset) | |
100 | > entry[1].append(('', 'print-revset', False, |
|
100 | > entry[1].append(('', 'print-revset', False, | |
101 | > 'print generated revset and exit (DEPRECATED)')) |
|
101 | > 'print generated revset and exit (DEPRECATED)')) | |
102 | > EOF |
|
102 | > EOF | |
103 |
|
103 | |||
104 | $ echo "[extensions]" >> $HGRCPATH |
|
104 | $ echo "[extensions]" >> $HGRCPATH | |
105 | $ echo "graphlog=" >> $HGRCPATH |
|
105 | $ echo "graphlog=" >> $HGRCPATH | |
106 | $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH |
|
106 | $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH | |
107 |
|
107 | |||
108 | $ hg init repo |
|
108 | $ hg init repo | |
109 | $ cd repo |
|
109 | $ cd repo | |
110 |
|
110 | |||
111 | Empty repo: |
|
111 | Empty repo: | |
112 |
|
112 | |||
113 | $ hg glog |
|
113 | $ hg glog | |
114 |
|
114 | |||
115 |
|
115 | |||
116 | Building DAG: |
|
116 | Building DAG: | |
117 |
|
117 | |||
118 | $ commit 0 "root" |
|
118 | $ commit 0 "root" | |
119 | $ commit 1 "collapse" 0 |
|
119 | $ commit 1 "collapse" 0 | |
120 | $ commit 2 "collapse" 1 |
|
120 | $ commit 2 "collapse" 1 | |
121 | $ commit 3 "collapse" 2 |
|
121 | $ commit 3 "collapse" 2 | |
122 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 |
|
122 | $ commit 4 "merge two known; one immediate left, one immediate right" 1 3 | |
123 | $ commit 5 "expand" 3 4 |
|
123 | $ commit 5 "expand" 3 4 | |
124 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 |
|
124 | $ commit 6 "merge two known; one immediate left, one far left" 2 5 | |
125 | $ commit 7 "expand" 2 5 |
|
125 | $ commit 7 "expand" 2 5 | |
126 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 |
|
126 | $ commit 8 "merge two known; one immediate left, one far right" 0 7 | |
127 | $ commit 9 "expand" 7 8 |
|
127 | $ commit 9 "expand" 7 8 | |
128 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 |
|
128 | $ commit 10 "merge two known; one immediate left, one near right" 0 6 | |
129 | $ commit 11 "expand" 6 10 |
|
129 | $ commit 11 "expand" 6 10 | |
130 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 |
|
130 | $ commit 12 "merge two known; one immediate right, one far left" 1 9 | |
131 | $ commit 13 "expand" 9 11 |
|
131 | $ commit 13 "expand" 9 11 | |
132 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 |
|
132 | $ commit 14 "merge two known; one immediate right, one far right" 0 12 | |
133 | $ commit 15 "expand" 13 14 |
|
133 | $ commit 15 "expand" 13 14 | |
134 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 |
|
134 | $ commit 16 "merge two known; one immediate right, one near right" 0 1 | |
135 | $ commit 17 "expand" 12 16 |
|
135 | $ commit 17 "expand" 12 16 | |
136 | $ commit 18 "merge two known; two far left" 1 15 |
|
136 | $ commit 18 "merge two known; two far left" 1 15 | |
137 | $ commit 19 "expand" 15 17 |
|
137 | $ commit 19 "expand" 15 17 | |
138 | $ commit 20 "merge two known; two far right" 0 18 |
|
138 | $ commit 20 "merge two known; two far right" 0 18 | |
139 | $ commit 21 "expand" 19 20 |
|
139 | $ commit 21 "expand" 19 20 | |
140 | $ commit 22 "merge two known; one far left, one far right" 18 21 |
|
140 | $ commit 22 "merge two known; one far left, one far right" 18 21 | |
141 | $ commit 23 "merge one known; immediate left" 1 22 |
|
141 | $ commit 23 "merge one known; immediate left" 1 22 | |
142 | $ commit 24 "merge one known; immediate right" 0 23 |
|
142 | $ commit 24 "merge one known; immediate right" 0 23 | |
143 | $ commit 25 "merge one known; far left" 21 24 |
|
143 | $ commit 25 "merge one known; far left" 21 24 | |
144 | $ commit 26 "merge one known; far right" 18 25 |
|
144 | $ commit 26 "merge one known; far right" 18 25 | |
145 | $ commit 27 "collapse" 21 |
|
145 | $ commit 27 "collapse" 21 | |
146 | $ commit 28 "merge zero known" 1 26 |
|
146 | $ commit 28 "merge zero known" 1 26 | |
147 | $ commit 29 "regular commit" 0 |
|
147 | $ commit 29 "regular commit" 0 | |
148 | $ commit 30 "expand" 28 29 |
|
148 | $ commit 30 "expand" 28 29 | |
149 | $ commit 31 "expand" 21 30 |
|
149 | $ commit 31 "expand" 21 30 | |
150 | $ commit 32 "expand" 27 31 |
|
150 | $ commit 32 "expand" 27 31 | |
151 | $ commit 33 "head" 18 |
|
151 | $ commit 33 "head" 18 | |
152 | $ commit 34 "head" 32 |
|
152 | $ commit 34 "head" 32 | |
153 |
|
153 | |||
154 |
|
154 | |||
155 | $ hg glog -q |
|
155 | $ hg glog -q | |
156 | @ 34:fea3ac5810e0 |
|
156 | @ 34:fea3ac5810e0 | |
157 | | |
|
157 | | | |
158 | | o 33:68608f5145f9 |
|
158 | | o 33:68608f5145f9 | |
159 | | | |
|
159 | | | | |
160 | o | 32:d06dffa21a31 |
|
160 | o | 32:d06dffa21a31 | |
161 | |\ \ |
|
161 | |\ \ | |
162 | | o \ 31:621d83e11f67 |
|
162 | | o \ 31:621d83e11f67 | |
163 | | |\ \ |
|
163 | | |\ \ | |
164 | | | o \ 30:6e11cd4b648f |
|
164 | | | o \ 30:6e11cd4b648f | |
165 | | | |\ \ |
|
165 | | | |\ \ | |
166 | | | | o | 29:cd9bb2be7593 |
|
166 | | | | o | 29:cd9bb2be7593 | |
167 | | | | | | |
|
167 | | | | | | | |
168 | | | o | | 28:44ecd0b9ae99 |
|
168 | | | o | | 28:44ecd0b9ae99 | |
169 | | | |\ \ \ |
|
169 | | | |\ \ \ | |
170 | o | | | | | 27:886ed638191b |
|
170 | o | | | | | 27:886ed638191b | |
171 | |/ / / / / |
|
171 | |/ / / / / | |
172 | | | o---+ 26:7f25b6c2f0b9 |
|
172 | | | o---+ 26:7f25b6c2f0b9 | |
173 | | | | | | |
|
173 | | | | | | | |
174 | +---o | | 25:91da8ed57247 |
|
174 | +---o | | 25:91da8ed57247 | |
175 | | | | | | |
|
175 | | | | | | | |
176 | | | o | | 24:a9c19a3d96b7 |
|
176 | | | o | | 24:a9c19a3d96b7 | |
177 | | | |\| | |
|
177 | | | |\| | | |
178 | | | o | | 23:a01cddf0766d |
|
178 | | | o | | 23:a01cddf0766d | |
179 | | |/| | | |
|
179 | | |/| | | | |
180 | +---o---+ 22:e0d9cccacb5d |
|
180 | +---o---+ 22:e0d9cccacb5d | |
181 | | | / / |
|
181 | | | / / | |
182 | o | | | 21:d42a756af44d |
|
182 | o | | | 21:d42a756af44d | |
183 | |\ \ \ \ |
|
183 | |\ \ \ \ | |
184 | | o---+-+ 20:d30ed6450e32 |
|
184 | | o---+-+ 20:d30ed6450e32 | |
185 | | / / / |
|
185 | | / / / | |
186 | o | | | 19:31ddc2c1573b |
|
186 | o | | | 19:31ddc2c1573b | |
187 | |\ \ \ \ |
|
187 | |\ \ \ \ | |
188 | +---+---o 18:1aa84d96232a |
|
188 | +---+---o 18:1aa84d96232a | |
189 | | | | | |
|
189 | | | | | | |
190 | | o | | 17:44765d7c06e0 |
|
190 | | o | | 17:44765d7c06e0 | |
191 | | |\ \ \ |
|
191 | | |\ \ \ | |
192 | | | o---+ 16:3677d192927d |
|
192 | | | o---+ 16:3677d192927d | |
193 | | | |/ / |
|
193 | | | |/ / | |
194 | o | | | 15:1dda3f72782d |
|
194 | o | | | 15:1dda3f72782d | |
195 | |\ \ \ \ |
|
195 | |\ \ \ \ | |
196 | | o-----+ 14:8eac370358ef |
|
196 | | o-----+ 14:8eac370358ef | |
197 | | |/ / / |
|
197 | | |/ / / | |
198 | o | | | 13:22d8966a97e3 |
|
198 | o | | | 13:22d8966a97e3 | |
199 | |\ \ \ \ |
|
199 | |\ \ \ \ | |
200 | +---o | | 12:86b91144a6e9 |
|
200 | +---o | | 12:86b91144a6e9 | |
201 | | | |/ / |
|
201 | | | |/ / | |
202 | | o | | 11:832d76e6bdf2 |
|
202 | | o | | 11:832d76e6bdf2 | |
203 | | |\ \ \ |
|
203 | | |\ \ \ | |
204 | | | o---+ 10:74c64d036d72 |
|
204 | | | o---+ 10:74c64d036d72 | |
205 | | |/ / / |
|
205 | | |/ / / | |
206 | o | | | 9:7010c0af0a35 |
|
206 | o | | | 9:7010c0af0a35 | |
207 | |\ \ \ \ |
|
207 | |\ \ \ \ | |
208 | | o-----+ 8:7a0b11f71937 |
|
208 | | o-----+ 8:7a0b11f71937 | |
209 | |/ / / / |
|
209 | |/ / / / | |
210 | o | | | 7:b632bb1b1224 |
|
210 | o | | | 7:b632bb1b1224 | |
211 | |\ \ \ \ |
|
211 | |\ \ \ \ | |
212 | +---o | | 6:b105a072e251 |
|
212 | +---o | | 6:b105a072e251 | |
213 | | |/ / / |
|
213 | | |/ / / | |
214 | | o | | 5:4409d547b708 |
|
214 | | o | | 5:4409d547b708 | |
215 | | |\ \ \ |
|
215 | | |\ \ \ | |
216 | | | o | | 4:26a8bac39d9f |
|
216 | | | o | | 4:26a8bac39d9f | |
217 | | |/|/ / |
|
217 | | |/|/ / | |
218 | | o / / 3:27eef8ed80b4 |
|
218 | | o / / 3:27eef8ed80b4 | |
219 | |/ / / |
|
219 | |/ / / | |
220 | o / / 2:3d9a33b8d1e1 |
|
220 | o / / 2:3d9a33b8d1e1 | |
221 | |/ / |
|
221 | |/ / | |
222 | o / 1:6db2ef61d156 |
|
222 | o / 1:6db2ef61d156 | |
223 | |/ |
|
223 | |/ | |
224 | o 0:e6eb3150255d |
|
224 | o 0:e6eb3150255d | |
225 |
|
225 | |||
226 |
|
226 | |||
227 | $ hg glog |
|
227 | $ hg glog | |
228 | @ changeset: 34:fea3ac5810e0 |
|
228 | @ changeset: 34:fea3ac5810e0 | |
229 | | tag: tip |
|
229 | | tag: tip | |
230 | | parent: 32:d06dffa21a31 |
|
230 | | parent: 32:d06dffa21a31 | |
231 | | user: test |
|
231 | | user: test | |
232 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
232 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
233 | | summary: (34) head |
|
233 | | summary: (34) head | |
234 | | |
|
234 | | | |
235 | | o changeset: 33:68608f5145f9 |
|
235 | | o changeset: 33:68608f5145f9 | |
236 | | | parent: 18:1aa84d96232a |
|
236 | | | parent: 18:1aa84d96232a | |
237 | | | user: test |
|
237 | | | user: test | |
238 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
238 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
239 | | | summary: (33) head |
|
239 | | | summary: (33) head | |
240 | | | |
|
240 | | | | |
241 | o | changeset: 32:d06dffa21a31 |
|
241 | o | changeset: 32:d06dffa21a31 | |
242 | |\ \ parent: 27:886ed638191b |
|
242 | |\ \ parent: 27:886ed638191b | |
243 | | | | parent: 31:621d83e11f67 |
|
243 | | | | parent: 31:621d83e11f67 | |
244 | | | | user: test |
|
244 | | | | user: test | |
245 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
245 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
246 | | | | summary: (32) expand |
|
246 | | | | summary: (32) expand | |
247 | | | | |
|
247 | | | | | |
248 | | o | changeset: 31:621d83e11f67 |
|
248 | | o | changeset: 31:621d83e11f67 | |
249 | | |\ \ parent: 21:d42a756af44d |
|
249 | | |\ \ parent: 21:d42a756af44d | |
250 | | | | | parent: 30:6e11cd4b648f |
|
250 | | | | | parent: 30:6e11cd4b648f | |
251 | | | | | user: test |
|
251 | | | | | user: test | |
252 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
252 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
253 | | | | | summary: (31) expand |
|
253 | | | | | summary: (31) expand | |
254 | | | | | |
|
254 | | | | | | |
255 | | | o | changeset: 30:6e11cd4b648f |
|
255 | | | o | changeset: 30:6e11cd4b648f | |
256 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
256 | | | |\ \ parent: 28:44ecd0b9ae99 | |
257 | | | | | | parent: 29:cd9bb2be7593 |
|
257 | | | | | | parent: 29:cd9bb2be7593 | |
258 | | | | | | user: test |
|
258 | | | | | | user: test | |
259 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
259 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
260 | | | | | | summary: (30) expand |
|
260 | | | | | | summary: (30) expand | |
261 | | | | | | |
|
261 | | | | | | | |
262 | | | | o | changeset: 29:cd9bb2be7593 |
|
262 | | | | o | changeset: 29:cd9bb2be7593 | |
263 | | | | | | parent: 0:e6eb3150255d |
|
263 | | | | | | parent: 0:e6eb3150255d | |
264 | | | | | | user: test |
|
264 | | | | | | user: test | |
265 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
265 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
266 | | | | | | summary: (29) regular commit |
|
266 | | | | | | summary: (29) regular commit | |
267 | | | | | | |
|
267 | | | | | | | |
268 | | | o | | changeset: 28:44ecd0b9ae99 |
|
268 | | | o | | changeset: 28:44ecd0b9ae99 | |
269 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
269 | | | |\ \ \ parent: 1:6db2ef61d156 | |
270 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
270 | | | | | | | parent: 26:7f25b6c2f0b9 | |
271 | | | | | | | user: test |
|
271 | | | | | | | user: test | |
272 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
272 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
273 | | | | | | | summary: (28) merge zero known |
|
273 | | | | | | | summary: (28) merge zero known | |
274 | | | | | | | |
|
274 | | | | | | | | |
275 | o | | | | | changeset: 27:886ed638191b |
|
275 | o | | | | | changeset: 27:886ed638191b | |
276 | |/ / / / / parent: 21:d42a756af44d |
|
276 | |/ / / / / parent: 21:d42a756af44d | |
277 | | | | | | user: test |
|
277 | | | | | | user: test | |
278 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
278 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
279 | | | | | | summary: (27) collapse |
|
279 | | | | | | summary: (27) collapse | |
280 | | | | | | |
|
280 | | | | | | | |
281 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
281 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
282 | | | | | | parent: 18:1aa84d96232a |
|
282 | | | | | | parent: 18:1aa84d96232a | |
283 | | | | | | parent: 25:91da8ed57247 |
|
283 | | | | | | parent: 25:91da8ed57247 | |
284 | | | | | | user: test |
|
284 | | | | | | user: test | |
285 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
285 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
286 | | | | | | summary: (26) merge one known; far right |
|
286 | | | | | | summary: (26) merge one known; far right | |
287 | | | | | | |
|
287 | | | | | | | |
288 | +---o | | changeset: 25:91da8ed57247 |
|
288 | +---o | | changeset: 25:91da8ed57247 | |
289 | | | | | | parent: 21:d42a756af44d |
|
289 | | | | | | parent: 21:d42a756af44d | |
290 | | | | | | parent: 24:a9c19a3d96b7 |
|
290 | | | | | | parent: 24:a9c19a3d96b7 | |
291 | | | | | | user: test |
|
291 | | | | | | user: test | |
292 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
292 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
293 | | | | | | summary: (25) merge one known; far left |
|
293 | | | | | | summary: (25) merge one known; far left | |
294 | | | | | | |
|
294 | | | | | | | |
295 | | | o | | changeset: 24:a9c19a3d96b7 |
|
295 | | | o | | changeset: 24:a9c19a3d96b7 | |
296 | | | |\| | parent: 0:e6eb3150255d |
|
296 | | | |\| | parent: 0:e6eb3150255d | |
297 | | | | | | parent: 23:a01cddf0766d |
|
297 | | | | | | parent: 23:a01cddf0766d | |
298 | | | | | | user: test |
|
298 | | | | | | user: test | |
299 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
299 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
300 | | | | | | summary: (24) merge one known; immediate right |
|
300 | | | | | | summary: (24) merge one known; immediate right | |
301 | | | | | | |
|
301 | | | | | | | |
302 | | | o | | changeset: 23:a01cddf0766d |
|
302 | | | o | | changeset: 23:a01cddf0766d | |
303 | | |/| | | parent: 1:6db2ef61d156 |
|
303 | | |/| | | parent: 1:6db2ef61d156 | |
304 | | | | | | parent: 22:e0d9cccacb5d |
|
304 | | | | | | parent: 22:e0d9cccacb5d | |
305 | | | | | | user: test |
|
305 | | | | | | user: test | |
306 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
306 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
307 | | | | | | summary: (23) merge one known; immediate left |
|
307 | | | | | | summary: (23) merge one known; immediate left | |
308 | | | | | | |
|
308 | | | | | | | |
309 | +---o---+ changeset: 22:e0d9cccacb5d |
|
309 | +---o---+ changeset: 22:e0d9cccacb5d | |
310 | | | | | parent: 18:1aa84d96232a |
|
310 | | | | | parent: 18:1aa84d96232a | |
311 | | | / / parent: 21:d42a756af44d |
|
311 | | | / / parent: 21:d42a756af44d | |
312 | | | | | user: test |
|
312 | | | | | user: test | |
313 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
313 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
314 | | | | | summary: (22) merge two known; one far left, one far right |
|
314 | | | | | summary: (22) merge two known; one far left, one far right | |
315 | | | | | |
|
315 | | | | | | |
316 | o | | | changeset: 21:d42a756af44d |
|
316 | o | | | changeset: 21:d42a756af44d | |
317 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
317 | |\ \ \ \ parent: 19:31ddc2c1573b | |
318 | | | | | | parent: 20:d30ed6450e32 |
|
318 | | | | | | parent: 20:d30ed6450e32 | |
319 | | | | | | user: test |
|
319 | | | | | | user: test | |
320 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
320 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
321 | | | | | | summary: (21) expand |
|
321 | | | | | | summary: (21) expand | |
322 | | | | | | |
|
322 | | | | | | | |
323 | | o---+-+ changeset: 20:d30ed6450e32 |
|
323 | | o---+-+ changeset: 20:d30ed6450e32 | |
324 | | | | | parent: 0:e6eb3150255d |
|
324 | | | | | parent: 0:e6eb3150255d | |
325 | | / / / parent: 18:1aa84d96232a |
|
325 | | / / / parent: 18:1aa84d96232a | |
326 | | | | | user: test |
|
326 | | | | | user: test | |
327 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
327 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
328 | | | | | summary: (20) merge two known; two far right |
|
328 | | | | | summary: (20) merge two known; two far right | |
329 | | | | | |
|
329 | | | | | | |
330 | o | | | changeset: 19:31ddc2c1573b |
|
330 | o | | | changeset: 19:31ddc2c1573b | |
331 | |\ \ \ \ parent: 15:1dda3f72782d |
|
331 | |\ \ \ \ parent: 15:1dda3f72782d | |
332 | | | | | | parent: 17:44765d7c06e0 |
|
332 | | | | | | parent: 17:44765d7c06e0 | |
333 | | | | | | user: test |
|
333 | | | | | | user: test | |
334 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
334 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
335 | | | | | | summary: (19) expand |
|
335 | | | | | | summary: (19) expand | |
336 | | | | | | |
|
336 | | | | | | | |
337 | +---+---o changeset: 18:1aa84d96232a |
|
337 | +---+---o changeset: 18:1aa84d96232a | |
338 | | | | | parent: 1:6db2ef61d156 |
|
338 | | | | | parent: 1:6db2ef61d156 | |
339 | | | | | parent: 15:1dda3f72782d |
|
339 | | | | | parent: 15:1dda3f72782d | |
340 | | | | | user: test |
|
340 | | | | | user: test | |
341 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
341 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
342 | | | | | summary: (18) merge two known; two far left |
|
342 | | | | | summary: (18) merge two known; two far left | |
343 | | | | | |
|
343 | | | | | | |
344 | | o | | changeset: 17:44765d7c06e0 |
|
344 | | o | | changeset: 17:44765d7c06e0 | |
345 | | |\ \ \ parent: 12:86b91144a6e9 |
|
345 | | |\ \ \ parent: 12:86b91144a6e9 | |
346 | | | | | | parent: 16:3677d192927d |
|
346 | | | | | | parent: 16:3677d192927d | |
347 | | | | | | user: test |
|
347 | | | | | | user: test | |
348 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
348 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
349 | | | | | | summary: (17) expand |
|
349 | | | | | | summary: (17) expand | |
350 | | | | | | |
|
350 | | | | | | | |
351 | | | o---+ changeset: 16:3677d192927d |
|
351 | | | o---+ changeset: 16:3677d192927d | |
352 | | | | | | parent: 0:e6eb3150255d |
|
352 | | | | | | parent: 0:e6eb3150255d | |
353 | | | |/ / parent: 1:6db2ef61d156 |
|
353 | | | |/ / parent: 1:6db2ef61d156 | |
354 | | | | | user: test |
|
354 | | | | | user: test | |
355 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
355 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
356 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
356 | | | | | summary: (16) merge two known; one immediate right, one near right | |
357 | | | | | |
|
357 | | | | | | |
358 | o | | | changeset: 15:1dda3f72782d |
|
358 | o | | | changeset: 15:1dda3f72782d | |
359 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
359 | |\ \ \ \ parent: 13:22d8966a97e3 | |
360 | | | | | | parent: 14:8eac370358ef |
|
360 | | | | | | parent: 14:8eac370358ef | |
361 | | | | | | user: test |
|
361 | | | | | | user: test | |
362 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
362 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
363 | | | | | | summary: (15) expand |
|
363 | | | | | | summary: (15) expand | |
364 | | | | | | |
|
364 | | | | | | | |
365 | | o-----+ changeset: 14:8eac370358ef |
|
365 | | o-----+ changeset: 14:8eac370358ef | |
366 | | | | | | parent: 0:e6eb3150255d |
|
366 | | | | | | parent: 0:e6eb3150255d | |
367 | | |/ / / parent: 12:86b91144a6e9 |
|
367 | | |/ / / parent: 12:86b91144a6e9 | |
368 | | | | | user: test |
|
368 | | | | | user: test | |
369 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
369 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
370 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
370 | | | | | summary: (14) merge two known; one immediate right, one far right | |
371 | | | | | |
|
371 | | | | | | |
372 | o | | | changeset: 13:22d8966a97e3 |
|
372 | o | | | changeset: 13:22d8966a97e3 | |
373 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
373 | |\ \ \ \ parent: 9:7010c0af0a35 | |
374 | | | | | | parent: 11:832d76e6bdf2 |
|
374 | | | | | | parent: 11:832d76e6bdf2 | |
375 | | | | | | user: test |
|
375 | | | | | | user: test | |
376 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
376 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
377 | | | | | | summary: (13) expand |
|
377 | | | | | | summary: (13) expand | |
378 | | | | | | |
|
378 | | | | | | | |
379 | +---o | | changeset: 12:86b91144a6e9 |
|
379 | +---o | | changeset: 12:86b91144a6e9 | |
380 | | | |/ / parent: 1:6db2ef61d156 |
|
380 | | | |/ / parent: 1:6db2ef61d156 | |
381 | | | | | parent: 9:7010c0af0a35 |
|
381 | | | | | parent: 9:7010c0af0a35 | |
382 | | | | | user: test |
|
382 | | | | | user: test | |
383 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
383 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
384 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
384 | | | | | summary: (12) merge two known; one immediate right, one far left | |
385 | | | | | |
|
385 | | | | | | |
386 | | o | | changeset: 11:832d76e6bdf2 |
|
386 | | o | | changeset: 11:832d76e6bdf2 | |
387 | | |\ \ \ parent: 6:b105a072e251 |
|
387 | | |\ \ \ parent: 6:b105a072e251 | |
388 | | | | | | parent: 10:74c64d036d72 |
|
388 | | | | | | parent: 10:74c64d036d72 | |
389 | | | | | | user: test |
|
389 | | | | | | user: test | |
390 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
390 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
391 | | | | | | summary: (11) expand |
|
391 | | | | | | summary: (11) expand | |
392 | | | | | | |
|
392 | | | | | | | |
393 | | | o---+ changeset: 10:74c64d036d72 |
|
393 | | | o---+ changeset: 10:74c64d036d72 | |
394 | | | | | | parent: 0:e6eb3150255d |
|
394 | | | | | | parent: 0:e6eb3150255d | |
395 | | |/ / / parent: 6:b105a072e251 |
|
395 | | |/ / / parent: 6:b105a072e251 | |
396 | | | | | user: test |
|
396 | | | | | user: test | |
397 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
397 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
398 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
398 | | | | | summary: (10) merge two known; one immediate left, one near right | |
399 | | | | | |
|
399 | | | | | | |
400 | o | | | changeset: 9:7010c0af0a35 |
|
400 | o | | | changeset: 9:7010c0af0a35 | |
401 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
401 | |\ \ \ \ parent: 7:b632bb1b1224 | |
402 | | | | | | parent: 8:7a0b11f71937 |
|
402 | | | | | | parent: 8:7a0b11f71937 | |
403 | | | | | | user: test |
|
403 | | | | | | user: test | |
404 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
404 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
405 | | | | | | summary: (9) expand |
|
405 | | | | | | summary: (9) expand | |
406 | | | | | | |
|
406 | | | | | | | |
407 | | o-----+ changeset: 8:7a0b11f71937 |
|
407 | | o-----+ changeset: 8:7a0b11f71937 | |
408 | | | | | | parent: 0:e6eb3150255d |
|
408 | | | | | | parent: 0:e6eb3150255d | |
409 | |/ / / / parent: 7:b632bb1b1224 |
|
409 | |/ / / / parent: 7:b632bb1b1224 | |
410 | | | | | user: test |
|
410 | | | | | user: test | |
411 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
411 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
412 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
412 | | | | | summary: (8) merge two known; one immediate left, one far right | |
413 | | | | | |
|
413 | | | | | | |
414 | o | | | changeset: 7:b632bb1b1224 |
|
414 | o | | | changeset: 7:b632bb1b1224 | |
415 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
415 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
416 | | | | | | parent: 5:4409d547b708 |
|
416 | | | | | | parent: 5:4409d547b708 | |
417 | | | | | | user: test |
|
417 | | | | | | user: test | |
418 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
418 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
419 | | | | | | summary: (7) expand |
|
419 | | | | | | summary: (7) expand | |
420 | | | | | | |
|
420 | | | | | | | |
421 | +---o | | changeset: 6:b105a072e251 |
|
421 | +---o | | changeset: 6:b105a072e251 | |
422 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
422 | | |/ / / parent: 2:3d9a33b8d1e1 | |
423 | | | | | parent: 5:4409d547b708 |
|
423 | | | | | parent: 5:4409d547b708 | |
424 | | | | | user: test |
|
424 | | | | | user: test | |
425 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
425 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
426 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
426 | | | | | summary: (6) merge two known; one immediate left, one far left | |
427 | | | | | |
|
427 | | | | | | |
428 | | o | | changeset: 5:4409d547b708 |
|
428 | | o | | changeset: 5:4409d547b708 | |
429 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
429 | | |\ \ \ parent: 3:27eef8ed80b4 | |
430 | | | | | | parent: 4:26a8bac39d9f |
|
430 | | | | | | parent: 4:26a8bac39d9f | |
431 | | | | | | user: test |
|
431 | | | | | | user: test | |
432 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
432 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
433 | | | | | | summary: (5) expand |
|
433 | | | | | | summary: (5) expand | |
434 | | | | | | |
|
434 | | | | | | | |
435 | | | o | | changeset: 4:26a8bac39d9f |
|
435 | | | o | | changeset: 4:26a8bac39d9f | |
436 | | |/|/ / parent: 1:6db2ef61d156 |
|
436 | | |/|/ / parent: 1:6db2ef61d156 | |
437 | | | | | parent: 3:27eef8ed80b4 |
|
437 | | | | | parent: 3:27eef8ed80b4 | |
438 | | | | | user: test |
|
438 | | | | | user: test | |
439 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
439 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
440 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
440 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
441 | | | | | |
|
441 | | | | | | |
442 | | o | | changeset: 3:27eef8ed80b4 |
|
442 | | o | | changeset: 3:27eef8ed80b4 | |
443 | |/ / / user: test |
|
443 | |/ / / user: test | |
444 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
444 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
445 | | | | summary: (3) collapse |
|
445 | | | | summary: (3) collapse | |
446 | | | | |
|
446 | | | | | |
447 | o | | changeset: 2:3d9a33b8d1e1 |
|
447 | o | | changeset: 2:3d9a33b8d1e1 | |
448 | |/ / user: test |
|
448 | |/ / user: test | |
449 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
449 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
450 | | | summary: (2) collapse |
|
450 | | | summary: (2) collapse | |
451 | | | |
|
451 | | | | |
452 | o | changeset: 1:6db2ef61d156 |
|
452 | o | changeset: 1:6db2ef61d156 | |
453 | |/ user: test |
|
453 | |/ user: test | |
454 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
454 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
455 | | summary: (1) collapse |
|
455 | | summary: (1) collapse | |
456 | | |
|
456 | | | |
457 | o changeset: 0:e6eb3150255d |
|
457 | o changeset: 0:e6eb3150255d | |
458 | user: test |
|
458 | user: test | |
459 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
459 | date: Thu Jan 01 00:00:00 1970 +0000 | |
460 | summary: (0) root |
|
460 | summary: (0) root | |
461 |
|
461 | |||
462 |
|
462 | |||
463 | File glog: |
|
463 | File glog: | |
464 | $ hg glog a |
|
464 | $ hg glog a | |
465 | @ changeset: 34:fea3ac5810e0 |
|
465 | @ changeset: 34:fea3ac5810e0 | |
466 | | tag: tip |
|
466 | | tag: tip | |
467 | | parent: 32:d06dffa21a31 |
|
467 | | parent: 32:d06dffa21a31 | |
468 | | user: test |
|
468 | | user: test | |
469 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
469 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
470 | | summary: (34) head |
|
470 | | summary: (34) head | |
471 | | |
|
471 | | | |
472 | | o changeset: 33:68608f5145f9 |
|
472 | | o changeset: 33:68608f5145f9 | |
473 | | | parent: 18:1aa84d96232a |
|
473 | | | parent: 18:1aa84d96232a | |
474 | | | user: test |
|
474 | | | user: test | |
475 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
475 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
476 | | | summary: (33) head |
|
476 | | | summary: (33) head | |
477 | | | |
|
477 | | | | |
478 | o | changeset: 32:d06dffa21a31 |
|
478 | o | changeset: 32:d06dffa21a31 | |
479 | |\ \ parent: 27:886ed638191b |
|
479 | |\ \ parent: 27:886ed638191b | |
480 | | | | parent: 31:621d83e11f67 |
|
480 | | | | parent: 31:621d83e11f67 | |
481 | | | | user: test |
|
481 | | | | user: test | |
482 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
482 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
483 | | | | summary: (32) expand |
|
483 | | | | summary: (32) expand | |
484 | | | | |
|
484 | | | | | |
485 | | o | changeset: 31:621d83e11f67 |
|
485 | | o | changeset: 31:621d83e11f67 | |
486 | | |\ \ parent: 21:d42a756af44d |
|
486 | | |\ \ parent: 21:d42a756af44d | |
487 | | | | | parent: 30:6e11cd4b648f |
|
487 | | | | | parent: 30:6e11cd4b648f | |
488 | | | | | user: test |
|
488 | | | | | user: test | |
489 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
489 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
490 | | | | | summary: (31) expand |
|
490 | | | | | summary: (31) expand | |
491 | | | | | |
|
491 | | | | | | |
492 | | | o | changeset: 30:6e11cd4b648f |
|
492 | | | o | changeset: 30:6e11cd4b648f | |
493 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
493 | | | |\ \ parent: 28:44ecd0b9ae99 | |
494 | | | | | | parent: 29:cd9bb2be7593 |
|
494 | | | | | | parent: 29:cd9bb2be7593 | |
495 | | | | | | user: test |
|
495 | | | | | | user: test | |
496 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
496 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
497 | | | | | | summary: (30) expand |
|
497 | | | | | | summary: (30) expand | |
498 | | | | | | |
|
498 | | | | | | | |
499 | | | | o | changeset: 29:cd9bb2be7593 |
|
499 | | | | o | changeset: 29:cd9bb2be7593 | |
500 | | | | | | parent: 0:e6eb3150255d |
|
500 | | | | | | parent: 0:e6eb3150255d | |
501 | | | | | | user: test |
|
501 | | | | | | user: test | |
502 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
502 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
503 | | | | | | summary: (29) regular commit |
|
503 | | | | | | summary: (29) regular commit | |
504 | | | | | | |
|
504 | | | | | | | |
505 | | | o | | changeset: 28:44ecd0b9ae99 |
|
505 | | | o | | changeset: 28:44ecd0b9ae99 | |
506 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
506 | | | |\ \ \ parent: 1:6db2ef61d156 | |
507 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
507 | | | | | | | parent: 26:7f25b6c2f0b9 | |
508 | | | | | | | user: test |
|
508 | | | | | | | user: test | |
509 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
509 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
510 | | | | | | | summary: (28) merge zero known |
|
510 | | | | | | | summary: (28) merge zero known | |
511 | | | | | | | |
|
511 | | | | | | | | |
512 | o | | | | | changeset: 27:886ed638191b |
|
512 | o | | | | | changeset: 27:886ed638191b | |
513 | |/ / / / / parent: 21:d42a756af44d |
|
513 | |/ / / / / parent: 21:d42a756af44d | |
514 | | | | | | user: test |
|
514 | | | | | | user: test | |
515 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
515 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
516 | | | | | | summary: (27) collapse |
|
516 | | | | | | summary: (27) collapse | |
517 | | | | | | |
|
517 | | | | | | | |
518 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
518 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
519 | | | | | | parent: 18:1aa84d96232a |
|
519 | | | | | | parent: 18:1aa84d96232a | |
520 | | | | | | parent: 25:91da8ed57247 |
|
520 | | | | | | parent: 25:91da8ed57247 | |
521 | | | | | | user: test |
|
521 | | | | | | user: test | |
522 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
522 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
523 | | | | | | summary: (26) merge one known; far right |
|
523 | | | | | | summary: (26) merge one known; far right | |
524 | | | | | | |
|
524 | | | | | | | |
525 | +---o | | changeset: 25:91da8ed57247 |
|
525 | +---o | | changeset: 25:91da8ed57247 | |
526 | | | | | | parent: 21:d42a756af44d |
|
526 | | | | | | parent: 21:d42a756af44d | |
527 | | | | | | parent: 24:a9c19a3d96b7 |
|
527 | | | | | | parent: 24:a9c19a3d96b7 | |
528 | | | | | | user: test |
|
528 | | | | | | user: test | |
529 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
529 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
530 | | | | | | summary: (25) merge one known; far left |
|
530 | | | | | | summary: (25) merge one known; far left | |
531 | | | | | | |
|
531 | | | | | | | |
532 | | | o | | changeset: 24:a9c19a3d96b7 |
|
532 | | | o | | changeset: 24:a9c19a3d96b7 | |
533 | | | |\| | parent: 0:e6eb3150255d |
|
533 | | | |\| | parent: 0:e6eb3150255d | |
534 | | | | | | parent: 23:a01cddf0766d |
|
534 | | | | | | parent: 23:a01cddf0766d | |
535 | | | | | | user: test |
|
535 | | | | | | user: test | |
536 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
536 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
537 | | | | | | summary: (24) merge one known; immediate right |
|
537 | | | | | | summary: (24) merge one known; immediate right | |
538 | | | | | | |
|
538 | | | | | | | |
539 | | | o | | changeset: 23:a01cddf0766d |
|
539 | | | o | | changeset: 23:a01cddf0766d | |
540 | | |/| | | parent: 1:6db2ef61d156 |
|
540 | | |/| | | parent: 1:6db2ef61d156 | |
541 | | | | | | parent: 22:e0d9cccacb5d |
|
541 | | | | | | parent: 22:e0d9cccacb5d | |
542 | | | | | | user: test |
|
542 | | | | | | user: test | |
543 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
543 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
544 | | | | | | summary: (23) merge one known; immediate left |
|
544 | | | | | | summary: (23) merge one known; immediate left | |
545 | | | | | | |
|
545 | | | | | | | |
546 | +---o---+ changeset: 22:e0d9cccacb5d |
|
546 | +---o---+ changeset: 22:e0d9cccacb5d | |
547 | | | | | parent: 18:1aa84d96232a |
|
547 | | | | | parent: 18:1aa84d96232a | |
548 | | | / / parent: 21:d42a756af44d |
|
548 | | | / / parent: 21:d42a756af44d | |
549 | | | | | user: test |
|
549 | | | | | user: test | |
550 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
550 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
551 | | | | | summary: (22) merge two known; one far left, one far right |
|
551 | | | | | summary: (22) merge two known; one far left, one far right | |
552 | | | | | |
|
552 | | | | | | |
553 | o | | | changeset: 21:d42a756af44d |
|
553 | o | | | changeset: 21:d42a756af44d | |
554 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
554 | |\ \ \ \ parent: 19:31ddc2c1573b | |
555 | | | | | | parent: 20:d30ed6450e32 |
|
555 | | | | | | parent: 20:d30ed6450e32 | |
556 | | | | | | user: test |
|
556 | | | | | | user: test | |
557 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
557 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
558 | | | | | | summary: (21) expand |
|
558 | | | | | | summary: (21) expand | |
559 | | | | | | |
|
559 | | | | | | | |
560 | | o---+-+ changeset: 20:d30ed6450e32 |
|
560 | | o---+-+ changeset: 20:d30ed6450e32 | |
561 | | | | | parent: 0:e6eb3150255d |
|
561 | | | | | parent: 0:e6eb3150255d | |
562 | | / / / parent: 18:1aa84d96232a |
|
562 | | / / / parent: 18:1aa84d96232a | |
563 | | | | | user: test |
|
563 | | | | | user: test | |
564 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
564 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
565 | | | | | summary: (20) merge two known; two far right |
|
565 | | | | | summary: (20) merge two known; two far right | |
566 | | | | | |
|
566 | | | | | | |
567 | o | | | changeset: 19:31ddc2c1573b |
|
567 | o | | | changeset: 19:31ddc2c1573b | |
568 | |\ \ \ \ parent: 15:1dda3f72782d |
|
568 | |\ \ \ \ parent: 15:1dda3f72782d | |
569 | | | | | | parent: 17:44765d7c06e0 |
|
569 | | | | | | parent: 17:44765d7c06e0 | |
570 | | | | | | user: test |
|
570 | | | | | | user: test | |
571 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
571 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
572 | | | | | | summary: (19) expand |
|
572 | | | | | | summary: (19) expand | |
573 | | | | | | |
|
573 | | | | | | | |
574 | +---+---o changeset: 18:1aa84d96232a |
|
574 | +---+---o changeset: 18:1aa84d96232a | |
575 | | | | | parent: 1:6db2ef61d156 |
|
575 | | | | | parent: 1:6db2ef61d156 | |
576 | | | | | parent: 15:1dda3f72782d |
|
576 | | | | | parent: 15:1dda3f72782d | |
577 | | | | | user: test |
|
577 | | | | | user: test | |
578 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
578 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
579 | | | | | summary: (18) merge two known; two far left |
|
579 | | | | | summary: (18) merge two known; two far left | |
580 | | | | | |
|
580 | | | | | | |
581 | | o | | changeset: 17:44765d7c06e0 |
|
581 | | o | | changeset: 17:44765d7c06e0 | |
582 | | |\ \ \ parent: 12:86b91144a6e9 |
|
582 | | |\ \ \ parent: 12:86b91144a6e9 | |
583 | | | | | | parent: 16:3677d192927d |
|
583 | | | | | | parent: 16:3677d192927d | |
584 | | | | | | user: test |
|
584 | | | | | | user: test | |
585 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
585 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
586 | | | | | | summary: (17) expand |
|
586 | | | | | | summary: (17) expand | |
587 | | | | | | |
|
587 | | | | | | | |
588 | | | o---+ changeset: 16:3677d192927d |
|
588 | | | o---+ changeset: 16:3677d192927d | |
589 | | | | | | parent: 0:e6eb3150255d |
|
589 | | | | | | parent: 0:e6eb3150255d | |
590 | | | |/ / parent: 1:6db2ef61d156 |
|
590 | | | |/ / parent: 1:6db2ef61d156 | |
591 | | | | | user: test |
|
591 | | | | | user: test | |
592 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
592 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
593 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
593 | | | | | summary: (16) merge two known; one immediate right, one near right | |
594 | | | | | |
|
594 | | | | | | |
595 | o | | | changeset: 15:1dda3f72782d |
|
595 | o | | | changeset: 15:1dda3f72782d | |
596 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
596 | |\ \ \ \ parent: 13:22d8966a97e3 | |
597 | | | | | | parent: 14:8eac370358ef |
|
597 | | | | | | parent: 14:8eac370358ef | |
598 | | | | | | user: test |
|
598 | | | | | | user: test | |
599 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
599 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
600 | | | | | | summary: (15) expand |
|
600 | | | | | | summary: (15) expand | |
601 | | | | | | |
|
601 | | | | | | | |
602 | | o-----+ changeset: 14:8eac370358ef |
|
602 | | o-----+ changeset: 14:8eac370358ef | |
603 | | | | | | parent: 0:e6eb3150255d |
|
603 | | | | | | parent: 0:e6eb3150255d | |
604 | | |/ / / parent: 12:86b91144a6e9 |
|
604 | | |/ / / parent: 12:86b91144a6e9 | |
605 | | | | | user: test |
|
605 | | | | | user: test | |
606 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
606 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
607 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
607 | | | | | summary: (14) merge two known; one immediate right, one far right | |
608 | | | | | |
|
608 | | | | | | |
609 | o | | | changeset: 13:22d8966a97e3 |
|
609 | o | | | changeset: 13:22d8966a97e3 | |
610 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
610 | |\ \ \ \ parent: 9:7010c0af0a35 | |
611 | | | | | | parent: 11:832d76e6bdf2 |
|
611 | | | | | | parent: 11:832d76e6bdf2 | |
612 | | | | | | user: test |
|
612 | | | | | | user: test | |
613 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
613 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
614 | | | | | | summary: (13) expand |
|
614 | | | | | | summary: (13) expand | |
615 | | | | | | |
|
615 | | | | | | | |
616 | +---o | | changeset: 12:86b91144a6e9 |
|
616 | +---o | | changeset: 12:86b91144a6e9 | |
617 | | | |/ / parent: 1:6db2ef61d156 |
|
617 | | | |/ / parent: 1:6db2ef61d156 | |
618 | | | | | parent: 9:7010c0af0a35 |
|
618 | | | | | parent: 9:7010c0af0a35 | |
619 | | | | | user: test |
|
619 | | | | | user: test | |
620 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
620 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
621 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
621 | | | | | summary: (12) merge two known; one immediate right, one far left | |
622 | | | | | |
|
622 | | | | | | |
623 | | o | | changeset: 11:832d76e6bdf2 |
|
623 | | o | | changeset: 11:832d76e6bdf2 | |
624 | | |\ \ \ parent: 6:b105a072e251 |
|
624 | | |\ \ \ parent: 6:b105a072e251 | |
625 | | | | | | parent: 10:74c64d036d72 |
|
625 | | | | | | parent: 10:74c64d036d72 | |
626 | | | | | | user: test |
|
626 | | | | | | user: test | |
627 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
627 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
628 | | | | | | summary: (11) expand |
|
628 | | | | | | summary: (11) expand | |
629 | | | | | | |
|
629 | | | | | | | |
630 | | | o---+ changeset: 10:74c64d036d72 |
|
630 | | | o---+ changeset: 10:74c64d036d72 | |
631 | | | | | | parent: 0:e6eb3150255d |
|
631 | | | | | | parent: 0:e6eb3150255d | |
632 | | |/ / / parent: 6:b105a072e251 |
|
632 | | |/ / / parent: 6:b105a072e251 | |
633 | | | | | user: test |
|
633 | | | | | user: test | |
634 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
634 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
635 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
635 | | | | | summary: (10) merge two known; one immediate left, one near right | |
636 | | | | | |
|
636 | | | | | | |
637 | o | | | changeset: 9:7010c0af0a35 |
|
637 | o | | | changeset: 9:7010c0af0a35 | |
638 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
638 | |\ \ \ \ parent: 7:b632bb1b1224 | |
639 | | | | | | parent: 8:7a0b11f71937 |
|
639 | | | | | | parent: 8:7a0b11f71937 | |
640 | | | | | | user: test |
|
640 | | | | | | user: test | |
641 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
641 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
642 | | | | | | summary: (9) expand |
|
642 | | | | | | summary: (9) expand | |
643 | | | | | | |
|
643 | | | | | | | |
644 | | o-----+ changeset: 8:7a0b11f71937 |
|
644 | | o-----+ changeset: 8:7a0b11f71937 | |
645 | | | | | | parent: 0:e6eb3150255d |
|
645 | | | | | | parent: 0:e6eb3150255d | |
646 | |/ / / / parent: 7:b632bb1b1224 |
|
646 | |/ / / / parent: 7:b632bb1b1224 | |
647 | | | | | user: test |
|
647 | | | | | user: test | |
648 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
648 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
649 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
649 | | | | | summary: (8) merge two known; one immediate left, one far right | |
650 | | | | | |
|
650 | | | | | | |
651 | o | | | changeset: 7:b632bb1b1224 |
|
651 | o | | | changeset: 7:b632bb1b1224 | |
652 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
652 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
653 | | | | | | parent: 5:4409d547b708 |
|
653 | | | | | | parent: 5:4409d547b708 | |
654 | | | | | | user: test |
|
654 | | | | | | user: test | |
655 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
655 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
656 | | | | | | summary: (7) expand |
|
656 | | | | | | summary: (7) expand | |
657 | | | | | | |
|
657 | | | | | | | |
658 | +---o | | changeset: 6:b105a072e251 |
|
658 | +---o | | changeset: 6:b105a072e251 | |
659 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
659 | | |/ / / parent: 2:3d9a33b8d1e1 | |
660 | | | | | parent: 5:4409d547b708 |
|
660 | | | | | parent: 5:4409d547b708 | |
661 | | | | | user: test |
|
661 | | | | | user: test | |
662 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
662 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
663 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
663 | | | | | summary: (6) merge two known; one immediate left, one far left | |
664 | | | | | |
|
664 | | | | | | |
665 | | o | | changeset: 5:4409d547b708 |
|
665 | | o | | changeset: 5:4409d547b708 | |
666 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
666 | | |\ \ \ parent: 3:27eef8ed80b4 | |
667 | | | | | | parent: 4:26a8bac39d9f |
|
667 | | | | | | parent: 4:26a8bac39d9f | |
668 | | | | | | user: test |
|
668 | | | | | | user: test | |
669 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
669 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
670 | | | | | | summary: (5) expand |
|
670 | | | | | | summary: (5) expand | |
671 | | | | | | |
|
671 | | | | | | | |
672 | | | o | | changeset: 4:26a8bac39d9f |
|
672 | | | o | | changeset: 4:26a8bac39d9f | |
673 | | |/|/ / parent: 1:6db2ef61d156 |
|
673 | | |/|/ / parent: 1:6db2ef61d156 | |
674 | | | | | parent: 3:27eef8ed80b4 |
|
674 | | | | | parent: 3:27eef8ed80b4 | |
675 | | | | | user: test |
|
675 | | | | | user: test | |
676 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
676 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
677 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
677 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
678 | | | | | |
|
678 | | | | | | |
679 | | o | | changeset: 3:27eef8ed80b4 |
|
679 | | o | | changeset: 3:27eef8ed80b4 | |
680 | |/ / / user: test |
|
680 | |/ / / user: test | |
681 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
681 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
682 | | | | summary: (3) collapse |
|
682 | | | | summary: (3) collapse | |
683 | | | | |
|
683 | | | | | |
684 | o | | changeset: 2:3d9a33b8d1e1 |
|
684 | o | | changeset: 2:3d9a33b8d1e1 | |
685 | |/ / user: test |
|
685 | |/ / user: test | |
686 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
686 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
687 | | | summary: (2) collapse |
|
687 | | | summary: (2) collapse | |
688 | | | |
|
688 | | | | |
689 | o | changeset: 1:6db2ef61d156 |
|
689 | o | changeset: 1:6db2ef61d156 | |
690 | |/ user: test |
|
690 | |/ user: test | |
691 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
691 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
692 | | summary: (1) collapse |
|
692 | | summary: (1) collapse | |
693 | | |
|
693 | | | |
694 | o changeset: 0:e6eb3150255d |
|
694 | o changeset: 0:e6eb3150255d | |
695 | user: test |
|
695 | user: test | |
696 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
696 | date: Thu Jan 01 00:00:00 1970 +0000 | |
697 | summary: (0) root |
|
697 | summary: (0) root | |
698 |
|
698 | |||
699 |
|
699 | |||
700 | File glog per revset: |
|
700 | File glog per revset: | |
701 |
|
701 | |||
702 | $ hg glog -r 'file("a")' |
|
702 | $ hg glog -r 'file("a")' | |
703 | @ changeset: 34:fea3ac5810e0 |
|
703 | @ changeset: 34:fea3ac5810e0 | |
704 | | tag: tip |
|
704 | | tag: tip | |
705 | | parent: 32:d06dffa21a31 |
|
705 | | parent: 32:d06dffa21a31 | |
706 | | user: test |
|
706 | | user: test | |
707 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
707 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
708 | | summary: (34) head |
|
708 | | summary: (34) head | |
709 | | |
|
709 | | | |
710 | | o changeset: 33:68608f5145f9 |
|
710 | | o changeset: 33:68608f5145f9 | |
711 | | | parent: 18:1aa84d96232a |
|
711 | | | parent: 18:1aa84d96232a | |
712 | | | user: test |
|
712 | | | user: test | |
713 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
713 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
714 | | | summary: (33) head |
|
714 | | | summary: (33) head | |
715 | | | |
|
715 | | | | |
716 | o | changeset: 32:d06dffa21a31 |
|
716 | o | changeset: 32:d06dffa21a31 | |
717 | |\ \ parent: 27:886ed638191b |
|
717 | |\ \ parent: 27:886ed638191b | |
718 | | | | parent: 31:621d83e11f67 |
|
718 | | | | parent: 31:621d83e11f67 | |
719 | | | | user: test |
|
719 | | | | user: test | |
720 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
720 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
721 | | | | summary: (32) expand |
|
721 | | | | summary: (32) expand | |
722 | | | | |
|
722 | | | | | |
723 | | o | changeset: 31:621d83e11f67 |
|
723 | | o | changeset: 31:621d83e11f67 | |
724 | | |\ \ parent: 21:d42a756af44d |
|
724 | | |\ \ parent: 21:d42a756af44d | |
725 | | | | | parent: 30:6e11cd4b648f |
|
725 | | | | | parent: 30:6e11cd4b648f | |
726 | | | | | user: test |
|
726 | | | | | user: test | |
727 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
727 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
728 | | | | | summary: (31) expand |
|
728 | | | | | summary: (31) expand | |
729 | | | | | |
|
729 | | | | | | |
730 | | | o | changeset: 30:6e11cd4b648f |
|
730 | | | o | changeset: 30:6e11cd4b648f | |
731 | | | |\ \ parent: 28:44ecd0b9ae99 |
|
731 | | | |\ \ parent: 28:44ecd0b9ae99 | |
732 | | | | | | parent: 29:cd9bb2be7593 |
|
732 | | | | | | parent: 29:cd9bb2be7593 | |
733 | | | | | | user: test |
|
733 | | | | | | user: test | |
734 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
734 | | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
735 | | | | | | summary: (30) expand |
|
735 | | | | | | summary: (30) expand | |
736 | | | | | | |
|
736 | | | | | | | |
737 | | | | o | changeset: 29:cd9bb2be7593 |
|
737 | | | | o | changeset: 29:cd9bb2be7593 | |
738 | | | | | | parent: 0:e6eb3150255d |
|
738 | | | | | | parent: 0:e6eb3150255d | |
739 | | | | | | user: test |
|
739 | | | | | | user: test | |
740 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
740 | | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
741 | | | | | | summary: (29) regular commit |
|
741 | | | | | | summary: (29) regular commit | |
742 | | | | | | |
|
742 | | | | | | | |
743 | | | o | | changeset: 28:44ecd0b9ae99 |
|
743 | | | o | | changeset: 28:44ecd0b9ae99 | |
744 | | | |\ \ \ parent: 1:6db2ef61d156 |
|
744 | | | |\ \ \ parent: 1:6db2ef61d156 | |
745 | | | | | | | parent: 26:7f25b6c2f0b9 |
|
745 | | | | | | | parent: 26:7f25b6c2f0b9 | |
746 | | | | | | | user: test |
|
746 | | | | | | | user: test | |
747 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
747 | | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
748 | | | | | | | summary: (28) merge zero known |
|
748 | | | | | | | summary: (28) merge zero known | |
749 | | | | | | | |
|
749 | | | | | | | | |
750 | o | | | | | changeset: 27:886ed638191b |
|
750 | o | | | | | changeset: 27:886ed638191b | |
751 | |/ / / / / parent: 21:d42a756af44d |
|
751 | |/ / / / / parent: 21:d42a756af44d | |
752 | | | | | | user: test |
|
752 | | | | | | user: test | |
753 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
753 | | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
754 | | | | | | summary: (27) collapse |
|
754 | | | | | | summary: (27) collapse | |
755 | | | | | | |
|
755 | | | | | | | |
756 | | | o---+ changeset: 26:7f25b6c2f0b9 |
|
756 | | | o---+ changeset: 26:7f25b6c2f0b9 | |
757 | | | | | | parent: 18:1aa84d96232a |
|
757 | | | | | | parent: 18:1aa84d96232a | |
758 | | | | | | parent: 25:91da8ed57247 |
|
758 | | | | | | parent: 25:91da8ed57247 | |
759 | | | | | | user: test |
|
759 | | | | | | user: test | |
760 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
760 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
761 | | | | | | summary: (26) merge one known; far right |
|
761 | | | | | | summary: (26) merge one known; far right | |
762 | | | | | | |
|
762 | | | | | | | |
763 | +---o | | changeset: 25:91da8ed57247 |
|
763 | +---o | | changeset: 25:91da8ed57247 | |
764 | | | | | | parent: 21:d42a756af44d |
|
764 | | | | | | parent: 21:d42a756af44d | |
765 | | | | | | parent: 24:a9c19a3d96b7 |
|
765 | | | | | | parent: 24:a9c19a3d96b7 | |
766 | | | | | | user: test |
|
766 | | | | | | user: test | |
767 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
767 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
768 | | | | | | summary: (25) merge one known; far left |
|
768 | | | | | | summary: (25) merge one known; far left | |
769 | | | | | | |
|
769 | | | | | | | |
770 | | | o | | changeset: 24:a9c19a3d96b7 |
|
770 | | | o | | changeset: 24:a9c19a3d96b7 | |
771 | | | |\| | parent: 0:e6eb3150255d |
|
771 | | | |\| | parent: 0:e6eb3150255d | |
772 | | | | | | parent: 23:a01cddf0766d |
|
772 | | | | | | parent: 23:a01cddf0766d | |
773 | | | | | | user: test |
|
773 | | | | | | user: test | |
774 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
774 | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
775 | | | | | | summary: (24) merge one known; immediate right |
|
775 | | | | | | summary: (24) merge one known; immediate right | |
776 | | | | | | |
|
776 | | | | | | | |
777 | | | o | | changeset: 23:a01cddf0766d |
|
777 | | | o | | changeset: 23:a01cddf0766d | |
778 | | |/| | | parent: 1:6db2ef61d156 |
|
778 | | |/| | | parent: 1:6db2ef61d156 | |
779 | | | | | | parent: 22:e0d9cccacb5d |
|
779 | | | | | | parent: 22:e0d9cccacb5d | |
780 | | | | | | user: test |
|
780 | | | | | | user: test | |
781 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
781 | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
782 | | | | | | summary: (23) merge one known; immediate left |
|
782 | | | | | | summary: (23) merge one known; immediate left | |
783 | | | | | | |
|
783 | | | | | | | |
784 | +---o---+ changeset: 22:e0d9cccacb5d |
|
784 | +---o---+ changeset: 22:e0d9cccacb5d | |
785 | | | | | parent: 18:1aa84d96232a |
|
785 | | | | | parent: 18:1aa84d96232a | |
786 | | | / / parent: 21:d42a756af44d |
|
786 | | | / / parent: 21:d42a756af44d | |
787 | | | | | user: test |
|
787 | | | | | user: test | |
788 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
788 | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
789 | | | | | summary: (22) merge two known; one far left, one far right |
|
789 | | | | | summary: (22) merge two known; one far left, one far right | |
790 | | | | | |
|
790 | | | | | | |
791 | o | | | changeset: 21:d42a756af44d |
|
791 | o | | | changeset: 21:d42a756af44d | |
792 | |\ \ \ \ parent: 19:31ddc2c1573b |
|
792 | |\ \ \ \ parent: 19:31ddc2c1573b | |
793 | | | | | | parent: 20:d30ed6450e32 |
|
793 | | | | | | parent: 20:d30ed6450e32 | |
794 | | | | | | user: test |
|
794 | | | | | | user: test | |
795 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
795 | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
796 | | | | | | summary: (21) expand |
|
796 | | | | | | summary: (21) expand | |
797 | | | | | | |
|
797 | | | | | | | |
798 | | o---+-+ changeset: 20:d30ed6450e32 |
|
798 | | o---+-+ changeset: 20:d30ed6450e32 | |
799 | | | | | parent: 0:e6eb3150255d |
|
799 | | | | | parent: 0:e6eb3150255d | |
800 | | / / / parent: 18:1aa84d96232a |
|
800 | | / / / parent: 18:1aa84d96232a | |
801 | | | | | user: test |
|
801 | | | | | user: test | |
802 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
802 | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
803 | | | | | summary: (20) merge two known; two far right |
|
803 | | | | | summary: (20) merge two known; two far right | |
804 | | | | | |
|
804 | | | | | | |
805 | o | | | changeset: 19:31ddc2c1573b |
|
805 | o | | | changeset: 19:31ddc2c1573b | |
806 | |\ \ \ \ parent: 15:1dda3f72782d |
|
806 | |\ \ \ \ parent: 15:1dda3f72782d | |
807 | | | | | | parent: 17:44765d7c06e0 |
|
807 | | | | | | parent: 17:44765d7c06e0 | |
808 | | | | | | user: test |
|
808 | | | | | | user: test | |
809 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
809 | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
810 | | | | | | summary: (19) expand |
|
810 | | | | | | summary: (19) expand | |
811 | | | | | | |
|
811 | | | | | | | |
812 | +---+---o changeset: 18:1aa84d96232a |
|
812 | +---+---o changeset: 18:1aa84d96232a | |
813 | | | | | parent: 1:6db2ef61d156 |
|
813 | | | | | parent: 1:6db2ef61d156 | |
814 | | | | | parent: 15:1dda3f72782d |
|
814 | | | | | parent: 15:1dda3f72782d | |
815 | | | | | user: test |
|
815 | | | | | user: test | |
816 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
816 | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
817 | | | | | summary: (18) merge two known; two far left |
|
817 | | | | | summary: (18) merge two known; two far left | |
818 | | | | | |
|
818 | | | | | | |
819 | | o | | changeset: 17:44765d7c06e0 |
|
819 | | o | | changeset: 17:44765d7c06e0 | |
820 | | |\ \ \ parent: 12:86b91144a6e9 |
|
820 | | |\ \ \ parent: 12:86b91144a6e9 | |
821 | | | | | | parent: 16:3677d192927d |
|
821 | | | | | | parent: 16:3677d192927d | |
822 | | | | | | user: test |
|
822 | | | | | | user: test | |
823 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
823 | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
824 | | | | | | summary: (17) expand |
|
824 | | | | | | summary: (17) expand | |
825 | | | | | | |
|
825 | | | | | | | |
826 | | | o---+ changeset: 16:3677d192927d |
|
826 | | | o---+ changeset: 16:3677d192927d | |
827 | | | | | | parent: 0:e6eb3150255d |
|
827 | | | | | | parent: 0:e6eb3150255d | |
828 | | | |/ / parent: 1:6db2ef61d156 |
|
828 | | | |/ / parent: 1:6db2ef61d156 | |
829 | | | | | user: test |
|
829 | | | | | user: test | |
830 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
830 | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
831 | | | | | summary: (16) merge two known; one immediate right, one near right |
|
831 | | | | | summary: (16) merge two known; one immediate right, one near right | |
832 | | | | | |
|
832 | | | | | | |
833 | o | | | changeset: 15:1dda3f72782d |
|
833 | o | | | changeset: 15:1dda3f72782d | |
834 | |\ \ \ \ parent: 13:22d8966a97e3 |
|
834 | |\ \ \ \ parent: 13:22d8966a97e3 | |
835 | | | | | | parent: 14:8eac370358ef |
|
835 | | | | | | parent: 14:8eac370358ef | |
836 | | | | | | user: test |
|
836 | | | | | | user: test | |
837 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
837 | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
838 | | | | | | summary: (15) expand |
|
838 | | | | | | summary: (15) expand | |
839 | | | | | | |
|
839 | | | | | | | |
840 | | o-----+ changeset: 14:8eac370358ef |
|
840 | | o-----+ changeset: 14:8eac370358ef | |
841 | | | | | | parent: 0:e6eb3150255d |
|
841 | | | | | | parent: 0:e6eb3150255d | |
842 | | |/ / / parent: 12:86b91144a6e9 |
|
842 | | |/ / / parent: 12:86b91144a6e9 | |
843 | | | | | user: test |
|
843 | | | | | user: test | |
844 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
844 | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
845 | | | | | summary: (14) merge two known; one immediate right, one far right |
|
845 | | | | | summary: (14) merge two known; one immediate right, one far right | |
846 | | | | | |
|
846 | | | | | | |
847 | o | | | changeset: 13:22d8966a97e3 |
|
847 | o | | | changeset: 13:22d8966a97e3 | |
848 | |\ \ \ \ parent: 9:7010c0af0a35 |
|
848 | |\ \ \ \ parent: 9:7010c0af0a35 | |
849 | | | | | | parent: 11:832d76e6bdf2 |
|
849 | | | | | | parent: 11:832d76e6bdf2 | |
850 | | | | | | user: test |
|
850 | | | | | | user: test | |
851 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
851 | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
852 | | | | | | summary: (13) expand |
|
852 | | | | | | summary: (13) expand | |
853 | | | | | | |
|
853 | | | | | | | |
854 | +---o | | changeset: 12:86b91144a6e9 |
|
854 | +---o | | changeset: 12:86b91144a6e9 | |
855 | | | |/ / parent: 1:6db2ef61d156 |
|
855 | | | |/ / parent: 1:6db2ef61d156 | |
856 | | | | | parent: 9:7010c0af0a35 |
|
856 | | | | | parent: 9:7010c0af0a35 | |
857 | | | | | user: test |
|
857 | | | | | user: test | |
858 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
858 | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
859 | | | | | summary: (12) merge two known; one immediate right, one far left |
|
859 | | | | | summary: (12) merge two known; one immediate right, one far left | |
860 | | | | | |
|
860 | | | | | | |
861 | | o | | changeset: 11:832d76e6bdf2 |
|
861 | | o | | changeset: 11:832d76e6bdf2 | |
862 | | |\ \ \ parent: 6:b105a072e251 |
|
862 | | |\ \ \ parent: 6:b105a072e251 | |
863 | | | | | | parent: 10:74c64d036d72 |
|
863 | | | | | | parent: 10:74c64d036d72 | |
864 | | | | | | user: test |
|
864 | | | | | | user: test | |
865 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
865 | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
866 | | | | | | summary: (11) expand |
|
866 | | | | | | summary: (11) expand | |
867 | | | | | | |
|
867 | | | | | | | |
868 | | | o---+ changeset: 10:74c64d036d72 |
|
868 | | | o---+ changeset: 10:74c64d036d72 | |
869 | | | | | | parent: 0:e6eb3150255d |
|
869 | | | | | | parent: 0:e6eb3150255d | |
870 | | |/ / / parent: 6:b105a072e251 |
|
870 | | |/ / / parent: 6:b105a072e251 | |
871 | | | | | user: test |
|
871 | | | | | user: test | |
872 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
872 | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
873 | | | | | summary: (10) merge two known; one immediate left, one near right |
|
873 | | | | | summary: (10) merge two known; one immediate left, one near right | |
874 | | | | | |
|
874 | | | | | | |
875 | o | | | changeset: 9:7010c0af0a35 |
|
875 | o | | | changeset: 9:7010c0af0a35 | |
876 | |\ \ \ \ parent: 7:b632bb1b1224 |
|
876 | |\ \ \ \ parent: 7:b632bb1b1224 | |
877 | | | | | | parent: 8:7a0b11f71937 |
|
877 | | | | | | parent: 8:7a0b11f71937 | |
878 | | | | | | user: test |
|
878 | | | | | | user: test | |
879 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
879 | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
880 | | | | | | summary: (9) expand |
|
880 | | | | | | summary: (9) expand | |
881 | | | | | | |
|
881 | | | | | | | |
882 | | o-----+ changeset: 8:7a0b11f71937 |
|
882 | | o-----+ changeset: 8:7a0b11f71937 | |
883 | | | | | | parent: 0:e6eb3150255d |
|
883 | | | | | | parent: 0:e6eb3150255d | |
884 | |/ / / / parent: 7:b632bb1b1224 |
|
884 | |/ / / / parent: 7:b632bb1b1224 | |
885 | | | | | user: test |
|
885 | | | | | user: test | |
886 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
886 | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
887 | | | | | summary: (8) merge two known; one immediate left, one far right |
|
887 | | | | | summary: (8) merge two known; one immediate left, one far right | |
888 | | | | | |
|
888 | | | | | | |
889 | o | | | changeset: 7:b632bb1b1224 |
|
889 | o | | | changeset: 7:b632bb1b1224 | |
890 | |\ \ \ \ parent: 2:3d9a33b8d1e1 |
|
890 | |\ \ \ \ parent: 2:3d9a33b8d1e1 | |
891 | | | | | | parent: 5:4409d547b708 |
|
891 | | | | | | parent: 5:4409d547b708 | |
892 | | | | | | user: test |
|
892 | | | | | | user: test | |
893 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
893 | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
894 | | | | | | summary: (7) expand |
|
894 | | | | | | summary: (7) expand | |
895 | | | | | | |
|
895 | | | | | | | |
896 | +---o | | changeset: 6:b105a072e251 |
|
896 | +---o | | changeset: 6:b105a072e251 | |
897 | | |/ / / parent: 2:3d9a33b8d1e1 |
|
897 | | |/ / / parent: 2:3d9a33b8d1e1 | |
898 | | | | | parent: 5:4409d547b708 |
|
898 | | | | | parent: 5:4409d547b708 | |
899 | | | | | user: test |
|
899 | | | | | user: test | |
900 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
900 | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
901 | | | | | summary: (6) merge two known; one immediate left, one far left |
|
901 | | | | | summary: (6) merge two known; one immediate left, one far left | |
902 | | | | | |
|
902 | | | | | | |
903 | | o | | changeset: 5:4409d547b708 |
|
903 | | o | | changeset: 5:4409d547b708 | |
904 | | |\ \ \ parent: 3:27eef8ed80b4 |
|
904 | | |\ \ \ parent: 3:27eef8ed80b4 | |
905 | | | | | | parent: 4:26a8bac39d9f |
|
905 | | | | | | parent: 4:26a8bac39d9f | |
906 | | | | | | user: test |
|
906 | | | | | | user: test | |
907 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
907 | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
908 | | | | | | summary: (5) expand |
|
908 | | | | | | summary: (5) expand | |
909 | | | | | | |
|
909 | | | | | | | |
910 | | | o | | changeset: 4:26a8bac39d9f |
|
910 | | | o | | changeset: 4:26a8bac39d9f | |
911 | | |/|/ / parent: 1:6db2ef61d156 |
|
911 | | |/|/ / parent: 1:6db2ef61d156 | |
912 | | | | | parent: 3:27eef8ed80b4 |
|
912 | | | | | parent: 3:27eef8ed80b4 | |
913 | | | | | user: test |
|
913 | | | | | user: test | |
914 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
914 | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
915 | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
915 | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
916 | | | | | |
|
916 | | | | | | |
917 | | o | | changeset: 3:27eef8ed80b4 |
|
917 | | o | | changeset: 3:27eef8ed80b4 | |
918 | |/ / / user: test |
|
918 | |/ / / user: test | |
919 | | | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
919 | | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
920 | | | | summary: (3) collapse |
|
920 | | | | summary: (3) collapse | |
921 | | | | |
|
921 | | | | | |
922 | o | | changeset: 2:3d9a33b8d1e1 |
|
922 | o | | changeset: 2:3d9a33b8d1e1 | |
923 | |/ / user: test |
|
923 | |/ / user: test | |
924 | | | date: Thu Jan 01 00:00:02 1970 +0000 |
|
924 | | | date: Thu Jan 01 00:00:02 1970 +0000 | |
925 | | | summary: (2) collapse |
|
925 | | | summary: (2) collapse | |
926 | | | |
|
926 | | | | |
927 | o | changeset: 1:6db2ef61d156 |
|
927 | o | changeset: 1:6db2ef61d156 | |
928 | |/ user: test |
|
928 | |/ user: test | |
929 | | date: Thu Jan 01 00:00:01 1970 +0000 |
|
929 | | date: Thu Jan 01 00:00:01 1970 +0000 | |
930 | | summary: (1) collapse |
|
930 | | summary: (1) collapse | |
931 | | |
|
931 | | | |
932 | o changeset: 0:e6eb3150255d |
|
932 | o changeset: 0:e6eb3150255d | |
933 | user: test |
|
933 | user: test | |
934 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
934 | date: Thu Jan 01 00:00:00 1970 +0000 | |
935 | summary: (0) root |
|
935 | summary: (0) root | |
936 |
|
936 | |||
937 |
|
937 | |||
938 |
|
938 | |||
939 | File glog per revset (only merges): |
|
939 | File glog per revset (only merges): | |
940 |
|
940 | |||
941 | $ hg log -G -r 'file("a")' -m |
|
941 | $ hg log -G -r 'file("a")' -m | |
942 | o changeset: 32:d06dffa21a31 |
|
942 | o changeset: 32:d06dffa21a31 | |
943 | |\ parent: 27:886ed638191b |
|
943 | |\ parent: 27:886ed638191b | |
944 | | | parent: 31:621d83e11f67 |
|
944 | | | parent: 31:621d83e11f67 | |
945 | | | user: test |
|
945 | | | user: test | |
946 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
946 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
947 | | | summary: (32) expand |
|
947 | | | summary: (32) expand | |
948 | | | |
|
948 | | | | |
949 | o | changeset: 31:621d83e11f67 |
|
949 | o | changeset: 31:621d83e11f67 | |
950 | |\| parent: 21:d42a756af44d |
|
950 | |\| parent: 21:d42a756af44d | |
951 | | | parent: 30:6e11cd4b648f |
|
951 | | | parent: 30:6e11cd4b648f | |
952 | | | user: test |
|
952 | | | user: test | |
953 | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
953 | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
954 | | | summary: (31) expand |
|
954 | | | summary: (31) expand | |
955 | | | |
|
955 | | | | |
956 | o | changeset: 30:6e11cd4b648f |
|
956 | o | changeset: 30:6e11cd4b648f | |
957 | |\ \ parent: 28:44ecd0b9ae99 |
|
957 | |\ \ parent: 28:44ecd0b9ae99 | |
958 | | | | parent: 29:cd9bb2be7593 |
|
958 | | | | parent: 29:cd9bb2be7593 | |
959 | | | | user: test |
|
959 | | | | user: test | |
960 | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
960 | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
961 | | | | summary: (30) expand |
|
961 | | | | summary: (30) expand | |
962 | | | | |
|
962 | | | | | |
963 | o | | changeset: 28:44ecd0b9ae99 |
|
963 | o | | changeset: 28:44ecd0b9ae99 | |
964 | |\ \ \ parent: 1:6db2ef61d156 |
|
964 | |\ \ \ parent: 1:6db2ef61d156 | |
965 | | | | | parent: 26:7f25b6c2f0b9 |
|
965 | | | | | parent: 26:7f25b6c2f0b9 | |
966 | | | | | user: test |
|
966 | | | | | user: test | |
967 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
967 | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
968 | | | | | summary: (28) merge zero known |
|
968 | | | | | summary: (28) merge zero known | |
969 | | | | | |
|
969 | | | | | | |
970 | o | | | changeset: 26:7f25b6c2f0b9 |
|
970 | o | | | changeset: 26:7f25b6c2f0b9 | |
971 | |\ \ \ \ parent: 18:1aa84d96232a |
|
971 | |\ \ \ \ parent: 18:1aa84d96232a | |
972 | | | | | | parent: 25:91da8ed57247 |
|
972 | | | | | | parent: 25:91da8ed57247 | |
973 | | | | | | user: test |
|
973 | | | | | | user: test | |
974 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
974 | | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
975 | | | | | | summary: (26) merge one known; far right |
|
975 | | | | | | summary: (26) merge one known; far right | |
976 | | | | | | |
|
976 | | | | | | | |
977 | | o-----+ changeset: 25:91da8ed57247 |
|
977 | | o-----+ changeset: 25:91da8ed57247 | |
978 | | | | | | parent: 21:d42a756af44d |
|
978 | | | | | | parent: 21:d42a756af44d | |
979 | | | | | | parent: 24:a9c19a3d96b7 |
|
979 | | | | | | parent: 24:a9c19a3d96b7 | |
980 | | | | | | user: test |
|
980 | | | | | | user: test | |
981 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
981 | | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
982 | | | | | | summary: (25) merge one known; far left |
|
982 | | | | | | summary: (25) merge one known; far left | |
983 | | | | | | |
|
983 | | | | | | | |
984 | | o | | | changeset: 24:a9c19a3d96b7 |
|
984 | | o | | | changeset: 24:a9c19a3d96b7 | |
985 | | |\ \ \ \ parent: 0:e6eb3150255d |
|
985 | | |\ \ \ \ parent: 0:e6eb3150255d | |
986 | | | | | | | parent: 23:a01cddf0766d |
|
986 | | | | | | | parent: 23:a01cddf0766d | |
987 | | | | | | | user: test |
|
987 | | | | | | | user: test | |
988 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
988 | | | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
989 | | | | | | | summary: (24) merge one known; immediate right |
|
989 | | | | | | | summary: (24) merge one known; immediate right | |
990 | | | | | | | |
|
990 | | | | | | | | |
991 | | o---+ | | changeset: 23:a01cddf0766d |
|
991 | | o---+ | | changeset: 23:a01cddf0766d | |
992 | | | | | | | parent: 1:6db2ef61d156 |
|
992 | | | | | | | parent: 1:6db2ef61d156 | |
993 | | | | | | | parent: 22:e0d9cccacb5d |
|
993 | | | | | | | parent: 22:e0d9cccacb5d | |
994 | | | | | | | user: test |
|
994 | | | | | | | user: test | |
995 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
995 | | | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
996 | | | | | | | summary: (23) merge one known; immediate left |
|
996 | | | | | | | summary: (23) merge one known; immediate left | |
997 | | | | | | | |
|
997 | | | | | | | | |
998 | | o-------+ changeset: 22:e0d9cccacb5d |
|
998 | | o-------+ changeset: 22:e0d9cccacb5d | |
999 | | | | | | | parent: 18:1aa84d96232a |
|
999 | | | | | | | parent: 18:1aa84d96232a | |
1000 | |/ / / / / parent: 21:d42a756af44d |
|
1000 | |/ / / / / parent: 21:d42a756af44d | |
1001 | | | | | | user: test |
|
1001 | | | | | | user: test | |
1002 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
1002 | | | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
1003 | | | | | | summary: (22) merge two known; one far left, one far right |
|
1003 | | | | | | summary: (22) merge two known; one far left, one far right | |
1004 | | | | | | |
|
1004 | | | | | | | |
1005 | | | | | o changeset: 21:d42a756af44d |
|
1005 | | | | | o changeset: 21:d42a756af44d | |
1006 | | | | | |\ parent: 19:31ddc2c1573b |
|
1006 | | | | | |\ parent: 19:31ddc2c1573b | |
1007 | | | | | | | parent: 20:d30ed6450e32 |
|
1007 | | | | | | | parent: 20:d30ed6450e32 | |
1008 | | | | | | | user: test |
|
1008 | | | | | | | user: test | |
1009 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
1009 | | | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
1010 | | | | | | | summary: (21) expand |
|
1010 | | | | | | | summary: (21) expand | |
1011 | | | | | | | |
|
1011 | | | | | | | | |
1012 | +-+-------o changeset: 20:d30ed6450e32 |
|
1012 | +-+-------o changeset: 20:d30ed6450e32 | |
1013 | | | | | | parent: 0:e6eb3150255d |
|
1013 | | | | | | parent: 0:e6eb3150255d | |
1014 | | | | | | parent: 18:1aa84d96232a |
|
1014 | | | | | | parent: 18:1aa84d96232a | |
1015 | | | | | | user: test |
|
1015 | | | | | | user: test | |
1016 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
1016 | | | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
1017 | | | | | | summary: (20) merge two known; two far right |
|
1017 | | | | | | summary: (20) merge two known; two far right | |
1018 | | | | | | |
|
1018 | | | | | | | |
1019 | | | | | o changeset: 19:31ddc2c1573b |
|
1019 | | | | | o changeset: 19:31ddc2c1573b | |
1020 | | | | | |\ parent: 15:1dda3f72782d |
|
1020 | | | | | |\ parent: 15:1dda3f72782d | |
1021 | | | | | | | parent: 17:44765d7c06e0 |
|
1021 | | | | | | | parent: 17:44765d7c06e0 | |
1022 | | | | | | | user: test |
|
1022 | | | | | | | user: test | |
1023 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
1023 | | | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
1024 | | | | | | | summary: (19) expand |
|
1024 | | | | | | | summary: (19) expand | |
1025 | | | | | | | |
|
1025 | | | | | | | | |
1026 | o---+---+ | changeset: 18:1aa84d96232a |
|
1026 | o---+---+ | changeset: 18:1aa84d96232a | |
1027 | | | | | | parent: 1:6db2ef61d156 |
|
1027 | | | | | | parent: 1:6db2ef61d156 | |
1028 | / / / / / parent: 15:1dda3f72782d |
|
1028 | / / / / / parent: 15:1dda3f72782d | |
1029 | | | | | | user: test |
|
1029 | | | | | | user: test | |
1030 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
1030 | | | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
1031 | | | | | | summary: (18) merge two known; two far left |
|
1031 | | | | | | summary: (18) merge two known; two far left | |
1032 | | | | | | |
|
1032 | | | | | | | |
1033 | | | | | o changeset: 17:44765d7c06e0 |
|
1033 | | | | | o changeset: 17:44765d7c06e0 | |
1034 | | | | | |\ parent: 12:86b91144a6e9 |
|
1034 | | | | | |\ parent: 12:86b91144a6e9 | |
1035 | | | | | | | parent: 16:3677d192927d |
|
1035 | | | | | | | parent: 16:3677d192927d | |
1036 | | | | | | | user: test |
|
1036 | | | | | | | user: test | |
1037 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
1037 | | | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
1038 | | | | | | | summary: (17) expand |
|
1038 | | | | | | | summary: (17) expand | |
1039 | | | | | | | |
|
1039 | | | | | | | | |
1040 | +-+-------o changeset: 16:3677d192927d |
|
1040 | +-+-------o changeset: 16:3677d192927d | |
1041 | | | | | | parent: 0:e6eb3150255d |
|
1041 | | | | | | parent: 0:e6eb3150255d | |
1042 | | | | | | parent: 1:6db2ef61d156 |
|
1042 | | | | | | parent: 1:6db2ef61d156 | |
1043 | | | | | | user: test |
|
1043 | | | | | | user: test | |
1044 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
1044 | | | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
1045 | | | | | | summary: (16) merge two known; one immediate right, one near right |
|
1045 | | | | | | summary: (16) merge two known; one immediate right, one near right | |
1046 | | | | | | |
|
1046 | | | | | | | |
1047 | | | | o | changeset: 15:1dda3f72782d |
|
1047 | | | | o | changeset: 15:1dda3f72782d | |
1048 | | | | |\ \ parent: 13:22d8966a97e3 |
|
1048 | | | | |\ \ parent: 13:22d8966a97e3 | |
1049 | | | | | | | parent: 14:8eac370358ef |
|
1049 | | | | | | | parent: 14:8eac370358ef | |
1050 | | | | | | | user: test |
|
1050 | | | | | | | user: test | |
1051 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
1051 | | | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
1052 | | | | | | | summary: (15) expand |
|
1052 | | | | | | | summary: (15) expand | |
1053 | | | | | | | |
|
1053 | | | | | | | | |
1054 | +-------o | changeset: 14:8eac370358ef |
|
1054 | +-------o | changeset: 14:8eac370358ef | |
1055 | | | | | |/ parent: 0:e6eb3150255d |
|
1055 | | | | | |/ parent: 0:e6eb3150255d | |
1056 | | | | | | parent: 12:86b91144a6e9 |
|
1056 | | | | | | parent: 12:86b91144a6e9 | |
1057 | | | | | | user: test |
|
1057 | | | | | | user: test | |
1058 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
1058 | | | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
1059 | | | | | | summary: (14) merge two known; one immediate right, one far right |
|
1059 | | | | | | summary: (14) merge two known; one immediate right, one far right | |
1060 | | | | | | |
|
1060 | | | | | | | |
1061 | | | | o | changeset: 13:22d8966a97e3 |
|
1061 | | | | o | changeset: 13:22d8966a97e3 | |
1062 | | | | |\ \ parent: 9:7010c0af0a35 |
|
1062 | | | | |\ \ parent: 9:7010c0af0a35 | |
1063 | | | | | | | parent: 11:832d76e6bdf2 |
|
1063 | | | | | | | parent: 11:832d76e6bdf2 | |
1064 | | | | | | | user: test |
|
1064 | | | | | | | user: test | |
1065 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
1065 | | | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
1066 | | | | | | | summary: (13) expand |
|
1066 | | | | | | | summary: (13) expand | |
1067 | | | | | | | |
|
1067 | | | | | | | | |
1068 | | +---+---o changeset: 12:86b91144a6e9 |
|
1068 | | +---+---o changeset: 12:86b91144a6e9 | |
1069 | | | | | | parent: 1:6db2ef61d156 |
|
1069 | | | | | | parent: 1:6db2ef61d156 | |
1070 | | | | | | parent: 9:7010c0af0a35 |
|
1070 | | | | | | parent: 9:7010c0af0a35 | |
1071 | | | | | | user: test |
|
1071 | | | | | | user: test | |
1072 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
1072 | | | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
1073 | | | | | | summary: (12) merge two known; one immediate right, one far left |
|
1073 | | | | | | summary: (12) merge two known; one immediate right, one far left | |
1074 | | | | | | |
|
1074 | | | | | | | |
1075 | | | | | o changeset: 11:832d76e6bdf2 |
|
1075 | | | | | o changeset: 11:832d76e6bdf2 | |
1076 | | | | | |\ parent: 6:b105a072e251 |
|
1076 | | | | | |\ parent: 6:b105a072e251 | |
1077 | | | | | | | parent: 10:74c64d036d72 |
|
1077 | | | | | | | parent: 10:74c64d036d72 | |
1078 | | | | | | | user: test |
|
1078 | | | | | | | user: test | |
1079 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
1079 | | | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
1080 | | | | | | | summary: (11) expand |
|
1080 | | | | | | | summary: (11) expand | |
1081 | | | | | | | |
|
1081 | | | | | | | | |
1082 | +---------o changeset: 10:74c64d036d72 |
|
1082 | +---------o changeset: 10:74c64d036d72 | |
1083 | | | | | |/ parent: 0:e6eb3150255d |
|
1083 | | | | | |/ parent: 0:e6eb3150255d | |
1084 | | | | | | parent: 6:b105a072e251 |
|
1084 | | | | | | parent: 6:b105a072e251 | |
1085 | | | | | | user: test |
|
1085 | | | | | | user: test | |
1086 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
1086 | | | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
1087 | | | | | | summary: (10) merge two known; one immediate left, one near right |
|
1087 | | | | | | summary: (10) merge two known; one immediate left, one near right | |
1088 | | | | | | |
|
1088 | | | | | | | |
1089 | | | | o | changeset: 9:7010c0af0a35 |
|
1089 | | | | o | changeset: 9:7010c0af0a35 | |
1090 | | | | |\ \ parent: 7:b632bb1b1224 |
|
1090 | | | | |\ \ parent: 7:b632bb1b1224 | |
1091 | | | | | | | parent: 8:7a0b11f71937 |
|
1091 | | | | | | | parent: 8:7a0b11f71937 | |
1092 | | | | | | | user: test |
|
1092 | | | | | | | user: test | |
1093 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1093 | | | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
1094 | | | | | | | summary: (9) expand |
|
1094 | | | | | | | summary: (9) expand | |
1095 | | | | | | | |
|
1095 | | | | | | | | |
1096 | +-------o | changeset: 8:7a0b11f71937 |
|
1096 | +-------o | changeset: 8:7a0b11f71937 | |
1097 | | | | |/ / parent: 0:e6eb3150255d |
|
1097 | | | | |/ / parent: 0:e6eb3150255d | |
1098 | | | | | | parent: 7:b632bb1b1224 |
|
1098 | | | | | | parent: 7:b632bb1b1224 | |
1099 | | | | | | user: test |
|
1099 | | | | | | user: test | |
1100 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1100 | | | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
1101 | | | | | | summary: (8) merge two known; one immediate left, one far right |
|
1101 | | | | | | summary: (8) merge two known; one immediate left, one far right | |
1102 | | | | | | |
|
1102 | | | | | | | |
1103 | | | | o | changeset: 7:b632bb1b1224 |
|
1103 | | | | o | changeset: 7:b632bb1b1224 | |
1104 | | | | |\ \ parent: 2:3d9a33b8d1e1 |
|
1104 | | | | |\ \ parent: 2:3d9a33b8d1e1 | |
1105 | | | | | | | parent: 5:4409d547b708 |
|
1105 | | | | | | | parent: 5:4409d547b708 | |
1106 | | | | | | | user: test |
|
1106 | | | | | | | user: test | |
1107 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
1107 | | | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
1108 | | | | | | | summary: (7) expand |
|
1108 | | | | | | | summary: (7) expand | |
1109 | | | | | | | |
|
1109 | | | | | | | | |
1110 | | | | +---o changeset: 6:b105a072e251 |
|
1110 | | | | +---o changeset: 6:b105a072e251 | |
1111 | | | | | |/ parent: 2:3d9a33b8d1e1 |
|
1111 | | | | | |/ parent: 2:3d9a33b8d1e1 | |
1112 | | | | | | parent: 5:4409d547b708 |
|
1112 | | | | | | parent: 5:4409d547b708 | |
1113 | | | | | | user: test |
|
1113 | | | | | | user: test | |
1114 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
1114 | | | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
1115 | | | | | | summary: (6) merge two known; one immediate left, one far left |
|
1115 | | | | | | summary: (6) merge two known; one immediate left, one far left | |
1116 | | | | | | |
|
1116 | | | | | | | |
1117 | | | | o | changeset: 5:4409d547b708 |
|
1117 | | | | o | changeset: 5:4409d547b708 | |
1118 | | | | |\ \ parent: 3:27eef8ed80b4 |
|
1118 | | | | |\ \ parent: 3:27eef8ed80b4 | |
1119 | | | | | | | parent: 4:26a8bac39d9f |
|
1119 | | | | | | | parent: 4:26a8bac39d9f | |
1120 | | | | | | | user: test |
|
1120 | | | | | | | user: test | |
1121 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
1121 | | | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
1122 | | | | | | | summary: (5) expand |
|
1122 | | | | | | | summary: (5) expand | |
1123 | | | | | | | |
|
1123 | | | | | | | | |
1124 | | +---o | | changeset: 4:26a8bac39d9f |
|
1124 | | +---o | | changeset: 4:26a8bac39d9f | |
1125 | | | | |/ / parent: 1:6db2ef61d156 |
|
1125 | | | | |/ / parent: 1:6db2ef61d156 | |
1126 | | | | | | parent: 3:27eef8ed80b4 |
|
1126 | | | | | | parent: 3:27eef8ed80b4 | |
1127 | | | | | | user: test |
|
1127 | | | | | | user: test | |
1128 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
1128 | | | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
1129 | | | | | | summary: (4) merge two known; one immediate left, one immediate right |
|
1129 | | | | | | summary: (4) merge two known; one immediate left, one immediate right | |
1130 | | | | | | |
|
1130 | | | | | | | |
1131 |
|
1131 | |||
1132 |
|
1132 | |||
1133 | Empty revision range - display nothing: |
|
1133 | Empty revision range - display nothing: | |
1134 | $ hg glog -r 1..0 |
|
1134 | $ hg glog -r 1..0 | |
1135 |
|
1135 | |||
1136 | $ cd .. |
|
1136 | $ cd .. | |
1137 |
|
1137 | |||
1138 | #if no-outer-repo |
|
1138 | #if no-outer-repo | |
1139 |
|
1139 | |||
1140 | From outer space: |
|
1140 | From outer space: | |
1141 | $ hg glog -l1 repo |
|
1141 | $ hg glog -l1 repo | |
1142 | @ changeset: 34:fea3ac5810e0 |
|
1142 | @ changeset: 34:fea3ac5810e0 | |
1143 | | tag: tip |
|
1143 | | tag: tip | |
1144 | | parent: 32:d06dffa21a31 |
|
1144 | | parent: 32:d06dffa21a31 | |
1145 | | user: test |
|
1145 | | user: test | |
1146 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1146 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1147 | | summary: (34) head |
|
1147 | | summary: (34) head | |
1148 | | |
|
1148 | | | |
1149 | $ hg glog -l1 repo/a |
|
1149 | $ hg glog -l1 repo/a | |
1150 | @ changeset: 34:fea3ac5810e0 |
|
1150 | @ changeset: 34:fea3ac5810e0 | |
1151 | | tag: tip |
|
1151 | | tag: tip | |
1152 | | parent: 32:d06dffa21a31 |
|
1152 | | parent: 32:d06dffa21a31 | |
1153 | | user: test |
|
1153 | | user: test | |
1154 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1154 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1155 | | summary: (34) head |
|
1155 | | summary: (34) head | |
1156 | | |
|
1156 | | | |
1157 | $ hg glog -l1 repo/missing |
|
1157 | $ hg glog -l1 repo/missing | |
1158 |
|
1158 | |||
1159 | #endif |
|
1159 | #endif | |
1160 |
|
1160 | |||
1161 | File log with revs != cset revs: |
|
1161 | File log with revs != cset revs: | |
1162 | $ hg init flog |
|
1162 | $ hg init flog | |
1163 | $ cd flog |
|
1163 | $ cd flog | |
1164 | $ echo one >one |
|
1164 | $ echo one >one | |
1165 | $ hg add one |
|
1165 | $ hg add one | |
1166 | $ hg commit -mone |
|
1166 | $ hg commit -mone | |
1167 | $ echo two >two |
|
1167 | $ echo two >two | |
1168 | $ hg add two |
|
1168 | $ hg add two | |
1169 | $ hg commit -mtwo |
|
1169 | $ hg commit -mtwo | |
1170 | $ echo more >two |
|
1170 | $ echo more >two | |
1171 | $ hg commit -mmore |
|
1171 | $ hg commit -mmore | |
1172 | $ hg glog two |
|
1172 | $ hg glog two | |
1173 | @ changeset: 2:12c28321755b |
|
1173 | @ changeset: 2:12c28321755b | |
1174 | | tag: tip |
|
1174 | | tag: tip | |
1175 | | user: test |
|
1175 | | user: test | |
1176 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1176 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1177 | | summary: more |
|
1177 | | summary: more | |
1178 | | |
|
1178 | | | |
1179 | o changeset: 1:5ac72c0599bf |
|
1179 | o changeset: 1:5ac72c0599bf | |
1180 | | user: test |
|
1180 | | user: test | |
1181 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1181 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1182 | | summary: two |
|
1182 | | summary: two | |
1183 | | |
|
1183 | | | |
1184 |
|
1184 | |||
1185 | Issue1896: File log with explicit style |
|
1185 | Issue1896: File log with explicit style | |
1186 | $ hg glog --style=default one |
|
1186 | $ hg glog --style=default one | |
1187 | o changeset: 0:3d578b4a1f53 |
|
1187 | o changeset: 0:3d578b4a1f53 | |
1188 | user: test |
|
1188 | user: test | |
1189 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1189 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1190 | summary: one |
|
1190 | summary: one | |
1191 |
|
1191 | |||
1192 | Issue2395: glog --style header and footer |
|
1192 | Issue2395: glog --style header and footer | |
1193 | $ hg glog --style=xml one |
|
1193 | $ hg glog --style=xml one | |
1194 | <?xml version="1.0"?> |
|
1194 | <?xml version="1.0"?> | |
1195 | <log> |
|
1195 | <log> | |
1196 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> |
|
1196 | o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> | |
1197 | <author email="test">test</author> |
|
1197 | <author email="test">test</author> | |
1198 | <date>1970-01-01T00:00:00+00:00</date> |
|
1198 | <date>1970-01-01T00:00:00+00:00</date> | |
1199 | <msg xml:space="preserve">one</msg> |
|
1199 | <msg xml:space="preserve">one</msg> | |
1200 | </logentry> |
|
1200 | </logentry> | |
1201 | </log> |
|
1201 | </log> | |
1202 |
|
1202 | |||
1203 | $ cd .. |
|
1203 | $ cd .. | |
1204 |
|
1204 | |||
1205 | Incoming and outgoing: |
|
1205 | Incoming and outgoing: | |
1206 |
|
1206 | |||
1207 | $ hg clone -U -r31 repo repo2 |
|
1207 | $ hg clone -U -r31 repo repo2 | |
1208 | adding changesets |
|
1208 | adding changesets | |
1209 | adding manifests |
|
1209 | adding manifests | |
1210 | adding file changes |
|
1210 | adding file changes | |
1211 | added 31 changesets with 31 changes to 1 files |
|
1211 | added 31 changesets with 31 changes to 1 files | |
1212 | $ cd repo2 |
|
1212 | $ cd repo2 | |
1213 |
|
1213 | |||
1214 | $ hg incoming --graph ../repo |
|
1214 | $ hg incoming --graph ../repo | |
1215 | comparing with ../repo |
|
1215 | comparing with ../repo | |
1216 | searching for changes |
|
1216 | searching for changes | |
1217 | o changeset: 34:fea3ac5810e0 |
|
1217 | o changeset: 34:fea3ac5810e0 | |
1218 | | tag: tip |
|
1218 | | tag: tip | |
1219 | | parent: 32:d06dffa21a31 |
|
1219 | | parent: 32:d06dffa21a31 | |
1220 | | user: test |
|
1220 | | user: test | |
1221 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1221 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1222 | | summary: (34) head |
|
1222 | | summary: (34) head | |
1223 | | |
|
1223 | | | |
1224 | | o changeset: 33:68608f5145f9 |
|
1224 | | o changeset: 33:68608f5145f9 | |
1225 | | parent: 18:1aa84d96232a |
|
1225 | | parent: 18:1aa84d96232a | |
1226 | | user: test |
|
1226 | | user: test | |
1227 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1227 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1228 | | summary: (33) head |
|
1228 | | summary: (33) head | |
1229 | | |
|
1229 | | | |
1230 | o changeset: 32:d06dffa21a31 |
|
1230 | o changeset: 32:d06dffa21a31 | |
1231 | | parent: 27:886ed638191b |
|
1231 | | parent: 27:886ed638191b | |
1232 | | parent: 31:621d83e11f67 |
|
1232 | | parent: 31:621d83e11f67 | |
1233 | | user: test |
|
1233 | | user: test | |
1234 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1234 | | date: Thu Jan 01 00:00:32 1970 +0000 | |
1235 | | summary: (32) expand |
|
1235 | | summary: (32) expand | |
1236 | | |
|
1236 | | | |
1237 | o changeset: 27:886ed638191b |
|
1237 | o changeset: 27:886ed638191b | |
1238 | parent: 21:d42a756af44d |
|
1238 | parent: 21:d42a756af44d | |
1239 | user: test |
|
1239 | user: test | |
1240 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1240 | date: Thu Jan 01 00:00:27 1970 +0000 | |
1241 | summary: (27) collapse |
|
1241 | summary: (27) collapse | |
1242 |
|
1242 | |||
1243 | $ cd .. |
|
1243 | $ cd .. | |
1244 |
|
1244 | |||
1245 | $ hg -R repo outgoing --graph repo2 |
|
1245 | $ hg -R repo outgoing --graph repo2 | |
1246 | comparing with repo2 |
|
1246 | comparing with repo2 | |
1247 | searching for changes |
|
1247 | searching for changes | |
1248 | @ changeset: 34:fea3ac5810e0 |
|
1248 | @ changeset: 34:fea3ac5810e0 | |
1249 | | tag: tip |
|
1249 | | tag: tip | |
1250 | | parent: 32:d06dffa21a31 |
|
1250 | | parent: 32:d06dffa21a31 | |
1251 | | user: test |
|
1251 | | user: test | |
1252 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1252 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1253 | | summary: (34) head |
|
1253 | | summary: (34) head | |
1254 | | |
|
1254 | | | |
1255 | | o changeset: 33:68608f5145f9 |
|
1255 | | o changeset: 33:68608f5145f9 | |
1256 | | parent: 18:1aa84d96232a |
|
1256 | | parent: 18:1aa84d96232a | |
1257 | | user: test |
|
1257 | | user: test | |
1258 | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1258 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1259 | | summary: (33) head |
|
1259 | | summary: (33) head | |
1260 | | |
|
1260 | | | |
1261 | o changeset: 32:d06dffa21a31 |
|
1261 | o changeset: 32:d06dffa21a31 | |
1262 | | parent: 27:886ed638191b |
|
1262 | | parent: 27:886ed638191b | |
1263 | | parent: 31:621d83e11f67 |
|
1263 | | parent: 31:621d83e11f67 | |
1264 | | user: test |
|
1264 | | user: test | |
1265 | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1265 | | date: Thu Jan 01 00:00:32 1970 +0000 | |
1266 | | summary: (32) expand |
|
1266 | | summary: (32) expand | |
1267 | | |
|
1267 | | | |
1268 | o changeset: 27:886ed638191b |
|
1268 | o changeset: 27:886ed638191b | |
1269 | parent: 21:d42a756af44d |
|
1269 | parent: 21:d42a756af44d | |
1270 | user: test |
|
1270 | user: test | |
1271 | date: Thu Jan 01 00:00:27 1970 +0000 |
|
1271 | date: Thu Jan 01 00:00:27 1970 +0000 | |
1272 | summary: (27) collapse |
|
1272 | summary: (27) collapse | |
1273 |
|
1273 | |||
1274 |
|
1274 | |||
1275 | File + limit with revs != cset revs: |
|
1275 | File + limit with revs != cset revs: | |
1276 | $ cd repo |
|
1276 | $ cd repo | |
1277 | $ touch b |
|
1277 | $ touch b | |
1278 | $ hg ci -Aqm0 |
|
1278 | $ hg ci -Aqm0 | |
1279 | $ hg glog -l2 a |
|
1279 | $ hg glog -l2 a | |
1280 | o changeset: 34:fea3ac5810e0 |
|
1280 | o changeset: 34:fea3ac5810e0 | |
1281 | | parent: 32:d06dffa21a31 |
|
1281 | | parent: 32:d06dffa21a31 | |
1282 | | user: test |
|
1282 | | user: test | |
1283 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1283 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1284 | | summary: (34) head |
|
1284 | | summary: (34) head | |
1285 | | |
|
1285 | | | |
1286 | | o changeset: 33:68608f5145f9 |
|
1286 | | o changeset: 33:68608f5145f9 | |
1287 | | | parent: 18:1aa84d96232a |
|
1287 | | | parent: 18:1aa84d96232a | |
1288 | | | user: test |
|
1288 | | | user: test | |
1289 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1289 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1290 | | | summary: (33) head |
|
1290 | | | summary: (33) head | |
1291 | | | |
|
1291 | | | | |
1292 |
|
1292 | |||
1293 | File + limit + -ra:b, (b - a) < limit: |
|
1293 | File + limit + -ra:b, (b - a) < limit: | |
1294 | $ hg glog -l3000 -r32:tip a |
|
1294 | $ hg glog -l3000 -r32:tip a | |
1295 | o changeset: 34:fea3ac5810e0 |
|
1295 | o changeset: 34:fea3ac5810e0 | |
1296 | | parent: 32:d06dffa21a31 |
|
1296 | | parent: 32:d06dffa21a31 | |
1297 | | user: test |
|
1297 | | user: test | |
1298 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1298 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1299 | | summary: (34) head |
|
1299 | | summary: (34) head | |
1300 | | |
|
1300 | | | |
1301 | | o changeset: 33:68608f5145f9 |
|
1301 | | o changeset: 33:68608f5145f9 | |
1302 | | | parent: 18:1aa84d96232a |
|
1302 | | | parent: 18:1aa84d96232a | |
1303 | | | user: test |
|
1303 | | | user: test | |
1304 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1304 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1305 | | | summary: (33) head |
|
1305 | | | summary: (33) head | |
1306 | | | |
|
1306 | | | | |
1307 | o | changeset: 32:d06dffa21a31 |
|
1307 | o | changeset: 32:d06dffa21a31 | |
1308 | |\ \ parent: 27:886ed638191b |
|
1308 | |\ \ parent: 27:886ed638191b | |
1309 | | | | parent: 31:621d83e11f67 |
|
1309 | | | | parent: 31:621d83e11f67 | |
1310 | | | | user: test |
|
1310 | | | | user: test | |
1311 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1311 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
1312 | | | | summary: (32) expand |
|
1312 | | | | summary: (32) expand | |
1313 | | | | |
|
1313 | | | | | |
1314 |
|
1314 | |||
1315 | Point out a common and an uncommon unshown parent |
|
1315 | Point out a common and an uncommon unshown parent | |
1316 |
|
1316 | |||
1317 | $ hg glog -r 'rev(8) or rev(9)' |
|
1317 | $ hg glog -r 'rev(8) or rev(9)' | |
1318 | o changeset: 9:7010c0af0a35 |
|
1318 | o changeset: 9:7010c0af0a35 | |
1319 | |\ parent: 7:b632bb1b1224 |
|
1319 | |\ parent: 7:b632bb1b1224 | |
1320 | | | parent: 8:7a0b11f71937 |
|
1320 | | | parent: 8:7a0b11f71937 | |
1321 | | | user: test |
|
1321 | | | user: test | |
1322 | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
1322 | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
1323 | | | summary: (9) expand |
|
1323 | | | summary: (9) expand | |
1324 | | | |
|
1324 | | | | |
1325 | o | changeset: 8:7a0b11f71937 |
|
1325 | o | changeset: 8:7a0b11f71937 | |
1326 | |\| parent: 0:e6eb3150255d |
|
1326 | |\| parent: 0:e6eb3150255d | |
1327 | | | parent: 7:b632bb1b1224 |
|
1327 | | | parent: 7:b632bb1b1224 | |
1328 | | | user: test |
|
1328 | | | user: test | |
1329 | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
1329 | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
1330 | | | summary: (8) merge two known; one immediate left, one far right |
|
1330 | | | summary: (8) merge two known; one immediate left, one far right | |
1331 | | | |
|
1331 | | | | |
1332 |
|
1332 | |||
1333 | File + limit + -ra:b, b < tip: |
|
1333 | File + limit + -ra:b, b < tip: | |
1334 |
|
1334 | |||
1335 | $ hg glog -l1 -r32:34 a |
|
1335 | $ hg glog -l1 -r32:34 a | |
1336 | o changeset: 34:fea3ac5810e0 |
|
1336 | o changeset: 34:fea3ac5810e0 | |
1337 | | parent: 32:d06dffa21a31 |
|
1337 | | parent: 32:d06dffa21a31 | |
1338 | | user: test |
|
1338 | | user: test | |
1339 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1339 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1340 | | summary: (34) head |
|
1340 | | summary: (34) head | |
1341 | | |
|
1341 | | | |
1342 |
|
1342 | |||
1343 | file(File) + limit + -ra:b, b < tip: |
|
1343 | file(File) + limit + -ra:b, b < tip: | |
1344 |
|
1344 | |||
1345 | $ hg glog -l1 -r32:34 -r 'file("a")' |
|
1345 | $ hg glog -l1 -r32:34 -r 'file("a")' | |
1346 | o changeset: 34:fea3ac5810e0 |
|
1346 | o changeset: 34:fea3ac5810e0 | |
1347 | | parent: 32:d06dffa21a31 |
|
1347 | | parent: 32:d06dffa21a31 | |
1348 | | user: test |
|
1348 | | user: test | |
1349 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1349 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1350 | | summary: (34) head |
|
1350 | | summary: (34) head | |
1351 | | |
|
1351 | | | |
1352 |
|
1352 | |||
1353 | limit(file(File) and a::b), b < tip: |
|
1353 | limit(file(File) and a::b), b < tip: | |
1354 |
|
1354 | |||
1355 | $ hg glog -r 'limit(file("a") and 32::34, 1)' |
|
1355 | $ hg glog -r 'limit(file("a") and 32::34, 1)' | |
1356 | o changeset: 32:d06dffa21a31 |
|
1356 | o changeset: 32:d06dffa21a31 | |
1357 | |\ parent: 27:886ed638191b |
|
1357 | |\ parent: 27:886ed638191b | |
1358 | | | parent: 31:621d83e11f67 |
|
1358 | | | parent: 31:621d83e11f67 | |
1359 | | | user: test |
|
1359 | | | user: test | |
1360 | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1360 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
1361 | | | summary: (32) expand |
|
1361 | | | summary: (32) expand | |
1362 | | | |
|
1362 | | | | |
1363 |
|
1363 | |||
1364 | File + limit + -ra:b, b < tip: |
|
1364 | File + limit + -ra:b, b < tip: | |
1365 |
|
1365 | |||
1366 | $ hg glog -r 'limit(file("a") and 34::32, 1)' |
|
1366 | $ hg glog -r 'limit(file("a") and 34::32, 1)' | |
1367 |
|
1367 | |||
1368 | File + limit + -ra:b, b < tip, (b - a) < limit: |
|
1368 | File + limit + -ra:b, b < tip, (b - a) < limit: | |
1369 |
|
1369 | |||
1370 | $ hg glog -l10 -r33:34 a |
|
1370 | $ hg glog -l10 -r33:34 a | |
1371 | o changeset: 34:fea3ac5810e0 |
|
1371 | o changeset: 34:fea3ac5810e0 | |
1372 | | parent: 32:d06dffa21a31 |
|
1372 | | parent: 32:d06dffa21a31 | |
1373 | | user: test |
|
1373 | | user: test | |
1374 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1374 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1375 | | summary: (34) head |
|
1375 | | summary: (34) head | |
1376 | | |
|
1376 | | | |
1377 | | o changeset: 33:68608f5145f9 |
|
1377 | | o changeset: 33:68608f5145f9 | |
1378 | | | parent: 18:1aa84d96232a |
|
1378 | | | parent: 18:1aa84d96232a | |
1379 | | | user: test |
|
1379 | | | user: test | |
1380 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1380 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1381 | | | summary: (33) head |
|
1381 | | | summary: (33) head | |
1382 | | | |
|
1382 | | | | |
1383 |
|
1383 | |||
1384 | Do not crash or produce strange graphs if history is buggy |
|
1384 | Do not crash or produce strange graphs if history is buggy | |
1385 |
|
1385 | |||
1386 | $ hg branch branch |
|
1386 | $ hg branch branch | |
1387 | marked working directory as branch branch |
|
1387 | marked working directory as branch branch | |
1388 | (branches are permanent and global, did you want a bookmark?) |
|
1388 | (branches are permanent and global, did you want a bookmark?) | |
1389 | $ commit 36 "buggy merge: identical parents" 35 35 |
|
1389 | $ commit 36 "buggy merge: identical parents" 35 35 | |
1390 | $ hg glog -l5 |
|
1390 | $ hg glog -l5 | |
1391 | @ changeset: 36:08a19a744424 |
|
1391 | @ changeset: 36:08a19a744424 | |
1392 | | branch: branch |
|
1392 | | branch: branch | |
1393 | | tag: tip |
|
1393 | | tag: tip | |
1394 | | parent: 35:9159c3644c5e |
|
1394 | | parent: 35:9159c3644c5e | |
1395 | | parent: 35:9159c3644c5e |
|
1395 | | parent: 35:9159c3644c5e | |
1396 | | user: test |
|
1396 | | user: test | |
1397 | | date: Thu Jan 01 00:00:36 1970 +0000 |
|
1397 | | date: Thu Jan 01 00:00:36 1970 +0000 | |
1398 | | summary: (36) buggy merge: identical parents |
|
1398 | | summary: (36) buggy merge: identical parents | |
1399 | | |
|
1399 | | | |
1400 | o changeset: 35:9159c3644c5e |
|
1400 | o changeset: 35:9159c3644c5e | |
1401 | | user: test |
|
1401 | | user: test | |
1402 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1402 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1403 | | summary: 0 |
|
1403 | | summary: 0 | |
1404 | | |
|
1404 | | | |
1405 | o changeset: 34:fea3ac5810e0 |
|
1405 | o changeset: 34:fea3ac5810e0 | |
1406 | | parent: 32:d06dffa21a31 |
|
1406 | | parent: 32:d06dffa21a31 | |
1407 | | user: test |
|
1407 | | user: test | |
1408 | | date: Thu Jan 01 00:00:34 1970 +0000 |
|
1408 | | date: Thu Jan 01 00:00:34 1970 +0000 | |
1409 | | summary: (34) head |
|
1409 | | summary: (34) head | |
1410 | | |
|
1410 | | | |
1411 | | o changeset: 33:68608f5145f9 |
|
1411 | | o changeset: 33:68608f5145f9 | |
1412 | | | parent: 18:1aa84d96232a |
|
1412 | | | parent: 18:1aa84d96232a | |
1413 | | | user: test |
|
1413 | | | user: test | |
1414 | | | date: Thu Jan 01 00:00:33 1970 +0000 |
|
1414 | | | date: Thu Jan 01 00:00:33 1970 +0000 | |
1415 | | | summary: (33) head |
|
1415 | | | summary: (33) head | |
1416 | | | |
|
1416 | | | | |
1417 | o | changeset: 32:d06dffa21a31 |
|
1417 | o | changeset: 32:d06dffa21a31 | |
1418 | |\ \ parent: 27:886ed638191b |
|
1418 | |\ \ parent: 27:886ed638191b | |
1419 | | | | parent: 31:621d83e11f67 |
|
1419 | | | | parent: 31:621d83e11f67 | |
1420 | | | | user: test |
|
1420 | | | | user: test | |
1421 | | | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
1421 | | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
1422 | | | | summary: (32) expand |
|
1422 | | | | summary: (32) expand | |
1423 | | | | |
|
1423 | | | | | |
1424 |
|
1424 | |||
1425 | Test log -G options |
|
1425 | Test log -G options | |
1426 |
|
1426 | |||
1427 | $ testlog() { |
|
1427 | $ testlog() { | |
1428 | > hg log -G --print-revset "$@" |
|
1428 | > hg log -G --print-revset "$@" | |
1429 | > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1429 | > hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \ | |
1430 | > | sed 's/.*nodetag/nodetag/' > log.nodes |
|
1430 | > | sed 's/.*nodetag/nodetag/' > log.nodes | |
1431 | > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \ |
|
1431 | > hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \ | |
1432 | > | sed 's/.*nodetag/nodetag/' > glog.nodes |
|
1432 | > | sed 's/.*nodetag/nodetag/' > glog.nodes | |
1433 | > diff -u log.nodes glog.nodes | grep '^[-+@ ]' || : |
|
1433 | > diff -u log.nodes glog.nodes | grep '^[-+@ ]' || : | |
1434 | > } |
|
1434 | > } | |
1435 |
|
1435 | |||
1436 | glog always reorders nodes which explains the difference with log |
|
1436 | glog always reorders nodes which explains the difference with log | |
1437 |
|
1437 | |||
1438 | $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 |
|
1438 | $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 | |
1439 | ['27', '25', '21', '34', '32', '31'] |
|
1439 | ['27', '25', '21', '34', '32', '31'] | |
1440 | [] |
|
1440 | [] | |
1441 | --- log.nodes * (glob) |
|
1441 | --- log.nodes * (glob) | |
1442 | +++ glog.nodes * (glob) |
|
1442 | +++ glog.nodes * (glob) | |
1443 | @@ -1,6 +1,6 @@ |
|
1443 | @@ -1,6 +1,6 @@ | |
1444 | -nodetag 27 |
|
1444 | -nodetag 27 | |
1445 | -nodetag 25 |
|
1445 | -nodetag 25 | |
1446 | -nodetag 21 |
|
1446 | -nodetag 21 | |
1447 | nodetag 34 |
|
1447 | nodetag 34 | |
1448 | nodetag 32 |
|
1448 | nodetag 32 | |
1449 | nodetag 31 |
|
1449 | nodetag 31 | |
1450 | +nodetag 27 |
|
1450 | +nodetag 27 | |
1451 | +nodetag 25 |
|
1451 | +nodetag 25 | |
1452 | +nodetag 21 |
|
1452 | +nodetag 21 | |
1453 | $ testlog -u test -u not-a-user |
|
1453 | $ testlog -u test -u not-a-user | |
1454 | [] |
|
1454 | [] | |
1455 | (group |
|
1455 | (group | |
1456 | (group |
|
1456 | (group | |
1457 | (or |
|
1457 | (or | |
1458 | (func |
|
1458 | (func | |
1459 | ('symbol', 'user') |
|
1459 | ('symbol', 'user') | |
1460 | ('string', 'test')) |
|
1460 | ('string', 'test')) | |
1461 | (func |
|
1461 | (func | |
1462 | ('symbol', 'user') |
|
1462 | ('symbol', 'user') | |
1463 | ('string', 'not-a-user'))))) |
|
1463 | ('string', 'not-a-user'))))) | |
1464 | $ testlog -b not-a-branch |
|
1464 | $ testlog -b not-a-branch | |
1465 | abort: unknown revision 'not-a-branch'! |
|
1465 | abort: unknown revision 'not-a-branch'! | |
1466 | abort: unknown revision 'not-a-branch'! |
|
1466 | abort: unknown revision 'not-a-branch'! | |
1467 | abort: unknown revision 'not-a-branch'! |
|
1467 | abort: unknown revision 'not-a-branch'! | |
1468 | $ testlog -b 35 -b 36 --only-branch branch |
|
1468 | $ testlog -b 35 -b 36 --only-branch branch | |
1469 | [] |
|
1469 | [] | |
1470 | (group |
|
1470 | (group | |
1471 | (group |
|
1471 | (group | |
1472 | (or |
|
1472 | (or | |
1473 | (or |
|
1473 | (or | |
1474 | (func |
|
1474 | (func | |
1475 | ('symbol', 'branch') |
|
1475 | ('symbol', 'branch') | |
1476 | ('string', 'default')) |
|
1476 | ('string', 'default')) | |
1477 | (func |
|
1477 | (func | |
1478 | ('symbol', 'branch') |
|
1478 | ('symbol', 'branch') | |
1479 | ('string', 'branch'))) |
|
1479 | ('string', 'branch'))) | |
1480 | (func |
|
1480 | (func | |
1481 | ('symbol', 'branch') |
|
1481 | ('symbol', 'branch') | |
1482 | ('string', 'branch'))))) |
|
1482 | ('string', 'branch'))))) | |
1483 | $ testlog -k expand -k merge |
|
1483 | $ testlog -k expand -k merge | |
1484 | [] |
|
1484 | [] | |
1485 | (group |
|
1485 | (group | |
1486 | (group |
|
1486 | (group | |
1487 | (or |
|
1487 | (or | |
1488 | (func |
|
1488 | (func | |
1489 | ('symbol', 'keyword') |
|
1489 | ('symbol', 'keyword') | |
1490 | ('string', 'expand')) |
|
1490 | ('string', 'expand')) | |
1491 | (func |
|
1491 | (func | |
1492 | ('symbol', 'keyword') |
|
1492 | ('symbol', 'keyword') | |
1493 | ('string', 'merge'))))) |
|
1493 | ('string', 'merge'))))) | |
1494 | $ testlog --only-merges |
|
1494 | $ testlog --only-merges | |
1495 | [] |
|
1495 | [] | |
1496 | (group |
|
1496 | (group | |
1497 | (func |
|
1497 | (func | |
1498 | ('symbol', 'merge') |
|
1498 | ('symbol', 'merge') | |
1499 | None)) |
|
1499 | None)) | |
1500 | $ testlog --no-merges |
|
1500 | $ testlog --no-merges | |
1501 | [] |
|
1501 | [] | |
1502 | (group |
|
1502 | (group | |
1503 | (not |
|
1503 | (not | |
1504 | (func |
|
1504 | (func | |
1505 | ('symbol', 'merge') |
|
1505 | ('symbol', 'merge') | |
1506 | None))) |
|
1506 | None))) | |
1507 | $ testlog --date '2 0 to 4 0' |
|
1507 | $ testlog --date '2 0 to 4 0' | |
1508 | [] |
|
1508 | [] | |
1509 | (group |
|
1509 | (group | |
1510 | (func |
|
1510 | (func | |
1511 | ('symbol', 'date') |
|
1511 | ('symbol', 'date') | |
1512 | ('string', '2 0 to 4 0'))) |
|
1512 | ('string', '2 0 to 4 0'))) | |
1513 | $ hg log -G -d 'brace ) in a date' |
|
1513 | $ hg log -G -d 'brace ) in a date' | |
1514 | abort: invalid date: 'brace ) in a date' |
|
1514 | abort: invalid date: 'brace ) in a date' | |
1515 | [255] |
|
1515 | [255] | |
1516 | $ testlog --prune 31 --prune 32 |
|
1516 | $ testlog --prune 31 --prune 32 | |
1517 | [] |
|
1517 | [] | |
1518 | (group |
|
1518 | (group | |
1519 | (group |
|
1519 | (group | |
1520 | (and |
|
1520 | (and | |
1521 | (not |
|
1521 | (not | |
1522 | (group |
|
1522 | (group | |
1523 | (or |
|
1523 | (or | |
1524 | ('string', '31') |
|
1524 | ('string', '31') | |
1525 | (func |
|
1525 | (func | |
1526 | ('symbol', 'ancestors') |
|
1526 | ('symbol', 'ancestors') | |
1527 | ('string', '31'))))) |
|
1527 | ('string', '31'))))) | |
1528 | (not |
|
1528 | (not | |
1529 | (group |
|
1529 | (group | |
1530 | (or |
|
1530 | (or | |
1531 | ('string', '32') |
|
1531 | ('string', '32') | |
1532 | (func |
|
1532 | (func | |
1533 | ('symbol', 'ancestors') |
|
1533 | ('symbol', 'ancestors') | |
1534 | ('string', '32')))))))) |
|
1534 | ('string', '32')))))))) | |
1535 |
|
1535 | |||
1536 | Dedicated repo for --follow and paths filtering. The g is crafted to |
|
1536 | Dedicated repo for --follow and paths filtering. The g is crafted to | |
1537 | have 2 filelog topological heads in a linear changeset graph. |
|
1537 | have 2 filelog topological heads in a linear changeset graph. | |
1538 |
|
1538 | |||
1539 | $ cd .. |
|
1539 | $ cd .. | |
1540 | $ hg init follow |
|
1540 | $ hg init follow | |
1541 | $ cd follow |
|
1541 | $ cd follow | |
1542 | $ testlog --follow |
|
1542 | $ testlog --follow | |
1543 | [] |
|
1543 | [] | |
1544 | [] |
|
1544 | [] | |
1545 | $ echo a > a |
|
1545 | $ echo a > a | |
1546 | $ echo aa > aa |
|
1546 | $ echo aa > aa | |
1547 | $ echo f > f |
|
1547 | $ echo f > f | |
1548 | $ hg ci -Am "add a" a aa f |
|
1548 | $ hg ci -Am "add a" a aa f | |
1549 | $ hg cp a b |
|
1549 | $ hg cp a b | |
1550 | $ hg cp f g |
|
1550 | $ hg cp f g | |
1551 | $ hg ci -m "copy a b" |
|
1551 | $ hg ci -m "copy a b" | |
1552 | $ mkdir dir |
|
1552 | $ mkdir dir | |
1553 | $ hg mv b dir |
|
1553 | $ hg mv b dir | |
1554 | $ echo g >> g |
|
1554 | $ echo g >> g | |
1555 | $ echo f >> f |
|
1555 | $ echo f >> f | |
1556 | $ hg ci -m "mv b dir/b" |
|
1556 | $ hg ci -m "mv b dir/b" | |
1557 | $ hg mv a b |
|
1557 | $ hg mv a b | |
1558 | $ hg cp -f f g |
|
1558 | $ hg cp -f f g | |
1559 | $ echo a > d |
|
1559 | $ echo a > d | |
1560 | $ hg add d |
|
1560 | $ hg add d | |
1561 | $ hg ci -m "mv a b; add d" |
|
1561 | $ hg ci -m "mv a b; add d" | |
1562 | $ hg mv dir/b e |
|
1562 | $ hg mv dir/b e | |
1563 | $ hg ci -m "mv dir/b e" |
|
1563 | $ hg ci -m "mv dir/b e" | |
1564 | $ hg glog --template '({rev}) {desc|firstline}\n' |
|
1564 | $ hg glog --template '({rev}) {desc|firstline}\n' | |
1565 | @ (4) mv dir/b e |
|
1565 | @ (4) mv dir/b e | |
1566 | | |
|
1566 | | | |
1567 | o (3) mv a b; add d |
|
1567 | o (3) mv a b; add d | |
1568 | | |
|
1568 | | | |
1569 | o (2) mv b dir/b |
|
1569 | o (2) mv b dir/b | |
1570 | | |
|
1570 | | | |
1571 | o (1) copy a b |
|
1571 | o (1) copy a b | |
1572 | | |
|
1572 | | | |
1573 | o (0) add a |
|
1573 | o (0) add a | |
1574 |
|
1574 | |||
1575 |
|
1575 | |||
1576 | $ testlog a |
|
1576 | $ testlog a | |
1577 | [] |
|
1577 | [] | |
1578 | (group |
|
1578 | (group | |
1579 | (group |
|
1579 | (group | |
1580 | (func |
|
1580 | (func | |
1581 | ('symbol', 'filelog') |
|
1581 | ('symbol', 'filelog') | |
1582 | ('string', 'a')))) |
|
1582 | ('string', 'a')))) | |
1583 | $ testlog a b |
|
1583 | $ testlog a b | |
1584 | [] |
|
1584 | [] | |
1585 | (group |
|
1585 | (group | |
1586 | (group |
|
1586 | (group | |
1587 | (or |
|
1587 | (or | |
1588 | (func |
|
1588 | (func | |
1589 | ('symbol', 'filelog') |
|
1589 | ('symbol', 'filelog') | |
1590 | ('string', 'a')) |
|
1590 | ('string', 'a')) | |
1591 | (func |
|
1591 | (func | |
1592 | ('symbol', 'filelog') |
|
1592 | ('symbol', 'filelog') | |
1593 | ('string', 'b'))))) |
|
1593 | ('string', 'b'))))) | |
1594 |
|
1594 | |||
1595 | Test falling back to slow path for non-existing files |
|
1595 | Test falling back to slow path for non-existing files | |
1596 |
|
1596 | |||
1597 | $ testlog a c |
|
1597 | $ testlog a c | |
1598 | [] |
|
1598 | [] | |
1599 | (group |
|
1599 | (group | |
1600 | (func |
|
1600 | (func | |
1601 | ('symbol', '_matchfiles') |
|
1601 | ('symbol', '_matchfiles') | |
1602 | (list |
|
1602 | (list | |
1603 | (list |
|
1603 | (list | |
1604 | (list |
|
1604 | (list | |
1605 | ('string', 'r:') |
|
1605 | ('string', 'r:') | |
1606 | ('string', 'd:relpath')) |
|
1606 | ('string', 'd:relpath')) | |
1607 | ('string', 'p:a')) |
|
1607 | ('string', 'p:a')) | |
1608 | ('string', 'p:c')))) |
|
1608 | ('string', 'p:c')))) | |
1609 |
|
1609 | |||
1610 | Test multiple --include/--exclude/paths |
|
1610 | Test multiple --include/--exclude/paths | |
1611 |
|
1611 | |||
1612 | $ testlog --include a --include e --exclude b --exclude e a e |
|
1612 | $ testlog --include a --include e --exclude b --exclude e a e | |
1613 | [] |
|
1613 | [] | |
1614 | (group |
|
1614 | (group | |
1615 | (func |
|
1615 | (func | |
1616 | ('symbol', '_matchfiles') |
|
1616 | ('symbol', '_matchfiles') | |
1617 | (list |
|
1617 | (list | |
1618 | (list |
|
1618 | (list | |
1619 | (list |
|
1619 | (list | |
1620 | (list |
|
1620 | (list | |
1621 | (list |
|
1621 | (list | |
1622 | (list |
|
1622 | (list | |
1623 | (list |
|
1623 | (list | |
1624 | ('string', 'r:') |
|
1624 | ('string', 'r:') | |
1625 | ('string', 'd:relpath')) |
|
1625 | ('string', 'd:relpath')) | |
1626 | ('string', 'p:a')) |
|
1626 | ('string', 'p:a')) | |
1627 | ('string', 'p:e')) |
|
1627 | ('string', 'p:e')) | |
1628 | ('string', 'i:a')) |
|
1628 | ('string', 'i:a')) | |
1629 | ('string', 'i:e')) |
|
1629 | ('string', 'i:e')) | |
1630 | ('string', 'x:b')) |
|
1630 | ('string', 'x:b')) | |
1631 | ('string', 'x:e')))) |
|
1631 | ('string', 'x:e')))) | |
1632 |
|
1632 | |||
1633 | Test glob expansion of pats |
|
1633 | Test glob expansion of pats | |
1634 |
|
1634 | |||
1635 | $ expandglobs=`python -c "import mercurial.util; \ |
|
1635 | $ expandglobs=`python -c "import mercurial.util; \ | |
1636 | > print mercurial.util.expandglobs and 'true' or 'false'"` |
|
1636 | > print mercurial.util.expandglobs and 'true' or 'false'"` | |
1637 | $ if [ $expandglobs = "true" ]; then |
|
1637 | $ if [ $expandglobs = "true" ]; then | |
1638 | > testlog 'a*'; |
|
1638 | > testlog 'a*'; | |
1639 | > else |
|
1639 | > else | |
1640 | > testlog a*; |
|
1640 | > testlog a*; | |
1641 | > fi; |
|
1641 | > fi; | |
1642 | [] |
|
1642 | [] | |
1643 | (group |
|
1643 | (group | |
1644 | (group |
|
1644 | (group | |
1645 | (func |
|
1645 | (func | |
1646 | ('symbol', 'filelog') |
|
1646 | ('symbol', 'filelog') | |
1647 | ('string', 'aa')))) |
|
1647 | ('string', 'aa')))) | |
1648 |
|
1648 | |||
1649 | Test --follow on a directory |
|
1649 | Test --follow on a directory | |
1650 |
|
1650 | |||
1651 | $ testlog -f dir |
|
1651 | $ testlog -f dir | |
1652 | abort: cannot follow file not in parent revision: "dir" |
|
1652 | abort: cannot follow file not in parent revision: "dir" | |
1653 | abort: cannot follow file not in parent revision: "dir" |
|
1653 | abort: cannot follow file not in parent revision: "dir" | |
1654 | abort: cannot follow file not in parent revision: "dir" |
|
1654 | abort: cannot follow file not in parent revision: "dir" | |
1655 |
|
1655 | |||
1656 | Test --follow on file not in parent revision |
|
1656 | Test --follow on file not in parent revision | |
1657 |
|
1657 | |||
1658 | $ testlog -f a |
|
1658 | $ testlog -f a | |
1659 | abort: cannot follow file not in parent revision: "a" |
|
1659 | abort: cannot follow file not in parent revision: "a" | |
1660 | abort: cannot follow file not in parent revision: "a" |
|
1660 | abort: cannot follow file not in parent revision: "a" | |
1661 | abort: cannot follow file not in parent revision: "a" |
|
1661 | abort: cannot follow file not in parent revision: "a" | |
1662 |
|
1662 | |||
1663 | Test --follow and patterns |
|
1663 | Test --follow and patterns | |
1664 |
|
1664 | |||
1665 | $ testlog -f 'glob:*' |
|
1665 | $ testlog -f 'glob:*' | |
1666 | abort: can only follow copies/renames for explicit filenames |
|
1666 | abort: can only follow copies/renames for explicit filenames | |
1667 | abort: can only follow copies/renames for explicit filenames |
|
1667 | abort: can only follow copies/renames for explicit filenames | |
1668 | abort: can only follow copies/renames for explicit filenames |
|
1668 | abort: can only follow copies/renames for explicit filenames | |
1669 |
|
1669 | |||
1670 | Test --follow on a single rename |
|
1670 | Test --follow on a single rename | |
1671 |
|
1671 | |||
1672 | $ hg up -q 2 |
|
1672 | $ hg up -q 2 | |
1673 | $ testlog -f a |
|
1673 | $ testlog -f a | |
1674 | [] |
|
1674 | [] | |
1675 | (group |
|
1675 | (group | |
1676 | (group |
|
1676 | (group | |
1677 | (func |
|
1677 | (func | |
1678 | ('symbol', 'follow') |
|
1678 | ('symbol', 'follow') | |
1679 | ('string', 'a')))) |
|
1679 | ('string', 'a')))) | |
1680 |
|
1680 | |||
1681 | Test --follow and multiple renames |
|
1681 | Test --follow and multiple renames | |
1682 |
|
1682 | |||
1683 | $ hg up -q tip |
|
1683 | $ hg up -q tip | |
1684 | $ testlog -f e |
|
1684 | $ testlog -f e | |
1685 | [] |
|
1685 | [] | |
1686 | (group |
|
1686 | (group | |
1687 | (group |
|
1687 | (group | |
1688 | (func |
|
1688 | (func | |
1689 | ('symbol', 'follow') |
|
1689 | ('symbol', 'follow') | |
1690 | ('string', 'e')))) |
|
1690 | ('string', 'e')))) | |
1691 |
|
1691 | |||
1692 | Test --follow and multiple filelog heads |
|
1692 | Test --follow and multiple filelog heads | |
1693 |
|
1693 | |||
1694 | $ hg up -q 2 |
|
1694 | $ hg up -q 2 | |
1695 | $ testlog -f g |
|
1695 | $ testlog -f g | |
1696 | [] |
|
1696 | [] | |
1697 | (group |
|
1697 | (group | |
1698 | (group |
|
1698 | (group | |
1699 | (func |
|
1699 | (func | |
1700 | ('symbol', 'follow') |
|
1700 | ('symbol', 'follow') | |
1701 | ('string', 'g')))) |
|
1701 | ('string', 'g')))) | |
1702 | $ cat log.nodes |
|
1702 | $ cat log.nodes | |
1703 | nodetag 2 |
|
1703 | nodetag 2 | |
1704 | nodetag 1 |
|
1704 | nodetag 1 | |
1705 | nodetag 0 |
|
1705 | nodetag 0 | |
1706 | $ hg up -q tip |
|
1706 | $ hg up -q tip | |
1707 | $ testlog -f g |
|
1707 | $ testlog -f g | |
1708 | [] |
|
1708 | [] | |
1709 | (group |
|
1709 | (group | |
1710 | (group |
|
1710 | (group | |
1711 | (func |
|
1711 | (func | |
1712 | ('symbol', 'follow') |
|
1712 | ('symbol', 'follow') | |
1713 | ('string', 'g')))) |
|
1713 | ('string', 'g')))) | |
1714 | $ cat log.nodes |
|
1714 | $ cat log.nodes | |
1715 | nodetag 3 |
|
1715 | nodetag 3 | |
1716 | nodetag 2 |
|
1716 | nodetag 2 | |
1717 | nodetag 0 |
|
1717 | nodetag 0 | |
1718 |
|
1718 | |||
1719 | Test --follow and multiple files |
|
1719 | Test --follow and multiple files | |
1720 |
|
1720 | |||
1721 | $ testlog -f g e |
|
1721 | $ testlog -f g e | |
1722 | [] |
|
1722 | [] | |
1723 | (group |
|
1723 | (group | |
1724 | (group |
|
1724 | (group | |
1725 | (or |
|
1725 | (or | |
1726 | (func |
|
1726 | (func | |
1727 | ('symbol', 'follow') |
|
1727 | ('symbol', 'follow') | |
1728 | ('string', 'g')) |
|
1728 | ('string', 'g')) | |
1729 | (func |
|
1729 | (func | |
1730 | ('symbol', 'follow') |
|
1730 | ('symbol', 'follow') | |
1731 | ('string', 'e'))))) |
|
1731 | ('string', 'e'))))) | |
1732 | $ cat log.nodes |
|
1732 | $ cat log.nodes | |
1733 | nodetag 4 |
|
1733 | nodetag 4 | |
1734 | nodetag 3 |
|
1734 | nodetag 3 | |
1735 | nodetag 2 |
|
1735 | nodetag 2 | |
1736 | nodetag 1 |
|
1736 | nodetag 1 | |
1737 | nodetag 0 |
|
1737 | nodetag 0 | |
1738 |
|
1738 | |||
1739 | Test --follow-first |
|
1739 | Test --follow-first | |
1740 |
|
1740 | |||
1741 | $ hg up -q 3 |
|
1741 | $ hg up -q 3 | |
1742 | $ echo ee > e |
|
1742 | $ echo ee > e | |
1743 | $ hg ci -Am "add another e" e |
|
1743 | $ hg ci -Am "add another e" e | |
1744 | created new head |
|
1744 | created new head | |
1745 | $ hg merge --tool internal:other 4 |
|
1745 | $ hg merge --tool internal:other 4 | |
1746 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
1746 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
1747 | (branch merge, don't forget to commit) |
|
1747 | (branch merge, don't forget to commit) | |
1748 | $ echo merge > e |
|
1748 | $ echo merge > e | |
1749 | $ hg ci -m "merge 5 and 4" |
|
1749 | $ hg ci -m "merge 5 and 4" | |
1750 | $ testlog --follow-first |
|
1750 | $ testlog --follow-first | |
1751 | [] |
|
1751 | [] | |
1752 | (group |
|
1752 | (group | |
1753 | (func |
|
1753 | (func | |
1754 | ('symbol', '_firstancestors') |
|
1754 | ('symbol', '_firstancestors') | |
1755 | ('symbol', '6'))) |
|
1755 | ('symbol', '6'))) | |
1756 |
|
1756 | |||
1757 | Cannot compare with log --follow-first FILE as it never worked |
|
1757 | Cannot compare with log --follow-first FILE as it never worked | |
1758 |
|
1758 | |||
1759 | $ hg log -G --print-revset --follow-first e |
|
1759 | $ hg log -G --print-revset --follow-first e | |
1760 | [] |
|
1760 | [] | |
1761 | (group |
|
1761 | (group | |
1762 | (group |
|
1762 | (group | |
1763 | (func |
|
1763 | (func | |
1764 | ('symbol', '_followfirst') |
|
1764 | ('symbol', '_followfirst') | |
1765 | ('string', 'e')))) |
|
1765 | ('string', 'e')))) | |
1766 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
|
1766 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' | |
1767 | @ 6 merge 5 and 4 |
|
1767 | @ 6 merge 5 and 4 | |
1768 | |\ |
|
1768 | |\ | |
1769 | o | 5 add another e |
|
1769 | o | 5 add another e | |
1770 | | | |
|
1770 | | | | |
1771 |
|
1771 | |||
1772 | Test --copies |
|
1772 | Test --copies | |
1773 |
|
1773 | |||
1774 | $ hg log -G --copies --template "{rev} {desc|firstline} \ |
|
1774 | $ hg log -G --copies --template "{rev} {desc|firstline} \ | |
1775 | > copies: {file_copies_switch}\n" |
|
1775 | > copies: {file_copies_switch}\n" | |
1776 | @ 6 merge 5 and 4 copies: |
|
1776 | @ 6 merge 5 and 4 copies: | |
1777 | |\ |
|
1777 | |\ | |
1778 | | o 5 add another e copies: |
|
1778 | | o 5 add another e copies: | |
1779 | | | |
|
1779 | | | | |
1780 | o | 4 mv dir/b e copies: e (dir/b) |
|
1780 | o | 4 mv dir/b e copies: e (dir/b) | |
1781 | |/ |
|
1781 | |/ | |
1782 | o 3 mv a b; add d copies: b (a)g (f) |
|
1782 | o 3 mv a b; add d copies: b (a)g (f) | |
1783 | | |
|
1783 | | | |
1784 | o 2 mv b dir/b copies: dir/b (b) |
|
1784 | o 2 mv b dir/b copies: dir/b (b) | |
1785 | | |
|
1785 | | | |
1786 | o 1 copy a b copies: b (a)g (f) |
|
1786 | o 1 copy a b copies: b (a)g (f) | |
1787 | | |
|
1787 | | | |
1788 | o 0 add a copies: |
|
1788 | o 0 add a copies: | |
1789 |
|
1789 | |||
1790 | Test "set:..." and parent revision |
|
1790 | Test "set:..." and parent revision | |
1791 |
|
1791 | |||
1792 | $ hg up -q 4 |
|
1792 | $ hg up -q 4 | |
1793 | $ testlog "set:copied()" |
|
1793 | $ testlog "set:copied()" | |
1794 | [] |
|
1794 | [] | |
1795 | (group |
|
1795 | (group | |
1796 | (func |
|
1796 | (func | |
1797 | ('symbol', '_matchfiles') |
|
1797 | ('symbol', '_matchfiles') | |
1798 | (list |
|
1798 | (list | |
1799 | (list |
|
1799 | (list | |
1800 | ('string', 'r:') |
|
1800 | ('string', 'r:') | |
1801 | ('string', 'd:relpath')) |
|
1801 | ('string', 'd:relpath')) | |
1802 | ('string', 'p:set:copied()')))) |
|
1802 | ('string', 'p:set:copied()')))) | |
1803 | $ testlog --include "set:copied()" |
|
1803 | $ testlog --include "set:copied()" | |
1804 | [] |
|
1804 | [] | |
1805 | (group |
|
1805 | (group | |
1806 | (func |
|
1806 | (func | |
1807 | ('symbol', '_matchfiles') |
|
1807 | ('symbol', '_matchfiles') | |
1808 | (list |
|
1808 | (list | |
1809 | (list |
|
1809 | (list | |
1810 | ('string', 'r:') |
|
1810 | ('string', 'r:') | |
1811 | ('string', 'd:relpath')) |
|
1811 | ('string', 'd:relpath')) | |
1812 | ('string', 'i:set:copied()')))) |
|
1812 | ('string', 'i:set:copied()')))) | |
1813 | $ testlog -r "sort(file('set:copied()'), -rev)" |
|
1813 | $ testlog -r "sort(file('set:copied()'), -rev)" | |
1814 | ["sort(file('set:copied()'), -rev)"] |
|
1814 | ["sort(file('set:copied()'), -rev)"] | |
1815 | [] |
|
1815 | [] | |
1816 |
|
1816 | |||
1817 | Test --removed |
|
1817 | Test --removed | |
1818 |
|
1818 | |||
1819 | $ testlog --removed |
|
1819 | $ testlog --removed | |
1820 | [] |
|
1820 | [] | |
1821 | [] |
|
1821 | [] | |
1822 | $ testlog --removed a |
|
1822 | $ testlog --removed a | |
1823 | [] |
|
1823 | [] | |
1824 | (group |
|
1824 | (group | |
1825 | (func |
|
1825 | (func | |
1826 | ('symbol', '_matchfiles') |
|
1826 | ('symbol', '_matchfiles') | |
1827 | (list |
|
1827 | (list | |
1828 | (list |
|
1828 | (list | |
1829 | ('string', 'r:') |
|
1829 | ('string', 'r:') | |
1830 | ('string', 'd:relpath')) |
|
1830 | ('string', 'd:relpath')) | |
1831 | ('string', 'p:a')))) |
|
1831 | ('string', 'p:a')))) | |
1832 | $ testlog --removed --follow a |
|
1832 | $ testlog --removed --follow a | |
1833 | abort: can only follow copies/renames for explicit filenames |
|
1833 | abort: can only follow copies/renames for explicit filenames | |
1834 | abort: can only follow copies/renames for explicit filenames |
|
1834 | abort: can only follow copies/renames for explicit filenames | |
1835 | abort: can only follow copies/renames for explicit filenames |
|
1835 | abort: can only follow copies/renames for explicit filenames | |
1836 |
|
1836 | |||
1837 | Test --patch and --stat with --follow and --follow-first |
|
1837 | Test --patch and --stat with --follow and --follow-first | |
1838 |
|
1838 | |||
1839 | $ hg up -q 3 |
|
1839 | $ hg up -q 3 | |
1840 | $ hg log -G --git --patch b |
|
1840 | $ hg log -G --git --patch b | |
1841 | o changeset: 1:216d4c92cf98 |
|
1841 | o changeset: 1:216d4c92cf98 | |
1842 | | user: test |
|
1842 | | user: test | |
1843 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1843 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1844 | | summary: copy a b |
|
1844 | | summary: copy a b | |
1845 | | |
|
1845 | | | |
1846 | | diff --git a/a b/b |
|
1846 | | diff --git a/a b/b | |
1847 | | copy from a |
|
1847 | | copy from a | |
1848 | | copy to b |
|
1848 | | copy to b | |
1849 | | |
|
1849 | | | |
1850 |
|
1850 | |||
1851 | $ hg log -G --git --stat b |
|
1851 | $ hg log -G --git --stat b | |
1852 | o changeset: 1:216d4c92cf98 |
|
1852 | o changeset: 1:216d4c92cf98 | |
1853 | | user: test |
|
1853 | | user: test | |
1854 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1854 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1855 | | summary: copy a b |
|
1855 | | summary: copy a b | |
1856 | | |
|
1856 | | | |
1857 | | a | 0 |
|
1857 | | a | 0 | |
1858 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1858 | | 1 files changed, 0 insertions(+), 0 deletions(-) | |
1859 | | |
|
1859 | | | |
1860 |
|
1860 | |||
1861 | $ hg log -G --git --patch --follow b |
|
1861 | $ hg log -G --git --patch --follow b | |
1862 | o changeset: 1:216d4c92cf98 |
|
1862 | o changeset: 1:216d4c92cf98 | |
1863 | | user: test |
|
1863 | | user: test | |
1864 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1864 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1865 | | summary: copy a b |
|
1865 | | summary: copy a b | |
1866 | | |
|
1866 | | | |
1867 | | diff --git a/a b/b |
|
1867 | | diff --git a/a b/b | |
1868 | | copy from a |
|
1868 | | copy from a | |
1869 | | copy to b |
|
1869 | | copy to b | |
1870 | | |
|
1870 | | | |
1871 | o changeset: 0:f8035bb17114 |
|
1871 | o changeset: 0:f8035bb17114 | |
1872 | user: test |
|
1872 | user: test | |
1873 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1873 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1874 | summary: add a |
|
1874 | summary: add a | |
1875 |
|
1875 | |||
1876 | diff --git a/a b/a |
|
1876 | diff --git a/a b/a | |
1877 | new file mode 100644 |
|
1877 | new file mode 100644 | |
1878 | --- /dev/null |
|
1878 | --- /dev/null | |
1879 | +++ b/a |
|
1879 | +++ b/a | |
1880 | @@ -0,0 +1,1 @@ |
|
1880 | @@ -0,0 +1,1 @@ | |
1881 | +a |
|
1881 | +a | |
1882 |
|
1882 | |||
1883 |
|
1883 | |||
1884 | $ hg log -G --git --stat --follow b |
|
1884 | $ hg log -G --git --stat --follow b | |
1885 | o changeset: 1:216d4c92cf98 |
|
1885 | o changeset: 1:216d4c92cf98 | |
1886 | | user: test |
|
1886 | | user: test | |
1887 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1887 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1888 | | summary: copy a b |
|
1888 | | summary: copy a b | |
1889 | | |
|
1889 | | | |
1890 | | a | 0 |
|
1890 | | a | 0 | |
1891 | | 1 files changed, 0 insertions(+), 0 deletions(-) |
|
1891 | | 1 files changed, 0 insertions(+), 0 deletions(-) | |
1892 | | |
|
1892 | | | |
1893 | o changeset: 0:f8035bb17114 |
|
1893 | o changeset: 0:f8035bb17114 | |
1894 | user: test |
|
1894 | user: test | |
1895 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1895 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1896 | summary: add a |
|
1896 | summary: add a | |
1897 |
|
1897 | |||
1898 | a | 1 + |
|
1898 | a | 1 + | |
1899 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
1899 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
1900 |
|
1900 | |||
1901 |
|
1901 | |||
1902 | $ hg up -q 6 |
|
1902 | $ hg up -q 6 | |
1903 | $ hg log -G --git --patch --follow-first e |
|
1903 | $ hg log -G --git --patch --follow-first e | |
1904 | @ changeset: 6:fc281d8ff18d |
|
1904 | @ changeset: 6:fc281d8ff18d | |
1905 | |\ tag: tip |
|
1905 | |\ tag: tip | |
1906 | | | parent: 5:99b31f1c2782 |
|
1906 | | | parent: 5:99b31f1c2782 | |
1907 | | | parent: 4:17d952250a9d |
|
1907 | | | parent: 4:17d952250a9d | |
1908 | | | user: test |
|
1908 | | | user: test | |
1909 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1909 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1910 | | | summary: merge 5 and 4 |
|
1910 | | | summary: merge 5 and 4 | |
1911 | | | |
|
1911 | | | | |
1912 | | | diff --git a/e b/e |
|
1912 | | | diff --git a/e b/e | |
1913 | | | --- a/e |
|
1913 | | | --- a/e | |
1914 | | | +++ b/e |
|
1914 | | | +++ b/e | |
1915 | | | @@ -1,1 +1,1 @@ |
|
1915 | | | @@ -1,1 +1,1 @@ | |
1916 | | | -ee |
|
1916 | | | -ee | |
1917 | | | +merge |
|
1917 | | | +merge | |
1918 | | | |
|
1918 | | | | |
1919 | o | changeset: 5:99b31f1c2782 |
|
1919 | o | changeset: 5:99b31f1c2782 | |
1920 | | | parent: 3:5918b8d165d1 |
|
1920 | | | parent: 3:5918b8d165d1 | |
1921 | | | user: test |
|
1921 | | | user: test | |
1922 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1922 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1923 | | | summary: add another e |
|
1923 | | | summary: add another e | |
1924 | | | |
|
1924 | | | | |
1925 | | | diff --git a/e b/e |
|
1925 | | | diff --git a/e b/e | |
1926 | | | new file mode 100644 |
|
1926 | | | new file mode 100644 | |
1927 | | | --- /dev/null |
|
1927 | | | --- /dev/null | |
1928 | | | +++ b/e |
|
1928 | | | +++ b/e | |
1929 | | | @@ -0,0 +1,1 @@ |
|
1929 | | | @@ -0,0 +1,1 @@ | |
1930 | | | +ee |
|
1930 | | | +ee | |
1931 | | | |
|
1931 | | | | |
1932 |
|
1932 | |||
1933 | Test old-style --rev |
|
1933 | Test old-style --rev | |
1934 |
|
1934 | |||
1935 | $ hg tag 'foo-bar' |
|
1935 | $ hg tag 'foo-bar' | |
1936 | $ testlog -r 'foo-bar' |
|
1936 | $ testlog -r 'foo-bar' | |
1937 | ['foo-bar'] |
|
1937 | ['foo-bar'] | |
1938 | [] |
|
1938 | [] | |
1939 |
|
1939 | |||
1940 | Test --follow and forward --rev |
|
1940 | Test --follow and forward --rev | |
1941 |
|
1941 | |||
1942 | $ hg up -q 6 |
|
1942 | $ hg up -q 6 | |
1943 | $ echo g > g |
|
1943 | $ echo g > g | |
1944 | $ hg ci -Am 'add g' g |
|
1944 | $ hg ci -Am 'add g' g | |
1945 | created new head |
|
1945 | created new head | |
1946 | $ hg up -q 2 |
|
1946 | $ hg up -q 2 | |
1947 | $ hg log -G --template "{rev} {desc|firstline}\n" |
|
1947 | $ hg log -G --template "{rev} {desc|firstline}\n" | |
1948 | o 8 add g |
|
1948 | o 8 add g | |
1949 | | |
|
1949 | | | |
1950 | | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
1950 | | o 7 Added tag foo-bar for changeset fc281d8ff18d | |
1951 | |/ |
|
1951 | |/ | |
1952 | o 6 merge 5 and 4 |
|
1952 | o 6 merge 5 and 4 | |
1953 | |\ |
|
1953 | |\ | |
1954 | | o 5 add another e |
|
1954 | | o 5 add another e | |
1955 | | | |
|
1955 | | | | |
1956 | o | 4 mv dir/b e |
|
1956 | o | 4 mv dir/b e | |
1957 | |/ |
|
1957 | |/ | |
1958 | o 3 mv a b; add d |
|
1958 | o 3 mv a b; add d | |
1959 | | |
|
1959 | | | |
1960 | @ 2 mv b dir/b |
|
1960 | @ 2 mv b dir/b | |
1961 | | |
|
1961 | | | |
1962 | o 1 copy a b |
|
1962 | o 1 copy a b | |
1963 | | |
|
1963 | | | |
1964 | o 0 add a |
|
1964 | o 0 add a | |
1965 |
|
1965 | |||
1966 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 |
|
1966 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 | |
1967 | ['6', '8', '5', '7', '4'] |
|
1967 | ['6', '8', '5', '7', '4'] | |
1968 | (group |
|
1968 | (group | |
1969 | (func |
|
1969 | (func | |
1970 | ('symbol', 'descendants') |
|
1970 | ('symbol', 'descendants') | |
1971 | ('symbol', '6'))) |
|
1971 | ('symbol', '6'))) | |
1972 | --- log.nodes * (glob) |
|
1972 | --- log.nodes * (glob) | |
1973 | +++ glog.nodes * (glob) |
|
1973 | +++ glog.nodes * (glob) | |
1974 | @@ -1,3 +1,3 @@ |
|
1974 | @@ -1,3 +1,3 @@ | |
1975 | -nodetag 6 |
|
1975 | -nodetag 6 | |
1976 | nodetag 8 |
|
1976 | nodetag 8 | |
1977 | nodetag 7 |
|
1977 | nodetag 7 | |
1978 | +nodetag 6 |
|
1978 | +nodetag 6 | |
1979 |
|
1979 | |||
1980 | Test --follow-first and forward --rev |
|
1980 | Test --follow-first and forward --rev | |
1981 |
|
1981 | |||
1982 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 |
|
1982 | $ testlog --follow-first -r6 -r8 -r5 -r7 -r4 | |
1983 | ['6', '8', '5', '7', '4'] |
|
1983 | ['6', '8', '5', '7', '4'] | |
1984 | (group |
|
1984 | (group | |
1985 | (func |
|
1985 | (func | |
1986 | ('symbol', '_firstdescendants') |
|
1986 | ('symbol', '_firstdescendants') | |
1987 | ('symbol', '6'))) |
|
1987 | ('symbol', '6'))) | |
1988 | --- log.nodes * (glob) |
|
1988 | --- log.nodes * (glob) | |
1989 | +++ glog.nodes * (glob) |
|
1989 | +++ glog.nodes * (glob) | |
1990 | @@ -1,3 +1,3 @@ |
|
1990 | @@ -1,3 +1,3 @@ | |
1991 | -nodetag 6 |
|
1991 | -nodetag 6 | |
1992 | nodetag 8 |
|
1992 | nodetag 8 | |
1993 | nodetag 7 |
|
1993 | nodetag 7 | |
1994 | +nodetag 6 |
|
1994 | +nodetag 6 | |
1995 |
|
1995 | |||
1996 | Test --follow and backward --rev |
|
1996 | Test --follow and backward --rev | |
1997 |
|
1997 | |||
1998 | $ testlog --follow -r6 -r5 -r7 -r8 -r4 |
|
1998 | $ testlog --follow -r6 -r5 -r7 -r8 -r4 | |
1999 | ['6', '5', '7', '8', '4'] |
|
1999 | ['6', '5', '7', '8', '4'] | |
2000 | (group |
|
2000 | (group | |
2001 | (func |
|
2001 | (func | |
2002 | ('symbol', 'ancestors') |
|
2002 | ('symbol', 'ancestors') | |
2003 | ('symbol', '6'))) |
|
2003 | ('symbol', '6'))) | |
2004 |
|
2004 | |||
2005 | Test --follow-first and backward --rev |
|
2005 | Test --follow-first and backward --rev | |
2006 |
|
2006 | |||
2007 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 |
|
2007 | $ testlog --follow-first -r6 -r5 -r7 -r8 -r4 | |
2008 | ['6', '5', '7', '8', '4'] |
|
2008 | ['6', '5', '7', '8', '4'] | |
2009 | (group |
|
2009 | (group | |
2010 | (func |
|
2010 | (func | |
2011 | ('symbol', '_firstancestors') |
|
2011 | ('symbol', '_firstancestors') | |
2012 | ('symbol', '6'))) |
|
2012 | ('symbol', '6'))) | |
2013 |
|
2013 | |||
2014 | Test subdir |
|
2014 | Test subdir | |
2015 |
|
2015 | |||
2016 | $ hg up -q 3 |
|
2016 | $ hg up -q 3 | |
2017 | $ cd dir |
|
2017 | $ cd dir | |
2018 | $ testlog . |
|
2018 | $ testlog . | |
2019 | [] |
|
2019 | [] | |
2020 | (group |
|
2020 | (group | |
2021 | (func |
|
2021 | (func | |
2022 | ('symbol', '_matchfiles') |
|
2022 | ('symbol', '_matchfiles') | |
2023 | (list |
|
2023 | (list | |
2024 | (list |
|
2024 | (list | |
2025 | ('string', 'r:') |
|
2025 | ('string', 'r:') | |
2026 | ('string', 'd:relpath')) |
|
2026 | ('string', 'd:relpath')) | |
2027 | ('string', 'p:.')))) |
|
2027 | ('string', 'p:.')))) | |
2028 | $ testlog ../b |
|
2028 | $ testlog ../b | |
2029 | [] |
|
2029 | [] | |
2030 | (group |
|
2030 | (group | |
2031 | (group |
|
2031 | (group | |
2032 | (func |
|
2032 | (func | |
2033 | ('symbol', 'filelog') |
|
2033 | ('symbol', 'filelog') | |
2034 | ('string', '../b')))) |
|
2034 | ('string', '../b')))) | |
2035 | $ testlog -f ../b |
|
2035 | $ testlog -f ../b | |
2036 | [] |
|
2036 | [] | |
2037 | (group |
|
2037 | (group | |
2038 | (group |
|
2038 | (group | |
2039 | (func |
|
2039 | (func | |
2040 | ('symbol', 'follow') |
|
2040 | ('symbol', 'follow') | |
2041 | ('string', 'b')))) |
|
2041 | ('string', 'b')))) | |
2042 | $ cd .. |
|
2042 | $ cd .. | |
2043 |
|
2043 | |||
2044 | Test --hidden |
|
2044 | Test --hidden | |
2045 | (enable obsolete) |
|
2045 | (enable obsolete) | |
2046 |
|
2046 | |||
2047 | $ cat > ${TESTTMP}/obs.py << EOF |
|
2047 | $ cat > ${TESTTMP}/obs.py << EOF | |
2048 | > import mercurial.obsolete |
|
2048 | > import mercurial.obsolete | |
2049 | > mercurial.obsolete._enabled = True |
|
2049 | > mercurial.obsolete._enabled = True | |
2050 | > EOF |
|
2050 | > EOF | |
2051 | $ echo '[extensions]' >> $HGRCPATH |
|
2051 | $ echo '[extensions]' >> $HGRCPATH | |
2052 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
2052 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |
2053 |
|
2053 | |||
2054 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2054 | $ hg debugobsolete `hg id --debug -i -r 8` | |
2055 | $ testlog |
|
2055 | $ testlog | |
2056 | [] |
|
2056 | [] | |
2057 | [] |
|
2057 | [] | |
2058 | $ testlog --hidden |
|
2058 | $ testlog --hidden | |
2059 | [] |
|
2059 | [] | |
2060 | [] |
|
2060 | [] | |
2061 | $ hg glog --template '{rev} {desc}\n' |
|
2061 | $ hg glog --template '{rev} {desc}\n' | |
2062 | o 7 Added tag foo-bar for changeset fc281d8ff18d |
|
2062 | o 7 Added tag foo-bar for changeset fc281d8ff18d | |
2063 | | |
|
2063 | | | |
2064 | o 6 merge 5 and 4 |
|
2064 | o 6 merge 5 and 4 | |
2065 | |\ |
|
2065 | |\ | |
2066 | | o 5 add another e |
|
2066 | | o 5 add another e | |
2067 | | | |
|
2067 | | | | |
2068 | o | 4 mv dir/b e |
|
2068 | o | 4 mv dir/b e | |
2069 | |/ |
|
2069 | |/ | |
2070 | @ 3 mv a b; add d |
|
2070 | @ 3 mv a b; add d | |
2071 | | |
|
2071 | | | |
2072 | o 2 mv b dir/b |
|
2072 | o 2 mv b dir/b | |
2073 | | |
|
2073 | | | |
2074 | o 1 copy a b |
|
2074 | o 1 copy a b | |
2075 | | |
|
2075 | | | |
2076 | o 0 add a |
|
2076 | o 0 add a | |
2077 |
|
2077 | |||
2078 |
|
2078 | |||
2079 | A template without trailing newline should do something sane |
|
2079 | A template without trailing newline should do something sane | |
2080 |
|
2080 | |||
2081 | $ hg glog -r ::2 --template '{rev} {desc}' |
|
2081 | $ hg glog -r ::2 --template '{rev} {desc}' | |
2082 | o 2 mv b dir/b |
|
2082 | o 2 mv b dir/b | |
2083 | | |
|
2083 | | | |
2084 | o 1 copy a b |
|
2084 | o 1 copy a b | |
2085 | | |
|
2085 | | | |
2086 | o 0 add a |
|
2086 | o 0 add a | |
2087 |
|
2087 | |||
2088 |
|
2088 | |||
2089 | Extra newlines must be preserved |
|
2089 | Extra newlines must be preserved | |
2090 |
|
2090 | |||
2091 | $ hg glog -r ::2 --template '\n{rev} {desc}\n\n' |
|
2091 | $ hg glog -r ::2 --template '\n{rev} {desc}\n\n' | |
2092 | o |
|
2092 | o | |
2093 | | 2 mv b dir/b |
|
2093 | | 2 mv b dir/b | |
2094 | | |
|
2094 | | | |
2095 | o |
|
2095 | o | |
2096 | | 1 copy a b |
|
2096 | | 1 copy a b | |
2097 | | |
|
2097 | | | |
2098 | o |
|
2098 | o | |
2099 | 0 add a |
|
2099 | 0 add a | |
2100 |
|
2100 | |||
2101 |
|
2101 | |||
2102 | The almost-empty template should do something sane too ... |
|
2102 | The almost-empty template should do something sane too ... | |
2103 |
|
2103 | |||
2104 | $ hg glog -r ::2 --template '\n' |
|
2104 | $ hg glog -r ::2 --template '\n' | |
2105 | o |
|
2105 | o | |
2106 | | |
|
2106 | | | |
2107 | o |
|
2107 | o | |
2108 | | |
|
2108 | | | |
2109 | o |
|
2109 | o | |
2110 |
|
2110 | |||
2111 |
|
2111 | |||
2112 | issue3772 |
|
2112 | issue3772 | |
2113 |
|
2113 | |||
2114 | $ hg glog -r :null |
|
2114 | $ hg glog -r :null | |
2115 | o changeset: -1:000000000000 |
|
2115 | o changeset: -1:000000000000 | |
2116 | user: |
|
2116 | user: | |
2117 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2117 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2118 |
|
2118 | |||
|
2119 | $ hg glog -r null:null | |||
|
2120 | o changeset: -1:000000000000 | |||
|
2121 | user: | |||
|
2122 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2123 | ||||
2119 |
|
2124 | |||
2120 | $ cd .. |
|
2125 | $ cd .. |
@@ -1,1308 +1,1313 b'' | |||||
1 | The g is crafted to have 2 filelog topological heads in a linear |
|
1 | The g is crafted to have 2 filelog topological heads in a linear | |
2 | changeset graph |
|
2 | changeset graph | |
3 |
|
3 | |||
4 | $ hg init a |
|
4 | $ hg init a | |
5 | $ cd a |
|
5 | $ cd a | |
6 | $ echo a > a |
|
6 | $ echo a > a | |
7 | $ echo f > f |
|
7 | $ echo f > f | |
8 | $ hg ci -Ama -d '1 0' |
|
8 | $ hg ci -Ama -d '1 0' | |
9 | adding a |
|
9 | adding a | |
10 | adding f |
|
10 | adding f | |
11 |
|
11 | |||
12 | $ hg cp a b |
|
12 | $ hg cp a b | |
13 | $ hg cp f g |
|
13 | $ hg cp f g | |
14 | $ hg ci -mb -d '2 0' |
|
14 | $ hg ci -mb -d '2 0' | |
15 |
|
15 | |||
16 | $ mkdir dir |
|
16 | $ mkdir dir | |
17 | $ hg mv b dir |
|
17 | $ hg mv b dir | |
18 | $ echo g >> g |
|
18 | $ echo g >> g | |
19 | $ echo f >> f |
|
19 | $ echo f >> f | |
20 | $ hg ci -mc -d '3 0' |
|
20 | $ hg ci -mc -d '3 0' | |
21 |
|
21 | |||
22 | $ hg mv a b |
|
22 | $ hg mv a b | |
23 | $ hg cp -f f g |
|
23 | $ hg cp -f f g | |
24 | $ echo a > d |
|
24 | $ echo a > d | |
25 | $ hg add d |
|
25 | $ hg add d | |
26 | $ hg ci -md -d '4 0' |
|
26 | $ hg ci -md -d '4 0' | |
27 |
|
27 | |||
28 | $ hg mv dir/b e |
|
28 | $ hg mv dir/b e | |
29 | $ hg ci -me -d '5 0' |
|
29 | $ hg ci -me -d '5 0' | |
30 |
|
30 | |||
31 | $ hg log a |
|
31 | $ hg log a | |
32 | changeset: 0:9161b9aeaf16 |
|
32 | changeset: 0:9161b9aeaf16 | |
33 | user: test |
|
33 | user: test | |
34 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
34 | date: Thu Jan 01 00:00:01 1970 +0000 | |
35 | summary: a |
|
35 | summary: a | |
36 |
|
36 | |||
37 | log on directory |
|
37 | log on directory | |
38 |
|
38 | |||
39 | $ hg log dir |
|
39 | $ hg log dir | |
40 | changeset: 4:7e4639b4691b |
|
40 | changeset: 4:7e4639b4691b | |
41 | tag: tip |
|
41 | tag: tip | |
42 | user: test |
|
42 | user: test | |
43 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
43 | date: Thu Jan 01 00:00:05 1970 +0000 | |
44 | summary: e |
|
44 | summary: e | |
45 |
|
45 | |||
46 | changeset: 2:f8954cd4dc1f |
|
46 | changeset: 2:f8954cd4dc1f | |
47 | user: test |
|
47 | user: test | |
48 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
48 | date: Thu Jan 01 00:00:03 1970 +0000 | |
49 | summary: c |
|
49 | summary: c | |
50 |
|
50 | |||
51 | $ hg log somethingthatdoesntexist dir |
|
51 | $ hg log somethingthatdoesntexist dir | |
52 | changeset: 4:7e4639b4691b |
|
52 | changeset: 4:7e4639b4691b | |
53 | tag: tip |
|
53 | tag: tip | |
54 | user: test |
|
54 | user: test | |
55 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
55 | date: Thu Jan 01 00:00:05 1970 +0000 | |
56 | summary: e |
|
56 | summary: e | |
57 |
|
57 | |||
58 | changeset: 2:f8954cd4dc1f |
|
58 | changeset: 2:f8954cd4dc1f | |
59 | user: test |
|
59 | user: test | |
60 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
60 | date: Thu Jan 01 00:00:03 1970 +0000 | |
61 | summary: c |
|
61 | summary: c | |
62 |
|
62 | |||
63 |
|
63 | |||
64 | -f, directory |
|
64 | -f, directory | |
65 |
|
65 | |||
66 | $ hg log -f dir |
|
66 | $ hg log -f dir | |
67 | abort: cannot follow file not in parent revision: "dir" |
|
67 | abort: cannot follow file not in parent revision: "dir" | |
68 | [255] |
|
68 | [255] | |
69 |
|
69 | |||
70 | -f, but no args |
|
70 | -f, but no args | |
71 |
|
71 | |||
72 | $ hg log -f |
|
72 | $ hg log -f | |
73 | changeset: 4:7e4639b4691b |
|
73 | changeset: 4:7e4639b4691b | |
74 | tag: tip |
|
74 | tag: tip | |
75 | user: test |
|
75 | user: test | |
76 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
76 | date: Thu Jan 01 00:00:05 1970 +0000 | |
77 | summary: e |
|
77 | summary: e | |
78 |
|
78 | |||
79 | changeset: 3:2ca5ba701980 |
|
79 | changeset: 3:2ca5ba701980 | |
80 | user: test |
|
80 | user: test | |
81 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
81 | date: Thu Jan 01 00:00:04 1970 +0000 | |
82 | summary: d |
|
82 | summary: d | |
83 |
|
83 | |||
84 | changeset: 2:f8954cd4dc1f |
|
84 | changeset: 2:f8954cd4dc1f | |
85 | user: test |
|
85 | user: test | |
86 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
86 | date: Thu Jan 01 00:00:03 1970 +0000 | |
87 | summary: c |
|
87 | summary: c | |
88 |
|
88 | |||
89 | changeset: 1:d89b0a12d229 |
|
89 | changeset: 1:d89b0a12d229 | |
90 | user: test |
|
90 | user: test | |
91 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
91 | date: Thu Jan 01 00:00:02 1970 +0000 | |
92 | summary: b |
|
92 | summary: b | |
93 |
|
93 | |||
94 | changeset: 0:9161b9aeaf16 |
|
94 | changeset: 0:9161b9aeaf16 | |
95 | user: test |
|
95 | user: test | |
96 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
96 | date: Thu Jan 01 00:00:01 1970 +0000 | |
97 | summary: a |
|
97 | summary: a | |
98 |
|
98 | |||
99 |
|
99 | |||
100 | one rename |
|
100 | one rename | |
101 |
|
101 | |||
102 | $ hg up -q 2 |
|
102 | $ hg up -q 2 | |
103 | $ hg log -vf a |
|
103 | $ hg log -vf a | |
104 | changeset: 0:9161b9aeaf16 |
|
104 | changeset: 0:9161b9aeaf16 | |
105 | user: test |
|
105 | user: test | |
106 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:01 1970 +0000 | |
107 | files: a f |
|
107 | files: a f | |
108 | description: |
|
108 | description: | |
109 | a |
|
109 | a | |
110 |
|
110 | |||
111 |
|
111 | |||
112 |
|
112 | |||
113 | many renames |
|
113 | many renames | |
114 |
|
114 | |||
115 | $ hg up -q tip |
|
115 | $ hg up -q tip | |
116 | $ hg log -vf e |
|
116 | $ hg log -vf e | |
117 | changeset: 4:7e4639b4691b |
|
117 | changeset: 4:7e4639b4691b | |
118 | tag: tip |
|
118 | tag: tip | |
119 | user: test |
|
119 | user: test | |
120 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
120 | date: Thu Jan 01 00:00:05 1970 +0000 | |
121 | files: dir/b e |
|
121 | files: dir/b e | |
122 | description: |
|
122 | description: | |
123 | e |
|
123 | e | |
124 |
|
124 | |||
125 |
|
125 | |||
126 | changeset: 2:f8954cd4dc1f |
|
126 | changeset: 2:f8954cd4dc1f | |
127 | user: test |
|
127 | user: test | |
128 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
128 | date: Thu Jan 01 00:00:03 1970 +0000 | |
129 | files: b dir/b f g |
|
129 | files: b dir/b f g | |
130 | description: |
|
130 | description: | |
131 | c |
|
131 | c | |
132 |
|
132 | |||
133 |
|
133 | |||
134 | changeset: 1:d89b0a12d229 |
|
134 | changeset: 1:d89b0a12d229 | |
135 | user: test |
|
135 | user: test | |
136 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
136 | date: Thu Jan 01 00:00:02 1970 +0000 | |
137 | files: b g |
|
137 | files: b g | |
138 | description: |
|
138 | description: | |
139 | b |
|
139 | b | |
140 |
|
140 | |||
141 |
|
141 | |||
142 | changeset: 0:9161b9aeaf16 |
|
142 | changeset: 0:9161b9aeaf16 | |
143 | user: test |
|
143 | user: test | |
144 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
144 | date: Thu Jan 01 00:00:01 1970 +0000 | |
145 | files: a f |
|
145 | files: a f | |
146 | description: |
|
146 | description: | |
147 | a |
|
147 | a | |
148 |
|
148 | |||
149 |
|
149 | |||
150 |
|
150 | |||
151 |
|
151 | |||
152 | log -pf dir/b |
|
152 | log -pf dir/b | |
153 |
|
153 | |||
154 | $ hg up -q 3 |
|
154 | $ hg up -q 3 | |
155 | $ hg log -pf dir/b |
|
155 | $ hg log -pf dir/b | |
156 | changeset: 2:f8954cd4dc1f |
|
156 | changeset: 2:f8954cd4dc1f | |
157 | user: test |
|
157 | user: test | |
158 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
158 | date: Thu Jan 01 00:00:03 1970 +0000 | |
159 | summary: c |
|
159 | summary: c | |
160 |
|
160 | |||
161 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b |
|
161 | diff -r d89b0a12d229 -r f8954cd4dc1f dir/b | |
162 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
162 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
163 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 |
|
163 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |
164 | @@ -0,0 +1,1 @@ |
|
164 | @@ -0,0 +1,1 @@ | |
165 | +a |
|
165 | +a | |
166 |
|
166 | |||
167 | changeset: 1:d89b0a12d229 |
|
167 | changeset: 1:d89b0a12d229 | |
168 | user: test |
|
168 | user: test | |
169 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
169 | date: Thu Jan 01 00:00:02 1970 +0000 | |
170 | summary: b |
|
170 | summary: b | |
171 |
|
171 | |||
172 | diff -r 9161b9aeaf16 -r d89b0a12d229 b |
|
172 | diff -r 9161b9aeaf16 -r d89b0a12d229 b | |
173 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
173 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
174 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 |
|
174 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |
175 | @@ -0,0 +1,1 @@ |
|
175 | @@ -0,0 +1,1 @@ | |
176 | +a |
|
176 | +a | |
177 |
|
177 | |||
178 | changeset: 0:9161b9aeaf16 |
|
178 | changeset: 0:9161b9aeaf16 | |
179 | user: test |
|
179 | user: test | |
180 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
180 | date: Thu Jan 01 00:00:01 1970 +0000 | |
181 | summary: a |
|
181 | summary: a | |
182 |
|
182 | |||
183 | diff -r 000000000000 -r 9161b9aeaf16 a |
|
183 | diff -r 000000000000 -r 9161b9aeaf16 a | |
184 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
184 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
185 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
185 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
186 | @@ -0,0 +1,1 @@ |
|
186 | @@ -0,0 +1,1 @@ | |
187 | +a |
|
187 | +a | |
188 |
|
188 | |||
189 |
|
189 | |||
190 | log -vf dir/b |
|
190 | log -vf dir/b | |
191 |
|
191 | |||
192 | $ hg log -vf dir/b |
|
192 | $ hg log -vf dir/b | |
193 | changeset: 2:f8954cd4dc1f |
|
193 | changeset: 2:f8954cd4dc1f | |
194 | user: test |
|
194 | user: test | |
195 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
195 | date: Thu Jan 01 00:00:03 1970 +0000 | |
196 | files: b dir/b f g |
|
196 | files: b dir/b f g | |
197 | description: |
|
197 | description: | |
198 | c |
|
198 | c | |
199 |
|
199 | |||
200 |
|
200 | |||
201 | changeset: 1:d89b0a12d229 |
|
201 | changeset: 1:d89b0a12d229 | |
202 | user: test |
|
202 | user: test | |
203 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
203 | date: Thu Jan 01 00:00:02 1970 +0000 | |
204 | files: b g |
|
204 | files: b g | |
205 | description: |
|
205 | description: | |
206 | b |
|
206 | b | |
207 |
|
207 | |||
208 |
|
208 | |||
209 | changeset: 0:9161b9aeaf16 |
|
209 | changeset: 0:9161b9aeaf16 | |
210 | user: test |
|
210 | user: test | |
211 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
211 | date: Thu Jan 01 00:00:01 1970 +0000 | |
212 | files: a f |
|
212 | files: a f | |
213 | description: |
|
213 | description: | |
214 | a |
|
214 | a | |
215 |
|
215 | |||
216 |
|
216 | |||
217 |
|
217 | |||
218 |
|
218 | |||
219 | -f and multiple filelog heads |
|
219 | -f and multiple filelog heads | |
220 |
|
220 | |||
221 | $ hg up -q 2 |
|
221 | $ hg up -q 2 | |
222 | $ hg log -f g --template '{rev}\n' |
|
222 | $ hg log -f g --template '{rev}\n' | |
223 | 2 |
|
223 | 2 | |
224 | 1 |
|
224 | 1 | |
225 | 0 |
|
225 | 0 | |
226 | $ hg up -q tip |
|
226 | $ hg up -q tip | |
227 | $ hg log -f g --template '{rev}\n' |
|
227 | $ hg log -f g --template '{rev}\n' | |
228 | 3 |
|
228 | 3 | |
229 | 2 |
|
229 | 2 | |
230 | 0 |
|
230 | 0 | |
231 |
|
231 | |||
232 |
|
232 | |||
233 | log copies with --copies |
|
233 | log copies with --copies | |
234 |
|
234 | |||
235 | $ hg log -vC --template '{rev} {file_copies}\n' |
|
235 | $ hg log -vC --template '{rev} {file_copies}\n' | |
236 | 4 e (dir/b) |
|
236 | 4 e (dir/b) | |
237 | 3 b (a)g (f) |
|
237 | 3 b (a)g (f) | |
238 | 2 dir/b (b) |
|
238 | 2 dir/b (b) | |
239 | 1 b (a)g (f) |
|
239 | 1 b (a)g (f) | |
240 | 0 |
|
240 | 0 | |
241 |
|
241 | |||
242 | log copies switch without --copies, with old filecopy template |
|
242 | log copies switch without --copies, with old filecopy template | |
243 |
|
243 | |||
244 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
244 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' | |
245 | 4 |
|
245 | 4 | |
246 | 3 |
|
246 | 3 | |
247 | 2 |
|
247 | 2 | |
248 | 1 |
|
248 | 1 | |
249 | 0 |
|
249 | 0 | |
250 |
|
250 | |||
251 | log copies switch with --copies |
|
251 | log copies switch with --copies | |
252 |
|
252 | |||
253 | $ hg log -vC --template '{rev} {file_copies_switch}\n' |
|
253 | $ hg log -vC --template '{rev} {file_copies_switch}\n' | |
254 | 4 e (dir/b) |
|
254 | 4 e (dir/b) | |
255 | 3 b (a)g (f) |
|
255 | 3 b (a)g (f) | |
256 | 2 dir/b (b) |
|
256 | 2 dir/b (b) | |
257 | 1 b (a)g (f) |
|
257 | 1 b (a)g (f) | |
258 | 0 |
|
258 | 0 | |
259 |
|
259 | |||
260 |
|
260 | |||
261 | log copies with hardcoded style and with --style=default |
|
261 | log copies with hardcoded style and with --style=default | |
262 |
|
262 | |||
263 | $ hg log -vC -r4 |
|
263 | $ hg log -vC -r4 | |
264 | changeset: 4:7e4639b4691b |
|
264 | changeset: 4:7e4639b4691b | |
265 | tag: tip |
|
265 | tag: tip | |
266 | user: test |
|
266 | user: test | |
267 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
267 | date: Thu Jan 01 00:00:05 1970 +0000 | |
268 | files: dir/b e |
|
268 | files: dir/b e | |
269 | copies: e (dir/b) |
|
269 | copies: e (dir/b) | |
270 | description: |
|
270 | description: | |
271 | e |
|
271 | e | |
272 |
|
272 | |||
273 |
|
273 | |||
274 | $ hg log -vC -r4 --style=default |
|
274 | $ hg log -vC -r4 --style=default | |
275 | changeset: 4:7e4639b4691b |
|
275 | changeset: 4:7e4639b4691b | |
276 | tag: tip |
|
276 | tag: tip | |
277 | user: test |
|
277 | user: test | |
278 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
278 | date: Thu Jan 01 00:00:05 1970 +0000 | |
279 | files: dir/b e |
|
279 | files: dir/b e | |
280 | copies: e (dir/b) |
|
280 | copies: e (dir/b) | |
281 | description: |
|
281 | description: | |
282 | e |
|
282 | e | |
283 |
|
283 | |||
284 |
|
284 | |||
285 |
|
285 | |||
286 |
|
286 | |||
287 | log copies, non-linear manifest |
|
287 | log copies, non-linear manifest | |
288 |
|
288 | |||
289 | $ hg up -C 3 |
|
289 | $ hg up -C 3 | |
290 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
290 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
291 | $ hg mv dir/b e |
|
291 | $ hg mv dir/b e | |
292 | $ echo foo > foo |
|
292 | $ echo foo > foo | |
293 | $ hg ci -Ame2 -d '6 0' |
|
293 | $ hg ci -Ame2 -d '6 0' | |
294 | adding foo |
|
294 | adding foo | |
295 | created new head |
|
295 | created new head | |
296 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
296 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 | |
297 | 5 e (dir/b) |
|
297 | 5 e (dir/b) | |
298 |
|
298 | |||
299 |
|
299 | |||
300 | log copies, execute bit set |
|
300 | log copies, execute bit set | |
301 |
|
301 | |||
302 | #if execbit |
|
302 | #if execbit | |
303 | $ chmod +x e |
|
303 | $ chmod +x e | |
304 | $ hg ci -me3 -d '7 0' |
|
304 | $ hg ci -me3 -d '7 0' | |
305 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
305 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 | |
306 | 6 |
|
306 | 6 | |
307 | #endif |
|
307 | #endif | |
308 |
|
308 | |||
309 |
|
309 | |||
310 | log -p d |
|
310 | log -p d | |
311 |
|
311 | |||
312 | $ hg log -pv d |
|
312 | $ hg log -pv d | |
313 | changeset: 3:2ca5ba701980 |
|
313 | changeset: 3:2ca5ba701980 | |
314 | user: test |
|
314 | user: test | |
315 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
315 | date: Thu Jan 01 00:00:04 1970 +0000 | |
316 | files: a b d g |
|
316 | files: a b d g | |
317 | description: |
|
317 | description: | |
318 | d |
|
318 | d | |
319 |
|
319 | |||
320 |
|
320 | |||
321 | diff -r f8954cd4dc1f -r 2ca5ba701980 d |
|
321 | diff -r f8954cd4dc1f -r 2ca5ba701980 d | |
322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
322 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
323 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
323 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
324 | @@ -0,0 +1,1 @@ |
|
324 | @@ -0,0 +1,1 @@ | |
325 | +a |
|
325 | +a | |
326 |
|
326 | |||
327 |
|
327 | |||
328 |
|
328 | |||
329 | log --removed file |
|
329 | log --removed file | |
330 |
|
330 | |||
331 | $ hg log --removed -v a |
|
331 | $ hg log --removed -v a | |
332 | changeset: 3:2ca5ba701980 |
|
332 | changeset: 3:2ca5ba701980 | |
333 | user: test |
|
333 | user: test | |
334 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
334 | date: Thu Jan 01 00:00:04 1970 +0000 | |
335 | files: a b d g |
|
335 | files: a b d g | |
336 | description: |
|
336 | description: | |
337 | d |
|
337 | d | |
338 |
|
338 | |||
339 |
|
339 | |||
340 | changeset: 0:9161b9aeaf16 |
|
340 | changeset: 0:9161b9aeaf16 | |
341 | user: test |
|
341 | user: test | |
342 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
342 | date: Thu Jan 01 00:00:01 1970 +0000 | |
343 | files: a f |
|
343 | files: a f | |
344 | description: |
|
344 | description: | |
345 | a |
|
345 | a | |
346 |
|
346 | |||
347 |
|
347 | |||
348 |
|
348 | |||
349 | log --removed revrange file |
|
349 | log --removed revrange file | |
350 |
|
350 | |||
351 | $ hg log --removed -v -r0:2 a |
|
351 | $ hg log --removed -v -r0:2 a | |
352 | changeset: 0:9161b9aeaf16 |
|
352 | changeset: 0:9161b9aeaf16 | |
353 | user: test |
|
353 | user: test | |
354 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
354 | date: Thu Jan 01 00:00:01 1970 +0000 | |
355 | files: a f |
|
355 | files: a f | |
356 | description: |
|
356 | description: | |
357 | a |
|
357 | a | |
358 |
|
358 | |||
359 |
|
359 | |||
360 | $ cd .. |
|
360 | $ cd .. | |
361 |
|
361 | |||
362 | log --follow tests |
|
362 | log --follow tests | |
363 |
|
363 | |||
364 | $ hg init follow |
|
364 | $ hg init follow | |
365 | $ cd follow |
|
365 | $ cd follow | |
366 |
|
366 | |||
367 | $ echo base > base |
|
367 | $ echo base > base | |
368 | $ hg ci -Ambase -d '1 0' |
|
368 | $ hg ci -Ambase -d '1 0' | |
369 | adding base |
|
369 | adding base | |
370 |
|
370 | |||
371 | $ echo r1 >> base |
|
371 | $ echo r1 >> base | |
372 | $ hg ci -Amr1 -d '1 0' |
|
372 | $ hg ci -Amr1 -d '1 0' | |
373 | $ echo r2 >> base |
|
373 | $ echo r2 >> base | |
374 | $ hg ci -Amr2 -d '1 0' |
|
374 | $ hg ci -Amr2 -d '1 0' | |
375 |
|
375 | |||
376 | $ hg up -C 1 |
|
376 | $ hg up -C 1 | |
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
377 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
378 | $ echo b1 > b1 |
|
378 | $ echo b1 > b1 | |
379 | $ hg ci -Amb1 -d '1 0' |
|
379 | $ hg ci -Amb1 -d '1 0' | |
380 | adding b1 |
|
380 | adding b1 | |
381 | created new head |
|
381 | created new head | |
382 |
|
382 | |||
383 |
|
383 | |||
384 | log -f |
|
384 | log -f | |
385 |
|
385 | |||
386 | $ hg log -f |
|
386 | $ hg log -f | |
387 | changeset: 3:e62f78d544b4 |
|
387 | changeset: 3:e62f78d544b4 | |
388 | tag: tip |
|
388 | tag: tip | |
389 | parent: 1:3d5bf5654eda |
|
389 | parent: 1:3d5bf5654eda | |
390 | user: test |
|
390 | user: test | |
391 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
391 | date: Thu Jan 01 00:00:01 1970 +0000 | |
392 | summary: b1 |
|
392 | summary: b1 | |
393 |
|
393 | |||
394 | changeset: 1:3d5bf5654eda |
|
394 | changeset: 1:3d5bf5654eda | |
395 | user: test |
|
395 | user: test | |
396 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
396 | date: Thu Jan 01 00:00:01 1970 +0000 | |
397 | summary: r1 |
|
397 | summary: r1 | |
398 |
|
398 | |||
399 | changeset: 0:67e992f2c4f3 |
|
399 | changeset: 0:67e992f2c4f3 | |
400 | user: test |
|
400 | user: test | |
401 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
401 | date: Thu Jan 01 00:00:01 1970 +0000 | |
402 | summary: base |
|
402 | summary: base | |
403 |
|
403 | |||
404 |
|
404 | |||
405 |
|
405 | |||
406 | log -f -r 1:tip |
|
406 | log -f -r 1:tip | |
407 |
|
407 | |||
408 | $ hg up -C 0 |
|
408 | $ hg up -C 0 | |
409 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
409 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
410 | $ echo b2 > b2 |
|
410 | $ echo b2 > b2 | |
411 | $ hg ci -Amb2 -d '1 0' |
|
411 | $ hg ci -Amb2 -d '1 0' | |
412 | adding b2 |
|
412 | adding b2 | |
413 | created new head |
|
413 | created new head | |
414 | $ hg log -f -r 1:tip |
|
414 | $ hg log -f -r 1:tip | |
415 | changeset: 1:3d5bf5654eda |
|
415 | changeset: 1:3d5bf5654eda | |
416 | user: test |
|
416 | user: test | |
417 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
417 | date: Thu Jan 01 00:00:01 1970 +0000 | |
418 | summary: r1 |
|
418 | summary: r1 | |
419 |
|
419 | |||
420 | changeset: 2:60c670bf5b30 |
|
420 | changeset: 2:60c670bf5b30 | |
421 | user: test |
|
421 | user: test | |
422 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
422 | date: Thu Jan 01 00:00:01 1970 +0000 | |
423 | summary: r2 |
|
423 | summary: r2 | |
424 |
|
424 | |||
425 | changeset: 3:e62f78d544b4 |
|
425 | changeset: 3:e62f78d544b4 | |
426 | parent: 1:3d5bf5654eda |
|
426 | parent: 1:3d5bf5654eda | |
427 | user: test |
|
427 | user: test | |
428 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
428 | date: Thu Jan 01 00:00:01 1970 +0000 | |
429 | summary: b1 |
|
429 | summary: b1 | |
430 |
|
430 | |||
431 |
|
431 | |||
432 |
|
432 | |||
433 | log -r . with two parents |
|
433 | log -r . with two parents | |
434 |
|
434 | |||
435 | $ hg up -C 3 |
|
435 | $ hg up -C 3 | |
436 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
436 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
437 | $ hg merge tip |
|
437 | $ hg merge tip | |
438 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
438 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
439 | (branch merge, don't forget to commit) |
|
439 | (branch merge, don't forget to commit) | |
440 | $ hg log -r . |
|
440 | $ hg log -r . | |
441 | changeset: 3:e62f78d544b4 |
|
441 | changeset: 3:e62f78d544b4 | |
442 | parent: 1:3d5bf5654eda |
|
442 | parent: 1:3d5bf5654eda | |
443 | user: test |
|
443 | user: test | |
444 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
444 | date: Thu Jan 01 00:00:01 1970 +0000 | |
445 | summary: b1 |
|
445 | summary: b1 | |
446 |
|
446 | |||
447 |
|
447 | |||
448 |
|
448 | |||
449 | log -r . with one parent |
|
449 | log -r . with one parent | |
450 |
|
450 | |||
451 | $ hg ci -mm12 -d '1 0' |
|
451 | $ hg ci -mm12 -d '1 0' | |
452 | $ hg log -r . |
|
452 | $ hg log -r . | |
453 | changeset: 5:302e9dd6890d |
|
453 | changeset: 5:302e9dd6890d | |
454 | tag: tip |
|
454 | tag: tip | |
455 | parent: 3:e62f78d544b4 |
|
455 | parent: 3:e62f78d544b4 | |
456 | parent: 4:ddb82e70d1a1 |
|
456 | parent: 4:ddb82e70d1a1 | |
457 | user: test |
|
457 | user: test | |
458 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
458 | date: Thu Jan 01 00:00:01 1970 +0000 | |
459 | summary: m12 |
|
459 | summary: m12 | |
460 |
|
460 | |||
461 |
|
461 | |||
462 | $ echo postm >> b1 |
|
462 | $ echo postm >> b1 | |
463 | $ hg ci -Amb1.1 -d'1 0' |
|
463 | $ hg ci -Amb1.1 -d'1 0' | |
464 |
|
464 | |||
465 |
|
465 | |||
466 | log --follow-first |
|
466 | log --follow-first | |
467 |
|
467 | |||
468 | $ hg log --follow-first |
|
468 | $ hg log --follow-first | |
469 | changeset: 6:2404bbcab562 |
|
469 | changeset: 6:2404bbcab562 | |
470 | tag: tip |
|
470 | tag: tip | |
471 | user: test |
|
471 | user: test | |
472 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
472 | date: Thu Jan 01 00:00:01 1970 +0000 | |
473 | summary: b1.1 |
|
473 | summary: b1.1 | |
474 |
|
474 | |||
475 | changeset: 5:302e9dd6890d |
|
475 | changeset: 5:302e9dd6890d | |
476 | parent: 3:e62f78d544b4 |
|
476 | parent: 3:e62f78d544b4 | |
477 | parent: 4:ddb82e70d1a1 |
|
477 | parent: 4:ddb82e70d1a1 | |
478 | user: test |
|
478 | user: test | |
479 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
479 | date: Thu Jan 01 00:00:01 1970 +0000 | |
480 | summary: m12 |
|
480 | summary: m12 | |
481 |
|
481 | |||
482 | changeset: 3:e62f78d544b4 |
|
482 | changeset: 3:e62f78d544b4 | |
483 | parent: 1:3d5bf5654eda |
|
483 | parent: 1:3d5bf5654eda | |
484 | user: test |
|
484 | user: test | |
485 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
485 | date: Thu Jan 01 00:00:01 1970 +0000 | |
486 | summary: b1 |
|
486 | summary: b1 | |
487 |
|
487 | |||
488 | changeset: 1:3d5bf5654eda |
|
488 | changeset: 1:3d5bf5654eda | |
489 | user: test |
|
489 | user: test | |
490 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
490 | date: Thu Jan 01 00:00:01 1970 +0000 | |
491 | summary: r1 |
|
491 | summary: r1 | |
492 |
|
492 | |||
493 | changeset: 0:67e992f2c4f3 |
|
493 | changeset: 0:67e992f2c4f3 | |
494 | user: test |
|
494 | user: test | |
495 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
495 | date: Thu Jan 01 00:00:01 1970 +0000 | |
496 | summary: base |
|
496 | summary: base | |
497 |
|
497 | |||
498 |
|
498 | |||
499 |
|
499 | |||
500 | log -P 2 |
|
500 | log -P 2 | |
501 |
|
501 | |||
502 | $ hg log -P 2 |
|
502 | $ hg log -P 2 | |
503 | changeset: 6:2404bbcab562 |
|
503 | changeset: 6:2404bbcab562 | |
504 | tag: tip |
|
504 | tag: tip | |
505 | user: test |
|
505 | user: test | |
506 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
506 | date: Thu Jan 01 00:00:01 1970 +0000 | |
507 | summary: b1.1 |
|
507 | summary: b1.1 | |
508 |
|
508 | |||
509 | changeset: 5:302e9dd6890d |
|
509 | changeset: 5:302e9dd6890d | |
510 | parent: 3:e62f78d544b4 |
|
510 | parent: 3:e62f78d544b4 | |
511 | parent: 4:ddb82e70d1a1 |
|
511 | parent: 4:ddb82e70d1a1 | |
512 | user: test |
|
512 | user: test | |
513 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
513 | date: Thu Jan 01 00:00:01 1970 +0000 | |
514 | summary: m12 |
|
514 | summary: m12 | |
515 |
|
515 | |||
516 | changeset: 4:ddb82e70d1a1 |
|
516 | changeset: 4:ddb82e70d1a1 | |
517 | parent: 0:67e992f2c4f3 |
|
517 | parent: 0:67e992f2c4f3 | |
518 | user: test |
|
518 | user: test | |
519 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
519 | date: Thu Jan 01 00:00:01 1970 +0000 | |
520 | summary: b2 |
|
520 | summary: b2 | |
521 |
|
521 | |||
522 | changeset: 3:e62f78d544b4 |
|
522 | changeset: 3:e62f78d544b4 | |
523 | parent: 1:3d5bf5654eda |
|
523 | parent: 1:3d5bf5654eda | |
524 | user: test |
|
524 | user: test | |
525 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
525 | date: Thu Jan 01 00:00:01 1970 +0000 | |
526 | summary: b1 |
|
526 | summary: b1 | |
527 |
|
527 | |||
528 |
|
528 | |||
529 |
|
529 | |||
530 | log -r tip -p --git |
|
530 | log -r tip -p --git | |
531 |
|
531 | |||
532 | $ hg log -r tip -p --git |
|
532 | $ hg log -r tip -p --git | |
533 | changeset: 6:2404bbcab562 |
|
533 | changeset: 6:2404bbcab562 | |
534 | tag: tip |
|
534 | tag: tip | |
535 | user: test |
|
535 | user: test | |
536 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
536 | date: Thu Jan 01 00:00:01 1970 +0000 | |
537 | summary: b1.1 |
|
537 | summary: b1.1 | |
538 |
|
538 | |||
539 | diff --git a/b1 b/b1 |
|
539 | diff --git a/b1 b/b1 | |
540 | --- a/b1 |
|
540 | --- a/b1 | |
541 | +++ b/b1 |
|
541 | +++ b/b1 | |
542 | @@ -1,1 +1,2 @@ |
|
542 | @@ -1,1 +1,2 @@ | |
543 | b1 |
|
543 | b1 | |
544 | +postm |
|
544 | +postm | |
545 |
|
545 | |||
546 |
|
546 | |||
547 |
|
547 | |||
548 | log -r "" |
|
548 | log -r "" | |
549 |
|
549 | |||
550 | $ hg log -r '' |
|
550 | $ hg log -r '' | |
551 | hg: parse error: empty query |
|
551 | hg: parse error: empty query | |
552 | [255] |
|
552 | [255] | |
553 |
|
553 | |||
554 | log -r <some unknown node id> |
|
554 | log -r <some unknown node id> | |
555 |
|
555 | |||
556 | $ hg log -r 1000000000000000000000000000000000000000 |
|
556 | $ hg log -r 1000000000000000000000000000000000000000 | |
557 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
557 | abort: unknown revision '1000000000000000000000000000000000000000'! | |
558 | [255] |
|
558 | [255] | |
559 |
|
559 | |||
560 | log -k r1 |
|
560 | log -k r1 | |
561 |
|
561 | |||
562 | $ hg log -k r1 |
|
562 | $ hg log -k r1 | |
563 | changeset: 1:3d5bf5654eda |
|
563 | changeset: 1:3d5bf5654eda | |
564 | user: test |
|
564 | user: test | |
565 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
565 | date: Thu Jan 01 00:00:01 1970 +0000 | |
566 | summary: r1 |
|
566 | summary: r1 | |
567 |
|
567 | |||
568 | log -p -l2 --color=always |
|
568 | log -p -l2 --color=always | |
569 |
|
569 | |||
570 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
570 | $ hg --config extensions.color= --config color.mode=ansi \ | |
571 | > log -p -l2 --color=always |
|
571 | > log -p -l2 --color=always | |
572 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) |
|
572 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) | |
573 | tag: tip |
|
573 | tag: tip | |
574 | user: test |
|
574 | user: test | |
575 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
575 | date: Thu Jan 01 00:00:01 1970 +0000 | |
576 | summary: b1.1 |
|
576 | summary: b1.1 | |
577 |
|
577 | |||
578 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) |
|
578 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) | |
579 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
579 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
580 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
580 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
581 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
581 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | |
582 | b1 |
|
582 | b1 | |
583 | \x1b[0;32m+postm\x1b[0m (esc) |
|
583 | \x1b[0;32m+postm\x1b[0m (esc) | |
584 |
|
584 | |||
585 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) |
|
585 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) | |
586 | parent: 3:e62f78d544b4 |
|
586 | parent: 3:e62f78d544b4 | |
587 | parent: 4:ddb82e70d1a1 |
|
587 | parent: 4:ddb82e70d1a1 | |
588 | user: test |
|
588 | user: test | |
589 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
589 | date: Thu Jan 01 00:00:01 1970 +0000 | |
590 | summary: m12 |
|
590 | summary: m12 | |
591 |
|
591 | |||
592 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) |
|
592 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) | |
593 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) |
|
593 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) | |
594 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) |
|
594 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
595 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) |
|
595 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) | |
596 | \x1b[0;32m+b2\x1b[0m (esc) |
|
596 | \x1b[0;32m+b2\x1b[0m (esc) | |
597 |
|
597 | |||
598 |
|
598 | |||
599 |
|
599 | |||
600 | log -r tip --stat |
|
600 | log -r tip --stat | |
601 |
|
601 | |||
602 | $ hg log -r tip --stat |
|
602 | $ hg log -r tip --stat | |
603 | changeset: 6:2404bbcab562 |
|
603 | changeset: 6:2404bbcab562 | |
604 | tag: tip |
|
604 | tag: tip | |
605 | user: test |
|
605 | user: test | |
606 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
606 | date: Thu Jan 01 00:00:01 1970 +0000 | |
607 | summary: b1.1 |
|
607 | summary: b1.1 | |
608 |
|
608 | |||
609 | b1 | 1 + |
|
609 | b1 | 1 + | |
610 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
610 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
611 |
|
611 | |||
612 |
|
612 | |||
613 | $ cd .. |
|
613 | $ cd .. | |
614 |
|
614 | |||
615 |
|
615 | |||
616 | User |
|
616 | User | |
617 |
|
617 | |||
618 | $ hg init usertest |
|
618 | $ hg init usertest | |
619 | $ cd usertest |
|
619 | $ cd usertest | |
620 |
|
620 | |||
621 | $ echo a > a |
|
621 | $ echo a > a | |
622 | $ hg ci -A -m "a" -u "User One <user1@example.org>" |
|
622 | $ hg ci -A -m "a" -u "User One <user1@example.org>" | |
623 | adding a |
|
623 | adding a | |
624 | $ echo b > b |
|
624 | $ echo b > b | |
625 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
625 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" | |
626 | adding b |
|
626 | adding b | |
627 |
|
627 | |||
628 | $ hg log -u "User One <user1@example.org>" |
|
628 | $ hg log -u "User One <user1@example.org>" | |
629 | changeset: 0:29a4c94f1924 |
|
629 | changeset: 0:29a4c94f1924 | |
630 | user: User One <user1@example.org> |
|
630 | user: User One <user1@example.org> | |
631 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
631 | date: Thu Jan 01 00:00:00 1970 +0000 | |
632 | summary: a |
|
632 | summary: a | |
633 |
|
633 | |||
634 | $ hg log -u "user1" -u "user2" |
|
634 | $ hg log -u "user1" -u "user2" | |
635 | changeset: 1:e834b5e69c0e |
|
635 | changeset: 1:e834b5e69c0e | |
636 | tag: tip |
|
636 | tag: tip | |
637 | user: User Two <user2@example.org> |
|
637 | user: User Two <user2@example.org> | |
638 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
638 | date: Thu Jan 01 00:00:00 1970 +0000 | |
639 | summary: b |
|
639 | summary: b | |
640 |
|
640 | |||
641 | changeset: 0:29a4c94f1924 |
|
641 | changeset: 0:29a4c94f1924 | |
642 | user: User One <user1@example.org> |
|
642 | user: User One <user1@example.org> | |
643 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
643 | date: Thu Jan 01 00:00:00 1970 +0000 | |
644 | summary: a |
|
644 | summary: a | |
645 |
|
645 | |||
646 | $ hg log -u "user3" |
|
646 | $ hg log -u "user3" | |
647 |
|
647 | |||
648 | $ cd .. |
|
648 | $ cd .. | |
649 |
|
649 | |||
650 | $ hg init branches |
|
650 | $ hg init branches | |
651 | $ cd branches |
|
651 | $ cd branches | |
652 |
|
652 | |||
653 | $ echo a > a |
|
653 | $ echo a > a | |
654 | $ hg ci -A -m "commit on default" |
|
654 | $ hg ci -A -m "commit on default" | |
655 | adding a |
|
655 | adding a | |
656 | $ hg branch test |
|
656 | $ hg branch test | |
657 | marked working directory as branch test |
|
657 | marked working directory as branch test | |
658 | (branches are permanent and global, did you want a bookmark?) |
|
658 | (branches are permanent and global, did you want a bookmark?) | |
659 | $ echo b > b |
|
659 | $ echo b > b | |
660 | $ hg ci -A -m "commit on test" |
|
660 | $ hg ci -A -m "commit on test" | |
661 | adding b |
|
661 | adding b | |
662 |
|
662 | |||
663 | $ hg up default |
|
663 | $ hg up default | |
664 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
664 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
665 | $ echo c > c |
|
665 | $ echo c > c | |
666 | $ hg ci -A -m "commit on default" |
|
666 | $ hg ci -A -m "commit on default" | |
667 | adding c |
|
667 | adding c | |
668 | $ hg up test |
|
668 | $ hg up test | |
669 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
669 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
670 | $ echo c > c |
|
670 | $ echo c > c | |
671 | $ hg ci -A -m "commit on test" |
|
671 | $ hg ci -A -m "commit on test" | |
672 | adding c |
|
672 | adding c | |
673 |
|
673 | |||
674 |
|
674 | |||
675 | log -b default |
|
675 | log -b default | |
676 |
|
676 | |||
677 | $ hg log -b default |
|
677 | $ hg log -b default | |
678 | changeset: 2:c3a4f03cc9a7 |
|
678 | changeset: 2:c3a4f03cc9a7 | |
679 | parent: 0:24427303d56f |
|
679 | parent: 0:24427303d56f | |
680 | user: test |
|
680 | user: test | |
681 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
681 | date: Thu Jan 01 00:00:00 1970 +0000 | |
682 | summary: commit on default |
|
682 | summary: commit on default | |
683 |
|
683 | |||
684 | changeset: 0:24427303d56f |
|
684 | changeset: 0:24427303d56f | |
685 | user: test |
|
685 | user: test | |
686 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
686 | date: Thu Jan 01 00:00:00 1970 +0000 | |
687 | summary: commit on default |
|
687 | summary: commit on default | |
688 |
|
688 | |||
689 |
|
689 | |||
690 |
|
690 | |||
691 | log -b test |
|
691 | log -b test | |
692 |
|
692 | |||
693 | $ hg log -b test |
|
693 | $ hg log -b test | |
694 | changeset: 3:f5d8de11c2e2 |
|
694 | changeset: 3:f5d8de11c2e2 | |
695 | branch: test |
|
695 | branch: test | |
696 | tag: tip |
|
696 | tag: tip | |
697 | parent: 1:d32277701ccb |
|
697 | parent: 1:d32277701ccb | |
698 | user: test |
|
698 | user: test | |
699 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
699 | date: Thu Jan 01 00:00:00 1970 +0000 | |
700 | summary: commit on test |
|
700 | summary: commit on test | |
701 |
|
701 | |||
702 | changeset: 1:d32277701ccb |
|
702 | changeset: 1:d32277701ccb | |
703 | branch: test |
|
703 | branch: test | |
704 | user: test |
|
704 | user: test | |
705 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
705 | date: Thu Jan 01 00:00:00 1970 +0000 | |
706 | summary: commit on test |
|
706 | summary: commit on test | |
707 |
|
707 | |||
708 |
|
708 | |||
709 |
|
709 | |||
710 | log -b dummy |
|
710 | log -b dummy | |
711 |
|
711 | |||
712 | $ hg log -b dummy |
|
712 | $ hg log -b dummy | |
713 | abort: unknown revision 'dummy'! |
|
713 | abort: unknown revision 'dummy'! | |
714 | [255] |
|
714 | [255] | |
715 |
|
715 | |||
716 |
|
716 | |||
717 | log -b . |
|
717 | log -b . | |
718 |
|
718 | |||
719 | $ hg log -b . |
|
719 | $ hg log -b . | |
720 | changeset: 3:f5d8de11c2e2 |
|
720 | changeset: 3:f5d8de11c2e2 | |
721 | branch: test |
|
721 | branch: test | |
722 | tag: tip |
|
722 | tag: tip | |
723 | parent: 1:d32277701ccb |
|
723 | parent: 1:d32277701ccb | |
724 | user: test |
|
724 | user: test | |
725 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
725 | date: Thu Jan 01 00:00:00 1970 +0000 | |
726 | summary: commit on test |
|
726 | summary: commit on test | |
727 |
|
727 | |||
728 | changeset: 1:d32277701ccb |
|
728 | changeset: 1:d32277701ccb | |
729 | branch: test |
|
729 | branch: test | |
730 | user: test |
|
730 | user: test | |
731 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
731 | date: Thu Jan 01 00:00:00 1970 +0000 | |
732 | summary: commit on test |
|
732 | summary: commit on test | |
733 |
|
733 | |||
734 |
|
734 | |||
735 |
|
735 | |||
736 | log -b default -b test |
|
736 | log -b default -b test | |
737 |
|
737 | |||
738 | $ hg log -b default -b test |
|
738 | $ hg log -b default -b test | |
739 | changeset: 3:f5d8de11c2e2 |
|
739 | changeset: 3:f5d8de11c2e2 | |
740 | branch: test |
|
740 | branch: test | |
741 | tag: tip |
|
741 | tag: tip | |
742 | parent: 1:d32277701ccb |
|
742 | parent: 1:d32277701ccb | |
743 | user: test |
|
743 | user: test | |
744 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
744 | date: Thu Jan 01 00:00:00 1970 +0000 | |
745 | summary: commit on test |
|
745 | summary: commit on test | |
746 |
|
746 | |||
747 | changeset: 2:c3a4f03cc9a7 |
|
747 | changeset: 2:c3a4f03cc9a7 | |
748 | parent: 0:24427303d56f |
|
748 | parent: 0:24427303d56f | |
749 | user: test |
|
749 | user: test | |
750 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
750 | date: Thu Jan 01 00:00:00 1970 +0000 | |
751 | summary: commit on default |
|
751 | summary: commit on default | |
752 |
|
752 | |||
753 | changeset: 1:d32277701ccb |
|
753 | changeset: 1:d32277701ccb | |
754 | branch: test |
|
754 | branch: test | |
755 | user: test |
|
755 | user: test | |
756 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
756 | date: Thu Jan 01 00:00:00 1970 +0000 | |
757 | summary: commit on test |
|
757 | summary: commit on test | |
758 |
|
758 | |||
759 | changeset: 0:24427303d56f |
|
759 | changeset: 0:24427303d56f | |
760 | user: test |
|
760 | user: test | |
761 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
761 | date: Thu Jan 01 00:00:00 1970 +0000 | |
762 | summary: commit on default |
|
762 | summary: commit on default | |
763 |
|
763 | |||
764 |
|
764 | |||
765 |
|
765 | |||
766 | log -b default -b . |
|
766 | log -b default -b . | |
767 |
|
767 | |||
768 | $ hg log -b default -b . |
|
768 | $ hg log -b default -b . | |
769 | changeset: 3:f5d8de11c2e2 |
|
769 | changeset: 3:f5d8de11c2e2 | |
770 | branch: test |
|
770 | branch: test | |
771 | tag: tip |
|
771 | tag: tip | |
772 | parent: 1:d32277701ccb |
|
772 | parent: 1:d32277701ccb | |
773 | user: test |
|
773 | user: test | |
774 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
774 | date: Thu Jan 01 00:00:00 1970 +0000 | |
775 | summary: commit on test |
|
775 | summary: commit on test | |
776 |
|
776 | |||
777 | changeset: 2:c3a4f03cc9a7 |
|
777 | changeset: 2:c3a4f03cc9a7 | |
778 | parent: 0:24427303d56f |
|
778 | parent: 0:24427303d56f | |
779 | user: test |
|
779 | user: test | |
780 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
780 | date: Thu Jan 01 00:00:00 1970 +0000 | |
781 | summary: commit on default |
|
781 | summary: commit on default | |
782 |
|
782 | |||
783 | changeset: 1:d32277701ccb |
|
783 | changeset: 1:d32277701ccb | |
784 | branch: test |
|
784 | branch: test | |
785 | user: test |
|
785 | user: test | |
786 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
786 | date: Thu Jan 01 00:00:00 1970 +0000 | |
787 | summary: commit on test |
|
787 | summary: commit on test | |
788 |
|
788 | |||
789 | changeset: 0:24427303d56f |
|
789 | changeset: 0:24427303d56f | |
790 | user: test |
|
790 | user: test | |
791 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
791 | date: Thu Jan 01 00:00:00 1970 +0000 | |
792 | summary: commit on default |
|
792 | summary: commit on default | |
793 |
|
793 | |||
794 |
|
794 | |||
795 |
|
795 | |||
796 | log -b . -b test |
|
796 | log -b . -b test | |
797 |
|
797 | |||
798 | $ hg log -b . -b test |
|
798 | $ hg log -b . -b test | |
799 | changeset: 3:f5d8de11c2e2 |
|
799 | changeset: 3:f5d8de11c2e2 | |
800 | branch: test |
|
800 | branch: test | |
801 | tag: tip |
|
801 | tag: tip | |
802 | parent: 1:d32277701ccb |
|
802 | parent: 1:d32277701ccb | |
803 | user: test |
|
803 | user: test | |
804 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
804 | date: Thu Jan 01 00:00:00 1970 +0000 | |
805 | summary: commit on test |
|
805 | summary: commit on test | |
806 |
|
806 | |||
807 | changeset: 1:d32277701ccb |
|
807 | changeset: 1:d32277701ccb | |
808 | branch: test |
|
808 | branch: test | |
809 | user: test |
|
809 | user: test | |
810 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
810 | date: Thu Jan 01 00:00:00 1970 +0000 | |
811 | summary: commit on test |
|
811 | summary: commit on test | |
812 |
|
812 | |||
813 |
|
813 | |||
814 |
|
814 | |||
815 | log -b 2 |
|
815 | log -b 2 | |
816 |
|
816 | |||
817 | $ hg log -b 2 |
|
817 | $ hg log -b 2 | |
818 | changeset: 2:c3a4f03cc9a7 |
|
818 | changeset: 2:c3a4f03cc9a7 | |
819 | parent: 0:24427303d56f |
|
819 | parent: 0:24427303d56f | |
820 | user: test |
|
820 | user: test | |
821 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
821 | date: Thu Jan 01 00:00:00 1970 +0000 | |
822 | summary: commit on default |
|
822 | summary: commit on default | |
823 |
|
823 | |||
824 | changeset: 0:24427303d56f |
|
824 | changeset: 0:24427303d56f | |
825 | user: test |
|
825 | user: test | |
826 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
826 | date: Thu Jan 01 00:00:00 1970 +0000 | |
827 | summary: commit on default |
|
827 | summary: commit on default | |
828 |
|
828 | |||
829 |
|
829 | |||
830 |
|
830 | |||
831 | log -p --cwd dir (in subdir) |
|
831 | log -p --cwd dir (in subdir) | |
832 |
|
832 | |||
833 | $ mkdir dir |
|
833 | $ mkdir dir | |
834 | $ hg log -p --cwd dir |
|
834 | $ hg log -p --cwd dir | |
835 | changeset: 3:f5d8de11c2e2 |
|
835 | changeset: 3:f5d8de11c2e2 | |
836 | branch: test |
|
836 | branch: test | |
837 | tag: tip |
|
837 | tag: tip | |
838 | parent: 1:d32277701ccb |
|
838 | parent: 1:d32277701ccb | |
839 | user: test |
|
839 | user: test | |
840 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
840 | date: Thu Jan 01 00:00:00 1970 +0000 | |
841 | summary: commit on test |
|
841 | summary: commit on test | |
842 |
|
842 | |||
843 | diff -r d32277701ccb -r f5d8de11c2e2 c |
|
843 | diff -r d32277701ccb -r f5d8de11c2e2 c | |
844 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
844 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
845 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
845 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
846 | @@ -0,0 +1,1 @@ |
|
846 | @@ -0,0 +1,1 @@ | |
847 | +c |
|
847 | +c | |
848 |
|
848 | |||
849 | changeset: 2:c3a4f03cc9a7 |
|
849 | changeset: 2:c3a4f03cc9a7 | |
850 | parent: 0:24427303d56f |
|
850 | parent: 0:24427303d56f | |
851 | user: test |
|
851 | user: test | |
852 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
852 | date: Thu Jan 01 00:00:00 1970 +0000 | |
853 | summary: commit on default |
|
853 | summary: commit on default | |
854 |
|
854 | |||
855 | diff -r 24427303d56f -r c3a4f03cc9a7 c |
|
855 | diff -r 24427303d56f -r c3a4f03cc9a7 c | |
856 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
856 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
857 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
857 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
858 | @@ -0,0 +1,1 @@ |
|
858 | @@ -0,0 +1,1 @@ | |
859 | +c |
|
859 | +c | |
860 |
|
860 | |||
861 | changeset: 1:d32277701ccb |
|
861 | changeset: 1:d32277701ccb | |
862 | branch: test |
|
862 | branch: test | |
863 | user: test |
|
863 | user: test | |
864 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
864 | date: Thu Jan 01 00:00:00 1970 +0000 | |
865 | summary: commit on test |
|
865 | summary: commit on test | |
866 |
|
866 | |||
867 | diff -r 24427303d56f -r d32277701ccb b |
|
867 | diff -r 24427303d56f -r d32277701ccb b | |
868 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
868 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
869 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
869 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
870 | @@ -0,0 +1,1 @@ |
|
870 | @@ -0,0 +1,1 @@ | |
871 | +b |
|
871 | +b | |
872 |
|
872 | |||
873 | changeset: 0:24427303d56f |
|
873 | changeset: 0:24427303d56f | |
874 | user: test |
|
874 | user: test | |
875 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
875 | date: Thu Jan 01 00:00:00 1970 +0000 | |
876 | summary: commit on default |
|
876 | summary: commit on default | |
877 |
|
877 | |||
878 | diff -r 000000000000 -r 24427303d56f a |
|
878 | diff -r 000000000000 -r 24427303d56f a | |
879 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
879 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
880 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
880 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
881 | @@ -0,0 +1,1 @@ |
|
881 | @@ -0,0 +1,1 @@ | |
882 | +a |
|
882 | +a | |
883 |
|
883 | |||
884 |
|
884 | |||
885 |
|
885 | |||
886 | log -p -R repo |
|
886 | log -p -R repo | |
887 |
|
887 | |||
888 | $ cd dir |
|
888 | $ cd dir | |
889 | $ hg log -p -R .. ../a |
|
889 | $ hg log -p -R .. ../a | |
890 | changeset: 0:24427303d56f |
|
890 | changeset: 0:24427303d56f | |
891 | user: test |
|
891 | user: test | |
892 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
892 | date: Thu Jan 01 00:00:00 1970 +0000 | |
893 | summary: commit on default |
|
893 | summary: commit on default | |
894 |
|
894 | |||
895 | diff -r 000000000000 -r 24427303d56f a |
|
895 | diff -r 000000000000 -r 24427303d56f a | |
896 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
896 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
897 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
897 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
898 | @@ -0,0 +1,1 @@ |
|
898 | @@ -0,0 +1,1 @@ | |
899 | +a |
|
899 | +a | |
900 |
|
900 | |||
901 |
|
901 | |||
902 | $ cd ../.. |
|
902 | $ cd ../.. | |
903 |
|
903 | |||
904 | $ hg init follow2 |
|
904 | $ hg init follow2 | |
905 | $ cd follow2 |
|
905 | $ cd follow2 | |
906 |
|
906 | |||
907 | # Build the following history: |
|
907 | # Build the following history: | |
908 | # tip - o - x - o - x - x |
|
908 | # tip - o - x - o - x - x | |
909 | # \ / |
|
909 | # \ / | |
910 | # o - o - o - x |
|
910 | # o - o - o - x | |
911 | # \ / |
|
911 | # \ / | |
912 | # o |
|
912 | # o | |
913 | # |
|
913 | # | |
914 | # Where "o" is a revision containing "foo" and |
|
914 | # Where "o" is a revision containing "foo" and | |
915 | # "x" is a revision without "foo" |
|
915 | # "x" is a revision without "foo" | |
916 |
|
916 | |||
917 | $ touch init |
|
917 | $ touch init | |
918 | $ hg ci -A -m "init, unrelated" |
|
918 | $ hg ci -A -m "init, unrelated" | |
919 | adding init |
|
919 | adding init | |
920 | $ echo 'foo' > init |
|
920 | $ echo 'foo' > init | |
921 | $ hg ci -m "change, unrelated" |
|
921 | $ hg ci -m "change, unrelated" | |
922 | $ echo 'foo' > foo |
|
922 | $ echo 'foo' > foo | |
923 | $ hg ci -A -m "add unrelated old foo" |
|
923 | $ hg ci -A -m "add unrelated old foo" | |
924 | adding foo |
|
924 | adding foo | |
925 | $ hg rm foo |
|
925 | $ hg rm foo | |
926 | $ hg ci -m "delete foo, unrelated" |
|
926 | $ hg ci -m "delete foo, unrelated" | |
927 | $ echo 'related' > foo |
|
927 | $ echo 'related' > foo | |
928 | $ hg ci -A -m "add foo, related" |
|
928 | $ hg ci -A -m "add foo, related" | |
929 | adding foo |
|
929 | adding foo | |
930 |
|
930 | |||
931 | $ hg up 0 |
|
931 | $ hg up 0 | |
932 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
932 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
933 | $ touch branch |
|
933 | $ touch branch | |
934 | $ hg ci -A -m "first branch, unrelated" |
|
934 | $ hg ci -A -m "first branch, unrelated" | |
935 | adding branch |
|
935 | adding branch | |
936 | created new head |
|
936 | created new head | |
937 | $ touch foo |
|
937 | $ touch foo | |
938 | $ hg ci -A -m "create foo, related" |
|
938 | $ hg ci -A -m "create foo, related" | |
939 | adding foo |
|
939 | adding foo | |
940 | $ echo 'change' > foo |
|
940 | $ echo 'change' > foo | |
941 | $ hg ci -m "change foo, related" |
|
941 | $ hg ci -m "change foo, related" | |
942 |
|
942 | |||
943 | $ hg up 6 |
|
943 | $ hg up 6 | |
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
944 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
945 | $ echo 'change foo in branch' > foo |
|
945 | $ echo 'change foo in branch' > foo | |
946 | $ hg ci -m "change foo in branch, related" |
|
946 | $ hg ci -m "change foo in branch, related" | |
947 | created new head |
|
947 | created new head | |
948 | $ hg merge 7 |
|
948 | $ hg merge 7 | |
949 | merging foo |
|
949 | merging foo | |
950 | warning: conflicts during merge. |
|
950 | warning: conflicts during merge. | |
951 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
951 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
952 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
952 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
953 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
953 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
954 | [1] |
|
954 | [1] | |
955 | $ echo 'merge 1' > foo |
|
955 | $ echo 'merge 1' > foo | |
956 | $ hg resolve -m foo |
|
956 | $ hg resolve -m foo | |
957 | $ hg ci -m "First merge, related" |
|
957 | $ hg ci -m "First merge, related" | |
958 |
|
958 | |||
959 | $ hg merge 4 |
|
959 | $ hg merge 4 | |
960 | merging foo |
|
960 | merging foo | |
961 | warning: conflicts during merge. |
|
961 | warning: conflicts during merge. | |
962 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
962 | merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') | |
963 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
963 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
964 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
964 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
965 | [1] |
|
965 | [1] | |
966 | $ echo 'merge 2' > foo |
|
966 | $ echo 'merge 2' > foo | |
967 | $ hg resolve -m foo |
|
967 | $ hg resolve -m foo | |
968 | $ hg ci -m "Last merge, related" |
|
968 | $ hg ci -m "Last merge, related" | |
969 |
|
969 | |||
970 | $ hg log --graph |
|
970 | $ hg log --graph | |
971 | @ changeset: 10:4dae8563d2c5 |
|
971 | @ changeset: 10:4dae8563d2c5 | |
972 | |\ tag: tip |
|
972 | |\ tag: tip | |
973 | | | parent: 9:7b35701b003e |
|
973 | | | parent: 9:7b35701b003e | |
974 | | | parent: 4:88176d361b69 |
|
974 | | | parent: 4:88176d361b69 | |
975 | | | user: test |
|
975 | | | user: test | |
976 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
976 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
977 | | | summary: Last merge, related |
|
977 | | | summary: Last merge, related | |
978 | | | |
|
978 | | | | |
979 | | o changeset: 9:7b35701b003e |
|
979 | | o changeset: 9:7b35701b003e | |
980 | | |\ parent: 8:e5416ad8a855 |
|
980 | | |\ parent: 8:e5416ad8a855 | |
981 | | | | parent: 7:87fe3144dcfa |
|
981 | | | | parent: 7:87fe3144dcfa | |
982 | | | | user: test |
|
982 | | | | user: test | |
983 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
983 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
984 | | | | summary: First merge, related |
|
984 | | | | summary: First merge, related | |
985 | | | | |
|
985 | | | | | |
986 | | | o changeset: 8:e5416ad8a855 |
|
986 | | | o changeset: 8:e5416ad8a855 | |
987 | | | | parent: 6:dc6c325fe5ee |
|
987 | | | | parent: 6:dc6c325fe5ee | |
988 | | | | user: test |
|
988 | | | | user: test | |
989 | | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
989 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
990 | | | | summary: change foo in branch, related |
|
990 | | | | summary: change foo in branch, related | |
991 | | | | |
|
991 | | | | | |
992 | | o | changeset: 7:87fe3144dcfa |
|
992 | | o | changeset: 7:87fe3144dcfa | |
993 | | |/ user: test |
|
993 | | |/ user: test | |
994 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
994 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
995 | | | summary: change foo, related |
|
995 | | | summary: change foo, related | |
996 | | | |
|
996 | | | | |
997 | | o changeset: 6:dc6c325fe5ee |
|
997 | | o changeset: 6:dc6c325fe5ee | |
998 | | | user: test |
|
998 | | | user: test | |
999 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
999 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1000 | | | summary: create foo, related |
|
1000 | | | summary: create foo, related | |
1001 | | | |
|
1001 | | | | |
1002 | | o changeset: 5:73db34516eb9 |
|
1002 | | o changeset: 5:73db34516eb9 | |
1003 | | | parent: 0:e87515fd044a |
|
1003 | | | parent: 0:e87515fd044a | |
1004 | | | user: test |
|
1004 | | | user: test | |
1005 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1005 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1006 | | | summary: first branch, unrelated |
|
1006 | | | summary: first branch, unrelated | |
1007 | | | |
|
1007 | | | | |
1008 | o | changeset: 4:88176d361b69 |
|
1008 | o | changeset: 4:88176d361b69 | |
1009 | | | user: test |
|
1009 | | | user: test | |
1010 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1010 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1011 | | | summary: add foo, related |
|
1011 | | | summary: add foo, related | |
1012 | | | |
|
1012 | | | | |
1013 | o | changeset: 3:dd78ae4afb56 |
|
1013 | o | changeset: 3:dd78ae4afb56 | |
1014 | | | user: test |
|
1014 | | | user: test | |
1015 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1015 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1016 | | | summary: delete foo, unrelated |
|
1016 | | | summary: delete foo, unrelated | |
1017 | | | |
|
1017 | | | | |
1018 | o | changeset: 2:c4c64aedf0f7 |
|
1018 | o | changeset: 2:c4c64aedf0f7 | |
1019 | | | user: test |
|
1019 | | | user: test | |
1020 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1020 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1021 | | | summary: add unrelated old foo |
|
1021 | | | summary: add unrelated old foo | |
1022 | | | |
|
1022 | | | | |
1023 | o | changeset: 1:e5faa7440653 |
|
1023 | o | changeset: 1:e5faa7440653 | |
1024 | |/ user: test |
|
1024 | |/ user: test | |
1025 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1025 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
1026 | | summary: change, unrelated |
|
1026 | | summary: change, unrelated | |
1027 | | |
|
1027 | | | |
1028 | o changeset: 0:e87515fd044a |
|
1028 | o changeset: 0:e87515fd044a | |
1029 | user: test |
|
1029 | user: test | |
1030 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1030 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1031 | summary: init, unrelated |
|
1031 | summary: init, unrelated | |
1032 |
|
1032 | |||
1033 |
|
1033 | |||
1034 | $ hg --traceback log -f foo |
|
1034 | $ hg --traceback log -f foo | |
1035 | changeset: 10:4dae8563d2c5 |
|
1035 | changeset: 10:4dae8563d2c5 | |
1036 | tag: tip |
|
1036 | tag: tip | |
1037 | parent: 9:7b35701b003e |
|
1037 | parent: 9:7b35701b003e | |
1038 | parent: 4:88176d361b69 |
|
1038 | parent: 4:88176d361b69 | |
1039 | user: test |
|
1039 | user: test | |
1040 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1040 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1041 | summary: Last merge, related |
|
1041 | summary: Last merge, related | |
1042 |
|
1042 | |||
1043 | changeset: 9:7b35701b003e |
|
1043 | changeset: 9:7b35701b003e | |
1044 | parent: 8:e5416ad8a855 |
|
1044 | parent: 8:e5416ad8a855 | |
1045 | parent: 7:87fe3144dcfa |
|
1045 | parent: 7:87fe3144dcfa | |
1046 | user: test |
|
1046 | user: test | |
1047 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1047 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1048 | summary: First merge, related |
|
1048 | summary: First merge, related | |
1049 |
|
1049 | |||
1050 | changeset: 8:e5416ad8a855 |
|
1050 | changeset: 8:e5416ad8a855 | |
1051 | parent: 6:dc6c325fe5ee |
|
1051 | parent: 6:dc6c325fe5ee | |
1052 | user: test |
|
1052 | user: test | |
1053 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1053 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1054 | summary: change foo in branch, related |
|
1054 | summary: change foo in branch, related | |
1055 |
|
1055 | |||
1056 | changeset: 7:87fe3144dcfa |
|
1056 | changeset: 7:87fe3144dcfa | |
1057 | user: test |
|
1057 | user: test | |
1058 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1058 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1059 | summary: change foo, related |
|
1059 | summary: change foo, related | |
1060 |
|
1060 | |||
1061 | changeset: 6:dc6c325fe5ee |
|
1061 | changeset: 6:dc6c325fe5ee | |
1062 | user: test |
|
1062 | user: test | |
1063 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1063 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1064 | summary: create foo, related |
|
1064 | summary: create foo, related | |
1065 |
|
1065 | |||
1066 | changeset: 4:88176d361b69 |
|
1066 | changeset: 4:88176d361b69 | |
1067 | user: test |
|
1067 | user: test | |
1068 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1068 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1069 | summary: add foo, related |
|
1069 | summary: add foo, related | |
1070 |
|
1070 | |||
1071 |
|
1071 | |||
1072 | Also check when maxrev < lastrevfilelog |
|
1072 | Also check when maxrev < lastrevfilelog | |
1073 |
|
1073 | |||
1074 | $ hg --traceback log -f -r4 foo |
|
1074 | $ hg --traceback log -f -r4 foo | |
1075 | changeset: 4:88176d361b69 |
|
1075 | changeset: 4:88176d361b69 | |
1076 | user: test |
|
1076 | user: test | |
1077 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1077 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1078 | summary: add foo, related |
|
1078 | summary: add foo, related | |
1079 |
|
1079 | |||
1080 | $ cd .. |
|
1080 | $ cd .. | |
1081 |
|
1081 | |||
1082 | Issue2383: hg log showing _less_ differences than hg diff |
|
1082 | Issue2383: hg log showing _less_ differences than hg diff | |
1083 |
|
1083 | |||
1084 | $ hg init issue2383 |
|
1084 | $ hg init issue2383 | |
1085 | $ cd issue2383 |
|
1085 | $ cd issue2383 | |
1086 |
|
1086 | |||
1087 | Create a test repo: |
|
1087 | Create a test repo: | |
1088 |
|
1088 | |||
1089 | $ echo a > a |
|
1089 | $ echo a > a | |
1090 | $ hg ci -Am0 |
|
1090 | $ hg ci -Am0 | |
1091 | adding a |
|
1091 | adding a | |
1092 | $ echo b > b |
|
1092 | $ echo b > b | |
1093 | $ hg ci -Am1 |
|
1093 | $ hg ci -Am1 | |
1094 | adding b |
|
1094 | adding b | |
1095 | $ hg co 0 |
|
1095 | $ hg co 0 | |
1096 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1096 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1097 | $ echo b > a |
|
1097 | $ echo b > a | |
1098 | $ hg ci -m2 |
|
1098 | $ hg ci -m2 | |
1099 | created new head |
|
1099 | created new head | |
1100 |
|
1100 | |||
1101 | Merge: |
|
1101 | Merge: | |
1102 |
|
1102 | |||
1103 | $ hg merge |
|
1103 | $ hg merge | |
1104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1105 | (branch merge, don't forget to commit) |
|
1105 | (branch merge, don't forget to commit) | |
1106 |
|
1106 | |||
1107 | Make sure there's a file listed in the merge to trigger the bug: |
|
1107 | Make sure there's a file listed in the merge to trigger the bug: | |
1108 |
|
1108 | |||
1109 | $ echo c > a |
|
1109 | $ echo c > a | |
1110 | $ hg ci -m3 |
|
1110 | $ hg ci -m3 | |
1111 |
|
1111 | |||
1112 | Two files shown here in diff: |
|
1112 | Two files shown here in diff: | |
1113 |
|
1113 | |||
1114 | $ hg diff --rev 2:3 |
|
1114 | $ hg diff --rev 2:3 | |
1115 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1115 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1116 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1116 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1117 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1117 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1118 | @@ -1,1 +1,1 @@ |
|
1118 | @@ -1,1 +1,1 @@ | |
1119 | -b |
|
1119 | -b | |
1120 | +c |
|
1120 | +c | |
1121 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1121 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1122 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1122 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1123 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1123 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1124 | @@ -0,0 +1,1 @@ |
|
1124 | @@ -0,0 +1,1 @@ | |
1125 | +b |
|
1125 | +b | |
1126 |
|
1126 | |||
1127 | Diff here should be the same: |
|
1127 | Diff here should be the same: | |
1128 |
|
1128 | |||
1129 | $ hg log -vpr 3 |
|
1129 | $ hg log -vpr 3 | |
1130 | changeset: 3:8e07aafe1edc |
|
1130 | changeset: 3:8e07aafe1edc | |
1131 | tag: tip |
|
1131 | tag: tip | |
1132 | parent: 2:b09be438c43a |
|
1132 | parent: 2:b09be438c43a | |
1133 | parent: 1:925d80f479bb |
|
1133 | parent: 1:925d80f479bb | |
1134 | user: test |
|
1134 | user: test | |
1135 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1135 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1136 | files: a |
|
1136 | files: a | |
1137 | description: |
|
1137 | description: | |
1138 | 3 |
|
1138 | 3 | |
1139 |
|
1139 | |||
1140 |
|
1140 | |||
1141 | diff -r b09be438c43a -r 8e07aafe1edc a |
|
1141 | diff -r b09be438c43a -r 8e07aafe1edc a | |
1142 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1142 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1143 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1143 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1144 | @@ -1,1 +1,1 @@ |
|
1144 | @@ -1,1 +1,1 @@ | |
1145 | -b |
|
1145 | -b | |
1146 | +c |
|
1146 | +c | |
1147 | diff -r b09be438c43a -r 8e07aafe1edc b |
|
1147 | diff -r b09be438c43a -r 8e07aafe1edc b | |
1148 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1148 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
1149 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1149 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
1150 | @@ -0,0 +1,1 @@ |
|
1150 | @@ -0,0 +1,1 @@ | |
1151 | +b |
|
1151 | +b | |
1152 |
|
1152 | |||
1153 | $ cd .. |
|
1153 | $ cd .. | |
1154 |
|
1154 | |||
1155 | 'hg log -r rev fn' when last(filelog(fn)) != rev |
|
1155 | 'hg log -r rev fn' when last(filelog(fn)) != rev | |
1156 |
|
1156 | |||
1157 | $ hg init simplelog |
|
1157 | $ hg init simplelog | |
1158 | $ cd simplelog |
|
1158 | $ cd simplelog | |
1159 | $ echo f > a |
|
1159 | $ echo f > a | |
1160 | $ hg ci -Am'a' -d '0 0' |
|
1160 | $ hg ci -Am'a' -d '0 0' | |
1161 | adding a |
|
1161 | adding a | |
1162 | $ echo f >> a |
|
1162 | $ echo f >> a | |
1163 | $ hg ci -Am'a bis' -d '1 0' |
|
1163 | $ hg ci -Am'a bis' -d '1 0' | |
1164 |
|
1164 | |||
1165 | $ hg log -r0 a |
|
1165 | $ hg log -r0 a | |
1166 | changeset: 0:9f758d63dcde |
|
1166 | changeset: 0:9f758d63dcde | |
1167 | user: test |
|
1167 | user: test | |
1168 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1168 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1169 | summary: a |
|
1169 | summary: a | |
1170 |
|
1170 | |||
1171 | enable obsolete to test hidden feature |
|
1171 | enable obsolete to test hidden feature | |
1172 |
|
1172 | |||
1173 | $ cat > ${TESTTMP}/obs.py << EOF |
|
1173 | $ cat > ${TESTTMP}/obs.py << EOF | |
1174 | > import mercurial.obsolete |
|
1174 | > import mercurial.obsolete | |
1175 | > mercurial.obsolete._enabled = True |
|
1175 | > mercurial.obsolete._enabled = True | |
1176 | > EOF |
|
1176 | > EOF | |
1177 | $ echo '[extensions]' >> $HGRCPATH |
|
1177 | $ echo '[extensions]' >> $HGRCPATH | |
1178 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH |
|
1178 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |
1179 |
|
1179 | |||
1180 | $ hg log --template='{rev}:{node}\n' |
|
1180 | $ hg log --template='{rev}:{node}\n' | |
1181 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1181 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1182 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1182 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1183 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f |
|
1183 | $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f | |
1184 | $ hg up null -q |
|
1184 | $ hg up null -q | |
1185 | $ hg log --template='{rev}:{node}\n' |
|
1185 | $ hg log --template='{rev}:{node}\n' | |
1186 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1186 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1187 | $ hg log --template='{rev}:{node}\n' --hidden |
|
1187 | $ hg log --template='{rev}:{node}\n' --hidden | |
1188 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1188 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1189 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1189 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1190 |
|
1190 | |||
1191 | test that parent prevent a changeset to be hidden |
|
1191 | test that parent prevent a changeset to be hidden | |
1192 |
|
1192 | |||
1193 | $ hg up 1 -q --hidden |
|
1193 | $ hg up 1 -q --hidden | |
1194 | $ hg log --template='{rev}:{node}\n' |
|
1194 | $ hg log --template='{rev}:{node}\n' | |
1195 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1195 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1196 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1196 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1197 |
|
1197 | |||
1198 | test that second parent prevent a changeset to be hidden too |
|
1198 | test that second parent prevent a changeset to be hidden too | |
1199 |
|
1199 | |||
1200 | $ hg debugsetparents 0 1 # nothing suitable to merge here |
|
1200 | $ hg debugsetparents 0 1 # nothing suitable to merge here | |
1201 | $ hg log --template='{rev}:{node}\n' |
|
1201 | $ hg log --template='{rev}:{node}\n' | |
1202 | 1:a765632148dc55d38c35c4f247c618701886cb2f |
|
1202 | 1:a765632148dc55d38c35c4f247c618701886cb2f | |
1203 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 |
|
1203 | 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05 | |
1204 |
|
1204 | |||
1205 | clear extensions configuration |
|
1205 | clear extensions configuration | |
1206 | $ echo '[extensions]' >> $HGRCPATH |
|
1206 | $ echo '[extensions]' >> $HGRCPATH | |
1207 | $ echo "obs=!" >> $HGRCPATH |
|
1207 | $ echo "obs=!" >> $HGRCPATH | |
1208 | $ cd .. |
|
1208 | $ cd .. | |
1209 |
|
1209 | |||
1210 | test -u/-k for problematic encoding |
|
1210 | test -u/-k for problematic encoding | |
1211 | # unicode: cp932: |
|
1211 | # unicode: cp932: | |
1212 | # u30A2 0x83 0x41(= 'A') |
|
1212 | # u30A2 0x83 0x41(= 'A') | |
1213 | # u30C2 0x83 0x61(= 'a') |
|
1213 | # u30C2 0x83 0x61(= 'a') | |
1214 |
|
1214 | |||
1215 | $ hg init problematicencoding |
|
1215 | $ hg init problematicencoding | |
1216 | $ cd problematicencoding |
|
1216 | $ cd problematicencoding | |
1217 |
|
1217 | |||
1218 | $ python > setup.sh <<EOF |
|
1218 | $ python > setup.sh <<EOF | |
1219 | > print u''' |
|
1219 | > print u''' | |
1220 | > echo a > text |
|
1220 | > echo a > text | |
1221 | > hg add text |
|
1221 | > hg add text | |
1222 | > hg --encoding utf-8 commit -u '\u30A2' -m none |
|
1222 | > hg --encoding utf-8 commit -u '\u30A2' -m none | |
1223 | > echo b > text |
|
1223 | > echo b > text | |
1224 | > hg --encoding utf-8 commit -u '\u30C2' -m none |
|
1224 | > hg --encoding utf-8 commit -u '\u30C2' -m none | |
1225 | > echo c > text |
|
1225 | > echo c > text | |
1226 | > hg --encoding utf-8 commit -u none -m '\u30A2' |
|
1226 | > hg --encoding utf-8 commit -u none -m '\u30A2' | |
1227 | > echo d > text |
|
1227 | > echo d > text | |
1228 | > hg --encoding utf-8 commit -u none -m '\u30C2' |
|
1228 | > hg --encoding utf-8 commit -u none -m '\u30C2' | |
1229 | > '''.encode('utf-8') |
|
1229 | > '''.encode('utf-8') | |
1230 | > EOF |
|
1230 | > EOF | |
1231 | $ sh < setup.sh |
|
1231 | $ sh < setup.sh | |
1232 |
|
1232 | |||
1233 | test in problematic encoding |
|
1233 | test in problematic encoding | |
1234 | $ python > test.sh <<EOF |
|
1234 | $ python > test.sh <<EOF | |
1235 | > print u''' |
|
1235 | > print u''' | |
1236 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' |
|
1236 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2' | |
1237 | > echo ==== |
|
1237 | > echo ==== | |
1238 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' |
|
1238 | > hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2' | |
1239 | > echo ==== |
|
1239 | > echo ==== | |
1240 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' |
|
1240 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2' | |
1241 | > echo ==== |
|
1241 | > echo ==== | |
1242 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' |
|
1242 | > hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2' | |
1243 | > '''.encode('cp932') |
|
1243 | > '''.encode('cp932') | |
1244 | > EOF |
|
1244 | > EOF | |
1245 | $ sh < test.sh |
|
1245 | $ sh < test.sh | |
1246 | 0 |
|
1246 | 0 | |
1247 | ==== |
|
1247 | ==== | |
1248 | 1 |
|
1248 | 1 | |
1249 | ==== |
|
1249 | ==== | |
1250 | 2 |
|
1250 | 2 | |
1251 | 0 |
|
1251 | 0 | |
1252 | ==== |
|
1252 | ==== | |
1253 | 3 |
|
1253 | 3 | |
1254 | 1 |
|
1254 | 1 | |
1255 |
|
1255 | |||
1256 | $ cd .. |
|
1256 | $ cd .. | |
1257 |
|
1257 | |||
1258 | test hg log on non-existent files and on directories |
|
1258 | test hg log on non-existent files and on directories | |
1259 | $ hg init issue1340 |
|
1259 | $ hg init issue1340 | |
1260 | $ cd issue1340 |
|
1260 | $ cd issue1340 | |
1261 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 |
|
1261 | $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6 | |
1262 | $ echo 1 > d1/f1 |
|
1262 | $ echo 1 > d1/f1 | |
1263 | $ echo 1 > D2/f1 |
|
1263 | $ echo 1 > D2/f1 | |
1264 | $ echo 1 > D3.i/f1 |
|
1264 | $ echo 1 > D3.i/f1 | |
1265 | $ echo 1 > d4.hg/f1 |
|
1265 | $ echo 1 > d4.hg/f1 | |
1266 | $ echo 1 > d5.d/f1 |
|
1266 | $ echo 1 > d5.d/f1 | |
1267 | $ echo 1 > .d6/f1 |
|
1267 | $ echo 1 > .d6/f1 | |
1268 | $ hg -q add . |
|
1268 | $ hg -q add . | |
1269 | $ hg commit -m "a bunch of weird directories" |
|
1269 | $ hg commit -m "a bunch of weird directories" | |
1270 | $ hg log -l1 d1/f1 | grep changeset |
|
1270 | $ hg log -l1 d1/f1 | grep changeset | |
1271 | changeset: 0:65624cd9070a |
|
1271 | changeset: 0:65624cd9070a | |
1272 | $ hg log -l1 f1 |
|
1272 | $ hg log -l1 f1 | |
1273 | $ hg log -l1 . | grep changeset |
|
1273 | $ hg log -l1 . | grep changeset | |
1274 | changeset: 0:65624cd9070a |
|
1274 | changeset: 0:65624cd9070a | |
1275 | $ hg log -l1 ./ | grep changeset |
|
1275 | $ hg log -l1 ./ | grep changeset | |
1276 | changeset: 0:65624cd9070a |
|
1276 | changeset: 0:65624cd9070a | |
1277 | $ hg log -l1 d1 | grep changeset |
|
1277 | $ hg log -l1 d1 | grep changeset | |
1278 | changeset: 0:65624cd9070a |
|
1278 | changeset: 0:65624cd9070a | |
1279 | $ hg log -l1 D2 | grep changeset |
|
1279 | $ hg log -l1 D2 | grep changeset | |
1280 | changeset: 0:65624cd9070a |
|
1280 | changeset: 0:65624cd9070a | |
1281 | $ hg log -l1 D2/f1 | grep changeset |
|
1281 | $ hg log -l1 D2/f1 | grep changeset | |
1282 | changeset: 0:65624cd9070a |
|
1282 | changeset: 0:65624cd9070a | |
1283 | $ hg log -l1 D3.i | grep changeset |
|
1283 | $ hg log -l1 D3.i | grep changeset | |
1284 | changeset: 0:65624cd9070a |
|
1284 | changeset: 0:65624cd9070a | |
1285 | $ hg log -l1 D3.i/f1 | grep changeset |
|
1285 | $ hg log -l1 D3.i/f1 | grep changeset | |
1286 | changeset: 0:65624cd9070a |
|
1286 | changeset: 0:65624cd9070a | |
1287 | $ hg log -l1 d4.hg | grep changeset |
|
1287 | $ hg log -l1 d4.hg | grep changeset | |
1288 | changeset: 0:65624cd9070a |
|
1288 | changeset: 0:65624cd9070a | |
1289 | $ hg log -l1 d4.hg/f1 | grep changeset |
|
1289 | $ hg log -l1 d4.hg/f1 | grep changeset | |
1290 | changeset: 0:65624cd9070a |
|
1290 | changeset: 0:65624cd9070a | |
1291 | $ hg log -l1 d5.d | grep changeset |
|
1291 | $ hg log -l1 d5.d | grep changeset | |
1292 | changeset: 0:65624cd9070a |
|
1292 | changeset: 0:65624cd9070a | |
1293 | $ hg log -l1 d5.d/f1 | grep changeset |
|
1293 | $ hg log -l1 d5.d/f1 | grep changeset | |
1294 | changeset: 0:65624cd9070a |
|
1294 | changeset: 0:65624cd9070a | |
1295 | $ hg log -l1 .d6 | grep changeset |
|
1295 | $ hg log -l1 .d6 | grep changeset | |
1296 | changeset: 0:65624cd9070a |
|
1296 | changeset: 0:65624cd9070a | |
1297 | $ hg log -l1 .d6/f1 | grep changeset |
|
1297 | $ hg log -l1 .d6/f1 | grep changeset | |
1298 | changeset: 0:65624cd9070a |
|
1298 | changeset: 0:65624cd9070a | |
1299 |
|
1299 | |||
1300 | issue3772: hg log -r :null showing revision 0 as well |
|
1300 | issue3772: hg log -r :null showing revision 0 as well | |
1301 |
|
1301 | |||
1302 | $ hg log -r :null |
|
1302 | $ hg log -r :null | |
1303 | changeset: -1:000000000000 |
|
1303 | changeset: -1:000000000000 | |
1304 | user: |
|
1304 | user: | |
1305 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1305 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1306 |
|
1306 | |||
|
1307 | $ hg log -r null:null | |||
|
1308 | changeset: -1:000000000000 | |||
|
1309 | user: | |||
|
1310 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1311 | ||||
1307 |
|
1312 | |||
1308 | $ cd .. |
|
1313 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now