Show More
@@ -553,7 +553,9 b' def rawcommit(ui, repo, *flist, **rc):' | |||
|
553 | 553 | files = relpath(repo, list(flist)) |
|
554 | 554 | if rc['files']: |
|
555 | 555 | files += open(rc['files']).read().splitlines() |
|
556 | ||
|
556 | ||
|
557 | rc['parent'] = map(repo.lookup, rc['parent']) | |
|
558 | ||
|
557 | 559 | repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
|
558 | 560 | |
|
559 | 561 | def recover(ui, repo): |
@@ -478,8 +478,8 b' class localrepository:' | |||
|
478 | 478 | |
|
479 | 479 | def rawcommit(self, files, text, user, date, p1=None, p2=None): |
|
480 | 480 | orig_parent = self.dirstate.parents()[0] or nullid |
|
481 |
p1 = |
|
|
482 |
p2 = |
|
|
481 | p1 = p1 or self.dirstate.parents()[0] or nullid | |
|
482 | p2 = p2 or self.dirstate.parents()[1] or nullid | |
|
483 | 483 | c1 = self.changelog.read(p1) |
|
484 | 484 | c2 = self.changelog.read(p2) |
|
485 | 485 | m1 = self.manifest.read(c1[0]) |
General Comments 0
You need to be logged in to leave comments.
Login now