Show More
@@ -1915,6 +1915,8 b' def displaygraph(ui, dag, displayer, sho' | |||||
1915 | char = '@' |
|
1915 | char = '@' | |
1916 | elif ctx.obsolete(): |
|
1916 | elif ctx.obsolete(): | |
1917 | char = 'x' |
|
1917 | char = 'x' | |
|
1918 | elif ctx.closesbranch(): | |||
|
1919 | char = '_' | |||
1918 | copies = None |
|
1920 | copies = None | |
1919 | if getrenamed and ctx.rev(): |
|
1921 | if getrenamed and ctx.rev(): | |
1920 | copies = [] |
|
1922 | copies = [] |
@@ -85,9 +85,9 b' graph converted repo' | |||||
85 | $ hg -R t-datesort log -G --template '{rev} "{desc}"\n' |
|
85 | $ hg -R t-datesort log -G --template '{rev} "{desc}"\n' | |
86 | o 12 "c1" |
|
86 | o 12 "c1" | |
87 | |\ |
|
87 | |\ | |
88 |
| |
|
88 | | _ 11 "b2x" | |
89 | | | |
|
89 | | | | |
90 |
| | |
|
90 | | | _ 10 "a7x" | |
91 | | | | |
|
91 | | | | | |
92 | o | | 9 "c0" |
|
92 | o | | 9 "c0" | |
93 | | | | |
|
93 | | | | | |
@@ -136,9 +136,9 b' graph converted repo' | |||||
136 | $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n' |
|
136 | $ hg -R t-sourcesort log -G --template '{rev} "{desc}"\n' | |
137 | o 12 "c1" |
|
137 | o 12 "c1" | |
138 | |\ |
|
138 | |\ | |
139 |
| |
|
139 | | _ 11 "b2x" | |
140 | | | |
|
140 | | | | |
141 |
| | |
|
141 | | | _ 10 "a7x" | |
142 | | | | |
|
142 | | | | | |
143 | o | | 9 "c0" |
|
143 | o | | 9 "c0" | |
144 | | | | |
|
144 | | | | | |
@@ -189,11 +189,11 b' graph converted repo' | |||||
189 | |\ |
|
189 | |\ | |
190 | | o 11 "c0" |
|
190 | | o 11 "c0" | |
191 | | | |
|
191 | | | | |
192 |
|
|
192 | _ | 10 "b2x" | |
193 | | | |
|
193 | | | | |
194 | o | 9 "b1" |
|
194 | o | 9 "b1" | |
195 | | | |
|
195 | | | | |
196 |
| | |
|
196 | | | _ 8 "a7x" | |
197 | | | | |
|
197 | | | | | |
198 | | | o 7 "a6" |
|
198 | | | o 7 "a6" | |
199 | | | | |
|
199 | | | | |
@@ -387,15 +387,15 b' test branch closing revision pruning if ' | |||||
387 | 1 addb |
|
387 | 1 addb | |
388 | 0 closedefault |
|
388 | 0 closedefault | |
389 | $ glog -R branchpruning-hg1 |
|
389 | $ glog -R branchpruning-hg1 | |
390 |
|
|
390 | _ 5 "closedefault" files: | |
391 | | |
|
391 | | | |
392 | o 4 "addb" files: b |
|
392 | o 4 "addb" files: b | |
393 | | |
|
393 | | | |
394 |
| |
|
394 | | _ 3 "closeempty" files: | |
395 | | | |
|
395 | | | | |
396 | | o 2 "emptybranch" files: |
|
396 | | o 2 "emptybranch" files: | |
397 | |/ |
|
397 | |/ | |
398 |
| |
|
398 | | _ 1 "closefoo" files: | |
399 | |/ |
|
399 | |/ | |
400 | o 0 "adda" files: a |
|
400 | o 0 "adda" files: a | |
401 |
|
401 | |||
@@ -422,7 +422,7 b' exercise incremental conversion at the s' | |||||
422 | 1 closeempty |
|
422 | 1 closeempty | |
423 | 0 closedefault |
|
423 | 0 closedefault | |
424 | $ glog -R branchpruning-hg2 |
|
424 | $ glog -R branchpruning-hg2 | |
425 |
|
|
425 | _ 1 "closedefault" files: | |
426 | | |
|
426 | | | |
427 | o 0 "addb" files: b |
|
427 | o 0 "addb" files: b | |
428 |
|
428 |
@@ -352,7 +352,7 b" rebase 'c1' to the branch head 'c2' that" | |||||
352 | $ hg ci -qm 'c2 closed' --close |
|
352 | $ hg ci -qm 'c2 closed' --close | |
353 | $ hg up -qr 2 |
|
353 | $ hg up -qr 2 | |
354 | $ hg tglog |
|
354 | $ hg tglog | |
355 |
|
|
355 | _ 4: 'c2 closed' c | |
356 | | |
|
356 | | | |
357 | o 3: 'b1' b |
|
357 | o 3: 'b1' b | |
358 | | |
|
358 | | | |
@@ -366,7 +366,7 b" rebase 'c1' to the branch head 'c2' that" | |||||
366 | nothing to rebase - working directory parent is also destination |
|
366 | nothing to rebase - working directory parent is also destination | |
367 | [1] |
|
367 | [1] | |
368 | $ hg tglog |
|
368 | $ hg tglog | |
369 |
|
|
369 | _ 4: 'c2 closed' c | |
370 | | |
|
370 | | | |
371 | o 3: 'b1' b |
|
371 | o 3: 'b1' b | |
372 | | |
|
372 | | |
General Comments 0
You need to be logged in to leave comments.
Login now