comparison hgext/rebase.py @ 40865:4edd427f34c1

rebase: clarify that commits that become empty are skipped

Our message just said that it created no changes, but we didn't
explicitly say that that meant that the the commit was not rebased. It
also wasn't clear why it created no changes, so this patch also
clarifies that that was because the changes were already in the
destination.

Differential Revision: https://phab.mercurial-scm.org/D5395

40864:09680349cc2d

            if newnode is not None:
                self.state[rev] = repo[newnode].rev()
                ui.debug('rebased as %s\n' % short(newnode))
            else:
                if not self.collapsef:
                    ui.warn(_('note: rebase of %s created no changes '
                              'to commit\n') % desc)
                    self.skipped.add(rev)
                self.state[rev] = p1
                ui.debug('next revision set to %d\n' % p1)
        else:
            ui.status(_('already rebased %s as %s\n') %

40865:4edd427f34c1

            if newnode is not None:
                self.state[rev] = repo[newnode].rev()
                ui.debug('rebased as %s\n' % short(newnode))
            else:
                if not self.collapsef:
                    ui.warn(_('note: not rebasing %s, its destination already '
                              'has all its changes\n') % desc)
                    self.skipped.add(rev)
                self.state[rev] = p1
                ui.debug('next revision set to %d\n' % p1)
        else:
            ui.status(_('already rebased %s as %s\n') %