equal
deleted
inserted
replaced
685 def findflag(ctx): |
685 def findflag(ctx): |
686 mnode = ctx.changeset()[0] |
686 mnode = ctx.changeset()[0] |
687 node, flag = self._repo.manifest.find(mnode, orig) |
687 node, flag = self._repo.manifest.find(mnode, orig) |
688 ff = self._repo.dirstate.flagfunc(lambda x: flag or None) |
688 ff = self._repo.dirstate.flagfunc(lambda x: flag or None) |
689 try: |
689 try: |
690 return ff(orig) |
690 return ff(path) |
691 except OSError: |
691 except OSError: |
692 pass |
692 pass |
693 |
693 |
694 flag = findflag(self._parents[0]) |
694 flag = findflag(self._parents[0]) |
695 if flag is None and len(self.parents()) > 1: |
695 if flag is None and len(self.parents()) > 1: |