# HG changeset patch # User Pierre-Yves David # Date 2015-06-15 23:04:14 # Node ID d89045a66e01c2076ec60f3f0b808de045690070 # Parent 37876ca00c0a001c4f155f2b60bd4ef0ac88aa7f phase: rename getphaserevs to loadphaserevs This function is: - already loading the data in place, - used once in the code. So we drop the return value and change the name to make this obvious. We keep the function public because we'll have to use it in revset. diff --git a/mercurial/phases.py b/mercurial/phases.py --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -194,7 +194,8 @@ class phasecache(object): for rev in repo.changelog.descendants(roots): revs[rev] = phase - def getphaserevs(self, repo): + def loadphaserevs(self, repo): + """ensure phase information is loaded in the object""" if self._phaserevs is None: try: if repo.ui.configbool('experimental', @@ -205,7 +206,6 @@ class phasecache(object): self._phaserevs, self._phasesets = res except AttributeError: self._computephaserevspure(repo) - return self._phaserevs def invalidate(self): self._phaserevs = None @@ -233,7 +233,7 @@ class phasecache(object): raise ValueError(_('cannot lookup negative revision')) if self._phaserevs is None or rev >= len(self._phaserevs): self.invalidate() - self._phaserevs = self.getphaserevs(repo) + self.loadphaserevs(repo) return self._phaserevs[rev] def write(self):