Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 13341:4e33ef68b1f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove pointless os.path.join calls when opening files in .hg/cache Windows deals just fine with '/' in paths and Mercurial on Windows already does file accesses elsewhere with mixed \ and / in file paths anyway. This patch also makes the static-http repo case use proper URLs of the form http://example.com/repo/.hg/cache/branchheads http://example.com/repo/.hg/cache/tags instead of the entirely pointless http://example.com/repo/.hg/cache%5Cbranchheads http://example.com/repo/.hg/cache%5tags (as introduced by 5ccdca7df211)
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 17 Jan 2011 09:37:20 +0100
parents dc11e30b48a3
children cce2e7b77e36
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Feb 01 17:53:50 2011 -0600
+++ b/mercurial/localrepo.py	Mon Jan 17 09:37:20 2011 +0100
@@ -439,7 +439,7 @@
     def _readbranchcache(self):
         partial = {}
         try:
-            f = self.opener(os.path.join("cache", "branchheads"))
+            f = self.opener("cache/branchheads")
             lines = f.read().split('\n')
             f.close()
         except (IOError, OSError):
@@ -467,8 +467,7 @@
 
     def _writebranchcache(self, branches, tip, tiprev):
         try:
-            f = self.opener(os.path.join("cache", "branchheads"), "w",
-                            atomictemp=True)
+            f = self.opener("cache/branchheads", "w", atomictemp=True)
             f.write("%s %s\n" % (hex(tip), tiprev))
             for label, nodes in branches.iteritems():
                 for node in nodes: