comparison hgext/histedit.py @ 28340:c100dbd593e2

histedit: reword message when a changeset produces no changes There are various ways to use histedit such that an item in the list of things to perform will not result in a change relative to the previous repository state. When that happens, histedit does not keep the commit/message. This changes the note to try to explain to the user that it will not be present in their history.
author timeless <timeless@mozdev.org>
date Wed, 02 Mar 2016 22:39:03 +0000
parents 89e04a33e958
children 5490b04e6132
comparison
equal deleted inserted replaced
28339:67fa77e40702 28340:c100dbd593e2
480 """Continues the action when the working copy is clean. The default 480 """Continues the action when the working copy is clean. The default
481 behavior is to accept the current commit as the new version of the 481 behavior is to accept the current commit as the new version of the
482 rulectx.""" 482 rulectx."""
483 ctx = self.repo['.'] 483 ctx = self.repo['.']
484 if ctx.node() == self.state.parentctxnode: 484 if ctx.node() == self.state.parentctxnode:
485 self.repo.ui.warn(_('%s: empty changeset\n') % 485 self.repo.ui.warn(_('%s: skipping changeset (no changes)\n') %
486 node.short(self.node)) 486 node.short(self.node))
487 return ctx, [(self.node, tuple())] 487 return ctx, [(self.node, tuple())]
488 if ctx.node() == self.node: 488 if ctx.node() == self.node:
489 # Nothing changed 489 # Nothing changed
490 return ctx, [] 490 return ctx, []