equal
deleted
inserted
replaced
1575 output = ["%s%s" % |
1575 output = ["%s%s" % |
1576 ('+'.join([hexfunc(parent) for parent in parents]), |
1576 ('+'.join([hexfunc(parent) for parent in parents]), |
1577 (modified or added or removed or deleted) and "+" or "")] |
1577 (modified or added or removed or deleted) and "+" or "")] |
1578 |
1578 |
1579 if not ui.quiet: |
1579 if not ui.quiet: |
|
1580 |
|
1581 branch = repo.workingctx().branch() |
|
1582 if branch: |
|
1583 output.append("(%s)" % branch) |
|
1584 |
1580 # multiple tags for a single parent separated by '/' |
1585 # multiple tags for a single parent separated by '/' |
1581 parenttags = ['/'.join(tags) |
1586 parenttags = ['/'.join(tags) |
1582 for tags in map(repo.nodetags, parents) if tags] |
1587 for tags in map(repo.nodetags, parents) if tags] |
1583 # tags for multiple parents separated by ' + ' |
1588 # tags for multiple parents separated by ' + ' |
1584 if parenttags: |
1589 if parenttags: |