Patchwork [16,of,41] basefilectx: move filelog from filectx

login
register
mail settings
Submitter Sean Farley
Date Aug. 12, 2013, 4:27 p.m.
Message ID <9c1d247bd0fbbee0d9e8.1376324832@laptop.local>
Download mbox | patch
Permalink /patch/2142/
State Accepted
Commit b1c344ebd8e44e6f95ecdb01b0d575822f7d5f75
Headers show

Comments

Sean Farley - Aug. 12, 2013, 4:27 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1376279478 18000
#      Sun Aug 11 22:51:18 2013 -0500
# Node ID 9c1d247bd0fbbee0d9e88d01426d380612a1cf8f
# Parent  108b5d68ee93197259c98719c25603fb29474ac4
basefilectx: move filelog from filectx

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -481,10 +481,12 @@ 
         return self._filerev
     def filenode(self):
         return self._filenode
     def flags(self):
         return self._changectx.flags(self._path)
+    def filelog(self):
+        return self._filelog
 
 class filectx(basefilectx):
     """A filecontext object makes access to data related to a particular
        filerevision convenient."""
     def __init__(self, repo, path, changeid=None, fileid=None,
@@ -537,12 +539,10 @@ 
         '''opens an arbitrary revision of the file without
         opening a new filelog'''
         return filectx(self._repo, self._path, fileid=fileid,
                        filelog=self._filelog)
 
-    def filelog(self):
-        return self._filelog
     def rev(self):
         return self._changeid
     def linkrev(self):
         return self._filelog.linkrev(self._filerev)
     def node(self):