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