##// END OF EJS Templates
graphlog: draw multiple edges towards null node (issue5440)...
Yuya Nishihara -
r31552:d0b9e980 default
parent child Browse files
Show More
@@ -182,6 +182,9 b' def asciiedges(type, char, lines, state,'
182 knownparents = []
182 knownparents = []
183 newparents = []
183 newparents = []
184 for ptype, parent in parents:
184 for ptype, parent in parents:
185 if parent == rev:
186 # self reference (should only be seen in null rev)
187 continue
185 if parent in seen:
188 if parent in seen:
186 knownparents.append(parent)
189 knownparents.append(parent)
187 else:
190 else:
@@ -191,8 +194,7 b' def asciiedges(type, char, lines, state,'
191 ncols = len(seen)
194 ncols = len(seen)
192 nextseen = seen[:]
195 nextseen = seen[:]
193 nextseen[nodeidx:nodeidx + 1] = newparents
196 nextseen[nodeidx:nodeidx + 1] = newparents
194 edges = [(nodeidx, nextseen.index(p))
197 edges = [(nodeidx, nextseen.index(p)) for p in knownparents]
195 for p in knownparents if p != nullrev]
196
198
197 seen[:] = nextseen
199 seen[:] = nextseen
198 while len(newparents) > 2:
200 while len(newparents) > 2:
@@ -3424,3 +3424,39 b' the right node styles are used (issue517'
3424 summary: 0
3424 summary: 0
3425
3425
3426
3426
3427 $ cd ..
3428
3429 Multiple roots (issue5440):
3430
3431 $ hg init multiroots
3432 $ cd multiroots
3433 $ cat <<EOF > .hg/hgrc
3434 > [ui]
3435 > logtemplate = '{rev} {desc}\n\n'
3436 > EOF
3437
3438 $ touch foo
3439 $ hg ci -Aqm foo
3440 $ hg co -q null
3441 $ touch bar
3442 $ hg ci -Aqm bar
3443
3444 $ hg log -Gr null:
3445 @ 1 bar
3446 |
3447 | o 0 foo
3448 |/
3449 o -1
3450
3451 $ hg log -Gr null+0
3452 o 0 foo
3453 |
3454 o -1
3455
3456 $ hg log -Gr null+1
3457 @ 1 bar
3458 |
3459 o -1
3460
3461
3462 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now