Merge with crew-stable
authorBrendan Cully <brendan@kublai.com>
Tue, 14 Jul 2009 18:00:37 -0700
changeset 9141 78b81646a2e4
parent 9140 ac0f082faa6c (current diff)
parent 9126 64994005bcb7 (diff)
child 9142 63cfacb7917e
Merge with crew-stable
--- a/mercurial/repair.py	Tue Jul 14 17:21:10 2009 -0700
+++ b/mercurial/repair.py	Tue Jul 14 18:00:37 2009 -0700
@@ -112,7 +112,6 @@
         chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp',
                             extranodes)
 
-    fs = [repo.file(name) for name in files]
     mfst = repo.manifest
 
     tr = repo.transaction()
@@ -121,8 +120,8 @@
     tr.startgroup()
     cl.strip(striprev, tr)
     mfst.strip(striprev, tr)
-    for f in fs:
-        f.strip(striprev, tr)
+    for fn in files:
+        repo.file(fn).strip(striprev, tr)
     tr.endgroup()
 
     try: