##// END OF EJS Templates
rawcommit: do lookup of parents at the appropriate layer...
mpm@selenic.com -
r452:a1e91c24 default
parent child Browse files
Show More
@@ -554,6 +554,8 b' def rawcommit(ui, repo, *flist, **rc):'
554 if rc['files']:
554 if rc['files']:
555 files += open(rc['files']).read().splitlines()
555 files += open(rc['files']).read().splitlines()
556
556
557 rc['parent'] = map(repo.lookup, rc['parent'])
558
557 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
559 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
558
560
559 def recover(ui, repo):
561 def recover(ui, repo):
@@ -478,8 +478,8 b' class localrepository:'
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])
General Comments 0
You need to be logged in to leave comments. Login now