Show More
@@ -34,6 +34,7 b' from mercurial import (' | |||||
34 | dirstateguard, |
|
34 | dirstateguard, | |
35 | error, |
|
35 | error, | |
36 | extensions, |
|
36 | extensions, | |
|
37 | formatter, | |||
37 | merge as mergemod, |
|
38 | merge as mergemod, | |
38 | mergestate as mergestatemod, |
|
39 | mergestate as mergestatemod, | |
39 | mergeutil, |
|
40 | mergeutil, | |
@@ -51,6 +52,7 b' from mercurial import (' | |||||
51 | scmutil, |
|
52 | scmutil, | |
52 | smartset, |
|
53 | smartset, | |
53 | state as statemod, |
|
54 | state as statemod, | |
|
55 | templatekw, | |||
54 | util, |
|
56 | util, | |
55 | ) |
|
57 | ) | |
56 |
|
58 | |||
@@ -146,20 +148,12 b' def _revsetdestautoorphanrebase(repo, su' | |||||
146 |
|
148 | |||
147 | def _ctxdesc(ctx): |
|
149 | def _ctxdesc(ctx): | |
148 | """short description for a context""" |
|
150 | """short description for a context""" | |
149 | desc = b'%d:%s "%s"' % ( |
|
151 | labels_spec = b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names, " "))}"), " ")' | |
150 | ctx.rev(), |
|
152 | spec = b'{rev}:{node|short} "{desc|firstline}"{if(%s, " ({%s})")}' % ( | |
151 |
c |
|
153 | labels_spec, | |
152 | ctx.description().split(b'\n', 1)[0], |
|
154 | labels_spec, | |
153 | ) |
|
155 | ) | |
154 | repo = ctx.repo() |
|
156 | return cmdutil.rendertemplate(ctx, spec) | |
155 | names = [] |
|
|||
156 | for nsname, ns in pycompat.iteritems(repo.names): |
|
|||
157 | if nsname == b'branches': |
|
|||
158 | continue |
|
|||
159 | names.extend(ns.names(repo, ctx.node())) |
|
|||
160 | if names: |
|
|||
161 | desc += b' (%s)' % b' '.join(names) |
|
|||
162 | return desc |
|
|||
163 |
|
157 | |||
164 |
|
158 | |||
165 | class rebaseruntime(object): |
|
159 | class rebaseruntime(object): |
General Comments 0
You need to be logged in to leave comments.
Login now