Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 24125:18af6ebd4001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: silence warning of unknown pats for -l/--list (BC) It was introduced at 232de244ab6f to warn that "hg resolve" did nothing meaningful. The warning seems not good for "hg resolve -l" because it is rather like "hg status" or "hg files".
author Yuya Nishihara <yuya@tcha.org>
date Wed, 11 Feb 2015 13:47:43 +0900
parents fafd9a1284cf
children b4d21bbc2589
comparison
equal deleted inserted replaced
24124:042d95beeee8 24125:18af6ebd4001
5326 # replace filemerge's .orig file with our resolve file 5326 # replace filemerge's .orig file with our resolve file
5327 util.rename(a + ".resolve", a + ".orig") 5327 util.rename(a + ".resolve", a + ".orig")
5328 5328
5329 ms.commit() 5329 ms.commit()
5330 5330
5331 if not didwork and pats: 5331 if not didwork and pats and not show:
5332 ui.warn(_("arguments do not match paths that need resolving\n")) 5332 ui.warn(_("arguments do not match paths that need resolving\n"))
5333 5333
5334 finally: 5334 finally:
5335 wlock.release() 5335 wlock.release()
5336 5336