/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to branch.py

Rely less on command-line git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
24
24
 
25
25
from bzrlib import (
26
26
    branch,
27
 
    bzrdir,
28
27
    config,
29
28
    errors,
30
29
    foreign,
41
40
    mutter,
42
41
    )
43
42
 
44
 
from bzrlib.plugins.git import (
45
 
    get_rich_root_format,
46
 
    )
47
43
from bzrlib.plugins.git.config import (
48
44
    GitBranchConfig,
49
45
    )
50
46
from bzrlib.plugins.git.errors import (
51
 
    NoPushSupport,
52
47
    NoSuchRef,
53
48
    )
54
49
 
61
56
            super(ForeignBranch, self).__init__()
62
57
 
63
58
 
64
 
def extract_tags(refs, mapping):
65
 
    ret = {}
66
 
    for k,v in refs.iteritems():
67
 
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
68
 
            v = refs.get(k+"^{}", v)
69
 
            ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
70
 
    return ret
71
 
 
72
 
 
73
59
class GitPullResult(branch.PullResult):
74
60
 
75
61
    def _lookup_revno(self, revid):
95
81
 
96
82
    def get_tag_dict(self):
97
83
        ret = {}
98
 
        for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
 
84
        for k,v in self.repository._git.tags.iteritems():
99
85
            obj = self.repository._git.get_object(v)
100
86
            while isinstance(obj, Tag):
101
87
                v = obj.object[1]
108
94
        return ret
109
95
 
110
96
    def set_tag(self, name, revid):
111
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
112
 
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
97
        self.repository._git.tags[name] = revid
113
98
 
114
99
 
115
100
class GitBranchFormat(branch.BranchFormat):
131
116
class GitBranch(ForeignBranch):
132
117
    """An adapter to git repositories for bzr Branch objects."""
133
118
 
134
 
    def __init__(self, bzrdir, repository, name, lockfiles):
 
119
    def __init__(self, bzrdir, repository, name, head, lockfiles):
135
120
        self.repository = repository
136
121
        self._format = GitBranchFormat()
137
122
        self.control_files = lockfiles
138
123
        self.bzrdir = bzrdir
139
124
        super(GitBranch, self).__init__(repository.get_mapping())
140
125
        self.name = name
141
 
        self._head = None
 
126
        self.head = head
142
127
        self.base = bzrdir.transport.base
143
128
 
144
129
    def _get_nick(self, local=False, possible_master_transports=None):
156
141
    def __repr__(self):
157
142
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
158
143
 
 
144
    def dpull(self, source, stop_revision=None):
 
145
        if stop_revision is None:
 
146
            stop_revision = source.last_revision()
 
147
        # FIXME: Check for diverged branches
 
148
        refs = { "refs/heads/master": stop_revision }
 
149
        for name, revid in source.tags.get_tag_dict().iteritems():
 
150
            if source.repository.has_revision(revid):
 
151
                refs["refs/tags/%s" % name] = revid
 
152
        revidmap, new_refs = self.repository.dfetch_refs(source.repository, 
 
153
                refs)
 
154
        if revidmap != {}:
 
155
            self.generate_revision_history(revidmap[stop_revision])
 
156
        return revidmap
 
157
 
159
158
    def generate_revision_history(self, revid, old_revid=None):
160
159
        # FIXME: Check that old_revid is in the ancestry of revid
161
160
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
162
161
        self._set_head(newhead)
163
162
 
 
163
    def _set_head(self, head):
 
164
        self.head = head
 
165
        self.repository._git.set_ref(self.name, self.head)
 
166
 
164
167
    def lock_write(self):
165
168
        self.control_files.lock_write()
166
169
 
189
192
    def get_physical_lock_status(self):
190
193
        return False
191
194
 
 
195
 
 
196
class LocalGitBranch(GitBranch):
 
197
    """A local Git branch."""
 
198
 
192
199
    @needs_read_lock
193
200
    def last_revision(self):
194
201
        # perhaps should escape this ?
196
203
            return revision.NULL_REVISION
197
204
        return self.mapping.revision_id_foreign_to_bzr(self.head)
198
205
 
199
 
    def _basic_push(self, target, overwrite=False, stop_revision=None):
200
 
        return branch.InterBranch.get(self, target)._basic_push(
201
 
            overwrite, stop_revision)
202
 
 
203
 
 
204
 
class LocalGitBranch(GitBranch):
205
 
    """A local Git branch."""
206
 
 
207
206
    def _get_checkout_format(self):
208
207
        """Return the most suitable metadir for a checkout of this branch.
209
208
        Weaves are used if this branch's repository uses weaves.
237
236
        :param hardlink: Whether to hardlink
238
237
        :return: WorkingTree object of checkout.
239
238
        """
240
 
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
 
239
        checkout_branch = BzrDir.create_branch_convenience(
241
240
            to_location, force_new_tree=False, format=get_rich_root_format())
242
241
        checkout = checkout_branch.bzrdir
243
242
        checkout_branch.bind(self)
254
253
        ret.reverse()
255
254
        return ret
256
255
 
257
 
    def _get_head(self):
258
 
        try:
259
 
            return self.repository._git.ref(self.name)
260
 
        except KeyError:
261
 
            return None
262
 
 
263
 
    def set_last_revision_info(self, revno, revid):
264
 
        self.set_last_revision(revid)
265
 
 
266
 
    def set_last_revision(self, revid):
267
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
268
 
                revid)
269
 
        self.head = newhead
270
 
 
271
 
    def _set_head(self, value):
272
 
        self._head = value
273
 
        self.repository._git.refs[self.name] = self._head
274
 
        self._clear_cached_state()
275
 
 
276
 
    head = property(_get_head, _set_head)
277
 
 
278
256
    def get_config(self):
279
257
        return GitBranchConfig(self)
280
258
 
304
282
        self._show_tag_conficts(to_file)
305
283
 
306
284
 
307
 
class GitBranchPushResult(branch.BranchPushResult):
308
 
 
309
 
    def _lookup_revno(self, revid):
310
 
        assert isinstance(revid, str), "was %r" % revid
311
 
        # Try in source branch first, it'll be faster
312
 
        try:
313
 
            return self.source_branch.revision_id_to_revno(revid)
314
 
        except errors.NoSuchRevision:
315
 
            # FIXME: Check using graph.find_distance_to_null() ?
316
 
            return self.target_branch.revision_id_to_revno(revid)
317
 
 
318
 
    @property
319
 
    def old_revno(self):
320
 
        return self._lookup_revno(self.old_revid)
321
 
 
322
 
    @property
323
 
    def new_revno(self):
324
 
        return self._lookup_revno(self.new_revid)
325
 
 
326
 
 
327
 
class InterFromGitBranch(branch.GenericInterBranch):
 
285
class InterGitGenericBranch(branch.InterBranch):
328
286
    """InterBranch implementation that pulls from Git into bzr."""
329
287
 
330
288
    @classmethod
408
366
            self.source.unlock()
409
367
        return result
410
368
 
411
 
    def _basic_push(self, overwrite=False, stop_revision=None):
412
 
        result = branch.BranchPushResult()
413
 
        result.source_branch = self.source
414
 
        result.target_branch = self.target
415
 
        graph = self.target.repository.get_graph(self.source.repository)
416
 
        result.old_revno, result.old_revid = self.target.last_revision_info()
417
 
        self.update_revisions(stop_revision, overwrite=overwrite, 
418
 
            graph=graph)
419
 
        result.new_git_head = self._head
420
 
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
421
 
            overwrite)
422
 
        result.new_revno, result.new_revid = self.target.last_revision_info()
423
 
        return result
424
 
 
425
 
 
426
 
class InterGitBranch(branch.GenericInterBranch):
 
369
 
 
370
 
 
371
 
 
372
branch.InterBranch.register_optimiser(InterGitGenericBranch)
 
373
 
 
374
 
 
375
class InterGitRemoteLocalBranch(branch.InterBranch):
427
376
    """InterBranch implementation that pulls between Git branches."""
428
377
 
429
 
 
430
 
class InterGitLocalRemoteBranch(InterGitBranch):
431
 
    """InterBranch that copies from a local to a remote git branch."""
432
 
 
433
 
    @classmethod
434
 
    def is_compatible(self, source, target):
435
 
        from bzrlib.plugins.git.remote import RemoteGitBranch
436
 
        return (isinstance(source, LocalGitBranch) and 
437
 
                isinstance(target, RemoteGitBranch))
438
 
 
439
 
    def _basic_push(self, overwrite=False, stop_revision=None):
440
 
        result = GitBranchPushResult()
441
 
        result.source_branch = self.source
442
 
        result.target_branch = self.target
443
 
        if stop_revision is None:
444
 
            stop_revision = self.source.last_revision()
445
 
        # FIXME: Check for diverged branches
446
 
        def get_changed_refs(old_refs):
447
 
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))
448
 
            refs = { "refs/heads/master": self.source.repository.lookup_git_revid(stop_revision)[0] }
449
 
            result.new_revid = stop_revision
450
 
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
451
 
                refs["refs/tags/%s" % name] = sha
452
 
            return refs
453
 
        self.target.repository.send_pack(get_changed_refs, 
454
 
                self.source.repository._git.object_store.generate_pack_contents)
455
 
        return result
456
 
 
457
 
 
458
 
class InterGitRemoteLocalBranch(InterGitBranch):
459
 
    """InterBranch that copies from a remote to a local git branch."""
460
 
 
461
378
    @classmethod
462
379
    def is_compatible(self, source, target):
463
380
        from bzrlib.plugins.git.remote import RemoteGitBranch
464
381
        return (isinstance(source, RemoteGitBranch) and 
465
382
                isinstance(target, LocalGitBranch))
466
383
 
467
 
    def _basic_push(self, overwrite=False, stop_revision=None):
468
 
        result = branch.BranchPushResult()
469
 
        result.source_branch = self.source
470
 
        result.target_branch = self.target
471
 
        result.old_revid = self.target.last_revision()
472
 
        refs, stop_revision = self.update_refs(stop_revision)
473
 
        self.target.generate_revision_history(stop_revision, result.old_revid)
474
 
        self.update_tags(refs)
475
 
        result.new_revid = self.target.last_revision()
476
 
        return result
477
 
 
478
 
    def update_tags(self, refs):
479
 
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
480
 
            self.target.tags.set_tag(name, revid)
481
 
 
482
 
    def update_refs(self, stop_revision=None):
483
 
        interrepo = repository.InterRepository.get(self.source.repository, 
484
 
            self.target.repository)
485
 
        if stop_revision is None:
486
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
487
 
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
488
 
        else:
489
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
490
 
        return refs, stop_revision
491
 
 
492
384
    def pull(self, stop_revision=None, overwrite=False, 
493
385
        possible_transports=None, local=False):
494
386
        # This type of branch can't be bound.
497
389
        result = GitPullResult()
498
390
        result.source_branch = self.source
499
391
        result.target_branch = self.target
 
392
        interrepo = repository.InterRepository.get(self.source.repository, 
 
393
            self.target.repository)
500
394
        result.old_revid = self.target.last_revision()
501
 
        refs, stop_revision = self.update_refs(stop_revision)
 
395
        if stop_revision is None:
 
396
            stop_revision = self.source.last_revision()
 
397
        interrepo.fetch(revision_id=stop_revision)
502
398
        self.target.generate_revision_history(stop_revision, result.old_revid)
503
 
        self.update_tags(refs)
504
399
        result.new_revid = self.target.last_revision()
505
400
        return result
506
401
 
507
 
    
508
 
class InterToGitBranch(branch.InterBranch):
509
 
    """InterBranch implementation that pulls from Git into bzr."""
510
 
 
511
 
    @classmethod
512
 
    def is_compatible(self, source, target):
513
 
        return (not isinstance(source, GitBranch) and 
514
 
                isinstance(target, GitBranch))
515
 
 
516
 
    def update_revisions(self, *args, **kwargs):
517
 
        raise NoPushSupport()
518
 
 
519
 
    def push(self, overwrite=True, stop_revision=None, 
520
 
             _override_hook_source_branch=None):
521
 
        raise NoPushSupport()
522
 
 
523
 
    def lossy_push(self, stop_revision=None):
524
 
        result = GitBranchPushResult()
525
 
        result.source_branch = self.source
526
 
        result.target_branch = self.target
527
 
        result.old_revid = self.target.last_revision()
528
 
        if stop_revision is None:
529
 
            stop_revision = self.source.last_revision()
530
 
        # FIXME: Check for diverged branches
531
 
        refs = { "refs/heads/master": stop_revision }
532
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
533
 
            if self.source.repository.has_revision(revid):
534
 
                refs["refs/tags/%s" % name] = revid
535
 
        revidmap, new_refs = self.target.repository.dfetch_refs(
536
 
            self.source.repository, refs)
537
 
        if revidmap != {}:
538
 
            self.target.generate_revision_history(revidmap[stop_revision])
539
 
            result.new_revid = revidmap[stop_revision]
540
 
        else:
541
 
            result.new_revid = result.old_revid
542
 
        result.revidmap = revidmap
543
 
        return result
544
 
 
545
402
 
546
403
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
547
 
branch.InterBranch.register_optimiser(InterFromGitBranch)
548
 
branch.InterBranch.register_optimiser(InterToGitBranch)
549
 
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)