dirstate: filecacheify _branch

The opener is relative to .hg, use it in a subclass of filecache to compute
the final path.

mercurial/dirstate.py

@@ -14,6 +14,12 b' import cStringIO'
 
 _format = ">cllll"
 propertycache = util.propertycache
+filecache = scmutil.filecache
+
+class repocache(filecache):
+    """filecache for files in .hg/"""
+    def join(self, obj, fname):
+        return obj._opener.join(fname)
 
 def _finddirs(path):
     pos = path.rfind('/')
@@ -78,7 +84,7 b' class dirstate(object):'
         f['.'] = '.' # prevents useless util.fspath() invocation
         return f
 
-    @propertycache
+    @repocache('branch')
     def _branch(self):
         try:
             return self._opener.read("branch").strip() or "default"

tests/test-commandserver.py

@@ -212,6 +212,13 b' def rollback(server):'
     runcommand(server, ['rollback'])
     runcommand(server, ['phase', '-r', '.'])
 
+def branch(server):
+    readchannel(server)
+    runcommand(server, ['branch'])
+    os.system('hg branch foo')
+    runcommand(server, ['branch'])
+    os.system('hg branch default')
+
 if __name__ == '__main__':
     os.system('hg init')
 
@@ -232,3 +239,4 b" if __name__ == '__main__':"
     check(tagscache)
     check(setphase)
     check(rollback)
+    check(branch)

tests/test-commandserver.py.out

@@ -145,3 +145,14 b' repository tip rolled back to revision 3'
 working directory now based on revision 3
  runcommand phase -r .
 3: public
+
+testing branch:
+
+ runcommand branch
+default
+marked working directory as branch foo
+(branches are permanent and global, did you want a bookmark?)
+ runcommand branch
+foo
+marked working directory as branch default
+(branches are permanent and global, did you want a bookmark?)