[PATCH 2 of 5] manifest: have context's dirs() call its manifest's dirs()

Drew Gottlieb drgott at google.com
Fri Mar 13 18:35:34 CDT 2015


# HG changeset patch
# User Drew Gottlieb <drgott at google.com>
# Date 1426285382 25200
#      Fri Mar 13 15:23:02 2015 -0700
# Node ID d1f4b4b9cc4e63ea7fd68f23a3214f11b64df845
# Parent  2fcfb7b2ea15fd09a121f8893f120c9211ccb00b
manifest: have context's dirs() call its manifest's dirs()

This lets the context's dirs() method be agnostic towards any alternate
manifest implementations.

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -266,12 +266,9 @@
         diffopts = patch.diffopts(self._repo.ui, opts)
         return patch.diff(self._repo, ctx2, self, match=match, opts=diffopts)
 
-    @propertycache
-    def _dirs(self):
-        return scmutil.dirs(self._manifest)
+    def dirs(self):
+        return self._manifest.dirs()
 
-    def dirs(self):
-        return self._dirs
 
     def dirty(self, missing=False, merge=True, branch=True):
         return False


More information about the Mercurial-devel mailing list