changeset 139:33da6875a534

preserve branch name of the form xxx/yyy when converting them into hg bookmarks
author vpenne <vpenne@wyplay.com>
date Wed, 20 May 2009 21:28:03 +0000
parents 2fa3ac775983
children b78e86adbd98 d237f5de2b7f
files dulwich/repo.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dulwich/repo.py
+++ b/dulwich/repo.py
@@ -289,9 +289,12 @@
 
     def remote_refs(self, remote_name):
         ret = {}
-        for root, dirs, files in os.walk(os.path.join(self.controldir(), 'refs', 'remotes', remote_name)):
+        r = os.path.join(self.controldir(), 'refs', 'remotes', remote_name)
+        for root, dirs, files in os.walk(r):
             for name in files:
-                ret[name] = self._get_ref(os.path.join(root, name))
+                if root != r:
+                    name = root[len(r) + 1:] + "/" + name
+                ret[name] = self._get_ref(os.path.join(r, name))
         return ret
 
     def head(self):