Mercurial > hg
comparison hgext/rebase.py @ 23519:8872d1bf30da
rebase: improve debug messages while processing the list of rebases
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 10 Dec 2014 06:20:35 +0100 |
| parents | 2fb0504b8175 |
| children | de143427c499 |
comparison
equal
deleted
inserted
replaced
| 23518:2fb0504b8175 | 23519:8872d1bf30da |
|---|---|
| 409 repo.dirstate.endparentchange() | 409 repo.dirstate.endparentchange() |
| 410 newnode = None | 410 newnode = None |
| 411 # Update the state | 411 # Update the state |
| 412 if newnode is not None: | 412 if newnode is not None: |
| 413 state[rev] = repo[newnode].rev() | 413 state[rev] = repo[newnode].rev() |
| 414 ui.debug('rebased as %s\n' % short(newnode)) | |
| 414 else: | 415 else: |
| 415 ui.warn(_('note: rebase of %d:%s created no changes ' | 416 ui.warn(_('note: rebase of %d:%s created no changes ' |
| 416 'to commit\n') % (rev, ctx)) | 417 'to commit\n') % (rev, ctx)) |
| 417 if not collapsef: | 418 if not collapsef: |
| 418 ui.debug('next revision set to %s\n' % p1) | |
| 419 skipped.add(rev) | 419 skipped.add(rev) |
| 420 state[rev] = p1 | 420 state[rev] = p1 |
| 421 ui.debug('next revision set to %s\n' % p1) | |
| 421 elif state[rev] == nullmerge: | 422 elif state[rev] == nullmerge: |
| 422 pass | 423 ui.debug('ignoring null merge rebase of %s\n' % rev) |
| 423 elif state[rev] == revignored: | 424 elif state[rev] == revignored: |
| 424 ui.status(_('not rebasing ignored %s\n') % desc) | 425 ui.status(_('not rebasing ignored %s\n') % desc) |
| 425 else: | 426 else: |
| 426 ui.status(_('already rebased %s as %s\n') % | 427 ui.status(_('already rebased %s as %s\n') % |
| 427 (desc, repo[state[rev]])) | 428 (desc, repo[state[rev]])) |