equal
deleted
inserted
replaced
405 succ = self.obsoletenotrebased[rev] |
405 succ = self.obsoletenotrebased[rev] |
406 if succ is None: |
406 if succ is None: |
407 msg = _('note: not rebasing %s, it has no ' |
407 msg = _('note: not rebasing %s, it has no ' |
408 'successor\n') % desc |
408 'successor\n') % desc |
409 else: |
409 else: |
410 succctx = repo[succ] |
410 succdesc = _ctxdesc(repo[succ]) |
411 succdesc = '%d:%s "%s"' % ( |
|
412 succctx.rev(), succctx, |
|
413 succctx.description().split('\n', 1)[0]) |
|
414 msg = (_('note: not rebasing %s, already in ' |
411 msg = (_('note: not rebasing %s, already in ' |
415 'destination as %s\n') % (desc, succdesc)) |
412 'destination as %s\n') % (desc, succdesc)) |
416 repo.ui.status(msg) |
413 repo.ui.status(msg) |
417 # Make clearrebased aware state[rev] is not a true successor |
414 # Make clearrebased aware state[rev] is not a true successor |
418 self.skipped.add(rev) |
415 self.skipped.add(rev) |