Rev 100: Actually use foreign branch utility code. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

Jelmer Vernooij jelmer at samba.org
Wed Aug 27 20:40:35 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-git/trunk

------------------------------------------------------------
revno: 100
revision-id: jelmer at samba.org-20080827194033-t5nswkrrl1z11nkw
parent: jelmer at samba.org-20080827193949-h83vvuh1m3b8oazp
parent: jelmer at samba.org-20080823142102-307i0cz76yn85100
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-08-27 21:40:33 +0200
message:
  Actually use foreign branch utility code.
modified:
  mapping.py                     ids.py-20071108230535-su8dxk529f4uk9fx-3
    ------------------------------------------------------------
    revno: 97.1.1
    revision-id: jelmer at samba.org-20080823142102-307i0cz76yn85100
    parent: jelmer at samba.org-20080823135348-37p81972kdzjdvrn
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: foreign-util
    timestamp: Sat 2008-08-23 16:21:02 +0200
    message:
      Use foreign utility functions.
    modified:
      mapping.py                     ids.py-20071108230535-su8dxk529f4uk9fx-3
=== modified file 'mapping.py'
--- a/mapping.py	2008-08-23 13:53:48 +0000
+++ b/mapping.py	2008-08-27 19:40:33 +0000
@@ -16,19 +16,20 @@
 
 """Converters, etc for going between Bazaar and Git ids."""
 
-class BzrGitMapping(object):
+from bzrlib.plugins.git import foreign
+
+class BzrGitMapping(foreign.VcsMapping):
     """Class that maps between Git and Bazaar semantics."""
     experimental = False
-    namespace = None
 
     def convert_revision_id_git_to_bzr(self, git_rev_id):
         """Convert a git revision id handle to a Bazaar revision id."""
-        return "%s:%s" % (self.namespace, git_rev_id)
+        return "%s:%s" % (self.revid_prefix, git_rev_id)
 
     def convert_revision_id_bzr_to_git(self, bzr_rev_id):
         """Convert a Bazaar revision id to a git revision id handle."""
         assert bzr_rev_id.startswith("%s:" % self.namespace)
-        return bzr_rev_id[len(self.namespace)+1:]
+        return bzr_rev_id[len(self.revid_prefix)+1:]
 
 
 class BzrGitMappingExperimental(BzrGitMapping):




More information about the bazaar-commits mailing list