/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to branch.py

Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
25
25
from bzrlib.decorators import needs_read_lock
26
26
 
27
27
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
29
28
 
30
29
class GitTagDict(tag.BasicTags):
31
30
 
70
69
 
71
70
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
71
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
72
        super(GitBranch, self).__init__(repository.get_mapping())
74
73
        self.control_files = lockfiles
75
74
        self.bzrdir = bzrdir
76
75
        self.name = name