Patchwork [27,of,41] basefilectx: move phase from filectx

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

Comments

Sean Farley - Aug. 12, 2013, 4:27 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1376279688 18000
#      Sun Aug 11 22:54:48 2013 -0500
# Node ID c1f589ed0131c2b53e2ae56c02082aba9856a53d
# Parent  043870c4f4504e68dd6ba095d548b61721720a3c
basefilectx: move phase from filectx

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -503,10 +503,12 @@ 
         return self._changectx.description()
     def branch(self):
         return self._changectx.branch()
     def extra(self):
         return self._changectx.extra()
+    def phase(self):
+        return self._changectx.phase()
 
 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,
@@ -559,12 +561,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 phase(self):
-        return self._changectx.phase()
     def phasestr(self):
         return self._changectx.phasestr()
     def manifest(self):
         return self._changectx.manifest()
     def changectx(self):