equal
deleted
inserted
replaced
476 return lock.lock(self.join("lock"), wait) |
476 return lock.lock(self.join("lock"), wait) |
477 raise inst |
477 raise inst |
478 |
478 |
479 def rawcommit(self, files, text, user, date, p1=None, p2=None): |
479 def rawcommit(self, files, text, user, date, p1=None, p2=None): |
480 orig_parent = self.dirstate.parents()[0] or nullid |
480 orig_parent = self.dirstate.parents()[0] or nullid |
481 p1 = (p1 and self.lookup(p1)) or self.dirstate.parents()[0] or nullid |
481 p1 = p1 or self.dirstate.parents()[0] or nullid |
482 p2 = (p2 and self.lookup(p2)) or self.dirstate.parents()[1] or nullid |
482 p2 = p2 or self.dirstate.parents()[1] or nullid |
483 c1 = self.changelog.read(p1) |
483 c1 = self.changelog.read(p1) |
484 c2 = self.changelog.read(p2) |
484 c2 = self.changelog.read(p2) |
485 m1 = self.manifest.read(c1[0]) |
485 m1 = self.manifest.read(c1[0]) |
486 mf1 = self.manifest.readflags(c1[0]) |
486 mf1 = self.manifest.readflags(c1[0]) |
487 m2 = self.manifest.read(c2[0]) |
487 m2 = self.manifest.read(c2[0]) |