##// END OF EJS Templates
Fix up parent display in logging...
Matt Mackall -
r3619:8c4fd0de default
parent child Browse files
Show More
@@ -324,12 +324,13 b' class changeset_printer(object):'
324
324
325 parents = log.parentrevs(rev)
325 parents = log.parentrevs(rev)
326 if not self.ui.debugflag:
326 if not self.ui.debugflag:
327 parents = [p for p in parents if p != nullrev]
327 if parents[1] == nullrev:
328 if len(parents) == 1 and parents[0] == rev-1:
328 if parents[0] >= rev - 1:
329 parents = []
329 parents = []
330 else:
331 parents = [parents[0]]
330 parents = [(p, hexfunc(log.node(p))) for p in parents]
332 parents = [(p, hexfunc(log.node(p))) for p in parents]
331
333
332
333 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
334 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
334
335
335 if branch:
336 if branch:
@@ -27,6 +27,7 b' summary: b'
27 %% abbrev of long option
27 %% abbrev of long option
28 changeset: 1:b6c483daf290
28 changeset: 1:b6c483daf290
29 tag: tip
29 tag: tip
30 parent: -1:000000000000
30 user: test
31 user: test
31 date: Thu Jan 01 00:00:01 1970 +0000
32 date: Thu Jan 01 00:00:01 1970 +0000
32 summary: b
33 summary: b
@@ -49,6 +50,7 b' 1:b6c483daf290'
49 %% -v/--verbose
50 %% -v/--verbose
50 changeset: 1:b6c483daf290
51 changeset: 1:b6c483daf290
51 tag: tip
52 tag: tip
53 parent: -1:000000000000
52 user: test
54 user: test
53 date: Thu Jan 01 00:00:01 1970 +0000
55 date: Thu Jan 01 00:00:01 1970 +0000
54 files: b
56 files: b
@@ -11,6 +11,7 b' added 1 changesets with 1 changes to 1 f'
11 (run 'hg heads' to see heads, 'hg merge' to merge)
11 (run 'hg heads' to see heads, 'hg merge' to merge)
12 changeset: 1:bdcee5d51fa6
12 changeset: 1:bdcee5d51fa6
13 tag: tip
13 tag: tip
14 parent: -1:000000000000
14 user: a
15 user: a
15 date: Mon Jan 12 13:46:40 1970 +0000
16 date: Mon Jan 12 13:46:40 1970 +0000
16 summary: a
17 summary: a
General Comments 0
You need to be logged in to leave comments. Login now