Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: only call dirstate.normal when we know the file is clean
authorAlexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 14 Feb 2008 18:08:16 -0200
changeset 6108 5086576a2152
parent 6107 41bb88cb913e
child 6109 242595e612ed
revert: only call dirstate.normal when we know the file is clean
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Feb 14 18:08:16 2008 -0200
+++ b/mercurial/commands.py	Thu Feb 14 18:08:16 2008 -0200
@@ -2329,9 +2329,12 @@
                 checkout(f)
                 repo.dirstate.add(f)
 
+            normal = repo.dirstate.normallookup
+            if node == parent and p2 == nullid:
+                normal = repo.dirstate.normal
             for f in undelete[0]:
                 checkout(f)
-                repo.dirstate.normal(f)
+                normal(f)
 
             audit_path = util.path_auditor(repo.root)
             for f in remove[0]:
Mercurial