/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 git_branch.py

GitBranchBuilder now handles file names with newlines correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
23
 
    tag,
24
23
    )
25
24
from bzrlib.decorators import needs_read_lock
26
25
 
27
 
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
 
29
 
class GitTagDict(tag.BasicTags):
30
 
 
31
 
    def __init__(self, branch):
32
 
        self.branch = branch
33
 
        self.repository = branch.repository
34
 
 
35
 
    def get_tag_dict(self):
36
 
        ret = {}
37
 
        for k,v in self.repository._git.tags.iteritems():
38
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
39
 
        return ret
40
 
 
41
 
    def set_tag(self, name, revid):
42
 
        self.repository._git.tags[name] = revid
 
26
from bzrlib.plugins.git import ids
43
27
 
44
28
 
45
29
class GitBranchConfig(config.BranchConfig):
57
41
 
58
42
class GitBranchFormat(branch.BranchFormat):
59
43
 
60
 
    def get_format_description(self):
 
44
    def get_branch_description(self):
61
45
        return 'Git Branch'
62
46
 
63
 
    def supports_tags(self):
64
 
        return True
65
 
 
66
 
 
67
 
class GitBranch(ForeignBranch):
 
47
 
 
48
class GitBranch(branch.Branch):
68
49
    """An adapter to git repositories for bzr Branch objects."""
69
50
 
70
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
71
 
        self.repository = repository
72
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
51
    def __init__(self, gitdir, lockfiles):
 
52
        from bzrlib.plugins.git import git_repository
 
53
        self.bzrdir = gitdir
73
54
        self.control_files = lockfiles
74
 
        self.bzrdir = bzrdir
75
 
        self.name = name
76
 
        self.head = head
77
 
        self.base = bzrdir.transport.base
 
55
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
 
56
        self.base = gitdir.root_transport.base
 
57
        if '.git' not in gitdir.root_transport.list_dir('.'):
 
58
            raise errors.NotBranchError(self.base)
78
59
        self._format = GitBranchFormat()
79
60
 
80
61
    def lock_write(self):
81
62
        self.control_files.lock_write()
82
63
 
83
 
    def get_stacked_on_url(self):
84
 
        # Git doesn't do stacking (yet...)
85
 
        return None
86
 
 
87
 
    def get_parent(self):
88
 
        """See Branch.get_parent()."""
89
 
        return None
90
 
 
91
 
    def set_parent(self, url):
92
 
        pass
93
 
 
94
 
    def lock_read(self):
95
 
        self.control_files.lock_read()
96
 
 
97
 
    def unlock(self):
98
 
        self.control_files.unlock()
99
 
 
100
 
    def get_physical_lock_status(self):
101
 
        return False
102
 
 
103
 
 
104
 
class LocalGitBranch(GitBranch):
105
 
 
106
64
    @needs_read_lock
107
65
    def last_revision(self):
108
66
        # perhaps should escape this ?
109
 
        if self.head is None:
 
67
        head_git_id = self.repository._git.get_head()
 
68
        if head_git_id is None:
110
69
            return revision.NULL_REVISION
111
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
112
 
 
113
 
    def _make_tags(self):
114
 
        return GitTagDict(self)
115
 
 
116
 
    def _gen_revision_history(self):
117
 
        if self.head is None:
 
70
        return ids.convert_revision_id_git_to_bzr(head_git_id)
 
71
 
 
72
    @needs_read_lock
 
73
    def revision_history(self):
 
74
        node = self.last_revision()
 
75
        if node == revision.NULL_REVISION:
118
76
            return []
119
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
120
 
        ret.reverse()
121
 
        return ret
 
77
        ancestors = self.repository.get_revision_graph(node)
 
78
        history = []
 
79
        while node is not None:
 
80
            history.append(node)
 
81
            if len(ancestors[node]) > 0:
 
82
                node = ancestors[node][0]
 
83
            else:
 
84
                node = None
 
85
        return list(reversed(history))
122
86
 
123
87
    def get_config(self):
124
88
        return GitBranchConfig(self)
125
89
 
 
90
    def lock_read(self):
 
91
        self.control_files.lock_read()
 
92
 
 
93
    def unlock(self):
 
94
        self.control_files.unlock()
 
95
 
126
96
    def get_push_location(self):
127
97
        """See Branch.get_push_location."""
128
98
        push_loc = self.get_config().get_user_option('push_location')
132
102
        """See Branch.set_push_location."""
133
103
        self.get_config().set_user_option('push_location', location,
134
104
                                          local=True)
135
 
 
136
 
    def supports_tags(self):
137
 
        return True
138
 
 
139
 
    def sprout(self, to_bzrdir, revision_id=None):
140
 
        """See Branch.sprout()."""
141
 
        result = to_bzrdir.create_branch()
142
 
        self.copy_content_into(result, revision_id=revision_id)
143
 
        result.set_parent(self.bzrdir.root_transport.base)
144
 
        return result
145