Rev 112: Fix the build. in http://people.samba.org/bzr/jelmer/bzr-git/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 112
revision-id: jelmer at samba.org-20081110162254-w72b1vuk55ara152
parent: jelmer at samba.org-20081110162016-41nffrsmw9knil2h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-11-10 17:22:54 +0100
message:
  Fix the build.
modified:
  branch.py                      git_branch.py-20071108230535-su8dxk529f4uk9fx-2
  repository.py                  git_repository.py-20071108234408-ygidvy5hviixghsd-2
=== modified file 'branch.py'
--- a/branch.py	2008-11-10 16:20:16 +0000
+++ b/branch.py	2008-11-10 16:22:54 +0000
@@ -36,7 +36,7 @@
     def get_tag_dict(self):
         ret = {}
         for tag in self.repository._git.tags:
-            ret[tag.name] = default_mapping.revision_id_foreign_to_bzr(tag.commit.id)
+            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.commit.id)
         return ret
 
     def set_tag(self, name, revid):
@@ -70,7 +70,7 @@
 
     def __init__(self, bzrdir, repository, head, base, lockfiles):
         self.repository = repository
-        super(GitBranch, self).__init__()
+        super(GitBranch, self).__init__(default_mapping)
         self.control_files = lockfiles
         self.bzrdir = bzrdir
         self.head = head
@@ -85,7 +85,7 @@
         # perhaps should escape this ?
         if self.head is None:
             return revision.NULL_REVISION
-        return default_mapping.revision_id_foreign_to_bzr(self.head)
+        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
     def _make_tags(self):
         return GitTagDict(self)
@@ -110,7 +110,7 @@
             skip += max_count
             for cm in cms:
                 if cm.id == nextid:
-                    ret.append(default_mapping.revision_id_foreign_to_bzr(cm.id))
+                    ret.append(self.mapping.revision_id_foreign_to_bzr(cm.id))
                     if cm.parents == []:
                         nextid = None
                     else:

=== modified file 'repository.py'
--- a/repository.py	2008-09-01 15:42:59 +0000
+++ b/repository.py	2008-11-10 16:22:54 +0000
@@ -34,7 +34,7 @@
     )
 from bzrlib.transport import get_transport
 
-from bzrlib.plugins.git import (
+from bzrlib.plugins.git.foreign import (
     versionedfiles
     )
 from bzrlib.plugins.git.mapping import default_mapping