# HG changeset patch # User Matt Mackall # Date 1158550686 18000 # Node ID 4ea58eb3f0c9903770bbbe54251cf163b4e95b46 # Parent da85145d45716f9d4db6c00cdc4dfdaabc051d0c filelog: make metadata method private diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -111,13 +111,13 @@ class filectx(object): def manifest(self): return self.changectx().manifest() def data(self): return self._filelog.read(self._filenode) - def metadata(self): return self._filelog.readmeta(self._filenode) def renamed(self): return self._filelog.renamed(self._filenode) def path(self): return self._path def parents(self): p = [ (self._path, n) for n in self._filelog.parents(self._filenode) ] r = self.renamed() + if r: p[0] = r return [ filectx(self._repo, p, fileid=n) for p,n in p if n != nullid ] diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -37,7 +37,7 @@ class filelog(revlog): s = t.index('\1\n', 2) return t[s+2:] - def readmeta(self, node): + def _readmeta(self, node): t = self.revision(node) if not t.startswith('\1\n'): return {} @@ -60,7 +60,7 @@ class filelog(revlog): def renamed(self, node): if self.parents(node)[0] != nullid: return False - m = self.readmeta(node) + m = self._readmeta(node) if m and m.has_key("copy"): return (m["copy"], bin(m["copyrev"])) return False