equal
deleted
inserted
replaced
759 edittext.append(text) |
759 edittext.append(text) |
760 edittext.append("") |
760 edittext.append("") |
761 edittext.append("HG: user: %s" % user) |
761 edittext.append("HG: user: %s" % user) |
762 if p2 != nullid: |
762 if p2 != nullid: |
763 edittext.append("HG: branch merge") |
763 edittext.append("HG: branch merge") |
|
764 if branchname: |
|
765 edittext.append("HG: branch %s" % util.tolocal(branchname)) |
764 edittext.extend(["HG: changed %s" % f for f in changed]) |
766 edittext.extend(["HG: changed %s" % f for f in changed]) |
765 edittext.extend(["HG: removed %s" % f for f in removed]) |
767 edittext.extend(["HG: removed %s" % f for f in removed]) |
766 if not changed and not remove: |
768 if not changed and not remove: |
767 edittext.append("HG: no files changed") |
769 edittext.append("HG: no files changed") |
768 edittext.append("") |
770 edittext.append("") |
783 n = self.changelog.add(mn, changed + removed, text, tr, p1, p2, |
785 n = self.changelog.add(mn, changed + removed, text, tr, p1, p2, |
784 user, date, extra) |
786 user, date, extra) |
785 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
787 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
786 parent2=xp2) |
788 parent2=xp2) |
787 tr.close() |
789 tr.close() |
|
790 |
|
791 if self.branchcache and "branch" in extra: |
|
792 self.branchcache[util.tolocal(extra["branch"])] = n |
788 |
793 |
789 if use_dirstate or update_dirstate: |
794 if use_dirstate or update_dirstate: |
790 self.dirstate.setparents(n) |
795 self.dirstate.setparents(n) |
791 if use_dirstate: |
796 if use_dirstate: |
792 self.dirstate.update(new, "n") |
797 self.dirstate.update(new, "n") |