Show More
@@ -413,9 +413,7 b' class localrepository:' | |||
|
413 | 413 | self.dirstate.clear() |
|
414 | 414 | self.dirstate.update(mmap.keys(), "n") |
|
415 | 415 | |
|
416 |
def commit(self |
|
|
417 | self.lock() | |
|
418 | ||
|
416 | def commit(self, files = None, text = ""): | |
|
419 | 417 | commit = [] |
|
420 | 418 | remove = [] |
|
421 | 419 | if files: |
@@ -436,6 +434,11 b' class localrepository:' | |||
|
436 | 434 | self.ui.status("nothing changed\n") |
|
437 | 435 | return |
|
438 | 436 | |
|
437 | p1, p2 = self.dirstate.parents() | |
|
438 | c1 = self.changelog.read(p1) | |
|
439 | c2 = self.changelog.read(p2) | |
|
440 | m1 = self.manifest.read(c1[0]) | |
|
441 | m2 = self.manifest.read(c2[0]) | |
|
439 | 442 | lock = self.lock() |
|
440 | 443 | tr = self.transaction() |
|
441 | 444 | |
@@ -452,28 +455,28 b' class localrepository:' | |||
|
452 | 455 | raise |
|
453 | 456 | |
|
454 | 457 | r = self.file(f) |
|
455 | new[f] = r.add(t, tr, linkrev) | |
|
458 | fp1 = m1.get(f, nullid) | |
|
459 | fp2 = m2.get(f, nullid) | |
|
460 | new[f] = r.add(t, tr, linkrev, fp1, fp2) | |
|
456 | 461 | |
|
457 | 462 | # update manifest |
|
458 | mmap = self.manifest.read(self.manifest.tip()) | |
|
459 | mmap.update(new) | |
|
460 | for f in remove: | |
|
461 | del mmap[f] | |
|
462 | mnode = self.manifest.add(mmap, tr, linkrev) | |
|
463 | m1.update(new) | |
|
464 | for f in remove: del m1[f] | |
|
465 | mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0]) | |
|
463 | 466 | |
|
464 | 467 | # add changeset |
|
465 | 468 | new = new.keys() |
|
466 | 469 | new.sort() |
|
467 | 470 | |
|
468 |
edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn |
|
|
471 | edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn) | |
|
469 | 472 | edittext += "".join(["HG: changed %s\n" % f for f in new]) |
|
470 | 473 | edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
|
471 | 474 | edittext = self.ui.edit(edittext) |
|
472 | 475 | |
|
473 |
n = self.changelog.add(mn |
|
|
476 | n = self.changelog.add(mn, new, edittext, tr, p1, p2) | |
|
474 | 477 | tr.close() |
|
475 | 478 | |
|
476 |
self. |
|
|
479 | self.dirstate.setparents(n) | |
|
477 | 480 | self.dirstate.update(new, "n") |
|
478 | 481 | self.dirstate.forget(remove) |
|
479 | 482 |
General Comments 0
You need to be logged in to leave comments.
Login now