/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.1613 by Jelmer Vernooij
Handle encoding better in working tree iter changes.
1
# Copyright (C) 2007,2012 Canonical Ltd
0.358.2 by Jelmer Vernooij
Refresh copyright headers, add my email.
2
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
0.358.1 by Jelmer Vernooij
Fix FSF address.
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
19
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
20
from __future__ import absolute_import
21
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
22
from io import BytesIO
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
23
from collections import defaultdict
24
0.200.261 by Jelmer Vernooij
More formatting fixes.
25
from dulwich.objects import (
0.200.1717 by Jelmer Vernooij
Ignore tags pointing at non-commit objects.
26
    NotCommitError,
0.200.1153 by Jelmer Vernooij
Import ZERO_SHA from dulwich.objects.
27
    ZERO_SHA,
0.200.261 by Jelmer Vernooij
More formatting fixes.
28
    )
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
29
from dulwich.repo import check_ref_format
0.200.261 by Jelmer Vernooij
More formatting fixes.
30
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
31
from .. import (
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
    branch,
33
    config,
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
34
    controldir,
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
35
    errors,
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
36
    lock,
0.200.1097 by Jelmer Vernooij
Implement GitBranchFormat.initialize.
37
    repository as _mod_repository,
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
38
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
39
    tag,
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
40
    trace,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
41
    transport,
0.200.1414 by Jelmer Vernooij
Fix pulling into bound branches.
42
    urlutils,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
43
    )
6986.2.3 by Jelmer Vernooij
Merge trunk
44
from ..foreign import ForeignBranch
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
45
from ..revision import (
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
46
    NULL_REVISION,
47
    )
6986.2.3 by Jelmer Vernooij
Merge trunk
48
from ..sixish import (
7018.3.2 by Jelmer Vernooij
Fix some git tests.
49
    text_type,
50
    viewitems,
51
    )
6986.2.1 by Jelmer Vernooij
Move breezy.plugins.git to breezy.git.
52
from ..trace import (
0.200.342 by Jelmer Vernooij
Report git sha during pull.
53
    is_quiet,
0.200.261 by Jelmer Vernooij
More formatting fixes.
54
    mutter,
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
55
    warning,
0.200.261 by Jelmer Vernooij
More formatting fixes.
56
    )
57
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
58
from .config import (
0.200.386 by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username().
59
    GitBranchConfig,
0.200.1472 by Jelmer Vernooij
Provide basic implementation of Branch.get_config_stack.
60
    GitBranchStack,
0.200.386 by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username().
61
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
62
from .errors import (
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
63
    NoPushSupport,
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
64
    NoSuchRef,
65
    )
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
66
from .push import (
67
    remote_divergence,
68
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
69
from .refs import (
0.408.4 by Jelmer Vernooij
Fix some tests.
70
    branch_name_to_ref,
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
71
    is_tag,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
72
    ref_to_branch_name,
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
73
    ref_to_tag_name,
0.346.1 by Jelmer Vernooij
Fix tag caching.
74
    remote_refs_dict_to_tag_refs,
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
75
    tag_name_to_ref,
0.200.1292 by Jelmer Vernooij
Fix repeeling objects when determining what to send.
76
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
77
from .unpeel_map import (
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
78
    UnpeelMap,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
79
    )
0.408.1 by Jelmer Vernooij
Convert Git URLs in stored config to Breezy URLs.
80
from .urls import git_url_to_bzr_url
0.200.261 by Jelmer Vernooij
More formatting fixes.
81
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
82
0.200.261 by Jelmer Vernooij
More formatting fixes.
83
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
84
class GitPullResult(branch.PullResult):
0.200.956 by Jelmer Vernooij
Add some more format tests.
85
    """Result of a pull from a Git branch."""
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
86
87
    def _lookup_revno(self, revid):
6973.13.2 by Jelmer Vernooij
Fix some more tests.
88
        if not isinstance(revid, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
89
            raise TypeError(revid)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
90
        # Try in source branch first, it'll be faster
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
91
        with self.target_branch.lock_read():
0.200.1362 by Jelmer Vernooij
Add locking.
92
            return self.target_branch.revision_id_to_revno(revid)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
93
94
    @property
95
    def old_revno(self):
96
        return self._lookup_revno(self.old_revid)
97
98
    @property
99
    def new_revno(self):
100
        return self._lookup_revno(self.new_revid)
101
102
0.200.1064 by Jelmer Vernooij
Use common base class for tags.
103
class GitTags(tag.BasicTags):
104
    """Ref-based tag dictionary."""
0.200.82 by Jelmer Vernooij
Support listing tags.
105
0.200.89 by Jelmer Vernooij
Support sprouting branches.
106
    def __init__(self, branch):
107
        self.branch = branch
108
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
109
0.346.1 by Jelmer Vernooij
Fix tag caching.
110
    def _merge_to_remote_git(self, target_repo, source_tag_refs, overwrite=False):
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
111
        updates = {}
112
        conflicts = []
113
        def get_changed_refs(old_refs):
114
            ret = dict(old_refs)
0.346.1 by Jelmer Vernooij
Fix tag caching.
115
            for ref_name, tag_name, peeled, unpeeled in source_tag_refs.iteritems():
116
                if old_refs.get(ref_name) == unpeeled:
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
117
                    pass
0.346.1 by Jelmer Vernooij
Fix tag caching.
118
                elif overwrite or not ref_name in old_refs:
119
                    ret[ref_name] = unpeeled
120
                    updates[tag_name] = target_repo.lookup_foreign_revision_id(peeled)
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
121
                else:
0.346.1 by Jelmer Vernooij
Fix tag caching.
122
                    conflicts.append(
123
                        (tag_name,
124
                        self.repository.lookup_foreign_revision_id(peeled),
125
                        target_repo.lookup_foreign_revision_id(old_refs[ref_name])))
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
126
            return ret
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
127
        target_repo.controldir.send_pack(get_changed_refs, lambda have, want: [])
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
128
        return updates, conflicts
129
0.346.1 by Jelmer Vernooij
Fix tag caching.
130
    def _merge_to_local_git(self, target_repo, source_tag_refs, overwrite=False):
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
131
        conflicts = []
132
        updates = {}
0.346.1 by Jelmer Vernooij
Fix tag caching.
133
        for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
134
            if target_repo._git.refs.get(ref_name) == unpeeled:
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
135
                pass
0.346.1 by Jelmer Vernooij
Fix tag caching.
136
            elif overwrite or not ref_name in target_repo._git.refs:
137
                target_repo._git.refs[ref_name] = unpeeled or peeled
138
                updates[tag_name] = self.repository.lookup_foreign_revision_id(peeled)
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
139
            else:
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
140
                source_revid = self.repository.lookup_foreign_revision_id(peeled)
141
                try:
142
                    target_revid = target_repo.lookup_foreign_revision_id(
143
                            target_repo._git.refs[ref_name])
144
                except KeyError:
145
                    trace.warning('%s does not point to a valid object',
146
                                  ref_name)
147
                    continue
148
                conflicts.append((tag_name, source_revid, target_revid))
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
149
        return updates, conflicts
150
0.346.1 by Jelmer Vernooij
Fix tag caching.
151
    def _merge_to_git(self, to_tags, source_tag_refs, overwrite=False):
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
152
        target_repo = to_tags.repository
153
        if self.repository.has_same_location(target_repo):
154
            return {}, []
0.346.1 by Jelmer Vernooij
Fix tag caching.
155
        try:
156
            if getattr(target_repo, "_git", None):
157
                return self._merge_to_local_git(target_repo, source_tag_refs, overwrite)
158
            else:
159
                return self._merge_to_remote_git(target_repo, source_tag_refs, overwrite)
160
        finally:
161
            to_tags.branch._tag_refs = None
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
162
0.346.1 by Jelmer Vernooij
Fix tag caching.
163
    def _merge_to_non_git(self, to_tags, source_tag_refs, overwrite=False):
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
164
        unpeeled_map = defaultdict(set)
165
        conflicts = []
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
166
        updates = {}
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
167
        result = dict(to_tags.get_tag_dict())
0.346.1 by Jelmer Vernooij
Fix tag caching.
168
        for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
169
            if unpeeled is not None:
170
                unpeeled_map[peeled].add(unpeeled)
0.346.1 by Jelmer Vernooij
Fix tag caching.
171
            try:
172
                bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
173
            except NotCommitError:
174
                continue
175
            if result.get(tag_name) == bzr_revid:
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
176
                pass
0.346.1 by Jelmer Vernooij
Fix tag caching.
177
            elif tag_name not in result or overwrite:
178
                result[tag_name] = bzr_revid
179
                updates[tag_name] = bzr_revid
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
180
            else:
0.346.1 by Jelmer Vernooij
Fix tag caching.
181
                conflicts.append((tag_name, bzr_revid, result[n]))
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
182
        to_tags._set_tag_dict(result)
183
        if len(unpeeled_map) > 0:
184
            map_file = UnpeelMap.from_repository(to_tags.branch.repository)
185
            map_file.update(unpeeled_map)
186
            map_file.save_in_repository(to_tags.branch.repository)
0.200.1396 by Jelmer Vernooij
Support updating tags in remote branches during pull.
187
        return updates, conflicts
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
188
189
    def merge_to(self, to_tags, overwrite=False, ignore_master=False,
0.346.1 by Jelmer Vernooij
Fix tag caching.
190
                 source_tag_refs=None):
0.200.1113 by Jelmer Vernooij
Fix Tags.merge_to.
191
        """See Tags.merge_to."""
0.346.1 by Jelmer Vernooij
Fix tag caching.
192
        if source_tag_refs is None:
193
            source_tag_refs = self.branch.get_tag_refs()
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
194
        if self == to_tags:
0.200.1402 by Jelmer Vernooij
Cope with tag changes in bzr.
195
            return {}, []
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
196
        if isinstance(to_tags, GitTags):
0.346.1 by Jelmer Vernooij
Fix tag caching.
197
            return self._merge_to_git(to_tags, source_tag_refs,
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
198
                                      overwrite=overwrite)
199
        else:
200
            if ignore_master:
201
                master = None
202
            else:
203
                master = to_tags.branch.get_master_branch()
204
            if master is not None:
0.331.1 by Jelmer Vernooij
Fix some tags tests.
205
                master.lock_write()
206
            try:
0.346.1 by Jelmer Vernooij
Fix tag caching.
207
                updates, conflicts = self._merge_to_non_git(to_tags, source_tag_refs,
0.331.1 by Jelmer Vernooij
Fix some tags tests.
208
                                                  overwrite=overwrite)
209
                if master is not None:
210
                    extra_updates, extra_conflicts = self.merge_to(
211
                        master.tags, overwrite=overwrite,
0.346.1 by Jelmer Vernooij
Fix tag caching.
212
                                               source_tag_refs=source_tag_refs,
0.331.1 by Jelmer Vernooij
Fix some tags tests.
213
                                               ignore_master=ignore_master)
214
                    updates.update(extra_updates)
215
                    conflicts += extra_conflicts
216
                return updates, conflicts
217
            finally:
218
                if master is not None:
219
                    master.unlock()
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
220
221
    def get_tag_dict(self):
222
        ret = {}
0.346.1 by Jelmer Vernooij
Fix tag caching.
223
        for (ref_name, tag_name, peeled, unpeeled) in self.branch.get_tag_refs():
224
            try:
225
                bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
226
            except NotCommitError:
227
                continue
228
            else:
229
                ret[tag_name] = bzr_revid
0.200.1065 by Jelmer Vernooij
Don't peel tags automatically when pushing back.
230
        return ret
231
0.200.1064 by Jelmer Vernooij
Use common base class for tags.
232
233
class LocalGitTagDict(GitTags):
234
    """Dictionary with tags in a local repository."""
235
236
    def __init__(self, branch):
237
        super(LocalGitTagDict, self).__init__(branch)
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
238
        self.refs = self.repository.controldir._git.refs
0.200.1064 by Jelmer Vernooij
Use common base class for tags.
239
0.200.711 by Jelmer Vernooij
Support merging tags to a local Git repository.
240
    def _set_tag_dict(self, to_dict):
0.200.1487 by Jelmer Vernooij
Use peeling.
241
        extra = set(self.refs.allkeys())
6973.13.2 by Jelmer Vernooij
Fix some more tests.
242
        for k, revid in viewitems(to_dict):
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
243
            name = tag_name_to_ref(k)
0.200.711 by Jelmer Vernooij
Support merging tags to a local Git repository.
244
            if name in extra:
245
                extra.remove(name)
246
            self.set_tag(k, revid)
247
        for name in extra:
0.200.1061 by Jelmer Vernooij
Add support for using unpeel map.
248
            if is_tag(name):
0.200.711 by Jelmer Vernooij
Support merging tags to a local Git repository.
249
                del self.repository._git[name]
0.200.956 by Jelmer Vernooij
Add some more format tests.
250
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
251
    def set_tag(self, name, revid):
0.200.1369 by Jelmer Vernooij
Clarify that ghost tags are not supported.
252
        try:
253
            git_sha, mapping = self.branch.lookup_bzr_revision_id(revid)
254
        except errors.NoSuchRevision:
255
            raise errors.GhostTagsNotSupported(self)
256
        self.refs[tag_name_to_ref(name)] = git_sha
0.346.1 by Jelmer Vernooij
Fix tag caching.
257
        self.branch._tag_refs = None
258
259
    def delete_tag(self, name):
260
        ref = tag_name_to_ref(name)
261
        if not ref in self.refs:
262
            raise errors.NoSuchTag(name)
263
        del self.refs[ref]
264
        self.branch._tag_refs = None
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
265
266
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
267
class GitBranchFormat(branch.BranchFormat):
268
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
269
    def network_name(self):
6973.6.2 by Jelmer Vernooij
Fix more tests.
270
        return b"git"
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
271
0.200.82 by Jelmer Vernooij
Support listing tags.
272
    def supports_tags(self):
273
        return True
274
0.200.1105 by Jelmer Vernooij
Don't claim to support leaving locks.
275
    def supports_leaving_lock(self):
276
        return False
277
0.200.1369 by Jelmer Vernooij
Clarify that ghost tags are not supported.
278
    def supports_tags_referencing_ghosts(self):
279
        return False
280
281
    def tags_are_versioned(self):
282
        return False
283
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
284
    def get_foreign_tests_branch_factory(self):
0.200.1644 by Jelmer Vernooij
More relative imports.
285
        from .tests.test_branch import ForeignTestsBranchFactory
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
286
        return ForeignTestsBranchFactory()
287
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
288
    def make_tags(self, branch):
0.200.1487 by Jelmer Vernooij
Use peeling.
289
        try:
290
            return branch.tags
291
        except AttributeError:
292
            pass
0.200.1433 by Jelmer Vernooij
Fix fetching between git repositories.
293
        if getattr(branch.repository, "_git", None) is None:
0.200.1644 by Jelmer Vernooij
More relative imports.
294
            from .remote import RemoteGitTagDict
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
295
            return RemoteGitTagDict(branch)
0.200.261 by Jelmer Vernooij
More formatting fixes.
296
        else:
297
            return LocalGitTagDict(branch)
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
298
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
299
    def initialize(self, a_controldir, name=None, repository=None,
0.200.1378 by Jelmer Vernooij
Fix branch.
300
                   append_revisions_only=None):
0.295.2 by Jelmer Vernooij
Make RemoteGitBranchFormat uninitializeable.
301
        raise NotImplementedError(self.initialize)
0.200.1097 by Jelmer Vernooij
Implement GitBranchFormat.initialize.
302
0.200.1728 by Jelmer Vernooij
Support following branch references.
303
    def get_reference(self, controldir, name=None):
304
        return controldir.get_branch_reference(name)
305
306
    def set_reference(self, controldir, name, target):
307
        return controldir.set_branch_reference(target, name)
308
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
309
0.295.1 by Jelmer Vernooij
Split up branch formats.
310
class LocalGitBranchFormat(GitBranchFormat):
311
312
    def get_format_description(self):
313
        return 'Local Git Branch'
314
315
    @property
316
    def _matchingcontroldir(self):
317
        from .dir import LocalGitControlDirFormat
318
        return LocalGitControlDirFormat()
319
0.295.2 by Jelmer Vernooij
Make RemoteGitBranchFormat uninitializeable.
320
    def initialize(self, a_controldir, name=None, repository=None,
321
                   append_revisions_only=None):
322
        from .dir import LocalGitDir
323
        if not isinstance(a_controldir, LocalGitDir):
324
            raise errors.IncompatibleFormat(self, a_controldir._format)
325
        return a_controldir.create_branch(repository=repository, name=name,
326
            append_revisions_only=append_revisions_only)
327
0.295.1 by Jelmer Vernooij
Split up branch formats.
328
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
329
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
330
    """An adapter to git repositories for bzr Branch objects."""
331
0.200.1129 by Jelmer Vernooij
Implement GitBranch.control_transport.
332
    @property
333
    def control_transport(self):
0.310.16 by Jelmer Vernooij
Update xfail.
334
        return self._control_transport
0.306.1 by Jelmer Vernooij
Set correct segment parameters on branches.
335
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
336
    @property
337
    def user_transport(self):
338
        return self._user_transport
339
0.295.1 by Jelmer Vernooij
Split up branch formats.
340
    def __init__(self, controldir, repository, ref, format):
0.200.82 by Jelmer Vernooij
Support listing tags.
341
        self.repository = repository
0.295.1 by Jelmer Vernooij
Split up branch formats.
342
        self._format = format
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
343
        self.controldir = controldir
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
344
        self._lock_mode = None
345
        self._lock_count = 0
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
346
        super(GitBranch, self).__init__(repository.get_mapping())
0.200.770 by Jelmer Vernooij
Proper branch names.
347
        self.ref = ref
0.200.1708 by Jelmer Vernooij
Fix to colocated branch tests.
348
        self._head = None
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
349
        self._user_transport = controldir.user_transport.clone('.')
0.310.16 by Jelmer Vernooij
Update xfail.
350
        self._control_transport = controldir.control_transport.clone('.')
0.346.1 by Jelmer Vernooij
Fix tag caching.
351
        self._tag_refs = None
0.306.1 by Jelmer Vernooij
Set correct segment parameters on branches.
352
        params = {}
0.200.1361 by Jelmer Vernooij
Support branches where the ref can't be mapped back to a branch name.
353
        try:
354
            self.name = ref_to_branch_name(ref)
355
        except ValueError:
356
            self.name = None
0.200.1708 by Jelmer Vernooij
Fix to colocated branch tests.
357
            if self.ref is not None:
0.310.16 by Jelmer Vernooij
Update xfail.
358
                params = {"ref": urlutils.escape(self.ref)}
0.200.1708 by Jelmer Vernooij
Fix to colocated branch tests.
359
        else:
360
            if self.name != "":
0.310.16 by Jelmer Vernooij
Update xfail.
361
                params = {"branch": urlutils.escape(self.name)}
362
        for k, v in params.items():
363
            self._user_transport.set_segment_parameter(k, v)
364
            self._control_transport.set_segment_parameter(k, v)
0.310.14 by Jelmer Vernooij
merge lightweight checkout-in-git support.
365
        self.base = controldir.user_transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
366
0.200.1360 by Jelmer Vernooij
Support lighweight argument to _get_checkout_format.
367
    def _get_checkout_format(self, lightweight=False):
0.239.8 by Jelmer Vernooij
Support checkouts.
368
        """Return the most suitable metadir for a checkout of this branch.
369
        Weaves are used if this branch's repository uses weaves.
370
        """
0.311.1 by Jelmer Vernooij
Support git lightweight checkouts.
371
        if lightweight:
372
            return controldir.format_registry.make_controldir("git")
373
        else:
374
            return controldir.format_registry.make_controldir("default")
0.239.8 by Jelmer Vernooij
Support checkouts.
375
0.238.3 by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch.
376
    def get_child_submit_format(self):
377
        """Return the preferred format of submissions to this branch."""
0.200.1584 by Jelmer Vernooij
Use config stacks in a few more places.
378
        ret = self.get_config_stack().get("child_submit_format")
0.238.3 by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch.
379
        if ret is not None:
380
            return ret
381
        return "git"
382
0.200.1397 by Jelmer Vernooij
Fix use of get_config() for RemoteGitBranch.
383
    def get_config(self):
384
        return GitBranchConfig(self)
385
0.200.1472 by Jelmer Vernooij
Provide basic implementation of Branch.get_config_stack.
386
    def get_config_stack(self):
387
        return GitBranchStack(self)
388
0.200.293 by Jelmer Vernooij
Fix branch nicks.
389
    def _get_nick(self, local=False, possible_master_transports=None):
390
        """Find the nick name for this branch.
391
392
        :return: Branch nick
393
        """
0.200.1547 by Jelmer Vernooij
Support setting branch nicks.
394
        cs = self.repository._git.get_config_stack()
395
        try:
0.200.1694 by Jelmer Vernooij
Fix nick test.
396
            return cs.get((b"branch", self.name.encode('utf-8')), b"nick").decode("utf-8")
0.200.1547 by Jelmer Vernooij
Support setting branch nicks.
397
        except KeyError:
398
            pass
0.200.1694 by Jelmer Vernooij
Fix nick test.
399
        return self.name or u"HEAD"
0.200.293 by Jelmer Vernooij
Fix branch nicks.
400
0.200.331 by Jelmer Vernooij
Add stub for setting nick function.
401
    def _set_nick(self, nick):
0.200.1547 by Jelmer Vernooij
Support setting branch nicks.
402
        cf = self.repository._git.get_config()
0.200.1694 by Jelmer Vernooij
Fix nick test.
403
        cf.set((b"branch", self.name.encode('utf-8')), b"nick", nick.encode("utf-8"))
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
404
        f = BytesIO()
0.200.1547 by Jelmer Vernooij
Support setting branch nicks.
405
        cf.write_to_file(f)
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
406
        self.repository._git._put_named_file('config', f.getvalue())
0.200.331 by Jelmer Vernooij
Add stub for setting nick function.
407
408
    nick = property(_get_nick, _set_nick)
0.200.293 by Jelmer Vernooij
Fix branch nicks.
409
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
410
    def __repr__(self):
0.200.770 by Jelmer Vernooij
Proper branch names.
411
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
412
            self.name)
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
413
0.296.2 by Jelmer Vernooij
Handle DivergedBranches.
414
    def generate_revision_history(self, revid, last_rev=None, other_branch=None):
415
        if last_rev is not None:
416
            graph = self.repository.get_graph()
417
            if not graph.is_ancestor(last_rev, revid):
418
                # our previous tip is not merged into stop_revision
419
                raise errors.DivergedBranches(self, other_branch)
420
0.297.2 by Jelmer Vernooij
Simplify Branch.generate_revision_history.
421
        self.set_last_revision(revid)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
422
0.200.1199 by Jelmer Vernooij
Support 'token' argument to Branch.lock_write.
423
    def lock_write(self, token=None):
424
        if token is not None:
425
            raise errors.TokenLockingNotSupported(self)
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
426
        if self._lock_mode:
0.200.1369 by Jelmer Vernooij
Clarify that ghost tags are not supported.
427
            if self._lock_mode == 'r':
428
                raise errors.ReadOnlyError(self)
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
429
            self._lock_count += 1
430
        else:
0.383.1 by Jelmer Vernooij
Fix a bunch of locking issues.
431
            self._lock_ref()
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
432
            self._lock_mode = 'w'
433
            self._lock_count = 1
434
        self.repository.lock_write()
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
435
        return lock.LogicalLockResult(self.unlock)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
436
0.200.1453 by Jelmer Vernooij
Provide Branch.leave_lock_in_place and Branch.dont_leave_lock_in_place.
437
    def leave_lock_in_place(self):
438
        raise NotImplementedError(self.leave_lock_in_place)
439
440
    def dont_leave_lock_in_place(self):
441
        raise NotImplementedError(self.dont_leave_lock_in_place)
442
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
443
    def get_stacked_on_url(self):
444
        # Git doesn't do stacking (yet...)
0.200.1660 by Jelmer Vernooij
Fix imports.
445
        raise branch.UnstackableBranchFormat(self._format, self.base)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
446
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
447
    def _get_parent_location(self):
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
448
        """See Branch.get_parent()."""
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
449
        # FIXME: Set "origin" url from .git/config ?
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
450
        cs = self.repository._git.get_config_stack()
451
        try:
0.408.1 by Jelmer Vernooij
Convert Git URLs in stored config to Breezy URLs.
452
            location = cs.get((b"remote", b'origin'), b"url")
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
453
        except KeyError:
454
            return None
0.408.4 by Jelmer Vernooij
Fix some tests.
455
456
        params = {}
457
        try:
458
            ref = cs.get((b"remote", b"origin"), b"merge")
459
        except KeyError:
460
            pass
0.408.1 by Jelmer Vernooij
Convert Git URLs in stored config to Breezy URLs.
461
        else:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
462
            if ref != b'HEAD':
0.408.4 by Jelmer Vernooij
Fix some tests.
463
                try:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
464
                    params['branch'] = urlutils.escape(ref_to_branch_name(ref))
0.408.4 by Jelmer Vernooij
Fix some tests.
465
                except ValueError:
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
466
                    params['ref'] = urlutils.quote_from_bytes(ref)
0.408.4 by Jelmer Vernooij
Fix some tests.
467
7045.3.1 by Jelmer Vernooij
Fix another ~500 tests.
468
        url = git_url_to_bzr_url(location.decode('utf-8'))
0.408.4 by Jelmer Vernooij
Fix some tests.
469
        return urlutils.join_segment_parameters(url, params)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
470
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
471
    def set_parent(self, location):
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
472
        # FIXME: Set "origin" url in .git/config ?
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
473
        cs = self.repository._git.get_config()
0.408.4 by Jelmer Vernooij
Fix some tests.
474
        this_url = urlutils.split_segment_parameters(self.user_url)[0]
475
        target_url, target_params = urlutils.split_segment_parameters(location)
476
        location = urlutils.relative_url(this_url, target_url)
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
477
        cs.set((b"remote", b"origin"), b"url", location)
0.408.4 by Jelmer Vernooij
Fix some tests.
478
        if 'branch' in target_params:
479
            cs.set((b"remote", b"origin"), b"merge",
480
                   branch_name_to_ref(target_params['branch']))
481
        elif 'ref' in target_params:
482
            cs.set((b"remote", b"origin"), b"merge",
483
                   target_params['ref'])
484
        else:
485
            # TODO(jelmer): Maybe unset rather than setting to HEAD?
486
            cs.set((b"remote", b"origin"), b"merge", 'HEAD')
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
487
        f = BytesIO()
0.288.3 by Jelmer Vernooij
Fix parent URL handling.
488
        cs.write_to_file(f)
489
        self.repository._git._put_named_file('config', f.getvalue())
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
490
0.200.1411 by Jelmer Vernooij
Fix control files.
491
    def break_lock(self):
492
        raise NotImplementedError(self.break_lock)
493
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
494
    def lock_read(self):
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
495
        if self._lock_mode:
0.361.1 by Jelmer Vernooij
Don't use assert.
496
            if self._lock_mode not in ('r', 'w'):
497
                raise ValueError(self._lock_mode)
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
498
            self._lock_count += 1
499
        else:
500
            self._lock_mode = 'r'
501
            self._lock_count = 1
502
        self.repository.lock_read()
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
503
        return lock.LogicalLockResult(self.unlock)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
504
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
505
    def peek_lock_mode(self):
506
        return self._lock_mode
507
0.200.432 by Jelmer Vernooij
Support Branch.is_locked, required for loggerhead.
508
    def is_locked(self):
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
509
        return (self._lock_mode is not None)
0.200.432 by Jelmer Vernooij
Support Branch.is_locked, required for loggerhead.
510
0.383.1 by Jelmer Vernooij
Fix a bunch of locking issues.
511
    def _lock_ref(self):
512
        pass
513
514
    def _unlock_ref(self):
515
        pass
516
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
517
    def unlock(self):
0.200.1250 by Jelmer Vernooij
Simplify lock handling.
518
        """See Branch.unlock()."""
519
        if self._lock_count == 0:
0.383.1 by Jelmer Vernooij
Fix a bunch of locking issues.
520
            raise errors.LockNotHeld(self)
521
        try:
522
            self._lock_count -= 1
523
            if self._lock_count == 0:
524
                if self._lock_mode == 'w':
525
                    self._unlock_ref()
526
                self._lock_mode = None
527
                self._clear_cached_state()
528
        finally:
529
            self.repository.unlock()
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
530
531
    def get_physical_lock_status(self):
532
        return False
533
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
534
    def last_revision(self):
0.200.1675 by Jelmer Vernooij
Remove uses of decorators.
535
        with self.lock_read():
536
            # perhaps should escape this ?
537
            if self.head is None:
538
                return revision.NULL_REVISION
539
            return self.lookup_foreign_revision_id(self.head)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
540
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
541
    def _basic_push(self, target, overwrite=False, stop_revision=None):
542
        return branch.InterBranch.get(self, target)._basic_push(
543
            overwrite, stop_revision)
544
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
545
    def lookup_foreign_revision_id(self, foreign_revid):
0.200.1760 by Jelmer Vernooij
Fall back to simple revision id generation.
546
        try:
547
            return self.repository.lookup_foreign_revision_id(foreign_revid,
548
                self.mapping)
549
        except KeyError:
550
            # Let's try..
551
            return self.mapping.revision_id_foreign_to_bzr(foreign_revid)
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
552
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
553
    def lookup_bzr_revision_id(self, revid):
554
        return self.repository.lookup_bzr_revision_id(
555
            revid, mapping=self.mapping)
556
0.200.1678 by Jelmer Vernooij
Fix tests.
557
    def get_unshelver(self, tree):
558
        raise errors.StoringUncommittedNotSupported(self)
559
0.346.1 by Jelmer Vernooij
Fix tag caching.
560
    def _clear_cached_state(self):
561
        super(GitBranch, self)._clear_cached_state()
562
        self._tag_refs = None
563
564
    def _iter_tag_refs(self, refs):
565
        """Iterate over the tag refs.
566
567
        :param refs: Refs dictionary (name -> git sha1)
568
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
569
        """
570
        raise NotImplementedError(self._iter_tag_refs)
571
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
572
    def get_tag_refs(self):
573
        with self.lock_read():
574
            if self._tag_refs is None:
575
                self._tag_refs = list(self._iter_tag_refs())
576
            return self._tag_refs
577
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
578
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
579
class LocalGitBranch(GitBranch):
580
    """A local Git branch."""
581
0.200.1648 by Jelmer Vernooij
Fix compatibility with newer versions of breezy.
582
    def __init__(self, controldir, repository, ref):
0.295.1 by Jelmer Vernooij
Split up branch formats.
583
        super(LocalGitBranch, self).__init__(controldir, repository, ref,
584
                LocalGitBranchFormat())
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
585
0.200.261 by Jelmer Vernooij
More formatting fixes.
586
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
587
        accelerator_tree=None, hardlink=False):
0.200.1774 by Jelmer Vernooij
Simplify checkout creation.
588
        t = transport.get_transport(to_location)
589
        t.ensure_base()
590
        format = self._get_checkout_format(lightweight=lightweight)
591
        checkout = format.initialize_on_transport(t)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
592
        if lightweight:
0.200.1774 by Jelmer Vernooij
Simplify checkout creation.
593
            from_branch = checkout.set_branch_reference(target_branch=self)
594
        else:
595
            policy = checkout.determine_repository_policy()
596
            repo = policy.acquire_repository()[0]
597
598
            checkout_branch = checkout.create_branch()
599
            checkout_branch.bind(self)
600
            checkout_branch.pull(self, stop_revision=revision_id)
601
            from_branch = None
602
        return checkout.create_workingtree(revision_id,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
603
                from_branch=from_branch, hardlink=hardlink)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
604
0.383.1 by Jelmer Vernooij
Fix a bunch of locking issues.
605
    def _lock_ref(self):
606
        self._ref_lock = self.repository._git.refs.lock_ref(self.ref)
607
608
    def _unlock_ref(self):
609
        self._ref_lock.unlock()
610
0.412.1 by Jelmer Vernooij
Implement Branch.break_lock.
611
    def break_lock(self):
612
        self.repository._git.refs.unlock_ref(self.ref)
613
0.200.1493 by Jelmer Vernooij
Test fixes.
614
    def fetch(self, from_branch, last_revision=None, limit=None):
615
        return branch.InterBranch.get(from_branch, self).fetch(
616
            stop_revision=last_revision, limit=limit)
617
0.200.57 by Jelmer Vernooij
Fix more tests.
618
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
619
        if self.head is None:
620
            return []
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
621
        last_revid = self.last_revision()
0.200.1279 by Jelmer Vernooij
Avoid using deprecated Repository.iter_reverse_revision_history.
622
        graph = self.repository.get_graph()
6968.1.1 by Jelmer Vernooij
Support 'bzr version-info' in horizon branches.
623
        try:
624
            ret = list(graph.iter_lefthand_ancestry(last_revid,
625
                (revision.NULL_REVISION, )))
626
        except errors.RevisionNotPresent as e:
627
            raise errors.GhostRevisionsHaveNoRevno(last_revid, e.revision_id)
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
628
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
629
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
630
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
631
    def _get_head(self):
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
632
        try:
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
633
            return self.repository._git.refs[self.ref]
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
634
        except KeyError:
635
            return None
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
636
0.200.1228 by Jelmer Vernooij
Provide Branch._read_last_revision_info.
637
    def _read_last_revision_info(self):
638
        last_revid = self.last_revision()
639
        graph = self.repository.get_graph()
640
        revno = graph.find_distance_to_null(last_revid,
641
            [(revision.NULL_REVISION, 0)])
642
        return revno, last_revid
643
644
    def set_last_revision_info(self, revno, revision_id):
645
        self.set_last_revision(revision_id)
646
        self._last_revision_info_cache = revno, revision_id
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
647
648
    def set_last_revision(self, revid):
6964.2.1 by Jelmer Vernooij
Initial work to support brz-git on python3.
649
        if not revid or not isinstance(revid, bytes):
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
650
            raise errors.InvalidRevisionId(revision_id=revid, branch=self)
0.200.1218 by Jelmer Vernooij
Support set_last_revision('null:').
651
        if revid == NULL_REVISION:
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
652
            newhead = None
0.200.1218 by Jelmer Vernooij
Support set_last_revision('null:').
653
        else:
654
            (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
655
            if self.mapping is None:
656
                raise AssertionError
657
        self._set_head(newhead)
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
658
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
659
    def _set_head(self, value):
0.361.1 by Jelmer Vernooij
Don't use assert.
660
        if value == ZERO_SHA:
661
            raise ValueError(value)
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
662
        self._head = value
0.336.2 by Jelmer Vernooij
Don't use ZERO_SHA outside of remote communication to indicate empty history.
663
        if value is None:
664
            del self.repository._git.refs[self.ref]
665
        else:
666
            self.repository._git.refs[self.ref] = self._head
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
667
        self._clear_cached_state()
668
669
    head = property(_get_head, _set_head)
670
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
671
    def get_push_location(self):
672
        """See Branch.get_push_location."""
0.200.1584 by Jelmer Vernooij
Use config stacks in a few more places.
673
        push_loc = self.get_config_stack().get('push_location')
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
674
        return push_loc
675
676
    def set_push_location(self, location):
677
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
678
        self.get_config().set_user_option('push_location', location,
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
679
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
680
681
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
682
        return True
0.200.956 by Jelmer Vernooij
Add some more format tests.
683
0.200.1681 by Jelmer Vernooij
Provide Branch.store_uncommitted.
684
    def store_uncommitted(self, creator):
685
        raise errors.StoringUncommittedNotSupported(self)
686
0.346.1 by Jelmer Vernooij
Fix tag caching.
687
    def _iter_tag_refs(self):
688
        """Iterate over the tag refs.
689
690
        :param refs: Refs dictionary (name -> git sha1)
691
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
692
        """
693
        refs = self.repository._git.refs
7018.3.2 by Jelmer Vernooij
Fix some git tests.
694
        for ref_name, unpeeled in viewitems(refs.as_dict()):
0.346.1 by Jelmer Vernooij
Fix tag caching.
695
            try:
696
                tag_name = ref_to_tag_name(ref_name)
697
            except (ValueError, UnicodeDecodeError):
698
                continue
699
            peeled = refs.get_peeled(ref_name)
700
            if peeled is None:
0.382.1 by Jelmer Vernooij
Various fixes for annotated tags and symrefs.
701
                peeled = unpeeled
6973.6.2 by Jelmer Vernooij
Fix more tests.
702
            if not isinstance(tag_name, text_type):
0.361.1 by Jelmer Vernooij
Don't use assert.
703
                raise TypeError(tag_name)
0.346.1 by Jelmer Vernooij
Fix tag caching.
704
            yield (ref_name, tag_name, peeled, unpeeled)
705
0.360.1 by Jelmer Vernooij
Implement GitMemoryTree.
706
    def create_memorytree(self):
707
        from .memorytree import GitMemoryTree
708
        return GitMemoryTree(self, self.repository._git.object_store, self.head)
709
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
710
    def reference_parent(self, path, file_id=None, possible_transports=None):
711
        """Return the parent branch for a tree-reference file_id
712
713
        :param path: The path of the file_id in the tree
714
        :param file_id: Optional file_id of the tree reference
715
        :return: A branch associated with the file_id
716
        """
717
        # FIXME should provide multiple branches, based on config
0.429.18 by Jelmer Vernooij
Fix reference_parent tets.
718
        url = urlutils.join(self.user_url, path)
719
        return branch.Branch.open(
720
                url,
721
                possible_transports=possible_transports)
722
0.429.10 by Jelmer Vernooij
use new read_submodule_head from dulwich.
723
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
724
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
725
def _quick_lookup_revno(local_branch, remote_branch, revid):
6973.13.2 by Jelmer Vernooij
Fix some more tests.
726
    if not isinstance(revid, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
727
        raise TypeError(revid)
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
728
    # Try in source branch first, it'll be faster
0.200.1788 by Jelmer Vernooij
Use context managers.
729
    with local_branch.lock_read():
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
730
        try:
0.200.1362 by Jelmer Vernooij
Add locking.
731
            return local_branch.revision_id_to_revno(revid)
732
        except errors.NoSuchRevision:
733
            graph = local_branch.repository.get_graph()
734
            try:
735
                return graph.find_distance_to_null(revid,
736
                    [(revision.NULL_REVISION, 0)])
737
            except errors.GhostRevisionsHaveNoRevno:
738
                # FIXME: Check using graph.find_distance_to_null() ?
0.200.1788 by Jelmer Vernooij
Use context managers.
739
                with remote_branch.lock_read():
0.200.1362 by Jelmer Vernooij
Add locking.
740
                    return remote_branch.revision_id_to_revno(revid)
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
741
742
0.200.342 by Jelmer Vernooij
Report git sha during pull.
743
class GitBranchPullResult(branch.PullResult):
744
0.252.36 by Jelmer Vernooij
Fix pull.
745
    def __init__(self):
746
        super(GitBranchPullResult, self).__init__()
747
        self.new_git_head = None
748
        self._old_revno = None
749
        self._new_revno = None
750
0.200.342 by Jelmer Vernooij
Report git sha during pull.
751
    def report(self, to_file):
752
        if not is_quiet():
753
            if self.old_revid == self.new_revid:
754
                to_file.write('No revisions to pull.\n')
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
755
            elif self.new_git_head is not None:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
756
                to_file.write('Now on revision %d (git sha: %s).\n' %
0.200.342 by Jelmer Vernooij
Report git sha during pull.
757
                        (self.new_revno, self.new_git_head))
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
758
            else:
759
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
0.200.342 by Jelmer Vernooij
Report git sha during pull.
760
        self._show_tag_conficts(to_file)
761
0.252.36 by Jelmer Vernooij
Fix pull.
762
    def _lookup_revno(self, revid):
0.200.1185 by Jelmer Vernooij
Some formatting fixes.
763
        return _quick_lookup_revno(self.target_branch, self.source_branch,
0.200.1513 by Jelmer Vernooij
Cope with zero shas.
764
            revid)
0.252.36 by Jelmer Vernooij
Fix pull.
765
766
    def _get_old_revno(self):
767
        if self._old_revno is not None:
768
            return self._old_revno
769
        return self._lookup_revno(self.old_revid)
770
771
    def _set_old_revno(self, revno):
772
        self._old_revno = revno
773
774
    old_revno = property(_get_old_revno, _set_old_revno)
775
776
    def _get_new_revno(self):
777
        if self._new_revno is not None:
778
            return self._new_revno
779
        return self._lookup_revno(self.new_revid)
780
781
    def _set_new_revno(self, revno):
782
        self._new_revno = revno
0.200.956 by Jelmer Vernooij
Add some more format tests.
783
0.252.36 by Jelmer Vernooij
Fix pull.
784
    new_revno = property(_get_new_revno, _set_new_revno)
785
0.200.342 by Jelmer Vernooij
Report git sha during pull.
786
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
787
class GitBranchPushResult(branch.BranchPushResult):
788
789
    def _lookup_revno(self, revid):
0.200.1185 by Jelmer Vernooij
Some formatting fixes.
790
        return _quick_lookup_revno(self.source_branch, self.target_branch,
791
            revid)
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
792
793
    @property
794
    def old_revno(self):
795
        return self._lookup_revno(self.old_revid)
796
797
    @property
798
    def new_revno(self):
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
799
        new_original_revno = getattr(self, "new_original_revno", None)
800
        if new_original_revno:
801
            return new_original_revno
802
        if getattr(self, "new_original_revid", None) is not None:
803
            return self._lookup_revno(self.new_original_revid)
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
804
        return self._lookup_revno(self.new_revid)
805
806
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
807
class InterFromGitBranch(branch.GenericInterBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
808
    """InterBranch implementation that pulls from Git into bzr."""
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
809
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
810
    @staticmethod
811
    def _get_branch_formats_to_test():
0.200.1100 by Jelmer Vernooij
Provide test combinations for InterBranch implementations.
812
        try:
813
            default_format = branch.format_registry.get_default()
814
        except AttributeError:
815
            default_format = branch.BranchFormat._default_format
0.295.4 by Jelmer Vernooij
Fix imports.
816
        from .remote import RemoteGitBranchFormat
0.200.1100 by Jelmer Vernooij
Provide test combinations for InterBranch implementations.
817
        return [
0.295.1 by Jelmer Vernooij
Split up branch formats.
818
            (RemoteGitBranchFormat(), default_format),
819
            (LocalGitBranchFormat(), default_format)]
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
820
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
821
    @classmethod
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
822
    def _get_interrepo(self, source, target):
0.200.1097 by Jelmer Vernooij
Implement GitBranchFormat.initialize.
823
        return _mod_repository.InterRepository.get(source.repository, target.repository)
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
824
825
    @classmethod
826
    def is_compatible(cls, source, target):
0.200.1222 by Jelmer Vernooij
Better checks in is_compatible methods.
827
        if not isinstance(source, GitBranch):
828
            return False
829
        if isinstance(target, GitBranch):
830
            # InterLocalGitRemoteGitBranch or InterToGitBranch should be used
831
            return False
832
        if getattr(cls._get_interrepo(source, target), "fetch_objects", None) is None:
833
            # fetch_objects is necessary for this to work
834
            return False
835
        return True
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
836
0.200.1305 by Jelmer Vernooij
Only actually fetch tags if "branch.fetch_tags" is set to true.
837
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
0.200.1265 by Jelmer Vernooij
Support limit option to Branch.fetch.
838
        self.fetch_objects(stop_revision, fetch_tags=fetch_tags, limit=limit)
0.260.1 by Jelmer Vernooij
Fix fetch from remote during merge.
839
0.200.1265 by Jelmer Vernooij
Support limit option to Branch.fetch.
840
    def fetch_objects(self, stop_revision, fetch_tags, limit=None):
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
841
        interrepo = self._get_interrepo(self.source, self.target)
0.200.1305 by Jelmer Vernooij
Only actually fetch tags if "branch.fetch_tags" is set to true.
842
        if fetch_tags is None:
0.200.1584 by Jelmer Vernooij
Use config stacks in a few more places.
843
            c = self.source.get_config_stack()
844
            fetch_tags = c.get('branch.fetch_tags')
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
845
        def determine_wants(heads):
0.259.6 by Jelmer Vernooij
Fetch tags during pull.
846
            if stop_revision is None:
0.336.6 by Jelmer Vernooij
Fix pull tests.
847
                try:
0.200.917 by Jelmer Vernooij
Cope with implicit branches during pull.
848
                    head = heads[self.source.ref]
0.336.6 by Jelmer Vernooij
Fix pull tests.
849
                except KeyError:
850
                    self._last_revid = revision.NULL_REVISION
0.200.917 by Jelmer Vernooij
Cope with implicit branches during pull.
851
                else:
0.336.6 by Jelmer Vernooij
Fix pull tests.
852
                    self._last_revid = self.source.lookup_foreign_revision_id(head)
0.259.6 by Jelmer Vernooij
Fetch tags during pull.
853
            else:
854
                self._last_revid = stop_revision
855
            real = interrepo.get_determine_wants_revids(
0.260.1 by Jelmer Vernooij
Fix fetch from remote during merge.
856
                [self._last_revid], include_tags=fetch_tags)
0.259.6 by Jelmer Vernooij
Fetch tags during pull.
857
            return real(heads)
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
858
        pack_hint, head, refs = interrepo.fetch_objects(
0.200.1265 by Jelmer Vernooij
Support limit option to Branch.fetch.
859
            determine_wants, self.source.mapping, limit=limit)
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
860
        if (pack_hint is not None and
861
            self.target.repository._format.pack_compresses):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
862
            self.target.repository.pack(hint=pack_hint)
0.260.1 by Jelmer Vernooij
Fix fetch from remote during merge.
863
        return head, refs
864
0.200.1219 by Jelmer Vernooij
Remove InterBranch.update_revisions.
865
    def _update_revisions(self, stop_revision=None, overwrite=False):
0.200.1305 by Jelmer Vernooij
Only actually fetch tags if "branch.fetch_tags" is set to true.
866
        head, refs = self.fetch_objects(stop_revision, fetch_tags=None)
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
867
        if overwrite:
0.200.314 by Jelmer Vernooij
Support stop_revision.
868
            prev_last_revid = None
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
869
        else:
0.200.314 by Jelmer Vernooij
Support stop_revision.
870
            prev_last_revid = self.target.last_revision()
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
871
        self.target.generate_revision_history(self._last_revid,
0.296.2 by Jelmer Vernooij
Handle DivergedBranches.
872
            last_rev=prev_last_revid, other_branch=self.source)
0.200.1062 by Jelmer Vernooij
Pass remote refs along in _update_revisions.
873
        return head, refs
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
874
0.200.1423 by Jelmer Vernooij
Fix space.
875
    def _basic_pull(self, stop_revision, overwrite, run_hooks,
0.200.1414 by Jelmer Vernooij
Fix pulling into bound branches.
876
              _override_hook_target, _hook_master):
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
877
        if overwrite is True:
878
            overwrite = set(["history", "tags"])
879
        else:
880
            overwrite = set()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
881
        result = GitBranchPullResult()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
882
        result.source_branch = self.source
883
        if _override_hook_target is None:
884
            result.target_branch = self.target
885
        else:
886
            result.target_branch = _override_hook_target
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
887
        with self.target.lock_write(), self.source.lock_read():
888
            # We assume that during 'pull' the target repository is closer than
889
            # the source one.
890
            (result.old_revno, result.old_revid) = \
891
                self.target.last_revision_info()
892
            result.new_git_head, remote_refs = self._update_revisions(
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
893
                stop_revision, overwrite=("history" in overwrite))
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
894
            tags_ret  = self.source.tags.merge_to(
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
895
                    self.target.tags, ("tags" in overwrite), ignore_master=True)
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
896
            if isinstance(tags_ret, tuple):
897
                result.tag_updates, result.tag_conflicts = tags_ret
898
            else:
899
                result.tag_conflicts = tags_ret
900
            (result.new_revno, result.new_revid) = \
901
                self.target.last_revision_info()
902
            if _hook_master:
903
                result.master_branch = _hook_master
904
                result.local_branch = result.target_branch
905
            else:
906
                result.master_branch = result.target_branch
907
                result.local_branch = None
908
            if run_hooks:
909
                for hook in branch.Branch.hooks['post_pull']:
910
                    hook(result)
911
            return result
0.200.1414 by Jelmer Vernooij
Fix pulling into bound branches.
912
913
    def pull(self, overwrite=False, stop_revision=None,
914
             possible_transports=None, _hook_master=None, run_hooks=True,
915
             _override_hook_target=None, local=False):
916
        """See Branch.pull.
917
918
        :param _hook_master: Private parameter - set the branch to
919
            be supplied as the master to pull hooks.
920
        :param run_hooks: Private parameter - if false, this branch
921
            is being called because it's the master of the primary branch,
922
            so it should not run its hooks.
923
        :param _override_hook_target: Private parameter - set the branch to be
924
            supplied as the target_branch to pull hooks.
925
        """
926
        # This type of branch can't be bound.
927
        bound_location = self.target.get_bound_location()
928
        if local and not bound_location:
929
            raise errors.LocalRequiresBoundBranch()
930
        master_branch = None
931
        source_is_master = False
932
        self.source.lock_read()
933
        if bound_location:
934
            # bound_location comes from a config file, some care has to be
935
            # taken to relate it to source.user_url
936
            normalized = urlutils.normalize_url(bound_location)
937
            try:
938
                relpath = self.source.user_transport.relpath(normalized)
939
                source_is_master = (relpath == '')
0.200.1660 by Jelmer Vernooij
Fix imports.
940
            except (errors.PathNotChild, urlutils.InvalidURL):
0.200.1414 by Jelmer Vernooij
Fix pulling into bound branches.
941
                source_is_master = False
942
        if not local and bound_location and not source_is_master:
943
            # not pulling from master, so we need to update master.
944
            master_branch = self.target.get_master_branch(possible_transports)
945
            master_branch.lock_write()
946
        try:
947
            try:
948
                if master_branch:
949
                    # pull from source into master.
950
                    master_branch.pull(self.source, overwrite, stop_revision,
951
                        run_hooks=False)
952
                result = self._basic_pull(stop_revision, overwrite, run_hooks,
953
                    _override_hook_target, _hook_master=master_branch)
954
            finally:
955
                self.source.unlock()
956
        finally:
957
            if master_branch:
958
                master_branch.unlock()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
959
        return result
960
0.331.1 by Jelmer Vernooij
Fix some tags tests.
961
    def _basic_push(self, overwrite, stop_revision):
962
        if overwrite is True:
963
            overwrite = set(["history", "tags"])
964
        else:
965
            overwrite = set()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
966
        result = branch.BranchPushResult()
967
        result.source_branch = self.source
968
        result.target_branch = self.target
969
        result.old_revno, result.old_revid = self.target.last_revision_info()
0.200.1219 by Jelmer Vernooij
Remove InterBranch.update_revisions.
970
        result.new_git_head, remote_refs = self._update_revisions(
0.331.1 by Jelmer Vernooij
Fix some tags tests.
971
            stop_revision, overwrite=("history" in overwrite))
0.200.1402 by Jelmer Vernooij
Cope with tag changes in bzr.
972
        tags_ret = self.source.tags.merge_to(self.target.tags,
0.331.1 by Jelmer Vernooij
Fix some tags tests.
973
            "tags" in overwrite, ignore_master=True)
974
        (result.tag_updates, result.tag_conflicts) = tags_ret
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
975
        result.new_revno, result.new_revid = self.target.last_revision_info()
976
        return result
977
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
978
0.200.512 by Jelmer Vernooij
Support pushing git->git.
979
class InterGitBranch(branch.GenericInterBranch):
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
980
    """InterBranch implementation that pulls between Git branches."""
981
0.200.1493 by Jelmer Vernooij
Test fixes.
982
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
983
        raise NotImplementedError(self.fetch)
984
0.200.512 by Jelmer Vernooij
Support pushing git->git.
985
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
986
class InterLocalGitRemoteGitBranch(InterGitBranch):
0.200.512 by Jelmer Vernooij
Support pushing git->git.
987
    """InterBranch that copies from a local to a remote git branch."""
988
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
989
    @staticmethod
990
    def _get_branch_formats_to_test():
0.295.4 by Jelmer Vernooij
Fix imports.
991
        from .remote import RemoteGitBranchFormat
0.295.3 by Jelmer Vernooij
Fix some more tests.
992
        return [
993
            (LocalGitBranchFormat(), RemoteGitBranchFormat())]
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
994
0.200.512 by Jelmer Vernooij
Support pushing git->git.
995
    @classmethod
996
    def is_compatible(self, source, target):
0.200.1644 by Jelmer Vernooij
More relative imports.
997
        from .remote import RemoteGitBranch
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
998
        return (isinstance(source, LocalGitBranch) and
0.200.512 by Jelmer Vernooij
Support pushing git->git.
999
                isinstance(target, RemoteGitBranch))
1000
0.331.1 by Jelmer Vernooij
Fix some tags tests.
1001
    def _basic_push(self, overwrite, stop_revision):
0.200.512 by Jelmer Vernooij
Support pushing git->git.
1002
        result = GitBranchPushResult()
1003
        result.source_branch = self.source
1004
        result.target_branch = self.target
1005
        if stop_revision is None:
1006
            stop_revision = self.source.last_revision()
1007
        def get_changed_refs(old_refs):
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
1008
            old_ref = old_refs.get(self.target.ref, None)
1009
            if old_ref is None:
1010
                result.old_revid = revision.NULL_REVISION
1011
            else:
1012
                result.old_revid = self.target.lookup_foreign_revision_id(old_ref)
1013
            new_ref = self.source.repository.lookup_bzr_revision_id(stop_revision)[0]
1014
            if not overwrite:
1015
                if remote_divergence(old_ref, new_ref, self.source.repository._git.object_store):
1016
                    raise errors.DivergedBranches(self.source, self.target)
1017
            refs = { self.target.ref: new_ref }
0.200.512 by Jelmer Vernooij
Support pushing git->git.
1018
            result.new_revid = stop_revision
7018.3.8 by Jelmer Vernooij
Disable some flaky tests on python3, allow running without fastimport.
1019
            for name, sha in viewitems(self.source.repository._git.refs.as_dict(b"refs/tags")):
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
1020
                refs[tag_name_to_ref(name)] = sha
0.200.512 by Jelmer Vernooij
Support pushing git->git.
1021
            return refs
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
1022
        self.target.repository.send_pack(get_changed_refs,
0.375.1 by Jelmer Vernooij
Fix remote tests, warn when fetching git->bzr and bzr->git.
1023
            self.source.repository._git.object_store.generate_pack_data)
0.200.512 by Jelmer Vernooij
Support pushing git->git.
1024
        return result
1025
1026
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
1027
class InterGitLocalGitBranch(InterGitBranch):
0.200.512 by Jelmer Vernooij
Support pushing git->git.
1028
    """InterBranch that copies from a remote to a local git branch."""
1029
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
1030
    @staticmethod
1031
    def _get_branch_formats_to_test():
0.295.4 by Jelmer Vernooij
Fix imports.
1032
        from .remote import RemoteGitBranchFormat
0.295.3 by Jelmer Vernooij
Fix some more tests.
1033
        return [
1034
            (RemoteGitBranchFormat(), LocalGitBranchFormat()),
1035
            (LocalGitBranchFormat(), LocalGitBranchFormat())]
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
1036
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
1037
    @classmethod
1038
    def is_compatible(self, source, target):
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
1039
        return (isinstance(source, GitBranch) and
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
1040
                isinstance(target, LocalGitBranch))
1041
0.200.1534 by Jelmer Vernooij
Implement fetch between git branches, encode nicks.
1042
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
1043
        interrepo = _mod_repository.InterRepository.get(self.source.repository,
1044
            self.target.repository)
1045
        if stop_revision is None:
1046
            stop_revision = self.source.last_revision()
1047
        determine_wants = interrepo.get_determine_wants_revids(
1048
            [stop_revision], include_tags=fetch_tags)
1049
        interrepo.fetch_objects(determine_wants, limit=limit)
1050
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1051
    def _basic_push(self, overwrite=False, stop_revision=None):
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1052
        if overwrite is True:
1053
            overwrite = set(["history", "tags"])
1054
        else:
1055
            overwrite = set()
0.200.1325 by Jelmer Vernooij
More test fixes.
1056
        result = GitBranchPushResult()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1057
        result.source_branch = self.source
1058
        result.target_branch = self.target
1059
        result.old_revid = self.target.last_revision()
1060
        refs, stop_revision = self.update_refs(stop_revision)
0.296.3 by Jelmer Vernooij
Update xfail.
1061
        self.target.generate_revision_history(stop_revision,
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1062
                (result.old_revid if ("history" not in overwrite) else None),
0.296.2 by Jelmer Vernooij
Handle DivergedBranches.
1063
                other_branch=self.source)
0.200.1402 by Jelmer Vernooij
Cope with tag changes in bzr.
1064
        tags_ret = self.source.tags.merge_to(self.target.tags,
0.346.1 by Jelmer Vernooij
Fix tag caching.
1065
            source_tag_refs=remote_refs_dict_to_tag_refs(refs),
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1066
            overwrite=("tags" in overwrite))
0.200.1402 by Jelmer Vernooij
Cope with tag changes in bzr.
1067
        if isinstance(tags_ret, tuple):
1068
            (result.tag_updates, result.tag_conflicts) = tags_ret
1069
        else:
1070
            result.tag_conflicts = tags_ret
0.200.505 by Jelmer Vernooij
Remove duplicate code.
1071
        result.new_revid = self.target.last_revision()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1072
        return result
1073
1074
    def update_refs(self, stop_revision=None):
0.296.1 by Jelmer Vernooij
Fix tag fetching.
1075
        interrepo = _mod_repository.InterRepository.get(
1076
                self.source.repository, self.target.repository)
1077
        c = self.source.get_config_stack()
1078
        fetch_tags = c.get('branch.fetch_tags')
1079
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1080
        if stop_revision is None:
7067.11.1 by Jelmer Vernooij
Fix pull operations on Git repositories on Python 3.
1081
            refs = interrepo.fetch(branches=[b"HEAD"], include_tags=fetch_tags)
0.336.5 by Jelmer Vernooij
Fix some tests.
1082
            try:
7067.11.1 by Jelmer Vernooij
Fix pull operations on Git repositories on Python 3.
1083
                head = refs[b"HEAD"]
0.336.5 by Jelmer Vernooij
Fix some tests.
1084
            except KeyError:
1085
                stop_revision = revision.NULL_REVISION
1086
            else:
1087
                stop_revision = self.target.lookup_foreign_revision_id(head)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1088
        else:
0.296.1 by Jelmer Vernooij
Fix tag fetching.
1089
            refs = interrepo.fetch(revision_id=stop_revision, include_tags=fetch_tags)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
1090
        return refs, stop_revision
1091
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
1092
    def pull(self, stop_revision=None, overwrite=False,
0.296.1 by Jelmer Vernooij
Fix tag fetching.
1093
             possible_transports=None, run_hooks=True, local=False):
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
1094
        # This type of branch can't be bound.
1095
        if local:
1096
            raise errors.LocalRequiresBoundBranch()
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1097
        if overwrite is True:
1098
            overwrite = set(["history", "tags"])
1099
        else:
1100
            overwrite = set()
1101
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
1102
        result = GitPullResult()
1103
        result.source_branch = self.source
1104
        result.target_branch = self.target
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
1105
        with self.target.lock_write(), self.source.lock_read():
1106
            result.old_revid = self.target.last_revision()
1107
            refs, stop_revision = self.update_refs(stop_revision)
0.296.2 by Jelmer Vernooij
Handle DivergedBranches.
1108
            self.target.generate_revision_history(stop_revision,
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1109
                    (result.old_revid if ("history" not in overwrite) else None),
0.296.2 by Jelmer Vernooij
Handle DivergedBranches.
1110
                    other_branch=self.source)
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
1111
            tags_ret = self.source.tags.merge_to(self.target.tags,
0.343.1 by Jelmer Vernooij
Support overwrite flag properly, remove DictTagDict.
1112
                overwrite=("tags" in overwrite),
0.346.1 by Jelmer Vernooij
Fix tag caching.
1113
                source_tag_refs=remote_refs_dict_to_tag_refs(refs))
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
1114
            if isinstance(tags_ret, tuple):
1115
                (result.tag_updates, result.tag_conflicts) = tags_ret
1116
            else:
1117
                result.tag_conflicts = tags_ret
1118
            result.new_revid = self.target.last_revision()
1119
            result.local_branch = None
1120
            result.master_branch = result.target_branch
1121
            if run_hooks:
1122
                for hook in branch.Branch.hooks['post_pull']:
1123
                    hook(result)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
1124
        return result
1125
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
1126
0.200.960 by Jelmer Vernooij
Use GenericInterBranch.
1127
class InterToGitBranch(branch.GenericInterBranch):
0.296.1 by Jelmer Vernooij
Fix tag fetching.
1128
    """InterBranch implementation that pulls from a non-bzr into a Git branch."""
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
1129
0.200.939 by Jelmer Vernooij
Use InterRepo directly.
1130
    def __init__(self, source, target):
1131
        super(InterToGitBranch, self).__init__(source, target)
0.200.1097 by Jelmer Vernooij
Implement GitBranchFormat.initialize.
1132
        self.interrepo = _mod_repository.InterRepository.get(source.repository,
0.200.939 by Jelmer Vernooij
Use InterRepo directly.
1133
                                           target.repository)
1134
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
1135
    @staticmethod
1136
    def _get_branch_formats_to_test():
0.200.1100 by Jelmer Vernooij
Provide test combinations for InterBranch implementations.
1137
        try:
1138
            default_format = branch.format_registry.get_default()
1139
        except AttributeError:
1140
            default_format = branch.BranchFormat._default_format
0.295.4 by Jelmer Vernooij
Fix imports.
1141
        from .remote import RemoteGitBranchFormat
0.295.1 by Jelmer Vernooij
Split up branch formats.
1142
        return [
1143
            (default_format, LocalGitBranchFormat()),
1144
            (default_format, RemoteGitBranchFormat())]
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
1145
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
1146
    @classmethod
1147
    def is_compatible(self, source, target):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
1148
        return (not isinstance(source, GitBranch) and
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
1149
                isinstance(target, GitBranch))
1150
0.200.1363 by Jelmer Vernooij
Only fetch tags if requested in config.
1151
    def _get_new_refs(self, stop_revision=None, fetch_tags=None):
0.361.1 by Jelmer Vernooij
Don't use assert.
1152
        if not self.source.is_locked():
1153
            raise errors.ObjectNotLocked(self.source)
0.252.38 by Jelmer Vernooij
Minor cleanups.
1154
        if stop_revision is None:
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
1155
            (stop_revno, stop_revision) = self.source.last_revision_info()
0.263.1 by Jelmer Vernooij
Fix dpush for certain branches.
1156
        else:
1157
            stop_revno = self.source.revision_id_to_revno(stop_revision)
6973.13.2 by Jelmer Vernooij
Fix some more tests.
1158
        if not isinstance(stop_revision, bytes):
0.361.1 by Jelmer Vernooij
Don't use assert.
1159
            raise TypeError(stop_revision)
0.377.1 by Jelmer Vernooij
Fix some remote operations and add more tests.
1160
        main_ref = self.target.ref
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
1161
        refs = { main_ref: (None, stop_revision) }
0.200.1363 by Jelmer Vernooij
Only fetch tags if requested in config.
1162
        if fetch_tags is None:
0.200.1584 by Jelmer Vernooij
Use config stacks in a few more places.
1163
            c = self.source.get_config_stack()
1164
            fetch_tags = c.get('branch.fetch_tags')
7018.3.2 by Jelmer Vernooij
Fix some git tests.
1165
        for name, revid in viewitems(self.source.tags.get_tag_dict()):
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
1166
            if self.source.repository.has_revision(revid):
1167
                ref = tag_name_to_ref(name)
1168
                if not check_ref_format(ref):
1169
                    warning("skipping tag with invalid characters %s (%s)",
1170
                        name, ref)
1171
                    continue
0.200.1398 by Jelmer Vernooij
Make GitSmartRemoteNotSupported derive from UnsupportedOperation.
1172
                if fetch_tags:
1173
                    # FIXME: Skip tags that are not in the ancestry
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
1174
                    refs[ref] = (None, revid)
0.200.1048 by Jelmer Vernooij
Make lookup of revno's after push/pull as efficient as possible.
1175
        return refs, main_ref, (stop_revno, stop_revision)
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
1176
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1177
    def _update_refs(self, result, old_refs, new_refs, overwrite):
1178
        mutter("updating refs. old refs: %r, new refs: %r",
1179
               old_refs, new_refs)
1180
        result.tag_updates = {}
1181
        result.tag_conflicts = []
1182
        ret = dict(old_refs)
1183
        def ref_equals(refs, ref, git_sha, revid):
1184
            try:
1185
                value = refs[ref]
1186
            except KeyError:
1187
                return False
1188
            if (value[0] is not None and
1189
                git_sha is not None and
0.200.1479 by Jelmer Vernooij
Simplify branch ref handling.
1190
                value[0] == git_sha):
1191
                return True
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1192
            if (value[1] is not None and
1193
                revid is not None and
0.200.1479 by Jelmer Vernooij
Simplify branch ref handling.
1194
                value[1] == revid):
1195
                return True
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1196
            # FIXME: If one side only has the git sha available and the other only
1197
            # has the bzr revid, then this will cause us to show a tag as updated
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
1198
            # that hasn't actually been updated.
0.200.1479 by Jelmer Vernooij
Simplify branch ref handling.
1199
            return False
0.200.1474 by Jelmer Vernooij
Cope with refs when pushing.
1200
        # FIXME: Check for diverged branches
7018.3.8 by Jelmer Vernooij
Disable some flaky tests on python3, allow running without fastimport.
1201
        for ref, (git_sha, revid) in viewitems(new_refs):
0.200.1479 by Jelmer Vernooij
Simplify branch ref handling.
1202
            if ref_equals(ret, ref, git_sha, revid):
1203
                # Already up to date
1204
                if git_sha is None:
1205
                    git_sha = old_refs[ref][0]
1206
                if revid is None:
1207
                    revid = old_refs[ref][1]
1208
                ret[ref] = new_refs[ref] = (git_sha, revid)
1209
            elif ref not in ret or overwrite:
1210
                try:
1211
                    tag_name = ref_to_tag_name(ref)
1212
                except ValueError:
1213
                    pass
1214
                else:
1215
                    result.tag_updates[tag_name] = revid
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1216
                ret[ref] = (git_sha, revid)
1217
            else:
0.200.1474 by Jelmer Vernooij
Cope with refs when pushing.
1218
                # FIXME: Check diverged
1219
                diverged = False
1220
                if diverged:
1221
                    try:
1222
                        name = ref_to_tag_name(ref)
1223
                    except ValueError:
1224
                        pass
1225
                    else:
1226
                        result.tag_conflicts.append((name, revid, ret[name][1]))
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1227
                else:
0.200.1474 by Jelmer Vernooij
Cope with refs when pushing.
1228
                    ret[ref] = (git_sha, revid)
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1229
        return ret
1230
0.200.1493 by Jelmer Vernooij
Test fixes.
1231
    def fetch(self, stop_revision=None, fetch_tags=None, lossy=False, limit=None):
1232
        if stop_revision is None:
1233
            stop_revision = self.source.last_revision()
1234
        ret = []
1235
        if fetch_tags:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
1236
            for k, v in viewitems(self.source.tags.get_tag_dict()):
0.200.1493 by Jelmer Vernooij
Test fixes.
1237
                ret.append((None, v))
1238
        ret.append((None, stop_revision))
0.320.5 by Jelmer Vernooij
Always raise NoRoundtrippingSupport rather than NoPushSupport.
1239
        try:
1240
            self.interrepo.fetch_objects(ret, lossy=lossy, limit=limit)
1241
        except NoPushSupport:
1242
            raise errors.NoRoundtrippingSupport(self.source, self.target)
0.200.1493 by Jelmer Vernooij
Test fixes.
1243
0.252.36 by Jelmer Vernooij
Fix pull.
1244
    def pull(self, overwrite=False, stop_revision=None, local=False,
0.200.1131 by Jelmer Vernooij
Accept run_hooks argument to InterToGitBranch.pull().
1245
             possible_transports=None, run_hooks=True):
0.252.36 by Jelmer Vernooij
Fix pull.
1246
        result = GitBranchPullResult()
1247
        result.source_branch = self.source
1248
        result.target_branch = self.target
0.200.1788 by Jelmer Vernooij
Use context managers.
1249
        with self.source.lock_read(), self.target.lock_write():
1250
            new_refs, main_ref, stop_revinfo = self._get_new_refs(
1251
                stop_revision)
1252
            def update_refs(old_refs):
1253
                return self._update_refs(result, old_refs, new_refs, overwrite)
0.200.1353 by Jelmer Vernooij
Run various hooks.
1254
            try:
0.200.1788 by Jelmer Vernooij
Use context managers.
1255
                result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
1256
                    update_refs, lossy=False)
1257
            except NoPushSupport:
1258
                raise errors.NoRoundtrippingSupport(self.source, self.target)
1259
            (old_sha1, result.old_revid) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
1260
            if result.old_revid is None:
1261
                result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
1262
            result.new_revid = new_refs[main_ref][1]
1263
            result.local_branch = None
1264
            result.master_branch = self.target
1265
            if run_hooks:
1266
                for hook in branch.Branch.hooks['post_pull']:
1267
                    hook(result)
0.252.36 by Jelmer Vernooij
Fix pull.
1268
        return result
1269
0.200.1260 by Jelmer Vernooij
Cope with new lossy argument.
1270
    def push(self, overwrite=False, stop_revision=None, lossy=False,
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
1271
             _override_hook_source_branch=None):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
1272
        result = GitBranchPushResult()
1273
        result.source_branch = self.source
1274
        result.target_branch = self.target
0.200.1356 by Jelmer Vernooij
Fix result properties for hook.
1275
        result.local_branch = None
1276
        result.master_branch = result.target_branch
0.331.1 by Jelmer Vernooij
Fix some tags tests.
1277
        with self.source.lock_read(), self.target.lock_write():
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
1278
            new_refs, main_ref, stop_revinfo = self._get_new_refs(stop_revision)
1279
            def update_refs(old_refs):
0.200.1392 by Jelmer Vernooij
Preserve existing refs.
1280
                return self._update_refs(result, old_refs, new_refs, overwrite)
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
1281
            try:
1282
                result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
0.404.5 by Jelmer Vernooij
Check for diverged branches during push.
1283
                    update_refs, lossy=lossy, overwrite=overwrite)
0.200.1391 by Jelmer Vernooij
Warn on (and skip) invalid tags.
1284
            except NoPushSupport:
1285
                raise errors.NoRoundtrippingSupport(self.source, self.target)
1286
            (old_sha1, result.old_revid) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
1287
            if result.old_revid is None:
1288
                result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
1289
            result.new_revid = new_refs[main_ref][1]
1290
            (result.new_original_revno, result.new_original_revid) = stop_revinfo
1291
            for hook in branch.Branch.hooks['post_push']:
1292
                hook(result)
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
1293
        return result
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
1294
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
1295
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
1296
branch.InterBranch.register_optimiser(InterGitLocalGitBranch)
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
1297
branch.InterBranch.register_optimiser(InterFromGitBranch)
1298
branch.InterBranch.register_optimiser(InterToGitBranch)
0.200.1176 by Jelmer Vernooij
Fix fetch return value for inter git fetching.
1299
branch.InterBranch.register_optimiser(InterLocalGitRemoteGitBranch)