Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/context.py @ 24775:36993b52d016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 17:30:01 -0500
parents 11e8fec00234 612ed41ae359
children 52628cd73d3e
comparison
equal deleted inserted replaced
24774:a9d63d87b837 24775:36993b52d016
906 # use linkrev to find the first changeset where self appeared 906 # use linkrev to find the first changeset where self appeared
907 base = self 907 base = self
908 introrev = self.introrev() 908 introrev = self.introrev()
909 if self.rev() != introrev: 909 if self.rev() != introrev:
910 base = self.filectx(self.filenode(), changeid=introrev) 910 base = self.filectx(self.filenode(), changeid=introrev)
911 if getattr(base, '_ancestrycontext', None) is None:
911 ac = self._repo.changelog.ancestors([introrev], inclusive=True) 912 ac = self._repo.changelog.ancestors([introrev], inclusive=True)
912 base._ancestrycontext = ac 913 base._ancestrycontext = ac
913 914
914 # This algorithm would prefer to be recursive, but Python is a 915 # This algorithm would prefer to be recursive, but Python is a
915 # bit recursion-hostile. Instead we do an iterative 916 # bit recursion-hostile. Instead we do an iterative