equal
deleted
inserted
replaced
217 |
217 |
218 def labelsgen(prefix, labelssuffix): |
218 def labelsgen(prefix, labelssuffix): |
219 """ Takes a label prefix and a list of suffixes. Returns a string of the prefix |
219 """ Takes a label prefix and a list of suffixes. Returns a string of the prefix |
220 formatted with each suffix separated with a space. |
220 formatted with each suffix separated with a space. |
221 """ |
221 """ |
222 return ' '.join(prefix % suffix for suffix in labelssuffix) |
222 return ' '.join(prefix % suffix.replace(' ', '-') for suffix in labelssuffix) |
223 |
223 |
224 def showstack(ui, repo, branch=None, topic=None, opts=None): |
224 def showstack(ui, repo, branch=None, topic=None, opts=None): |
225 if opts is None: |
225 if opts is None: |
226 opts = {} |
226 opts = {} |
227 |
227 |
334 |
334 |
335 if ctx.orphan(): |
335 if ctx.orphan(): |
336 symbol = '$' |
336 symbol = '$' |
337 states.append('orphan') |
337 states.append('orphan') |
338 |
338 |
|
339 if ctx.contentdivergent(): |
|
340 symbol = '$' |
|
341 states.append('content divergent') |
|
342 |
|
343 if ctx.phasedivergent(): |
|
344 symbol = '$' |
|
345 states.append('phase divergent') |
|
346 |
339 if not isentry: |
347 if not isentry: |
340 symbol = '^' |
348 symbol = '^' |
341 # "base" is kind of a "ghost" entry |
349 # "base" is kind of a "ghost" entry |
342 states.append('base') |
350 states.append('base') |
343 |
351 |