mercurial-crew-with-dirclash: mercurial/hg.py comparison

Simplify checkout slightly, replace checkdir with os.makedirs

comparison

equal deleted inserted replaced

-:1918852a67a8
+:82fb6d09f911
 self.setcurrent(n)
 self.dircache.update(new)
 self.dircache.remove(remove)
-def checkdir(self, path):
-d = os.path.dirname(path)
-if not d: return
-if not os.path.isdir(d):
-self.checkdir(d)
-os.mkdir(d)
 def checkout(self, node):
 # checkout is really dumb at the moment
 # it ought to basically merge
 change = self.changelog.read(node)
-mmap = self.manifest.read(change[0])
+l = self.manifest.read(change[0]).items()
-l = mmap.keys()
 l.sort()
-stats = []
-for f in l:
+for f,n in l:
-self.ui.note(f + "\n")
+if f[0] == "/": continue
-r = self.file(f)
+self.ui.note(f, "\n")
-t = r.revision(mmap[f])
+t = self.file(f).revision(n)
 try:
 file(f, "w").write(t)
-except:
+except IOError:
-self.checkdir(f)
+os.makedirs(os.path.dirname(f))
 file(f, "w").write(t)
 self.setcurrent(node)
 self.dircache.clear()
-self.dircache.update(l)
+self.dircache.update([f for f,n in l])
 def diffdir(self, path, changeset):
 changed = []
 mf = {}
 added = []

Mercurial > hg > mercurial-crew-with-dirclash