Show More
@@ -122,6 +122,16 b' def _revsetdestrebase(repo, subset, x):' | |||||
122 | sourceset = revset.getset(repo, smartset.fullreposet(repo), x) |
|
122 | sourceset = revset.getset(repo, smartset.fullreposet(repo), x) | |
123 | return subset & smartset.baseset([_destrebase(repo, sourceset)]) |
|
123 | return subset & smartset.baseset([_destrebase(repo, sourceset)]) | |
124 |
|
124 | |||
|
125 | def _ctxdesc(ctx): | |||
|
126 | """short description for a context""" | |||
|
127 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |||
|
128 | ctx.description().split('\n', 1)[0]) | |||
|
129 | repo = ctx.repo() | |||
|
130 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |||
|
131 | if names: | |||
|
132 | desc += ' (%s)' % ' '.join(names) | |||
|
133 | return desc | |||
|
134 | ||||
125 | class rebaseruntime(object): |
|
135 | class rebaseruntime(object): | |
126 | """This class is a container for rebase runtime state""" |
|
136 | """This class is a container for rebase runtime state""" | |
127 | def __init__(self, repo, ui, opts=None): |
|
137 | def __init__(self, repo, ui, opts=None): | |
@@ -377,11 +387,7 b' class rebaseruntime(object):' | |||||
377 | pos = 0 |
|
387 | pos = 0 | |
378 | for rev in sortedrevs: |
|
388 | for rev in sortedrevs: | |
379 | ctx = repo[rev] |
|
389 | ctx = repo[rev] | |
380 |
desc = |
|
390 | desc = _ctxdesc(ctx) | |
381 | ctx.description().split('\n', 1)[0]) |
|
|||
382 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
|||
383 | if names: |
|
|||
384 | desc += ' (%s)' % ' '.join(names) |
|
|||
385 | if self.state[rev] == rev: |
|
391 | if self.state[rev] == rev: | |
386 | ui.status(_('already rebased %s\n') % desc) |
|
392 | ui.status(_('already rebased %s\n') % desc) | |
387 | elif self.state[rev] == revtodo: |
|
393 | elif self.state[rev] == revtodo: |
General Comments 0
You need to be logged in to leave comments.
Login now