/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to breezy/git/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-09-02 16:35:18 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902163518-sy9f4unbboljphgu
Handle duplicate directories entries for git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/branch.py
1
 
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
1
# Copyright (C) 2007,2012 Canonical Ltd
 
2
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
"""An adapter between a Git Branch and a Bazaar Branch"""
19
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
from io import BytesIO
 
23
from collections import defaultdict
 
24
 
 
25
from dulwich.config import (
 
26
    ConfigFile as GitConfigFile,
 
27
    parse_submodules,
 
28
    )
 
29
 
20
30
from dulwich.objects import (
21
 
    Commit,
22
 
    Tag,
 
31
    NotCommitError,
 
32
    ZERO_SHA,
23
33
    )
 
34
from dulwich.repo import check_ref_format
24
35
 
25
 
from bzrlib import (
 
36
from .. import (
26
37
    branch,
27
 
    bzrdir,
 
38
    cleanup,
28
39
    config,
 
40
    controldir,
29
41
    errors,
30
 
    repository,
 
42
    lock,
 
43
    repository as _mod_repository,
31
44
    revision,
32
 
    tag,
 
45
    trace,
33
46
    transport,
34
 
    )
35
 
from bzrlib.decorators import (
36
 
    needs_read_lock,
37
 
    )
38
 
from bzrlib.revision import (
 
47
    urlutils,
 
48
    )
 
49
from ..foreign import ForeignBranch
 
50
from ..revision import (
39
51
    NULL_REVISION,
40
52
    )
41
 
from bzrlib.trace import (
 
53
from ..sixish import (
 
54
    text_type,
 
55
    viewitems,
 
56
    )
 
57
from ..tag import (
 
58
    Tags,
 
59
    InterTags,
 
60
    )
 
61
from ..trace import (
42
62
    is_quiet,
43
63
    mutter,
 
64
    warning,
44
65
    )
45
66
 
46
 
from bzrlib.plugins.git.config import (
47
 
    GitBranchConfig,
48
 
    )
49
 
from bzrlib.plugins.git.errors import (
 
67
from .errors import (
50
68
    NoPushSupport,
51
 
    NoSuchRef,
52
 
    )
53
 
from bzrlib.plugins.git.refs import (
 
69
    )
 
70
from .mapping import (
 
71
    encode_git_path,
 
72
    decode_git_path,
 
73
    )
 
74
from .push import (
 
75
    remote_divergence,
 
76
    )
 
77
from .refs import (
 
78
    branch_name_to_ref,
 
79
    is_tag,
54
80
    ref_to_branch_name,
55
 
    extract_tags,
 
81
    ref_to_tag_name,
 
82
    remote_refs_dict_to_tag_refs,
56
83
    tag_name_to_ref,
57
84
    )
58
 
 
59
 
from bzrlib.foreign import ForeignBranch
 
85
from .unpeel_map import (
 
86
    UnpeelMap,
 
87
    )
 
88
from .urls import (
 
89
    git_url_to_bzr_url,
 
90
    bzr_url_to_git_url,
 
91
    )
 
92
 
 
93
 
 
94
def _calculate_revnos(branch):
 
95
    if branch._format.stores_revno():
 
96
        return True
 
97
    config = branch.get_config_stack()
 
98
    return config.get('calculate_revnos')
60
99
 
61
100
 
62
101
class GitPullResult(branch.PullResult):
63
102
    """Result of a pull from a Git branch."""
64
103
 
65
104
    def _lookup_revno(self, revid):
66
 
        assert isinstance(revid, str), "was %r" % revid
 
105
        if not isinstance(revid, bytes):
 
106
            raise TypeError(revid)
 
107
        if not _calculate_revnos(self.target_branch):
 
108
            return None
67
109
        # Try in source branch first, it'll be faster
68
 
        return self.target_branch.revision_id_to_revno(revid)
 
110
        with self.target_branch.lock_read():
 
111
            return self.target_branch.revision_id_to_revno(revid)
69
112
 
70
113
    @property
71
114
    def old_revno(self):
76
119
        return self._lookup_revno(self.new_revid)
77
120
 
78
121
 
79
 
class LocalGitTagDict(tag.BasicTags):
80
 
    """Dictionary with tags in a local repository."""
 
122
class InterTagsFromGitToRemoteGit(InterTags):
 
123
 
 
124
    @classmethod
 
125
    def is_compatible(klass, source, target):
 
126
        if not isinstance(source, GitTags):
 
127
            return False
 
128
        if not isinstance(target, GitTags):
 
129
            return False
 
130
        if getattr(target.branch.repository, "_git", None) is not None:
 
131
            return False
 
132
        return True
 
133
 
 
134
    def merge(self, overwrite=False, ignore_master=False, selector=None):
 
135
        if self.source.branch.repository.has_same_location(self.target.branch.repository):
 
136
            return {}, []
 
137
        updates = {}
 
138
        conflicts = []
 
139
        source_tag_refs = self.source.branch.get_tag_refs()
 
140
        ref_to_tag_map = {}
 
141
 
 
142
        def get_changed_refs(old_refs):
 
143
            ret = dict(old_refs)
 
144
            for ref_name, tag_name, peeled, unpeeled in (
 
145
                    source_tag_refs.iteritems()):
 
146
                if selector and not selector(tag_name):
 
147
                    continue
 
148
                if old_refs.get(ref_name) == unpeeled:
 
149
                    pass
 
150
                elif overwrite or ref_name not in old_refs:
 
151
                    ret[ref_name] = unpeeled
 
152
                    updates[tag_name] = self.target.branch.repository.lookup_foreign_revision_id(
 
153
                        peeled)
 
154
                    ref_to_tag_map[ref_name] = tag_name
 
155
                    self.target.branch._tag_refs = None
 
156
                else:
 
157
                    conflicts.append(
 
158
                        (tag_name,
 
159
                         self.repository.lookup_foreign_revision_id(peeled),
 
160
                         self.target.branch.repository.lookup_foreign_revision_id(
 
161
                             old_refs[ref_name])))
 
162
            return ret
 
163
        result = self.target.branch.repository.controldir.send_pack(
 
164
            get_changed_refs, lambda have, want: [])
 
165
        if result is not None and not isinstance(result, dict):
 
166
            for ref, error in result.ref_status.items():
 
167
                if error:
 
168
                    warning('unable to update ref %s: %s',
 
169
                            ref, error)
 
170
                    del updates[ref_to_tag_map[ref]]
 
171
        return updates, set(conflicts)
 
172
 
 
173
 
 
174
class InterTagsFromGitToLocalGit(InterTags):
 
175
 
 
176
    @classmethod
 
177
    def is_compatible(klass, source, target):
 
178
        if not isinstance(source, GitTags):
 
179
            return False
 
180
        if not isinstance(target, GitTags):
 
181
            return False
 
182
        if getattr(target.branch.repository, "_git", None) is None:
 
183
            return False
 
184
        return True
 
185
 
 
186
    def merge(self, overwrite=False, ignore_master=False, selector=None):
 
187
        if self.source.branch.repository.has_same_location(self.target.branch.repository):
 
188
            return {}, []
 
189
 
 
190
        conflicts = []
 
191
        updates = {}
 
192
        source_tag_refs = self.source.branch.get_tag_refs()
 
193
 
 
194
        target_repo = self.target.branch.repository
 
195
 
 
196
        for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
 
197
            if selector and not selector(tag_name):
 
198
                continue
 
199
            if target_repo._git.refs.get(ref_name) == unpeeled:
 
200
                pass
 
201
            elif overwrite or ref_name not in target_repo._git.refs:
 
202
                try:
 
203
                    updates[tag_name] = (
 
204
                        target_repo.lookup_foreign_revision_id(peeled))
 
205
                except KeyError:
 
206
                    trace.warning('%s does not point to a valid object',
 
207
                                  tag_name)
 
208
                    continue
 
209
                except NotCommitError:
 
210
                    trace.warning('%s points to a non-commit object',
 
211
                                  tag_name)
 
212
                    continue
 
213
                target_repo._git.refs[ref_name] = unpeeled or peeled
 
214
                self.target.branch._tag_refs = None
 
215
            else:
 
216
                try:
 
217
                    source_revid = self.source.branch.repository.lookup_foreign_revision_id(
 
218
                        peeled)
 
219
                    target_revid = target_repo.lookup_foreign_revision_id(
 
220
                        target_repo._git.refs[ref_name])
 
221
                except KeyError:
 
222
                    trace.warning('%s does not point to a valid object',
 
223
                                  ref_name)
 
224
                    continue
 
225
                except NotCommitError:
 
226
                    trace.warning('%s points to a non-commit object',
 
227
                                  tag_name)
 
228
                    continue
 
229
                conflicts.append((tag_name, source_revid, target_revid))
 
230
        return updates, set(conflicts)
 
231
 
 
232
 
 
233
class InterTagsFromGitToNonGit(InterTags):
 
234
 
 
235
    @classmethod
 
236
    def is_compatible(klass, source, target):
 
237
        if not isinstance(source, GitTags):
 
238
            return False
 
239
        if isinstance(target, GitTags):
 
240
            return False
 
241
        return True
 
242
 
 
243
    def merge(self, overwrite=False, ignore_master=False, selector=None):
 
244
        """See Tags.merge_to."""
 
245
        source_tag_refs = self.source.branch.get_tag_refs()
 
246
        if ignore_master:
 
247
            master = None
 
248
        else:
 
249
            master = self.target.branch.get_master_branch()
 
250
        with cleanup.ExitStack() as es:
 
251
            if master is not None:
 
252
                es.enter_context(master.lock_write())
 
253
            updates, conflicts = self._merge_to(
 
254
                self.target, source_tag_refs, overwrite=overwrite,
 
255
                selector=selector)
 
256
            if master is not None:
 
257
                extra_updates, extra_conflicts = self._merge_to(
 
258
                    master.tags, overwrite=overwrite,
 
259
                    source_tag_refs=source_tag_refs,
 
260
                    ignore_master=ignore_master, selector=selector)
 
261
                updates.update(extra_updates)
 
262
                conflicts.update(extra_conflicts)
 
263
            return updates, conflicts
 
264
 
 
265
    def _merge_to(self, to_tags, source_tag_refs, overwrite=False,
 
266
                  selector=None):
 
267
        unpeeled_map = defaultdict(set)
 
268
        conflicts = []
 
269
        updates = {}
 
270
        result = dict(to_tags.get_tag_dict())
 
271
        for ref_name, tag_name, peeled, unpeeled in source_tag_refs:
 
272
            if selector and not selector(tag_name):
 
273
                continue
 
274
            if unpeeled is not None:
 
275
                unpeeled_map[peeled].add(unpeeled)
 
276
            try:
 
277
                bzr_revid = self.source.branch.lookup_foreign_revision_id(peeled)
 
278
            except NotCommitError:
 
279
                continue
 
280
            if result.get(tag_name) == bzr_revid:
 
281
                pass
 
282
            elif tag_name not in result or overwrite:
 
283
                result[tag_name] = bzr_revid
 
284
                updates[tag_name] = bzr_revid
 
285
            else:
 
286
                conflicts.append((tag_name, bzr_revid, result[tag_name]))
 
287
        to_tags._set_tag_dict(result)
 
288
        if len(unpeeled_map) > 0:
 
289
            map_file = UnpeelMap.from_repository(to_tags.branch.repository)
 
290
            map_file.update(unpeeled_map)
 
291
            map_file.save_in_repository(to_tags.branch.repository)
 
292
        return updates, set(conflicts)
 
293
 
 
294
 
 
295
InterTags.register_optimiser(InterTagsFromGitToRemoteGit)
 
296
InterTags.register_optimiser(InterTagsFromGitToLocalGit)
 
297
InterTags.register_optimiser(InterTagsFromGitToNonGit)
 
298
 
 
299
 
 
300
class GitTags(Tags):
 
301
    """Ref-based tag dictionary."""
81
302
 
82
303
    def __init__(self, branch):
83
304
        self.branch = branch
85
306
 
86
307
    def get_tag_dict(self):
87
308
        ret = {}
88
 
        for k,v in extract_tags(self.repository._git.get_refs()).iteritems():
 
309
        for (ref_name, tag_name, peeled, unpeeled) in (
 
310
                self.branch.get_tag_refs()):
89
311
            try:
90
 
                obj = self.repository._git[v]
91
 
            except KeyError:
92
 
                mutter("Tag %s points at unknown object %s, ignoring", v, obj)
93
 
                continue
94
 
            while isinstance(obj, Tag):
95
 
                v = obj.object[1]
96
 
                obj = self.repository._git[v]
97
 
            if not isinstance(obj, Commit):
98
 
                mutter("Tag %s points at object %r that is not a commit, "
99
 
                       "ignoring", k, obj)
100
 
                continue
101
 
            ret[k] = self.branch.lookup_foreign_revision_id(v)
 
312
                bzr_revid = self.branch.lookup_foreign_revision_id(peeled)
 
313
            except NotCommitError:
 
314
                continue
 
315
            else:
 
316
                ret[tag_name] = bzr_revid
102
317
        return ret
103
318
 
 
319
    def lookup_tag(self, tag_name):
 
320
        """Return the referent string of a tag"""
 
321
        # TODO(jelmer): Replace with something more efficient for local tags.
 
322
        td = self.get_tag_dict()
 
323
        try:
 
324
            return td[tag_name]
 
325
        except KeyError:
 
326
            raise errors.NoSuchTag(tag_name)
 
327
 
 
328
 
 
329
class LocalGitTagDict(GitTags):
 
330
    """Dictionary with tags in a local repository."""
 
331
 
 
332
    def __init__(self, branch):
 
333
        super(LocalGitTagDict, self).__init__(branch)
 
334
        self.refs = self.repository.controldir._git.refs
 
335
 
104
336
    def _set_tag_dict(self, to_dict):
105
 
        extra = set(self.repository._git.get_refs().keys())
106
 
        for k, revid in to_dict.iteritems():
 
337
        extra = set(self.refs.allkeys())
 
338
        for k, revid in viewitems(to_dict):
107
339
            name = tag_name_to_ref(k)
108
340
            if name in extra:
109
341
                extra.remove(name)
110
 
            self.set_tag(k, revid)
 
342
            try:
 
343
                self.set_tag(k, revid)
 
344
            except errors.GhostTagsNotSupported:
 
345
                pass
111
346
        for name in extra:
112
 
            if name.startswith("refs/tags/"):
 
347
            if is_tag(name):
113
348
                del self.repository._git[name]
114
349
 
115
350
    def set_tag(self, name, revid):
116
 
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
 
            self.branch.lookup_bzr_revision_id(revid)
118
 
 
119
 
 
120
 
class DictTagDict(LocalGitTagDict):
121
 
 
122
 
    def __init__(self, branch, tags):
123
 
        super(DictTagDict, self).__init__(branch)
124
 
        self._tags = tags
125
 
 
126
 
    def get_tag_dict(self):
127
 
        return self._tags
 
351
        try:
 
352
            git_sha, mapping = self.branch.lookup_bzr_revision_id(revid)
 
353
        except errors.NoSuchRevision:
 
354
            raise errors.GhostTagsNotSupported(self)
 
355
        self.refs[tag_name_to_ref(name)] = git_sha
 
356
        self.branch._tag_refs = None
 
357
 
 
358
    def delete_tag(self, name):
 
359
        ref = tag_name_to_ref(name)
 
360
        if ref not in self.refs:
 
361
            raise errors.NoSuchTag(name)
 
362
        del self.refs[ref]
 
363
        self.branch._tag_refs = None
128
364
 
129
365
 
130
366
class GitBranchFormat(branch.BranchFormat):
131
367
 
132
 
    def get_format_description(self):
133
 
        return 'Git Branch'
134
 
 
135
368
    def network_name(self):
136
 
        return "git"
 
369
        return b"git"
137
370
 
138
371
    def supports_tags(self):
139
372
        return True
140
373
 
 
374
    def supports_leaving_lock(self):
 
375
        return False
 
376
 
 
377
    def supports_tags_referencing_ghosts(self):
 
378
        return False
 
379
 
 
380
    def tags_are_versioned(self):
 
381
        return False
 
382
 
141
383
    def get_foreign_tests_branch_factory(self):
142
 
        from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory
 
384
        from .tests.test_branch import ForeignTestsBranchFactory
143
385
        return ForeignTestsBranchFactory()
144
386
 
145
387
    def make_tags(self, branch):
146
 
        if getattr(branch.repository, "get_refs", None) is not None:
147
 
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
388
        try:
 
389
            return branch.tags
 
390
        except AttributeError:
 
391
            pass
 
392
        if getattr(branch.repository, "_git", None) is None:
 
393
            from .remote import RemoteGitTagDict
148
394
            return RemoteGitTagDict(branch)
149
395
        else:
150
396
            return LocalGitTagDict(branch)
151
397
 
152
 
 
153
 
class GitReadLock(object):
154
 
 
155
 
    def __init__(self, unlock):
156
 
        self.unlock = unlock
157
 
 
158
 
 
159
 
class GitWriteLock(object):
160
 
 
161
 
    def __init__(self, unlock):
162
 
        self.unlock = unlock
 
398
    def initialize(self, a_controldir, name=None, repository=None,
 
399
                   append_revisions_only=None):
 
400
        raise NotImplementedError(self.initialize)
 
401
 
 
402
    def get_reference(self, controldir, name=None):
 
403
        return controldir.get_branch_reference(name=name)
 
404
 
 
405
    def set_reference(self, controldir, name, target):
 
406
        return controldir.set_branch_reference(target, name)
 
407
 
 
408
    def stores_revno(self):
 
409
        """True if this branch format store revision numbers."""
 
410
        return False
 
411
 
 
412
    supports_reference_locations = False
 
413
 
 
414
 
 
415
class LocalGitBranchFormat(GitBranchFormat):
 
416
 
 
417
    def get_format_description(self):
 
418
        return 'Local Git Branch'
 
419
 
 
420
    @property
 
421
    def _matchingcontroldir(self):
 
422
        from .dir import LocalGitControlDirFormat
 
423
        return LocalGitControlDirFormat()
 
424
 
 
425
    def initialize(self, a_controldir, name=None, repository=None,
 
426
                   append_revisions_only=None):
 
427
        from .dir import LocalGitDir
 
428
        if not isinstance(a_controldir, LocalGitDir):
 
429
            raise errors.IncompatibleFormat(self, a_controldir._format)
 
430
        return a_controldir.create_branch(
 
431
            repository=repository, name=name,
 
432
            append_revisions_only=append_revisions_only)
163
433
 
164
434
 
165
435
class GitBranch(ForeignBranch):
166
436
    """An adapter to git repositories for bzr Branch objects."""
167
437
 
168
 
    def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
 
438
    @property
 
439
    def control_transport(self):
 
440
        return self._control_transport
 
441
 
 
442
    @property
 
443
    def user_transport(self):
 
444
        return self._user_transport
 
445
 
 
446
    def __init__(self, controldir, repository, ref, format):
169
447
        self.repository = repository
170
 
        self._format = GitBranchFormat()
171
 
        self.control_files = lockfiles
172
 
        self.bzrdir = bzrdir
 
448
        self._format = format
 
449
        self.controldir = controldir
 
450
        self._lock_mode = None
 
451
        self._lock_count = 0
173
452
        super(GitBranch, self).__init__(repository.get_mapping())
174
 
        if tagsdict is not None:
175
 
            self.tags = DictTagDict(self, tagsdict)
176
453
        self.ref = ref
177
 
        self.name = ref_to_branch_name(ref)
178
454
        self._head = None
179
 
        self.base = bzrdir.root_transport.base
 
455
        self._user_transport = controldir.user_transport.clone('.')
 
456
        self._control_transport = controldir.control_transport.clone('.')
 
457
        self._tag_refs = None
 
458
        params = {}
 
459
        try:
 
460
            self.name = ref_to_branch_name(ref)
 
461
        except ValueError:
 
462
            self.name = None
 
463
            if self.ref is not None:
 
464
                params = {"ref": urlutils.escape(self.ref)}
 
465
        else:
 
466
            if self.name != "":
 
467
                params = {"branch": urlutils.escape(self.name)}
 
468
        for k, v in params.items():
 
469
            self._user_transport.set_segment_parameter(k, v)
 
470
            self._control_transport.set_segment_parameter(k, v)
 
471
        self.base = controldir.user_transport.base
180
472
 
181
 
    def _get_checkout_format(self):
 
473
    def _get_checkout_format(self, lightweight=False):
182
474
        """Return the most suitable metadir for a checkout of this branch.
183
475
        Weaves are used if this branch's repository uses weaves.
184
476
        """
185
 
        return bzrdir.format_registry.make_bzrdir("default")
 
477
        if lightweight:
 
478
            return controldir.format_registry.make_controldir("git")
 
479
        else:
 
480
            return controldir.format_registry.make_controldir("default")
186
481
 
187
482
    def get_child_submit_format(self):
188
483
        """Return the preferred format of submissions to this branch."""
189
 
        ret = self.get_config().get_user_option("child_submit_format")
 
484
        ret = self.get_config_stack().get("child_submit_format")
190
485
        if ret is not None:
191
486
            return ret
192
487
        return "git"
193
488
 
 
489
    def get_config(self):
 
490
        from .config import GitBranchConfig
 
491
        return GitBranchConfig(self)
 
492
 
 
493
    def get_config_stack(self):
 
494
        from .config import GitBranchStack
 
495
        return GitBranchStack(self)
 
496
 
194
497
    def _get_nick(self, local=False, possible_master_transports=None):
195
498
        """Find the nick name for this branch.
196
499
 
197
500
        :return: Branch nick
198
501
        """
199
 
        return self.name or "HEAD"
 
502
        if getattr(self.repository, '_git', None):
 
503
            cs = self.repository._git.get_config_stack()
 
504
            try:
 
505
                return cs.get((b"branch", self.name.encode('utf-8')),
 
506
                        b"nick").decode("utf-8")
 
507
            except KeyError:
 
508
                pass
 
509
        return self.name or u"HEAD"
200
510
 
201
511
    def _set_nick(self, nick):
202
 
        raise NotImplementedError
 
512
        cf = self.repository._git.get_config()
 
513
        cf.set((b"branch", self.name.encode('utf-8')),
 
514
               b"nick", nick.encode("utf-8"))
 
515
        f = BytesIO()
 
516
        cf.write_to_file(f)
 
517
        self.repository._git._put_named_file('config', f.getvalue())
203
518
 
204
519
    nick = property(_get_nick, _set_nick)
205
520
 
206
521
    def __repr__(self):
207
522
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
 
            self.ref or "HEAD")
209
 
 
210
 
    def generate_revision_history(self, revid, old_revid=None):
211
 
        # FIXME: Check that old_revid is in the ancestry of revid
212
 
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
213
 
        self._set_head(newhead)
214
 
 
215
 
    def lock_write(self):
216
 
        self.control_files.lock_write()
217
 
        return GitWriteLock(self.unlock)
 
523
                                 self.name)
 
524
 
 
525
    def generate_revision_history(self, revid, last_rev=None,
 
526
                                  other_branch=None):
 
527
        if last_rev is not None:
 
528
            graph = self.repository.get_graph()
 
529
            if not graph.is_ancestor(last_rev, revid):
 
530
                # our previous tip is not merged into stop_revision
 
531
                raise errors.DivergedBranches(self, other_branch)
 
532
 
 
533
        self.set_last_revision(revid)
 
534
 
 
535
    def lock_write(self, token=None):
 
536
        if token is not None:
 
537
            raise errors.TokenLockingNotSupported(self)
 
538
        if self._lock_mode:
 
539
            if self._lock_mode == 'r':
 
540
                raise errors.ReadOnlyError(self)
 
541
            self._lock_count += 1
 
542
        else:
 
543
            self._lock_ref()
 
544
            self._lock_mode = 'w'
 
545
            self._lock_count = 1
 
546
        self.repository.lock_write()
 
547
        return lock.LogicalLockResult(self.unlock)
 
548
 
 
549
    def leave_lock_in_place(self):
 
550
        raise NotImplementedError(self.leave_lock_in_place)
 
551
 
 
552
    def dont_leave_lock_in_place(self):
 
553
        raise NotImplementedError(self.dont_leave_lock_in_place)
218
554
 
219
555
    def get_stacked_on_url(self):
220
556
        # Git doesn't do stacking (yet...)
221
 
        raise errors.UnstackableBranchFormat(self._format, self.base)
222
 
 
223
 
    def get_parent(self):
 
557
        raise branch.UnstackableBranchFormat(self._format, self.base)
 
558
 
 
559
    def _get_push_origin(self, cs):
 
560
        """Get the name for the push origin.
 
561
 
 
562
        The exact behaviour is documented in the git-config(1) manpage.
 
563
        """
 
564
        try:
 
565
            return cs.get((b'branch', self.name.encode('utf-8')), b'pushRemote')
 
566
        except KeyError:
 
567
            try:
 
568
                return cs.get((b'branch', ), b'remote')
 
569
            except KeyError:
 
570
                try:
 
571
                    return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
 
572
                except KeyError:
 
573
                    return b'origin'
 
574
 
 
575
    def _get_origin(self, cs):
 
576
        try:
 
577
            return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
 
578
        except KeyError:
 
579
            return b'origin'
 
580
 
 
581
    def _get_related_push_branch(self, cs):
 
582
        remote = self._get_push_origin(cs)
 
583
        try:
 
584
            location = cs.get((b"remote", remote), b"url")
 
585
        except KeyError:
 
586
            return None
 
587
 
 
588
        return git_url_to_bzr_url(location.decode('utf-8'), ref=self.ref)
 
589
 
 
590
    def _get_related_merge_branch(self, cs):
 
591
        remote = self._get_origin(cs)
 
592
        try:
 
593
            location = cs.get((b"remote", remote), b"url")
 
594
        except KeyError:
 
595
            return None
 
596
 
 
597
        try:
 
598
            ref = cs.get((b"branch", remote), b"merge")
 
599
        except KeyError:
 
600
            ref = self.ref
 
601
 
 
602
        return git_url_to_bzr_url(location.decode('utf-8'), ref=ref)
 
603
 
 
604
    def _get_parent_location(self):
224
605
        """See Branch.get_parent()."""
225
 
        # FIXME: Set "origin" url from .git/config ?
226
 
        return None
227
 
 
228
 
    def set_parent(self, url):
229
 
        # FIXME: Set "origin" url in .git/config ?
230
 
        pass
 
606
        cs = self.repository._git.get_config_stack()
 
607
        return self._get_related_merge_branch(cs)
 
608
 
 
609
    def _write_git_config(self, cs):
 
610
        f = BytesIO()
 
611
        cs.write_to_file(f)
 
612
        self.repository._git._put_named_file('config', f.getvalue())
 
613
 
 
614
    def set_parent(self, location):
 
615
        cs = self.repository._git.get_config()
 
616
        remote = self._get_origin(cs)
 
617
        this_url = urlutils.strip_segment_parameters(self.user_url)
 
618
        target_url, branch, ref = bzr_url_to_git_url(location)
 
619
        location = urlutils.relative_url(this_url, target_url)
 
620
        cs.set((b"remote", remote), b"url", location)
 
621
        if branch:
 
622
            cs.set((b"branch", remote), b"merge", branch_name_to_ref(branch))
 
623
        elif ref:
 
624
            cs.set((b"branch", remote), b"merge", ref)
 
625
        else:
 
626
            # TODO(jelmer): Maybe unset rather than setting to HEAD?
 
627
            cs.set((b"branch", remote), b"merge", b'HEAD')
 
628
        self._write_git_config(cs)
 
629
 
 
630
    def break_lock(self):
 
631
        raise NotImplementedError(self.break_lock)
231
632
 
232
633
    def lock_read(self):
233
 
        self.control_files.lock_read()
234
 
        return GitReadLock(self.unlock)
 
634
        if self._lock_mode:
 
635
            if self._lock_mode not in ('r', 'w'):
 
636
                raise ValueError(self._lock_mode)
 
637
            self._lock_count += 1
 
638
        else:
 
639
            self._lock_mode = 'r'
 
640
            self._lock_count = 1
 
641
        self.repository.lock_read()
 
642
        return lock.LogicalLockResult(self.unlock)
 
643
 
 
644
    def peek_lock_mode(self):
 
645
        return self._lock_mode
235
646
 
236
647
    def is_locked(self):
237
 
        return self.control_files.is_locked()
 
648
        return (self._lock_mode is not None)
 
649
 
 
650
    def _lock_ref(self):
 
651
        pass
 
652
 
 
653
    def _unlock_ref(self):
 
654
        pass
238
655
 
239
656
    def unlock(self):
240
 
        self.control_files.unlock()
 
657
        """See Branch.unlock()."""
 
658
        if self._lock_count == 0:
 
659
            raise errors.LockNotHeld(self)
 
660
        try:
 
661
            self._lock_count -= 1
 
662
            if self._lock_count == 0:
 
663
                if self._lock_mode == 'w':
 
664
                    self._unlock_ref()
 
665
                self._lock_mode = None
 
666
                self._clear_cached_state()
 
667
        finally:
 
668
            self.repository.unlock()
241
669
 
242
670
    def get_physical_lock_status(self):
243
671
        return False
244
672
 
245
 
    @needs_read_lock
246
673
    def last_revision(self):
247
 
        # perhaps should escape this ?
248
 
        if self.head is None:
249
 
            return revision.NULL_REVISION
250
 
        return self.lookup_foreign_revision_id(self.head)
 
674
        with self.lock_read():
 
675
            # perhaps should escape this ?
 
676
            if self.head is None:
 
677
                return revision.NULL_REVISION
 
678
            return self.lookup_foreign_revision_id(self.head)
251
679
 
252
 
    def _basic_push(self, target, overwrite=False, stop_revision=None):
 
680
    def _basic_push(self, target, overwrite=False, stop_revision=None,
 
681
                    tag_selector=None):
253
682
        return branch.InterBranch.get(self, target)._basic_push(
254
 
            overwrite, stop_revision)
 
683
            overwrite, stop_revision, tag_selector=tag_selector)
255
684
 
256
685
    def lookup_foreign_revision_id(self, foreign_revid):
257
 
        return self.repository.lookup_foreign_revision_id(foreign_revid,
258
 
            self.mapping)
 
686
        try:
 
687
            return self.repository.lookup_foreign_revision_id(foreign_revid,
 
688
                                                              self.mapping)
 
689
        except KeyError:
 
690
            # Let's try..
 
691
            return self.mapping.revision_id_foreign_to_bzr(foreign_revid)
259
692
 
260
693
    def lookup_bzr_revision_id(self, revid):
261
694
        return self.repository.lookup_bzr_revision_id(
262
695
            revid, mapping=self.mapping)
263
696
 
 
697
    def get_unshelver(self, tree):
 
698
        raise errors.StoringUncommittedNotSupported(self)
 
699
 
 
700
    def _clear_cached_state(self):
 
701
        super(GitBranch, self)._clear_cached_state()
 
702
        self._tag_refs = None
 
703
 
 
704
    def _iter_tag_refs(self, refs):
 
705
        """Iterate over the tag refs.
 
706
 
 
707
        :param refs: Refs dictionary (name -> git sha1)
 
708
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
 
709
        """
 
710
        raise NotImplementedError(self._iter_tag_refs)
 
711
 
 
712
    def get_tag_refs(self):
 
713
        with self.lock_read():
 
714
            if self._tag_refs is None:
 
715
                self._tag_refs = list(self._iter_tag_refs())
 
716
            return self._tag_refs
 
717
 
 
718
    def import_last_revision_info_and_tags(self, source, revno, revid,
 
719
                                           lossy=False):
 
720
        """Set the last revision info, importing from another repo if necessary.
 
721
 
 
722
        This is used by the bound branch code to upload a revision to
 
723
        the master branch first before updating the tip of the local branch.
 
724
        Revisions referenced by source's tags are also transferred.
 
725
 
 
726
        :param source: Source branch to optionally fetch from
 
727
        :param revno: Revision number of the new tip
 
728
        :param revid: Revision id of the new tip
 
729
        :param lossy: Whether to discard metadata that can not be
 
730
            natively represented
 
731
        :return: Tuple with the new revision number and revision id
 
732
            (should only be different from the arguments when lossy=True)
 
733
        """
 
734
        push_result = source.push(
 
735
            self, stop_revision=revid, lossy=lossy, _stop_revno=revno)
 
736
        return (push_result.new_revno, push_result.new_revid)
 
737
 
 
738
    def reconcile(self, thorough=True):
 
739
        """Make sure the data stored in this branch is consistent."""
 
740
        from ..reconcile import ReconcileResult
 
741
        # Nothing to do here
 
742
        return ReconcileResult()
 
743
 
264
744
 
265
745
class LocalGitBranch(GitBranch):
266
746
    """A local Git branch."""
267
747
 
268
 
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
269
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
270
 
              lockfiles, tagsdict)
271
 
        refs = repository._git.get_refs()
272
 
        if not (name in refs.keys() or "HEAD" in refs.keys()):
273
 
            raise errors.NotBranchError(self.base)
 
748
    def __init__(self, controldir, repository, ref):
 
749
        super(LocalGitBranch, self).__init__(controldir, repository, ref,
 
750
                                             LocalGitBranchFormat())
274
751
 
275
752
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
276
 
        accelerator_tree=None, hardlink=False):
 
753
                        accelerator_tree=None, hardlink=False):
 
754
        t = transport.get_transport(to_location)
 
755
        t.ensure_base()
 
756
        format = self._get_checkout_format(lightweight=lightweight)
 
757
        checkout = format.initialize_on_transport(t)
277
758
        if lightweight:
278
 
            t = transport.get_transport(to_location)
279
 
            t.ensure_base()
280
 
            format = self._get_checkout_format()
281
 
            checkout = format.initialize_on_transport(t)
282
 
            from_branch = branch.BranchReferenceFormat().initialize(checkout,
283
 
                self)
284
 
            tree = checkout.create_workingtree(revision_id,
285
 
                from_branch=from_branch, hardlink=hardlink)
286
 
            return tree
 
759
            from_branch = checkout.set_branch_reference(target_branch=self)
287
760
        else:
288
 
            return self._create_heavyweight_checkout(to_location, revision_id,
289
 
                hardlink)
290
 
 
291
 
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
292
 
                                     hardlink=False):
293
 
        """Create a new heavyweight checkout of this branch.
294
 
 
295
 
        :param to_location: URL of location to create the new checkout in.
296
 
        :param revision_id: Revision that should be the tip of the checkout.
297
 
        :param hardlink: Whether to hardlink
298
 
        :return: WorkingTree object of checkout.
299
 
        """
300
 
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
301
 
            to_location, force_new_tree=False)
302
 
        checkout = checkout_branch.bzrdir
303
 
        checkout_branch.bind(self)
304
 
        # pull up to the specified revision_id to set the initial
305
 
        # branch tip correctly, and seed it with history.
306
 
        checkout_branch.pull(self, stop_revision=revision_id)
307
 
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
761
            policy = checkout.determine_repository_policy()
 
762
            policy.acquire_repository()
 
763
            checkout_branch = checkout.create_branch()
 
764
            checkout_branch.bind(self)
 
765
            checkout_branch.pull(self, stop_revision=revision_id)
 
766
            from_branch = None
 
767
        return checkout.create_workingtree(
 
768
            revision_id, from_branch=from_branch, hardlink=hardlink)
 
769
 
 
770
    def _lock_ref(self):
 
771
        self._ref_lock = self.repository._git.refs.lock_ref(self.ref)
 
772
 
 
773
    def _unlock_ref(self):
 
774
        self._ref_lock.unlock()
 
775
 
 
776
    def break_lock(self):
 
777
        self.repository._git.refs.unlock_ref(self.ref)
308
778
 
309
779
    def _gen_revision_history(self):
310
780
        if self.head is None:
311
781
            return []
312
 
        ret = list(self.repository.iter_reverse_revision_history(
313
 
            self.last_revision()))
 
782
        last_revid = self.last_revision()
 
783
        graph = self.repository.get_graph()
 
784
        try:
 
785
            ret = list(graph.iter_lefthand_ancestry(
 
786
                last_revid, (revision.NULL_REVISION, )))
 
787
        except errors.RevisionNotPresent as e:
 
788
            raise errors.GhostRevisionsHaveNoRevno(last_revid, e.revision_id)
314
789
        ret.reverse()
315
790
        return ret
316
791
 
317
792
    def _get_head(self):
318
793
        try:
319
 
            return self.repository._git.ref(self.ref or "HEAD")
 
794
            return self.repository._git.refs[self.ref]
320
795
        except KeyError:
321
796
            return None
322
797
 
323
 
    def set_last_revision_info(self, revno, revid):
324
 
        self.set_last_revision(revid)
 
798
    def _read_last_revision_info(self):
 
799
        last_revid = self.last_revision()
 
800
        graph = self.repository.get_graph()
 
801
        try:
 
802
            revno = graph.find_distance_to_null(
 
803
                last_revid, [(revision.NULL_REVISION, 0)])
 
804
        except errors.GhostRevisionsHaveNoRevno:
 
805
            revno = None
 
806
        return revno, last_revid
 
807
 
 
808
    def set_last_revision_info(self, revno, revision_id):
 
809
        self.set_last_revision(revision_id)
 
810
        self._last_revision_info_cache = revno, revision_id
325
811
 
326
812
    def set_last_revision(self, revid):
327
 
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
328
 
        self.head = newhead
 
813
        if not revid or not isinstance(revid, bytes):
 
814
            raise errors.InvalidRevisionId(revision_id=revid, branch=self)
 
815
        if revid == NULL_REVISION:
 
816
            newhead = None
 
817
        else:
 
818
            (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(
 
819
                revid)
 
820
            if self.mapping is None:
 
821
                raise AssertionError
 
822
        self._set_head(newhead)
329
823
 
330
824
    def _set_head(self, value):
 
825
        if value == ZERO_SHA:
 
826
            raise ValueError(value)
331
827
        self._head = value
332
 
        self.repository._git.refs[self.ref or "HEAD"] = self._head
 
828
        if value is None:
 
829
            del self.repository._git.refs[self.ref]
 
830
        else:
 
831
            self.repository._git.refs[self.ref] = self._head
333
832
        self._clear_cached_state()
334
833
 
335
834
    head = property(_get_head, _set_head)
336
835
 
337
 
    def get_config(self):
338
 
        return GitBranchConfig(self)
339
 
 
340
836
    def get_push_location(self):
341
837
        """See Branch.get_push_location."""
342
 
        push_loc = self.get_config().get_user_option('push_location')
343
 
        return push_loc
 
838
        push_loc = self.get_config_stack().get('push_location')
 
839
        if push_loc is not None:
 
840
            return push_loc
 
841
        cs = self.repository._git.get_config_stack()
 
842
        return self._get_related_push_branch(cs)
344
843
 
345
844
    def set_push_location(self, location):
346
845
        """See Branch.set_push_location."""
350
849
    def supports_tags(self):
351
850
        return True
352
851
 
 
852
    def store_uncommitted(self, creator):
 
853
        raise errors.StoringUncommittedNotSupported(self)
 
854
 
 
855
    def _iter_tag_refs(self):
 
856
        """Iterate over the tag refs.
 
857
 
 
858
        :param refs: Refs dictionary (name -> git sha1)
 
859
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
 
860
        """
 
861
        refs = self.repository.controldir.get_refs_container()
 
862
        for ref_name, unpeeled in viewitems(refs.as_dict()):
 
863
            try:
 
864
                tag_name = ref_to_tag_name(ref_name)
 
865
            except (ValueError, UnicodeDecodeError):
 
866
                continue
 
867
            peeled = refs.get_peeled(ref_name)
 
868
            if peeled is None:
 
869
                peeled = unpeeled
 
870
            if not isinstance(tag_name, text_type):
 
871
                raise TypeError(tag_name)
 
872
            yield (ref_name, tag_name, peeled, unpeeled)
 
873
 
 
874
    def create_memorytree(self):
 
875
        from .memorytree import GitMemoryTree
 
876
        return GitMemoryTree(self, self.repository._git.object_store,
 
877
                             self.head)
 
878
 
 
879
 
 
880
def _quick_lookup_revno(local_branch, remote_branch, revid):
 
881
    if not isinstance(revid, bytes):
 
882
        raise TypeError(revid)
 
883
    # Try in source branch first, it'll be faster
 
884
    with local_branch.lock_read():
 
885
        if not _calculate_revnos(local_branch):
 
886
            return None
 
887
        try:
 
888
            return local_branch.revision_id_to_revno(revid)
 
889
        except errors.NoSuchRevision:
 
890
            graph = local_branch.repository.get_graph()
 
891
            try:
 
892
                return graph.find_distance_to_null(
 
893
                    revid, [(revision.NULL_REVISION, 0)])
 
894
            except errors.GhostRevisionsHaveNoRevno:
 
895
                if not _calculate_revnos(remote_branch):
 
896
                    return None
 
897
                # FIXME: Check using graph.find_distance_to_null() ?
 
898
                with remote_branch.lock_read():
 
899
                    return remote_branch.revision_id_to_revno(revid)
 
900
 
353
901
 
354
902
class GitBranchPullResult(branch.PullResult):
355
903
 
365
913
                to_file.write('No revisions to pull.\n')
366
914
            elif self.new_git_head is not None:
367
915
                to_file.write('Now on revision %d (git sha: %s).\n' %
368
 
                        (self.new_revno, self.new_git_head))
 
916
                              (self.new_revno, self.new_git_head))
369
917
            else:
370
918
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
371
919
        self._show_tag_conficts(to_file)
372
920
 
373
921
    def _lookup_revno(self, revid):
374
 
        assert isinstance(revid, str), "was %r" % revid
375
 
        # Try in source branch first, it'll be faster
376
 
        try:
377
 
            return self.source_branch.revision_id_to_revno(revid)
378
 
        except errors.NoSuchRevision:
379
 
            # FIXME: Check using graph.find_distance_to_null() ?
380
 
            return self.target_branch.revision_id_to_revno(revid)
 
922
        return _quick_lookup_revno(self.target_branch, self.source_branch,
 
923
                                   revid)
381
924
 
382
925
    def _get_old_revno(self):
383
926
        if self._old_revno is not None:
403
946
class GitBranchPushResult(branch.BranchPushResult):
404
947
 
405
948
    def _lookup_revno(self, revid):
406
 
        assert isinstance(revid, str), "was %r" % revid
407
 
        # Try in source branch first, it'll be faster
408
 
        try:
409
 
            return self.source_branch.revision_id_to_revno(revid)
410
 
        except errors.NoSuchRevision:
411
 
            # FIXME: Check using graph.find_distance_to_null() ?
412
 
            return self.target_branch.revision_id_to_revno(revid)
 
949
        return _quick_lookup_revno(self.source_branch, self.target_branch,
 
950
                                   revid)
413
951
 
414
952
    @property
415
953
    def old_revno(self):
417
955
 
418
956
    @property
419
957
    def new_revno(self):
 
958
        new_original_revno = getattr(self, "new_original_revno", None)
 
959
        if new_original_revno:
 
960
            return new_original_revno
 
961
        if getattr(self, "new_original_revid", None) is not None:
 
962
            return self._lookup_revno(self.new_original_revid)
420
963
        return self._lookup_revno(self.new_revid)
421
964
 
422
965
 
425
968
 
426
969
    @staticmethod
427
970
    def _get_branch_formats_to_test():
428
 
        return []
 
971
        try:
 
972
            default_format = branch.format_registry.get_default()
 
973
        except AttributeError:
 
974
            default_format = branch.BranchFormat._default_format
 
975
        from .remote import RemoteGitBranchFormat
 
976
        return [
 
977
            (RemoteGitBranchFormat(), default_format),
 
978
            (LocalGitBranchFormat(), default_format)]
429
979
 
430
980
    @classmethod
431
981
    def _get_interrepo(self, source, target):
432
 
        return repository.InterRepository.get(source.repository,
433
 
            target.repository)
 
982
        return _mod_repository.InterRepository.get(
 
983
            source.repository, target.repository)
434
984
 
435
985
    @classmethod
436
986
    def is_compatible(cls, source, target):
437
 
        return (isinstance(source, GitBranch) and
438
 
                not isinstance(target, GitBranch) and
439
 
                (getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
440
 
 
441
 
    def _update_revisions(self, stop_revision=None, overwrite=False,
442
 
        graph=None, limit=None):
443
 
        """Like InterBranch.update_revisions(), but with additions.
444
 
 
445
 
        Compared to the `update_revisions()` below, this function takes a
446
 
        `limit` argument that limits how many git commits will be converted
447
 
        and returns the new git head.
448
 
        """
 
987
        if not isinstance(source, GitBranch):
 
988
            return False
 
989
        if isinstance(target, GitBranch):
 
990
            # InterLocalGitRemoteGitBranch or InterToGitBranch should be used
 
991
            return False
 
992
        if (getattr(cls._get_interrepo(source, target), "fetch_objects", None)
 
993
                is None):
 
994
            # fetch_objects is necessary for this to work
 
995
            return False
 
996
        return True
 
997
 
 
998
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None, lossy=False):
 
999
        self.fetch_objects(
 
1000
            stop_revision, fetch_tags=fetch_tags, limit=limit, lossy=lossy)
 
1001
        return _mod_repository.FetchResult()
 
1002
 
 
1003
    def fetch_objects(self, stop_revision, fetch_tags, limit=None, lossy=False, tag_selector=None):
449
1004
        interrepo = self._get_interrepo(self.source, self.target)
 
1005
        if fetch_tags is None:
 
1006
            c = self.source.get_config_stack()
 
1007
            fetch_tags = c.get('branch.fetch_tags')
 
1008
 
450
1009
        def determine_wants(heads):
451
 
            if self.source.ref is not None and not self.source.ref in heads:
452
 
                raise NoSuchRef(self.source.ref, heads.keys())
453
 
            if stop_revision is not None:
 
1010
            if stop_revision is None:
 
1011
                try:
 
1012
                    head = heads[self.source.ref]
 
1013
                except KeyError:
 
1014
                    self._last_revid = revision.NULL_REVISION
 
1015
                else:
 
1016
                    self._last_revid = self.source.lookup_foreign_revision_id(
 
1017
                        head)
 
1018
            else:
454
1019
                self._last_revid = stop_revision
455
 
                head, mapping = self.source.repository.lookup_bzr_revision_id(
456
 
                    stop_revision)
457
 
            else:
458
 
                if self.source.ref is not None:
459
 
                    head = heads[self.source.ref]
460
 
                else:
461
 
                    head = heads["HEAD"]
462
 
                self._last_revid = self.source.lookup_foreign_revision_id(head)
463
 
            if self.target.repository.has_revision(self._last_revid):
464
 
                return []
465
 
            return [head]
 
1020
            real = interrepo.get_determine_wants_revids(
 
1021
                [self._last_revid], include_tags=fetch_tags, tag_selector=tag_selector)
 
1022
            return real(heads)
466
1023
        pack_hint, head, refs = interrepo.fetch_objects(
467
 
            determine_wants, self.source.mapping, limit=limit)
 
1024
            determine_wants, self.source.mapping, limit=limit,
 
1025
            lossy=lossy)
468
1026
        if (pack_hint is not None and
469
 
            self.target.repository._format.pack_compresses):
 
1027
                self.target.repository._format.pack_compresses):
470
1028
            self.target.repository.pack(hint=pack_hint)
471
 
        if head is not None:
472
 
            self._last_revid = self.source.lookup_foreign_revision_id(head)
 
1029
        return head, refs
 
1030
 
 
1031
    def _update_revisions(self, stop_revision=None, overwrite=False, tag_selector=None):
 
1032
        head, refs = self.fetch_objects(stop_revision, fetch_tags=None, tag_selector=tag_selector)
473
1033
        if overwrite:
474
1034
            prev_last_revid = None
475
1035
        else:
476
1036
            prev_last_revid = self.target.last_revision()
477
 
        self.target.generate_revision_history(self._last_revid,
478
 
            prev_last_revid)
479
 
        return head
480
 
 
481
 
    def update_revisions(self, stop_revision=None, overwrite=False,
482
 
                         graph=None):
483
 
        """See InterBranch.update_revisions()."""
484
 
        self._update_revisions(stop_revision, overwrite, graph)
485
 
 
486
 
    def pull(self, overwrite=False, stop_revision=None,
487
 
             possible_transports=None, _hook_master=None, run_hooks=True,
488
 
             _override_hook_target=None, local=False, limit=None):
489
 
        """See Branch.pull.
490
 
 
491
 
        :param _hook_master: Private parameter - set the branch to
492
 
            be supplied as the master to pull hooks.
493
 
        :param run_hooks: Private parameter - if false, this branch
494
 
            is being called because it's the master of the primary branch,
495
 
            so it should not run its hooks.
496
 
        :param _override_hook_target: Private parameter - set the branch to be
497
 
            supplied as the target_branch to pull hooks.
498
 
        :param limit: Only import this many revisons.  `None`, the default,
499
 
            means import all revisions.
500
 
        """
501
 
        # This type of branch can't be bound.
502
 
        if local:
503
 
            raise errors.LocalRequiresBoundBranch()
 
1037
        self.target.generate_revision_history(
 
1038
            self._last_revid, last_rev=prev_last_revid,
 
1039
            other_branch=self.source)
 
1040
        return head, refs
 
1041
 
 
1042
    def update_references(self, revid=None):
 
1043
        if revid is None:
 
1044
            revid = self.target.last_revision()
 
1045
        tree = self.target.repository.revision_tree(revid)
 
1046
        try:
 
1047
            with tree.get_file('.gitmodules') as f:
 
1048
                for path, url, section in parse_submodules(
 
1049
                        GitConfigFile.from_file(f)):
 
1050
                    self.target.set_reference_info(
 
1051
                        tree.path2id(decode_git_path(path)), url.decode('utf-8'),
 
1052
                        decode_git_path(path))
 
1053
        except errors.NoSuchFile:
 
1054
            pass
 
1055
 
 
1056
    def _basic_pull(self, stop_revision, overwrite, run_hooks,
 
1057
                    _override_hook_target, _hook_master, tag_selector=None):
 
1058
        if overwrite is True:
 
1059
            overwrite = set(["history", "tags"])
 
1060
        elif not overwrite:
 
1061
            overwrite = set()
504
1062
        result = GitBranchPullResult()
505
1063
        result.source_branch = self.source
506
1064
        if _override_hook_target is None:
507
1065
            result.target_branch = self.target
508
1066
        else:
509
1067
            result.target_branch = _override_hook_target
510
 
        self.source.lock_read()
511
 
        try:
 
1068
        with self.target.lock_write(), self.source.lock_read():
512
1069
            # We assume that during 'pull' the target repository is closer than
513
1070
            # the source one.
514
 
            graph = self.target.repository.get_graph(self.source.repository)
515
1071
            (result.old_revno, result.old_revid) = \
516
1072
                self.target.last_revision_info()
517
 
            result.new_git_head = self._update_revisions(
518
 
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
519
 
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
520
 
                overwrite)
 
1073
            result.new_git_head, remote_refs = self._update_revisions(
 
1074
                stop_revision, overwrite=("history" in overwrite),
 
1075
                tag_selector=tag_selector)
 
1076
            tags_ret = self.source.tags.merge_to(
 
1077
                self.target.tags, ("tags" in overwrite), ignore_master=True)
 
1078
            if isinstance(tags_ret, tuple):
 
1079
                result.tag_updates, result.tag_conflicts = tags_ret
 
1080
            else:
 
1081
                result.tag_conflicts = tags_ret
521
1082
            (result.new_revno, result.new_revid) = \
522
1083
                self.target.last_revision_info()
 
1084
            self.update_references(revid=result.new_revid)
523
1085
            if _hook_master:
524
1086
                result.master_branch = _hook_master
525
1087
                result.local_branch = result.target_branch
529
1091
            if run_hooks:
530
1092
                for hook in branch.Branch.hooks['post_pull']:
531
1093
                    hook(result)
532
 
        finally:
533
 
            self.source.unlock()
534
 
        return result
535
 
 
536
 
    def _basic_push(self, overwrite=False, stop_revision=None):
 
1094
            return result
 
1095
 
 
1096
    def pull(self, overwrite=False, stop_revision=None,
 
1097
             possible_transports=None, _hook_master=None, run_hooks=True,
 
1098
             _override_hook_target=None, local=False, tag_selector=None):
 
1099
        """See Branch.pull.
 
1100
 
 
1101
        :param _hook_master: Private parameter - set the branch to
 
1102
            be supplied as the master to pull hooks.
 
1103
        :param run_hooks: Private parameter - if false, this branch
 
1104
            is being called because it's the master of the primary branch,
 
1105
            so it should not run its hooks.
 
1106
        :param _override_hook_target: Private parameter - set the branch to be
 
1107
            supplied as the target_branch to pull hooks.
 
1108
        """
 
1109
        # This type of branch can't be bound.
 
1110
        bound_location = self.target.get_bound_location()
 
1111
        if local and not bound_location:
 
1112
            raise errors.LocalRequiresBoundBranch()
 
1113
        source_is_master = False
 
1114
        with cleanup.ExitStack() as es:
 
1115
            es.enter_context(self.source.lock_read())
 
1116
            if bound_location:
 
1117
                # bound_location comes from a config file, some care has to be
 
1118
                # taken to relate it to source.user_url
 
1119
                normalized = urlutils.normalize_url(bound_location)
 
1120
                try:
 
1121
                    relpath = self.source.user_transport.relpath(normalized)
 
1122
                    source_is_master = (relpath == '')
 
1123
                except (errors.PathNotChild, urlutils.InvalidURL):
 
1124
                    source_is_master = False
 
1125
            if not local and bound_location and not source_is_master:
 
1126
                # not pulling from master, so we need to update master.
 
1127
                master_branch = self.target.get_master_branch(possible_transports)
 
1128
                es.enter_context(master_branch.lock_write())
 
1129
                # pull from source into master.
 
1130
                master_branch.pull(self.source, overwrite, stop_revision,
 
1131
                                   run_hooks=False)
 
1132
            else:
 
1133
                master_branch = None
 
1134
            return self._basic_pull(stop_revision, overwrite, run_hooks,
 
1135
                                    _override_hook_target,
 
1136
                                    _hook_master=master_branch,
 
1137
                                    tag_selector=tag_selector)
 
1138
 
 
1139
    def _basic_push(self, overwrite, stop_revision, tag_selector=None):
 
1140
        if overwrite is True:
 
1141
            overwrite = set(["history", "tags"])
 
1142
        elif not overwrite:
 
1143
            overwrite = set()
537
1144
        result = branch.BranchPushResult()
538
1145
        result.source_branch = self.source
539
1146
        result.target_branch = self.target
540
 
        graph = self.target.repository.get_graph(self.source.repository)
541
1147
        result.old_revno, result.old_revid = self.target.last_revision_info()
542
 
        result.new_git_head = self._update_revisions(
543
 
            stop_revision, overwrite=overwrite, graph=graph)
544
 
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
545
 
            overwrite)
 
1148
        result.new_git_head, remote_refs = self._update_revisions(
 
1149
            stop_revision, overwrite=("history" in overwrite),
 
1150
            tag_selector=tag_selector)
 
1151
        tags_ret = self.source.tags.merge_to(
 
1152
            self.target.tags, "tags" in overwrite, ignore_master=True,
 
1153
            selector=tag_selector)
 
1154
        (result.tag_updates, result.tag_conflicts) = tags_ret
546
1155
        result.new_revno, result.new_revid = self.target.last_revision_info()
 
1156
        self.update_references(revid=result.new_revid)
547
1157
        return result
548
1158
 
549
1159
 
550
1160
class InterGitBranch(branch.GenericInterBranch):
551
1161
    """InterBranch implementation that pulls between Git branches."""
552
1162
 
553
 
 
554
 
class InterGitLocalRemoteBranch(InterGitBranch):
 
1163
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None, lossy=False):
 
1164
        raise NotImplementedError(self.fetch)
 
1165
 
 
1166
 
 
1167
class InterLocalGitRemoteGitBranch(InterGitBranch):
555
1168
    """InterBranch that copies from a local to a remote git branch."""
556
1169
 
557
1170
    @staticmethod
558
1171
    def _get_branch_formats_to_test():
559
 
        return []
 
1172
        from .remote import RemoteGitBranchFormat
 
1173
        return [
 
1174
            (LocalGitBranchFormat(), RemoteGitBranchFormat())]
560
1175
 
561
1176
    @classmethod
562
1177
    def is_compatible(self, source, target):
563
 
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
1178
        from .remote import RemoteGitBranch
564
1179
        return (isinstance(source, LocalGitBranch) and
565
1180
                isinstance(target, RemoteGitBranch))
566
1181
 
567
 
    def _basic_push(self, overwrite=False, stop_revision=None):
568
 
        from dulwich.protocol import ZERO_SHA
 
1182
    def _basic_push(self, overwrite, stop_revision, tag_selector=None):
 
1183
        from .remote import parse_git_error
569
1184
        result = GitBranchPushResult()
570
1185
        result.source_branch = self.source
571
1186
        result.target_branch = self.target
572
1187
        if stop_revision is None:
573
1188
            stop_revision = self.source.last_revision()
574
 
        # FIXME: Check for diverged branches
 
1189
 
575
1190
        def get_changed_refs(old_refs):
576
 
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
577
 
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
 
1191
            old_ref = old_refs.get(self.target.ref, None)
 
1192
            if old_ref is None:
 
1193
                result.old_revid = revision.NULL_REVISION
 
1194
            else:
 
1195
                result.old_revid = self.target.lookup_foreign_revision_id(
 
1196
                    old_ref)
 
1197
            new_ref = self.source.repository.lookup_bzr_revision_id(
 
1198
                stop_revision)[0]
 
1199
            if not overwrite:
 
1200
                if remote_divergence(
 
1201
                        old_ref, new_ref,
 
1202
                        self.source.repository._git.object_store):
 
1203
                    raise errors.DivergedBranches(self.source, self.target)
 
1204
            refs = {self.target.ref: new_ref}
578
1205
            result.new_revid = stop_revision
579
 
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
 
1206
            for name, sha in viewitems(
 
1207
                    self.source.repository._git.refs.as_dict(b"refs/tags")):
 
1208
                if tag_selector and not tag_selector(name):
 
1209
                    continue
 
1210
                if sha not in self.source.repository._git:
 
1211
                    trace.mutter('Ignoring missing SHA: %s', sha)
 
1212
                    continue
580
1213
                refs[tag_name_to_ref(name)] = sha
581
1214
            return refs
582
 
        self.target.repository.send_pack(get_changed_refs,
583
 
            self.source.repository._git.object_store.generate_pack_contents)
 
1215
        dw_result = self.target.repository.send_pack(
 
1216
            get_changed_refs,
 
1217
            self.source.repository._git.generate_pack_data)
 
1218
        if dw_result is not None and not isinstance(dw_result, dict):
 
1219
            error = dw_result.ref_status.get(self.target.ref)
 
1220
            if error:
 
1221
                raise parse_git_error(self.target.user_url, error)
 
1222
            for ref, error in dw_result.ref_status.items():
 
1223
                if error:
 
1224
                    trace.warning('unable to open ref %s: %s', ref, error)
584
1225
        return result
585
1226
 
586
1227
 
587
 
class InterGitRemoteLocalBranch(InterGitBranch):
 
1228
class InterGitLocalGitBranch(InterGitBranch):
588
1229
    """InterBranch that copies from a remote to a local git branch."""
589
1230
 
590
1231
    @staticmethod
591
1232
    def _get_branch_formats_to_test():
592
 
        return []
 
1233
        from .remote import RemoteGitBranchFormat
 
1234
        return [
 
1235
            (RemoteGitBranchFormat(), LocalGitBranchFormat()),
 
1236
            (LocalGitBranchFormat(), LocalGitBranchFormat())]
593
1237
 
594
1238
    @classmethod
595
1239
    def is_compatible(self, source, target):
596
 
        from bzrlib.plugins.git.remote import RemoteGitBranch
597
 
        return (isinstance(source, RemoteGitBranch) and
 
1240
        return (isinstance(source, GitBranch) and
598
1241
                isinstance(target, LocalGitBranch))
599
1242
 
600
 
    def _basic_push(self, overwrite=False, stop_revision=None):
601
 
        result = branch.BranchPushResult()
 
1243
    def fetch(self, stop_revision=None, fetch_tags=None, limit=None, lossy=False):
 
1244
        interrepo = _mod_repository.InterRepository.get(
 
1245
            self.source.repository, self.target.repository)
 
1246
        if stop_revision is None:
 
1247
            stop_revision = self.source.last_revision()
 
1248
        if fetch_tags is None:
 
1249
            c = self.source.get_config_stack()
 
1250
            fetch_tags = c.get('branch.fetch_tags')
 
1251
        determine_wants = interrepo.get_determine_wants_revids(
 
1252
            [stop_revision], include_tags=fetch_tags)
 
1253
        interrepo.fetch_objects(determine_wants, limit=limit, lossy=lossy)
 
1254
        return _mod_repository.FetchResult()
 
1255
 
 
1256
    def _basic_push(self, overwrite=False, stop_revision=None, tag_selector=None):
 
1257
        if overwrite is True:
 
1258
            overwrite = set(["history", "tags"])
 
1259
        elif not overwrite:
 
1260
            overwrite = set()
 
1261
        result = GitBranchPushResult()
602
1262
        result.source_branch = self.source
603
1263
        result.target_branch = self.target
604
1264
        result.old_revid = self.target.last_revision()
605
1265
        refs, stop_revision = self.update_refs(stop_revision)
606
 
        self.target.generate_revision_history(stop_revision, result.old_revid)
607
 
        self.update_tags(refs)
 
1266
        self.target.generate_revision_history(
 
1267
            stop_revision,
 
1268
            (result.old_revid if ("history" not in overwrite) else None),
 
1269
            other_branch=self.source)
 
1270
        tags_ret = self.source.tags.merge_to(
 
1271
            self.target.tags,
 
1272
            overwrite=("tags" in overwrite),
 
1273
            selector=tag_selector)
 
1274
        if isinstance(tags_ret, tuple):
 
1275
            (result.tag_updates, result.tag_conflicts) = tags_ret
 
1276
        else:
 
1277
            result.tag_conflicts = tags_ret
608
1278
        result.new_revid = self.target.last_revision()
609
1279
        return result
610
1280
 
611
 
    def update_tags(self, refs):
612
 
        for name, v in extract_tags(refs).iteritems():
613
 
            revid = self.target.lookup_foreign_revision_id(v)
614
 
            self.target.tags.set_tag(name, revid)
615
 
 
616
1281
    def update_refs(self, stop_revision=None):
617
 
        interrepo = repository.InterRepository.get(self.source.repository,
618
 
            self.target.repository)
 
1282
        interrepo = _mod_repository.InterRepository.get(
 
1283
            self.source.repository, self.target.repository)
 
1284
        c = self.source.get_config_stack()
 
1285
        fetch_tags = c.get('branch.fetch_tags')
 
1286
 
619
1287
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
621
 
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
 
1288
            result = interrepo.fetch(branches=[self.source.ref], include_tags=fetch_tags)
 
1289
            try:
 
1290
                head = result.refs[self.source.ref]
 
1291
            except KeyError:
 
1292
                stop_revision = revision.NULL_REVISION
 
1293
            else:
 
1294
                stop_revision = self.target.lookup_foreign_revision_id(head)
622
1295
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
624
 
        return refs, stop_revision
 
1296
            result = interrepo.fetch(
 
1297
                revision_id=stop_revision, include_tags=fetch_tags)
 
1298
        return result.refs, stop_revision
625
1299
 
626
1300
    def pull(self, stop_revision=None, overwrite=False,
627
 
        possible_transports=None, run_hooks=True,local=False):
 
1301
             possible_transports=None, run_hooks=True, local=False,
 
1302
             tag_selector=None):
628
1303
        # This type of branch can't be bound.
629
1304
        if local:
630
1305
            raise errors.LocalRequiresBoundBranch()
 
1306
        if overwrite is True:
 
1307
            overwrite = set(["history", "tags"])
 
1308
        elif not overwrite:
 
1309
            overwrite = set()
 
1310
 
631
1311
        result = GitPullResult()
632
1312
        result.source_branch = self.source
633
1313
        result.target_branch = self.target
634
 
        result.old_revid = self.target.last_revision()
635
 
        refs, stop_revision = self.update_refs(stop_revision)
636
 
        self.target.generate_revision_history(stop_revision, result.old_revid)
637
 
        self.update_tags(refs)
638
 
        result.new_revid = self.target.last_revision()
 
1314
        with self.target.lock_write(), self.source.lock_read():
 
1315
            result.old_revid = self.target.last_revision()
 
1316
            refs, stop_revision = self.update_refs(stop_revision)
 
1317
            self.target.generate_revision_history(
 
1318
                stop_revision,
 
1319
                (result.old_revid if ("history" not in overwrite) else None),
 
1320
                other_branch=self.source)
 
1321
            tags_ret = self.source.tags.merge_to(
 
1322
                self.target.tags, overwrite=("tags" in overwrite),
 
1323
                selector=tag_selector)
 
1324
            if isinstance(tags_ret, tuple):
 
1325
                (result.tag_updates, result.tag_conflicts) = tags_ret
 
1326
            else:
 
1327
                result.tag_conflicts = tags_ret
 
1328
            result.new_revid = self.target.last_revision()
 
1329
            result.local_branch = None
 
1330
            result.master_branch = result.target_branch
 
1331
            if run_hooks:
 
1332
                for hook in branch.Branch.hooks['post_pull']:
 
1333
                    hook(result)
639
1334
        return result
640
1335
 
641
1336
 
642
1337
class InterToGitBranch(branch.GenericInterBranch):
643
 
    """InterBranch implementation that pulls from Git into bzr."""
 
1338
    """InterBranch implementation that pulls into a Git branch."""
644
1339
 
645
1340
    def __init__(self, source, target):
646
1341
        super(InterToGitBranch, self).__init__(source, target)
647
 
        self.interrepo = repository.InterRepository.get(source.repository,
648
 
                                           target.repository)
 
1342
        self.interrepo = _mod_repository.InterRepository.get(source.repository,
 
1343
                                                             target.repository)
649
1344
 
650
1345
    @staticmethod
651
1346
    def _get_branch_formats_to_test():
652
 
        return []
 
1347
        try:
 
1348
            default_format = branch.format_registry.get_default()
 
1349
        except AttributeError:
 
1350
            default_format = branch.BranchFormat._default_format
 
1351
        from .remote import RemoteGitBranchFormat
 
1352
        return [
 
1353
            (default_format, LocalGitBranchFormat()),
 
1354
            (default_format, RemoteGitBranchFormat())]
653
1355
 
654
1356
    @classmethod
655
1357
    def is_compatible(self, source, target):
656
1358
        return (not isinstance(source, GitBranch) and
657
1359
                isinstance(target, GitBranch))
658
1360
 
659
 
    def update_revisions(self, *args, **kwargs):
660
 
        raise NoPushSupport()
661
 
 
662
 
    def _get_new_refs(self, stop_revision=None):
 
1361
    def _get_new_refs(self, stop_revision=None, fetch_tags=None,
 
1362
                      stop_revno=None):
 
1363
        if not self.source.is_locked():
 
1364
            raise errors.ObjectNotLocked(self.source)
663
1365
        if stop_revision is None:
664
 
            stop_revision = self.source.last_revision()
665
 
        assert type(stop_revision) is str
666
 
        main_ref = self.target.ref or "refs/heads/master"
667
 
        refs = { main_ref: (None, stop_revision) }
668
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
1366
            (stop_revno, stop_revision) = self.source.last_revision_info()
 
1367
        elif stop_revno is None:
 
1368
            try:
 
1369
                stop_revno = self.source.revision_id_to_revno(stop_revision)
 
1370
            except errors.NoSuchRevision:
 
1371
                stop_revno = None
 
1372
        if not isinstance(stop_revision, bytes):
 
1373
            raise TypeError(stop_revision)
 
1374
        main_ref = self.target.ref
 
1375
        refs = {main_ref: (None, stop_revision)}
 
1376
        if fetch_tags is None:
 
1377
            c = self.source.get_config_stack()
 
1378
            fetch_tags = c.get('branch.fetch_tags')
 
1379
        for name, revid in viewitems(self.source.tags.get_tag_dict()):
669
1380
            if self.source.repository.has_revision(revid):
670
 
                refs[tag_name_to_ref(name)] = (None, revid)
671
 
        return refs, main_ref
 
1381
                ref = tag_name_to_ref(name)
 
1382
                if not check_ref_format(ref):
 
1383
                    warning("skipping tag with invalid characters %s (%s)",
 
1384
                            name, ref)
 
1385
                    continue
 
1386
                if fetch_tags:
 
1387
                    # FIXME: Skip tags that are not in the ancestry
 
1388
                    refs[ref] = (None, revid)
 
1389
        return refs, main_ref, (stop_revno, stop_revision)
 
1390
 
 
1391
    def _update_refs(self, result, old_refs, new_refs, overwrite, tag_selector):
 
1392
        mutter("updating refs. old refs: %r, new refs: %r",
 
1393
               old_refs, new_refs)
 
1394
        result.tag_updates = {}
 
1395
        result.tag_conflicts = []
 
1396
        ret = {}
 
1397
 
 
1398
        def ref_equals(refs, ref, git_sha, revid):
 
1399
            try:
 
1400
                value = refs[ref]
 
1401
            except KeyError:
 
1402
                return False
 
1403
            if (value[0] is not None and
 
1404
                git_sha is not None and
 
1405
                    value[0] == git_sha):
 
1406
                return True
 
1407
            if (value[1] is not None and
 
1408
                revid is not None and
 
1409
                    value[1] == revid):
 
1410
                return True
 
1411
            # FIXME: If one side only has the git sha available and the other
 
1412
            # only has the bzr revid, then this will cause us to show a tag as
 
1413
            # updated that hasn't actually been updated.
 
1414
            return False
 
1415
        # FIXME: Check for diverged branches
 
1416
        for ref, (git_sha, revid) in viewitems(new_refs):
 
1417
            if ref_equals(ret, ref, git_sha, revid):
 
1418
                # Already up to date
 
1419
                if git_sha is None:
 
1420
                    git_sha = old_refs[ref][0]
 
1421
                if revid is None:
 
1422
                    revid = old_refs[ref][1]
 
1423
                ret[ref] = new_refs[ref] = (git_sha, revid)
 
1424
            elif ref not in ret or overwrite:
 
1425
                try:
 
1426
                    tag_name = ref_to_tag_name(ref)
 
1427
                except ValueError:
 
1428
                    pass
 
1429
                else:
 
1430
                    if tag_selector and not tag_selector(tag_name):
 
1431
                        continue
 
1432
                    result.tag_updates[tag_name] = revid
 
1433
                ret[ref] = (git_sha, revid)
 
1434
            else:
 
1435
                # FIXME: Check diverged
 
1436
                diverged = False
 
1437
                if diverged:
 
1438
                    try:
 
1439
                        name = ref_to_tag_name(ref)
 
1440
                    except ValueError:
 
1441
                        pass
 
1442
                    else:
 
1443
                        result.tag_conflicts.append(
 
1444
                            (name, revid, ret[name][1]))
 
1445
                else:
 
1446
                    ret[ref] = (git_sha, revid)
 
1447
        return ret
 
1448
 
 
1449
    def fetch(self, stop_revision=None, fetch_tags=None, lossy=False,
 
1450
              limit=None):
 
1451
        if stop_revision is None:
 
1452
            stop_revision = self.source.last_revision()
 
1453
        ret = []
 
1454
        if fetch_tags:
 
1455
            for k, v in viewitems(self.source.tags.get_tag_dict()):
 
1456
                ret.append((None, v))
 
1457
        ret.append((None, stop_revision))
 
1458
        try:
 
1459
            revidmap = self.interrepo.fetch_objects(ret, lossy=lossy, limit=limit)
 
1460
        except NoPushSupport:
 
1461
            raise errors.NoRoundtrippingSupport(self.source, self.target)
 
1462
        return _mod_repository.FetchResult(revidmap={
 
1463
            old_revid: new_revid
 
1464
            for (old_revid, (new_sha, new_revid)) in revidmap.items()})
672
1465
 
673
1466
    def pull(self, overwrite=False, stop_revision=None, local=False,
674
 
             possible_transports=None):
675
 
        from dulwich.protocol import ZERO_SHA
 
1467
             possible_transports=None, run_hooks=True, _stop_revno=None,
 
1468
             tag_selector=None):
676
1469
        result = GitBranchPullResult()
677
1470
        result.source_branch = self.source
678
1471
        result.target_branch = self.target
679
 
        new_refs, main_ref = self._get_new_refs(stop_revision)
680
 
        def update_refs(old_refs):
681
 
            refs = dict(old_refs)
682
 
            # FIXME: Check for diverged branches
683
 
            refs.update(new_refs)
684
 
            return refs
685
 
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
686
 
        result.old_revid = self.target.lookup_foreign_revision_id(
687
 
            old_refs.get(main_ref, ZERO_SHA))
688
 
        result.new_revid = new_refs[main_ref]
689
 
        return result
690
 
 
691
 
    def push(self, overwrite=False, stop_revision=None,
692
 
             _override_hook_source_branch=None):
693
 
        from dulwich.protocol import ZERO_SHA
694
 
        result = GitBranchPushResult()
695
 
        result.source_branch = self.source
696
 
        result.target_branch = self.target
697
 
        new_refs, main_ref = self._get_new_refs(stop_revision)
698
 
        def update_refs(old_refs):
699
 
            refs = dict(old_refs)
700
 
            # FIXME: Check for diverged branches
701
 
            refs.update(new_refs)
702
 
            return refs
703
 
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
704
 
        (result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
705
 
        if result.old_revid is None:
706
 
            result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
707
 
        result.new_revid = new_refs[main_ref]
708
 
        return result
709
 
 
710
 
    def lossy_push(self, stop_revision=None):
711
 
        result = GitBranchPushResult()
712
 
        result.source_branch = self.source
713
 
        result.target_branch = self.target
714
 
        new_refs, main_ref = self._get_new_refs(stop_revision)
715
 
        def update_refs(old_refs):
716
 
            refs = dict(old_refs)
717
 
            # FIXME: Check for diverged branches
718
 
            refs.update(new_refs)
719
 
            return refs
720
 
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
721
 
            update_refs)
722
 
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
723
 
        result.new_revid = new_refs[main_ref][1]
724
 
        return result
725
 
 
726
 
 
727
 
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
 
1472
        with self.source.lock_read(), self.target.lock_write():
 
1473
            new_refs, main_ref, stop_revinfo = self._get_new_refs(
 
1474
                stop_revision, stop_revno=_stop_revno)
 
1475
 
 
1476
            def update_refs(old_refs):
 
1477
                return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
 
1478
            try:
 
1479
                result.revidmap, old_refs, new_refs = (
 
1480
                    self.interrepo.fetch_refs(update_refs, lossy=False))
 
1481
            except NoPushSupport:
 
1482
                raise errors.NoRoundtrippingSupport(self.source, self.target)
 
1483
            (old_sha1, result.old_revid) = old_refs.get(
 
1484
                main_ref, (ZERO_SHA, NULL_REVISION))
 
1485
            if result.old_revid is None:
 
1486
                result.old_revid = self.target.lookup_foreign_revision_id(
 
1487
                    old_sha1)
 
1488
            result.new_revid = new_refs[main_ref][1]
 
1489
            result.local_branch = None
 
1490
            result.master_branch = self.target
 
1491
            if run_hooks:
 
1492
                for hook in branch.Branch.hooks['post_pull']:
 
1493
                    hook(result)
 
1494
        return result
 
1495
 
 
1496
    def push(self, overwrite=False, stop_revision=None, lossy=False,
 
1497
             _override_hook_source_branch=None, _stop_revno=None,
 
1498
             tag_selector=None):
 
1499
        result = GitBranchPushResult()
 
1500
        result.source_branch = self.source
 
1501
        result.target_branch = self.target
 
1502
        result.local_branch = None
 
1503
        result.master_branch = result.target_branch
 
1504
        with self.source.lock_read(), self.target.lock_write():
 
1505
            new_refs, main_ref, stop_revinfo = self._get_new_refs(
 
1506
                stop_revision, stop_revno=_stop_revno)
 
1507
 
 
1508
            def update_refs(old_refs):
 
1509
                return self._update_refs(result, old_refs, new_refs, overwrite, tag_selector)
 
1510
            try:
 
1511
                result.revidmap, old_refs, new_refs = (
 
1512
                    self.interrepo.fetch_refs(
 
1513
                        update_refs, lossy=lossy, overwrite=overwrite))
 
1514
            except NoPushSupport:
 
1515
                raise errors.NoRoundtrippingSupport(self.source, self.target)
 
1516
            (old_sha1, result.old_revid) = old_refs.get(
 
1517
                main_ref, (ZERO_SHA, NULL_REVISION))
 
1518
            if lossy or result.old_revid is None:
 
1519
                result.old_revid = self.target.lookup_foreign_revision_id(
 
1520
                    old_sha1)
 
1521
            result.new_revid = new_refs[main_ref][1]
 
1522
            (result.new_original_revno,
 
1523
                result.new_original_revid) = stop_revinfo
 
1524
            for hook in branch.Branch.hooks['post_push']:
 
1525
                hook(result)
 
1526
        return result
 
1527
 
 
1528
 
 
1529
branch.InterBranch.register_optimiser(InterGitLocalGitBranch)
728
1530
branch.InterBranch.register_optimiser(InterFromGitBranch)
729
1531
branch.InterBranch.register_optimiser(InterToGitBranch)
730
 
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)
 
1532
branch.InterBranch.register_optimiser(InterLocalGitRemoteGitBranch)