equal
deleted
inserted
replaced
787 olddir = os.getcwd() |
787 olddir = os.getcwd() |
788 os.chdir(self.root) |
788 os.chdir(self.root) |
789 text = self.ui.edit("\n".join(edittext), user) |
789 text = self.ui.edit("\n".join(edittext), user) |
790 os.chdir(olddir) |
790 os.chdir(olddir) |
791 |
791 |
792 lines = [line.rstrip() for line in text.rstrip().splitlines()] |
|
793 while lines and not lines[0]: |
|
794 del lines[0] |
|
795 if not lines: |
|
796 return None |
|
797 text = '\n'.join(lines) |
|
798 if branchname: |
792 if branchname: |
799 extra["branch"] = branchname |
793 extra["branch"] = branchname |
|
794 |
|
795 if use_dirstate: |
|
796 lines = [line.rstrip() for line in text.rstrip().splitlines()] |
|
797 while lines and not lines[0]: |
|
798 del lines[0] |
|
799 if not lines: |
|
800 return None |
|
801 text = '\n'.join(lines) |
|
802 |
800 n = self.changelog.add(mn, changed + removed, text, trp, p1, p2, |
803 n = self.changelog.add(mn, changed + removed, text, trp, p1, p2, |
801 user, date, extra) |
804 user, date, extra) |
802 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
805 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
803 parent2=xp2) |
806 parent2=xp2) |
804 tr.close() |
807 tr.close() |