Show More
@@ -122,6 +122,16 b' def _revsetdestrebase(repo, subset, x):' | |||
|
122 | 122 | sourceset = revset.getset(repo, smartset.fullreposet(repo), x) |
|
123 | 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 | 135 | class rebaseruntime(object): |
|
126 | 136 | """This class is a container for rebase runtime state""" |
|
127 | 137 | def __init__(self, repo, ui, opts=None): |
@@ -377,11 +387,7 b' class rebaseruntime(object):' | |||
|
377 | 387 | pos = 0 |
|
378 | 388 | for rev in sortedrevs: |
|
379 | 389 | ctx = repo[rev] |
|
380 |
desc = |
|
|
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) | |
|
390 | desc = _ctxdesc(ctx) | |
|
385 | 391 | if self.state[rev] == rev: |
|
386 | 392 | ui.status(_('already rebased %s\n') % desc) |
|
387 | 393 | elif self.state[rev] == revtodo: |
General Comments 0
You need to be logged in to leave comments.
Login now