comparison mercurial/context.py @ 10927:c1d375e93ee8 stable

context: fix bug introduced in fb89cd21a7a0, path should be used
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 16 Apr 2010 01:57:32 +0200
parents fb89cd21a7a0
children 6f26ce7ae175
comparison
equal deleted inserted replaced
10925:a101a743c570 10927:c1d375e93ee8
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: