equal
deleted
inserted
replaced
495 |
495 |
496 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn) |
496 edittext = text + "\n" + "HG: manifest hash %s\n" % hex(mn) |
497 edittext += "".join(["HG: changed %s\n" % f for f in new]) |
497 edittext += "".join(["HG: changed %s\n" % f for f in new]) |
498 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
498 edittext += "".join(["HG: removed %s\n" % f for f in remove]) |
499 edittext = self.ui.edit(edittext) |
499 edittext = self.ui.edit(edittext) |
|
500 |
|
501 if not edittext: |
|
502 return 1 |
500 |
503 |
501 n = self.changelog.add(mn, new, edittext, tr, p1, p2) |
504 n = self.changelog.add(mn, new, edittext, tr, p1, p2) |
502 tr.close() |
505 tr.close() |
503 |
506 |
504 self.dirstate.setparents(n) |
507 self.dirstate.setparents(n) |