Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 22156:03a45eff9d2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: issue "no changes needed" message for files missing on both side When a file was marked as removed in the working copy and did not existed in the target of the revert, we did not issued any message pointing that no change was needed to the file (implicitly saying that revert had changed the file). We now properly issue a message in this situation. Tests change in and handful of case where the message was documented as missing.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 31 Jul 2014 16:03:26 -0700
parents 530390629842
children d3702a822241
comparison
equal deleted inserted replaced
22155:530390629842 22156:03a45eff9d2b
2464 # if the file is in any of this sets, it was touched in the working 2464 # if the file is in any of this sets, it was touched in the working
2465 # directory parent and we are sure it needs to be reverted. 2465 # directory parent and we are sure it needs to be reverted.
2466 for table, (action, backup) in disptable: 2466 for table, (action, backup) in disptable:
2467 if abs not in table: 2467 if abs not in table:
2468 continue 2468 continue
2469 if action is not None: 2469 if action is None:
2470 if exact:
2471 ui.warn(_('no changes needed to %s\n') % rel)
2472
2473 else:
2470 handle(action, backup) 2474 handle(action, backup)
2471 break 2475 break
2472 else: 2476 else:
2473 # Not touched in current dirstate. 2477 # Not touched in current dirstate.
2474 2478