Show More
@@ -758,14 +758,8 b' class changeset_printer(object):' | |||||
758 |
|
758 | |||
759 | hexfunc = self.ui.debugflag and hex or short |
|
759 | hexfunc = self.ui.debugflag and hex or short | |
760 |
|
760 | |||
761 | parents = log.parentrevs(rev) |
|
761 | parents = [(p, hexfunc(log.node(p))) | |
762 | if not self.ui.debugflag: |
|
762 | for p in self._meaningful_parentrevs(log, rev)] | |
763 | if parents[1] == nullrev: |
|
|||
764 | if parents[0] >= rev - 1: |
|
|||
765 | parents = [] |
|
|||
766 | else: |
|
|||
767 | parents = [parents[0]] |
|
|||
768 | parents = [(p, hexfunc(log.node(p))) for p in parents] |
|
|||
769 |
|
763 | |||
770 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) |
|
764 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) | |
771 |
|
765 | |||
@@ -823,6 +817,22 b' class changeset_printer(object):' | |||||
823 | opts=patch.diffopts(self.ui)) |
|
817 | opts=patch.diffopts(self.ui)) | |
824 | self.ui.write("\n") |
|
818 | self.ui.write("\n") | |
825 |
|
819 | |||
|
820 | def _meaningful_parentrevs(self, log, rev): | |||
|
821 | """Return list of meaningful (or all if debug) parentrevs for rev. | |||
|
822 | ||||
|
823 | For merges (two non-nullrev revisions) both parents are meaningful. | |||
|
824 | Otherwise the first parent revision is considered meaningful if it | |||
|
825 | is not the preceding revision. | |||
|
826 | """ | |||
|
827 | parents = log.parentrevs(rev) | |||
|
828 | if not self.ui.debugflag and parents[1] == nullrev: | |||
|
829 | if parents[0] >= rev - 1: | |||
|
830 | parents = [] | |||
|
831 | else: | |||
|
832 | parents = [parents[0]] | |||
|
833 | return parents | |||
|
834 | ||||
|
835 | ||||
826 | class changeset_templater(changeset_printer): |
|
836 | class changeset_templater(changeset_printer): | |
827 | '''format changeset information.''' |
|
837 | '''format changeset information.''' | |
828 |
|
838 | |||
@@ -919,12 +929,8 b' class changeset_templater(changeset_prin' | |||||
919 | return showlist('branch', [branch], plural='branches', **args) |
|
929 | return showlist('branch', [branch], plural='branches', **args) | |
920 |
|
930 | |||
921 | def showparents(**args): |
|
931 | def showparents(**args): | |
922 |
parents = [[('rev', |
|
932 | parents = [[('rev', p), ('node', hex(log.node(p)))] | |
923 |
for p in log |
|
933 | for p in self._meaningful_parentrevs(log, rev)] | |
924 | if self.ui.debugflag or p != nullid] |
|
|||
925 | if (not self.ui.debugflag and len(parents) == 1 and |
|
|||
926 | parents[0][0][1] == rev - 1): |
|
|||
927 | return |
|
|||
928 | return showlist('parent', parents, **args) |
|
934 | return showlist('parent', parents, **args) | |
929 |
|
935 | |||
930 | def showtags(**args): |
|
936 | def showtags(**args): |
@@ -25,6 +25,11 b' hg add d' | |||||
25 | hg commit -m 'new head' -d '1500000 0' -u 'person' |
|
25 | hg commit -m 'new head' -d '1500000 0' -u 'person' | |
26 | hg merge -q |
|
26 | hg merge -q | |
27 | hg commit -m 'merge' -d '1500001 0' -u 'person' |
|
27 | hg commit -m 'merge' -d '1500001 0' -u 'person' | |
|
28 | # second branch starting at nullrev | |||
|
29 | hg update null | |||
|
30 | echo second > second | |||
|
31 | hg add second | |||
|
32 | hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>' | |||
28 |
|
33 | |||
29 | # make sure user/global hgrc does not affect tests |
|
34 | # make sure user/global hgrc does not affect tests | |
30 | echo '[ui]' > .hg/hgrc |
|
35 | echo '[ui]' > .hg/hgrc |
@@ -1,3 +1,4 b'' | |||||
|
1 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |||
1 | # default style is like normal output |
|
2 | # default style is like normal output | |
2 | # normal |
|
3 | # normal | |
3 | # verbose |
|
4 | # verbose | |
@@ -5,7 +6,10 b'' | |||||
5 | # revision with no copies (used to print a traceback) |
|
6 | # revision with no copies (used to print a traceback) | |
6 |
|
7 | |||
7 | # compact style works |
|
8 | # compact style works | |
8 |
|
|
9 | 7[tip]:-1 29114dbae42b 1970-01-12 13:46 +0000 user | |
|
10 | second | |||
|
11 | ||||
|
12 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |||
9 | merge |
|
13 | merge | |
10 |
|
14 | |||
11 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
15 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
@@ -26,7 +30,10 b' 1 b608e9d1a3f0 1970-01-13 17:33 +000' | |||||
26 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
30 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
27 | line 1 |
|
31 | line 1 | |
28 |
|
32 | |||
29 |
|
|
33 | 7[tip]:-1 29114dbae42b 1970-01-12 13:46 +0000 user | |
|
34 | second | |||
|
35 | ||||
|
36 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |||
30 | merge |
|
37 | merge | |
31 |
|
38 | |||
32 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
39 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
@@ -47,7 +54,10 b' 1 b608e9d1a3f0 1970-01-13 17:33 +000' | |||||
47 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
54 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
48 | line 1 |
|
55 | line 1 | |
49 |
|
56 | |||
50 |
|
|
57 | 7[tip]:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 user | |
|
58 | second | |||
|
59 | ||||
|
60 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |||
51 | merge |
|
61 | merge | |
52 |
|
62 | |||
53 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
63 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person | |
@@ -77,6 +87,7 b" abort: ./t: no key named 'changeset'" | |||||
77 | # error if include fails |
|
87 | # error if include fails | |
78 | abort: template file ./q: Permission denied |
|
88 | abort: template file ./q: Permission denied | |
79 | # include works |
|
89 | # include works | |
|
90 | 7 | |||
80 | 6 |
|
91 | 6 | |
81 | 5 |
|
92 | 5 | |
82 | 4 |
|
93 | 4 | |
@@ -85,6 +96,7 b' 2' | |||||
85 | 1 |
|
96 | 1 | |
86 | 0 |
|
97 | 0 | |
87 | # ui.style works |
|
98 | # ui.style works | |
|
99 | 7 | |||
88 | 6 |
|
100 | 6 | |
89 | 5 |
|
101 | 5 | |
90 | 4 |
|
102 | 4 | |
@@ -93,10 +105,16 b' 2' | |||||
93 | 1 |
|
105 | 1 | |
94 | 0 |
|
106 | 0 | |
95 | # issue338 |
|
107 | # issue338 | |
|
108 | 1970-01-12 User Name <user@hostname> | |||
|
109 | ||||
|
110 | * second: | |||
|
111 | second | |||
|
112 | [29114dbae42b] [tip] | |||
|
113 | ||||
96 | 1970-01-18 person <person> |
|
114 | 1970-01-18 person <person> | |
97 |
|
115 | |||
98 | * merge |
|
116 | * merge | |
99 |
[c7b487c6c50e] |
|
117 | [c7b487c6c50e] | |
100 |
|
118 | |||
101 | * d: |
|
119 | * d: | |
102 | new head |
|
120 | new head | |
@@ -134,6 +152,7 b' 1970-01-12 User Name <user@hostname>' | |||||
134 | [1e4e1b8f71e0] |
|
152 | [1e4e1b8f71e0] | |
135 |
|
153 | |||
136 | # keys work |
|
154 | # keys work | |
|
155 | author: User Name <user@hostname> | |||
137 | author: person |
|
156 | author: person | |
138 | author: person |
|
157 | author: person | |
139 | author: person |
|
158 | author: person | |
@@ -141,6 +160,7 b' author: person' | |||||
141 | author: other@place |
|
160 | author: other@place | |
142 | author: A. N. Other <other@place> |
|
161 | author: A. N. Other <other@place> | |
143 | author: User Name <user@hostname> |
|
162 | author: User Name <user@hostname> | |
|
163 | author--verbose: User Name <user@hostname> | |||
144 | author--verbose: person |
|
164 | author--verbose: person | |
145 | author--verbose: person |
|
165 | author--verbose: person | |
146 | author--verbose: person |
|
166 | author--verbose: person | |
@@ -148,6 +168,7 b' author--verbose: person' | |||||
148 | author--verbose: other@place |
|
168 | author--verbose: other@place | |
149 | author--verbose: A. N. Other <other@place> |
|
169 | author--verbose: A. N. Other <other@place> | |
150 | author--verbose: User Name <user@hostname> |
|
170 | author--verbose: User Name <user@hostname> | |
|
171 | author--debug: User Name <user@hostname> | |||
151 | author--debug: person |
|
172 | author--debug: person | |
152 | author--debug: person |
|
173 | author--debug: person | |
153 | author--debug: person |
|
174 | author--debug: person | |
@@ -157,6 +178,7 b' author--debug: A. N. Other <other@place>' | |||||
157 | author--debug: User Name <user@hostname> |
|
178 | author--debug: User Name <user@hostname> | |
158 | branches: |
|
179 | branches: | |
159 | branches: |
|
180 | branches: | |
|
181 | branches: | |||
160 | branches: foo |
|
182 | branches: foo | |
161 | branches: |
|
183 | branches: | |
162 | branches: |
|
184 | branches: | |
@@ -164,6 +186,7 b' branches:' | |||||
164 | branches: |
|
186 | branches: | |
165 | branches--verbose: |
|
187 | branches--verbose: | |
166 | branches--verbose: |
|
188 | branches--verbose: | |
|
189 | branches--verbose: | |||
167 | branches--verbose: foo |
|
190 | branches--verbose: foo | |
168 | branches--verbose: |
|
191 | branches--verbose: | |
169 | branches--verbose: |
|
192 | branches--verbose: | |
@@ -171,11 +194,13 b' branches--verbose:' | |||||
171 | branches--verbose: |
|
194 | branches--verbose: | |
172 | branches--debug: |
|
195 | branches--debug: | |
173 | branches--debug: |
|
196 | branches--debug: | |
|
197 | branches--debug: | |||
174 | branches--debug: foo |
|
198 | branches--debug: foo | |
175 | branches--debug: |
|
199 | branches--debug: | |
176 | branches--debug: |
|
200 | branches--debug: | |
177 | branches--debug: |
|
201 | branches--debug: | |
178 | branches--debug: |
|
202 | branches--debug: | |
|
203 | date: 1000000.00 | |||
179 | date: 1500001.00 |
|
204 | date: 1500001.00 | |
180 | date: 1500000.00 |
|
205 | date: 1500000.00 | |
181 | date: 1400000.00 |
|
206 | date: 1400000.00 | |
@@ -183,6 +208,7 b' date: 1300000.00' | |||||
183 | date: 1200000.00 |
|
208 | date: 1200000.00 | |
184 | date: 1100000.00 |
|
209 | date: 1100000.00 | |
185 | date: 1000000.00 |
|
210 | date: 1000000.00 | |
|
211 | date--verbose: 1000000.00 | |||
186 | date--verbose: 1500001.00 |
|
212 | date--verbose: 1500001.00 | |
187 | date--verbose: 1500000.00 |
|
213 | date--verbose: 1500000.00 | |
188 | date--verbose: 1400000.00 |
|
214 | date--verbose: 1400000.00 | |
@@ -190,6 +216,7 b' date--verbose: 1300000.00' | |||||
190 | date--verbose: 1200000.00 |
|
216 | date--verbose: 1200000.00 | |
191 | date--verbose: 1100000.00 |
|
217 | date--verbose: 1100000.00 | |
192 | date--verbose: 1000000.00 |
|
218 | date--verbose: 1000000.00 | |
|
219 | date--debug: 1000000.00 | |||
193 | date--debug: 1500001.00 |
|
220 | date--debug: 1500001.00 | |
194 | date--debug: 1500000.00 |
|
221 | date--debug: 1500000.00 | |
195 | date--debug: 1400000.00 |
|
222 | date--debug: 1400000.00 | |
@@ -197,6 +224,7 b' date--debug: 1300000.00' | |||||
197 | date--debug: 1200000.00 |
|
224 | date--debug: 1200000.00 | |
198 | date--debug: 1100000.00 |
|
225 | date--debug: 1100000.00 | |
199 | date--debug: 1000000.00 |
|
226 | date--debug: 1000000.00 | |
|
227 | desc: second | |||
200 | desc: merge |
|
228 | desc: merge | |
201 | desc: new head |
|
229 | desc: new head | |
202 | desc: new branch |
|
230 | desc: new branch | |
@@ -208,6 +236,7 b' other 2' | |||||
208 | other 3 |
|
236 | other 3 | |
209 | desc: line 1 |
|
237 | desc: line 1 | |
210 | line 2 |
|
238 | line 2 | |
|
239 | desc--verbose: second | |||
211 | desc--verbose: merge |
|
240 | desc--verbose: merge | |
212 | desc--verbose: new head |
|
241 | desc--verbose: new head | |
213 | desc--verbose: new branch |
|
242 | desc--verbose: new branch | |
@@ -219,6 +248,7 b' other 2' | |||||
219 | other 3 |
|
248 | other 3 | |
220 | desc--verbose: line 1 |
|
249 | desc--verbose: line 1 | |
221 | line 2 |
|
250 | line 2 | |
|
251 | desc--debug: second | |||
222 | desc--debug: merge |
|
252 | desc--debug: merge | |
223 | desc--debug: new head |
|
253 | desc--debug: new head | |
224 | desc--debug: new branch |
|
254 | desc--debug: new branch | |
@@ -237,6 +267,8 b' file_adds:' | |||||
237 | file_adds: |
|
267 | file_adds: | |
238 | file_adds: |
|
268 | file_adds: | |
239 | file_adds: |
|
269 | file_adds: | |
|
270 | file_adds: | |||
|
271 | file_adds--verbose: | |||
240 | file_adds--verbose: |
|
272 | file_adds--verbose: | |
241 | file_adds--verbose: |
|
273 | file_adds--verbose: | |
242 | file_adds--verbose: |
|
274 | file_adds--verbose: | |
@@ -244,6 +276,7 b' file_adds--verbose:' | |||||
244 | file_adds--verbose: |
|
276 | file_adds--verbose: | |
245 | file_adds--verbose: |
|
277 | file_adds--verbose: | |
246 | file_adds--verbose: |
|
278 | file_adds--verbose: | |
|
279 | file_adds--debug: second | |||
247 | file_adds--debug: |
|
280 | file_adds--debug: | |
248 | file_adds--debug: d |
|
281 | file_adds--debug: d | |
249 | file_adds--debug: |
|
282 | file_adds--debug: | |
@@ -258,6 +291,7 b' file_dels:' | |||||
258 | file_dels: |
|
291 | file_dels: | |
259 | file_dels: |
|
292 | file_dels: | |
260 | file_dels: |
|
293 | file_dels: | |
|
294 | file_dels: | |||
261 | file_dels--verbose: |
|
295 | file_dels--verbose: | |
262 | file_dels--verbose: |
|
296 | file_dels--verbose: | |
263 | file_dels--verbose: |
|
297 | file_dels--verbose: | |
@@ -265,6 +299,8 b' file_dels--verbose:' | |||||
265 | file_dels--verbose: |
|
299 | file_dels--verbose: | |
266 | file_dels--verbose: |
|
300 | file_dels--verbose: | |
267 | file_dels--verbose: |
|
301 | file_dels--verbose: | |
|
302 | file_dels--verbose: | |||
|
303 | file_dels--debug: | |||
268 | file_dels--debug: |
|
304 | file_dels--debug: | |
269 | file_dels--debug: |
|
305 | file_dels--debug: | |
270 | file_dels--debug: |
|
306 | file_dels--debug: | |
@@ -272,6 +308,7 b' file_dels--debug:' | |||||
272 | file_dels--debug: |
|
308 | file_dels--debug: | |
273 | file_dels--debug: |
|
309 | file_dels--debug: | |
274 | file_dels--debug: |
|
310 | file_dels--debug: | |
|
311 | files: second | |||
275 | files: |
|
312 | files: | |
276 | files: d |
|
313 | files: d | |
277 | files: |
|
314 | files: | |
@@ -279,6 +316,7 b' files: c' | |||||
279 | files: c |
|
316 | files: c | |
280 | files: b |
|
317 | files: b | |
281 | files: a |
|
318 | files: a | |
|
319 | files--verbose: second | |||
282 | files--verbose: |
|
320 | files--verbose: | |
283 | files--verbose: d |
|
321 | files--verbose: d | |
284 | files--verbose: |
|
322 | files--verbose: | |
@@ -289,6 +327,7 b' files--verbose: a' | |||||
289 | files--debug: |
|
327 | files--debug: | |
290 | files--debug: |
|
328 | files--debug: | |
291 | files--debug: |
|
329 | files--debug: | |
|
330 | files--debug: | |||
292 | files--debug: c |
|
331 | files--debug: c | |
293 | files--debug: |
|
332 | files--debug: | |
294 | files--debug: |
|
333 | files--debug: | |
@@ -300,6 +339,7 b' manifest:' | |||||
300 | manifest: |
|
339 | manifest: | |
301 | manifest: |
|
340 | manifest: | |
302 | manifest: |
|
341 | manifest: | |
|
342 | manifest: | |||
303 | manifest--verbose: |
|
343 | manifest--verbose: | |
304 | manifest--verbose: |
|
344 | manifest--verbose: | |
305 | manifest--verbose: |
|
345 | manifest--verbose: | |
@@ -307,6 +347,8 b' manifest--verbose:' | |||||
307 | manifest--verbose: |
|
347 | manifest--verbose: | |
308 | manifest--verbose: |
|
348 | manifest--verbose: | |
309 | manifest--verbose: |
|
349 | manifest--verbose: | |
|
350 | manifest--verbose: | |||
|
351 | manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf | |||
310 | manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf |
|
352 | manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf | |
311 | manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
353 | manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 | |
312 | manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 |
|
354 | manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 | |
@@ -314,6 +356,7 b' manifest--debug: 3:cb5a1327723bada42f117' | |||||
314 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
356 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 | |
315 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
357 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 | |
316 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
358 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
|
359 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |||
317 | node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
360 | node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
318 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
361 | node: 13207e5a10d9fd28ec424934298e176197f2c67f | |
319 | node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
362 | node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
@@ -321,6 +364,7 b' node: 10e46f2dcbf4823578cf180f33ecf0b957' | |||||
321 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
364 | node: 97054abb4ab824450e9164180baf491ae0078465 | |
322 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
365 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
323 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
366 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
|
367 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |||
324 | node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
368 | node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
325 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
369 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f | |
326 | node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
370 | node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
@@ -328,6 +372,7 b' node--verbose: 10e46f2dcbf4823578cf180f3' | |||||
328 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
372 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
329 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
373 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
330 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
374 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
|
375 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |||
331 | node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
376 | node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
332 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
377 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f | |
333 | node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
378 | node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
@@ -335,6 +380,7 b' node--debug: 10e46f2dcbf4823578cf180f33e' | |||||
335 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
380 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
336 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
381 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
337 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
382 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
|
383 | parents: -1:000000000000 | |||
338 | parents: 5:13207e5a10d9 4:32a18f097fcc |
|
384 | parents: 5:13207e5a10d9 4:32a18f097fcc | |
339 | parents: 3:10e46f2dcbf4 |
|
385 | parents: 3:10e46f2dcbf4 | |
340 | parents: |
|
386 | parents: | |
@@ -342,6 +388,7 b' parents:' | |||||
342 | parents: |
|
388 | parents: | |
343 | parents: |
|
389 | parents: | |
344 | parents: |
|
390 | parents: | |
|
391 | parents--verbose: -1:000000000000 | |||
345 | parents--verbose: 5:13207e5a10d9 4:32a18f097fcc |
|
392 | parents--verbose: 5:13207e5a10d9 4:32a18f097fcc | |
346 | parents--verbose: 3:10e46f2dcbf4 |
|
393 | parents--verbose: 3:10e46f2dcbf4 | |
347 | parents--verbose: |
|
394 | parents--verbose: | |
@@ -349,6 +396,7 b' parents--verbose:' | |||||
349 | parents--verbose: |
|
396 | parents--verbose: | |
350 | parents--verbose: |
|
397 | parents--verbose: | |
351 | parents--verbose: |
|
398 | parents--verbose: | |
|
399 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |||
352 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
400 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
353 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
401 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
354 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
402 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
@@ -356,6 +404,7 b' parents--debug: 2:97054abb4ab824450e9164' | |||||
356 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
404 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 | |
357 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
405 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 | |
358 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
406 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |
|
407 | rev: 7 | |||
359 | rev: 6 |
|
408 | rev: 6 | |
360 | rev: 5 |
|
409 | rev: 5 | |
361 | rev: 4 |
|
410 | rev: 4 | |
@@ -363,6 +412,7 b' rev: 3' | |||||
363 | rev: 2 |
|
412 | rev: 2 | |
364 | rev: 1 |
|
413 | rev: 1 | |
365 | rev: 0 |
|
414 | rev: 0 | |
|
415 | rev--verbose: 7 | |||
366 | rev--verbose: 6 |
|
416 | rev--verbose: 6 | |
367 | rev--verbose: 5 |
|
417 | rev--verbose: 5 | |
368 | rev--verbose: 4 |
|
418 | rev--verbose: 4 | |
@@ -370,6 +420,7 b' rev--verbose: 3' | |||||
370 | rev--verbose: 2 |
|
420 | rev--verbose: 2 | |
371 | rev--verbose: 1 |
|
421 | rev--verbose: 1 | |
372 | rev--verbose: 0 |
|
422 | rev--verbose: 0 | |
|
423 | rev--debug: 7 | |||
373 | rev--debug: 6 |
|
424 | rev--debug: 6 | |
374 | rev--debug: 5 |
|
425 | rev--debug: 5 | |
375 | rev--debug: 4 |
|
426 | rev--debug: 4 | |
@@ -384,6 +435,7 b' tags:' | |||||
384 | tags: |
|
435 | tags: | |
385 | tags: |
|
436 | tags: | |
386 | tags: |
|
437 | tags: | |
|
438 | tags: | |||
387 | tags--verbose: tip |
|
439 | tags--verbose: tip | |
388 | tags--verbose: |
|
440 | tags--verbose: | |
389 | tags--verbose: |
|
441 | tags--verbose: | |
@@ -391,6 +443,7 b' tags--verbose:' | |||||
391 | tags--verbose: |
|
443 | tags--verbose: | |
392 | tags--verbose: |
|
444 | tags--verbose: | |
393 | tags--verbose: |
|
445 | tags--verbose: | |
|
446 | tags--verbose: | |||
394 | tags--debug: tip |
|
447 | tags--debug: tip | |
395 | tags--debug: |
|
448 | tags--debug: | |
396 | tags--debug: |
|
449 | tags--debug: | |
@@ -398,7 +451,9 b' tags--debug:' | |||||
398 | tags--debug: |
|
451 | tags--debug: | |
399 | tags--debug: |
|
452 | tags--debug: | |
400 | tags--debug: |
|
453 | tags--debug: | |
|
454 | tags--debug: | |||
401 | # filters work |
|
455 | # filters work | |
|
456 | hostname | |||
402 |
|
457 | |||
403 |
|
458 | |||
404 |
|
459 | |||
@@ -406,6 +461,7 b' tags--debug:' | |||||
406 | place |
|
461 | place | |
407 | place |
|
462 | place | |
408 | hostname |
|
463 | hostname | |
|
464 | User Name | |||
409 | person |
|
465 | person | |
410 | person |
|
466 | person | |
411 | person |
|
467 | person | |
@@ -413,6 +469,7 b' person' | |||||
413 | other |
|
469 | other | |
414 | A. N. Other |
|
470 | A. N. Other | |
415 | User Name |
|
471 | User Name | |
|
472 | user | |||
416 | person |
|
473 | person | |
417 | person |
|
474 | person | |
418 | person |
|
475 | person | |
@@ -420,6 +477,7 b' person' | |||||
420 | other |
|
477 | other | |
421 | other |
|
478 | other | |
422 | user |
|
479 | user | |
|
480 | Mon Jan 12 13:46:40 1970 +0000 | |||
423 | Sun Jan 18 08:40:01 1970 +0000 |
|
481 | Sun Jan 18 08:40:01 1970 +0000 | |
424 | Sun Jan 18 08:40:00 1970 +0000 |
|
482 | Sun Jan 18 08:40:00 1970 +0000 | |
425 | Sat Jan 17 04:53:20 1970 +0000 |
|
483 | Sat Jan 17 04:53:20 1970 +0000 | |
@@ -427,6 +485,7 b' Fri Jan 16 01:06:40 1970 +0000' | |||||
427 | Wed Jan 14 21:20:00 1970 +0000 |
|
485 | Wed Jan 14 21:20:00 1970 +0000 | |
428 | Tue Jan 13 17:33:20 1970 +0000 |
|
486 | Tue Jan 13 17:33:20 1970 +0000 | |
429 | Mon Jan 12 13:46:40 1970 +0000 |
|
487 | Mon Jan 12 13:46:40 1970 +0000 | |
|
488 | 1970-01-12 13:46 +0000 | |||
430 | 1970-01-18 08:40 +0000 |
|
489 | 1970-01-18 08:40 +0000 | |
431 | 1970-01-18 08:40 +0000 |
|
490 | 1970-01-18 08:40 +0000 | |
432 | 1970-01-17 04:53 +0000 |
|
491 | 1970-01-17 04:53 +0000 | |
@@ -434,6 +493,7 b' 1970-01-16 01:06 +0000' | |||||
434 | 1970-01-14 21:20 +0000 |
|
493 | 1970-01-14 21:20 +0000 | |
435 | 1970-01-13 17:33 +0000 |
|
494 | 1970-01-13 17:33 +0000 | |
436 | 1970-01-12 13:46 +0000 |
|
495 | 1970-01-12 13:46 +0000 | |
|
496 | Mon, 12 Jan 1970 13:46:40 +0000 | |||
437 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
497 | Sun, 18 Jan 1970 08:40:01 +0000 | |
438 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
498 | Sun, 18 Jan 1970 08:40:00 +0000 | |
439 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
499 | Sat, 17 Jan 1970 04:53:20 +0000 | |
@@ -441,6 +501,7 b' Fri, 16 Jan 1970 01:06:40 +0000' | |||||
441 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
501 | Wed, 14 Jan 1970 21:20:00 +0000 | |
442 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
502 | Tue, 13 Jan 1970 17:33:20 +0000 | |
443 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
503 | Mon, 12 Jan 1970 13:46:40 +0000 | |
|
504 | second | |||
444 | merge |
|
505 | merge | |
445 | new head |
|
506 | new head | |
446 | new branch |
|
507 | new branch | |
@@ -448,6 +509,7 b' no user, no domain' | |||||
448 | no person |
|
509 | no person | |
449 | other 1 |
|
510 | other 1 | |
450 | line 1 |
|
511 | line 1 | |
|
512 | 29114dbae42b | |||
451 | c7b487c6c50e |
|
513 | c7b487c6c50e | |
452 | 13207e5a10d9 |
|
514 | 13207e5a10d9 | |
453 | 32a18f097fcc |
|
515 | 32a18f097fcc |
General Comments 0
You need to be logged in to leave comments.
Login now