Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 18386:03442135dff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring: use unlinkpath with ignoremissing
author Mads Kiilerich <madski@unity3d.com>
date Tue, 15 Jan 2013 23:30:10 +0100
parents fdf2f5730bd4
children 9354a8c1bded
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jan 15 23:30:10 2013 +0100
+++ b/mercurial/commands.py	Tue Jan 15 23:30:10 2013 +0100
@@ -2947,8 +2947,8 @@
         wlock.release()
 
     # remove state when we complete successfully
-    if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
-        util.unlinkpath(repo.join('graftstate'))
+    if not opts.get('dry_run'):
+        util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
 
     return 0