Patchwork [25,of,41] basefilectx: move branch from filectx

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

Comments

Sean Farley - Aug. 12, 2013, 4:27 p.m.
# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1376279671 18000
#      Sun Aug 11 22:54:31 2013 -0500
# Node ID e87eae4d45ad7a044d4c57d69274fcf57dd4fae3
# Parent  304baff0b138716475430b47cf8fb2d417658a14
basefilectx: move branch from filectx

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -499,10 +499,12 @@ 
         return self._changectx.date()
     def files(self):
         return self._changectx.files()
     def description(self):
         return self._changectx.description()
+    def branch(self):
+        return self._changectx.branch()
 
 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,
@@ -555,12 +557,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 branch(self):
-        return self._changectx.branch()
     def extra(self):
         return self._changectx.extra()
     def phase(self):
         return self._changectx.phase()
     def phasestr(self):