Patchwork [28,of,41] basefilectx: move phasestr from filectx

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

Comments

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

Patch

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