equal
deleted
inserted
replaced
681 c2 = self.changelog.read(p2) |
681 c2 = self.changelog.read(p2) |
682 m1 = self.manifest.read(c1[0]).copy() |
682 m1 = self.manifest.read(c1[0]).copy() |
683 m2 = self.manifest.read(c2[0]) |
683 m2 = self.manifest.read(c2[0]) |
684 |
684 |
685 if use_dirstate: |
685 if use_dirstate: |
686 branchname = util.fromlocal(self.workingctx().branch()) |
686 branchname = self.workingctx().branch() |
|
687 try: |
|
688 branchname = branchname.decode('UTF-8').encode('UTF-8') |
|
689 except UnicodeDecodeError: |
|
690 raise util.Abort(_('branch name not in UTF-8!')) |
687 else: |
691 else: |
688 branchname = "" |
692 branchname = "" |
689 |
693 |
690 if use_dirstate: |
694 if use_dirstate: |
691 oldname = c1[5].get("branch", "") # stored in UTF-8 |
695 oldname = c1[5].get("branch", "") # stored in UTF-8 |