/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 new bzr-foreign.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
25
25
from bzrlib import (
26
26
    branch,
27
27
    config,
 
28
    foreign,
28
29
    repository,
29
30
    revision,
30
31
    tag,
40
41
from bzrlib.plugins.git.errors import (
41
42
    NoSuchRef,
42
43
    )
43
 
from bzrlib.plugins.git.foreign import (
44
 
    ForeignBranch,
45
 
    )
46
44
 
47
45
 
48
46
class LocalGitTagDict(tag.BasicTags):
101
99
            return LocalGitTagDict(branch)
102
100
 
103
101
 
104
 
class GitBranch(ForeignBranch):
 
102
class GitBranch(foreign.ForeignBranch):
105
103
    """An adapter to git repositories for bzr Branch objects."""
106
104
 
107
105
    def __init__(self, bzrdir, repository, name, head, lockfiles):