1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from copy import deepcopy
19
from cStringIO import StringIO
24
from unittest import TestSuite
25
from warnings import warn
28
import bzrlib.bzrdir as bzrdir
29
from bzrlib.config import TreeConfig
30
from bzrlib.decorators import needs_read_lock, needs_write_lock
31
from bzrlib.delta import compare_trees
32
import bzrlib.errors as errors
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
34
NoSuchRevision, HistoryMissing, NotBranchError,
35
DivergedBranches, LockError,
36
UninitializableFormat,
38
UnlistableBranch, NoSuchFile, NotVersionedError,
40
import bzrlib.inventory as inventory
41
from bzrlib.inventory import Inventory
42
from bzrlib.lockable_files import LockableFiles, TransportLock
43
from bzrlib.lockdir import LockDir
44
from bzrlib.osutils import (isdir, quotefn,
45
rename, splitpath, sha_file,
46
file_kind, abspath, normpath, pathjoin,
49
from bzrlib.textui import show_status
50
from bzrlib.trace import mutter, note
51
from bzrlib.tree import EmptyTree, RevisionTree
52
from bzrlib.repository import Repository
53
from bzrlib.revision import (
54
get_intervening_revisions,
59
from bzrlib.store import copy_all
60
from bzrlib.symbol_versioning import *
61
import bzrlib.transactions as transactions
62
from bzrlib.transport import Transport, get_transport
63
from bzrlib.tree import EmptyTree, RevisionTree
68
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
69
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
70
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
73
# TODO: Maybe include checks for common corruption of newlines, etc?
75
# TODO: Some operations like log might retrieve the same revisions
76
# repeatedly to calculate deltas. We could perhaps have a weakref
77
# cache in memory to make this faster. In general anything can be
78
# cached in memory between lock and unlock operations. .. nb thats
79
# what the transaction identity map provides
82
######################################################################
86
"""Branch holding a history of revisions.
89
Base directory/url of the branch.
91
# this is really an instance variable - FIXME move it there
95
def __init__(self, *ignored, **ignored_too):
96
raise NotImplementedError('The Branch class is abstract')
99
@deprecated_method(zero_eight)
100
def open_downlevel(base):
101
"""Open a branch which may be of an old format."""
102
return Branch.open(base, _unsupported=True)
105
def open(base, _unsupported=False):
106
"""Open the repository rooted at base.
108
For instance, if the repository is at URL/.bzr/repository,
109
Repository.open(URL) -> a Repository instance.
111
control = bzrdir.BzrDir.open(base, _unsupported)
112
return control.open_branch(_unsupported)
115
def open_containing(url):
116
"""Open an existing branch which contains url.
118
This probes for a branch at url, and searches upwards from there.
120
Basically we keep looking up until we find the control directory or
121
run into the root. If there isn't one, raises NotBranchError.
122
If there is one and it is either an unrecognised format or an unsupported
123
format, UnknownFormatError or UnsupportedFormatError are raised.
124
If there is one, it is returned, along with the unused portion of url.
126
control, relpath = bzrdir.BzrDir.open_containing(url)
127
return control.open_branch(), relpath
130
@deprecated_function(zero_eight)
131
def initialize(base):
132
"""Create a new working tree and branch, rooted at 'base' (url)
134
NOTE: This will soon be deprecated in favour of creation
137
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
139
def setup_caching(self, cache_root):
140
"""Subclasses that care about caching should override this, and set
141
up cached stores located under cache_root.
143
# seems to be unused, 2006-01-13 mbp
144
warn('%s is deprecated' % self.setup_caching)
145
self.cache_root = cache_root
148
cfg = self.tree_config()
149
return cfg.get_option(u"nickname", default=self.base.split('/')[-2])
151
def _set_nick(self, nick):
152
cfg = self.tree_config()
153
cfg.set_option(nick, "nickname")
154
assert cfg.get_option("nickname") == nick
156
nick = property(_get_nick, _set_nick)
158
def lock_write(self):
159
raise NotImplementedError('lock_write is abstract')
162
raise NotImplementedError('lock_read is abstract')
165
raise NotImplementedError('unlock is abstract')
167
def peek_lock_mode(self):
168
"""Return lock mode for the Branch: 'r', 'w' or None"""
169
raise NotImplementedError(self.peek_lock_mode)
171
def abspath(self, name):
172
"""Return absolute filename for something in the branch
174
XXX: Robert Collins 20051017 what is this used for? why is it a branch
175
method and not a tree method.
177
raise NotImplementedError('abspath is abstract')
179
def bind(self, other):
180
"""Bind the local branch the other branch.
182
:param other: The branch to bind to
185
raise errors.UpgradeRequired(self.base)
188
def fetch(self, from_branch, last_revision=None, pb=None):
189
"""Copy revisions from from_branch into this branch.
191
:param from_branch: Where to copy from.
192
:param last_revision: What revision to stop at (None for at the end
194
:param pb: An optional progress bar to use.
196
Returns the copied revision count and the failed revisions in a tuple:
199
if self.base == from_branch.base:
202
nested_pb = bzrlib.ui.ui_factory.nested_progress_bar()
207
from_branch.lock_read()
209
if last_revision is None:
210
pb.update('get source history')
211
from_history = from_branch.revision_history()
213
last_revision = from_history[-1]
215
# no history in the source branch
216
last_revision = NULL_REVISION
217
return self.repository.fetch(from_branch.repository,
218
revision_id=last_revision,
221
if nested_pb is not None:
225
def get_bound_location(self):
226
"""Return the URL of the branch we are bound to.
228
Older format branches cannot bind, please be sure to use a metadir
233
def get_master_branch(self):
234
"""Return the branch we are bound to.
236
:return: Either a Branch, or None
240
def get_root_id(self):
241
"""Return the id of this branches root"""
242
raise NotImplementedError('get_root_id is abstract')
244
def print_file(self, file, revision_id):
245
"""Print `file` to stdout."""
246
raise NotImplementedError('print_file is abstract')
248
def append_revision(self, *revision_ids):
249
raise NotImplementedError('append_revision is abstract')
251
def set_revision_history(self, rev_history):
252
raise NotImplementedError('set_revision_history is abstract')
254
def revision_history(self):
255
"""Return sequence of revision hashes on to this branch."""
256
raise NotImplementedError('revision_history is abstract')
259
"""Return current revision number for this branch.
261
That is equivalent to the number of revisions committed to
264
return len(self.revision_history())
267
"""Older format branches cannot bind or unbind."""
268
raise errors.UpgradeRequired(self.base)
270
def last_revision(self):
271
"""Return last patch hash, or None if no history."""
272
ph = self.revision_history()
278
def missing_revisions(self, other, stop_revision=None):
279
"""Return a list of new revisions that would perfectly fit.
281
If self and other have not diverged, return a list of the revisions
282
present in other, but missing from self.
284
>>> from bzrlib.workingtree import WorkingTree
285
>>> bzrlib.trace.silent = True
286
>>> d1 = bzrdir.ScratchDir()
287
>>> br1 = d1.open_branch()
288
>>> wt1 = d1.open_workingtree()
289
>>> d2 = bzrdir.ScratchDir()
290
>>> br2 = d2.open_branch()
291
>>> wt2 = d2.open_workingtree()
292
>>> br1.missing_revisions(br2)
294
>>> wt2.commit("lala!", rev_id="REVISION-ID-1")
295
>>> br1.missing_revisions(br2)
297
>>> br2.missing_revisions(br1)
299
>>> wt1.commit("lala!", rev_id="REVISION-ID-1")
300
>>> br1.missing_revisions(br2)
302
>>> wt2.commit("lala!", rev_id="REVISION-ID-2A")
303
>>> br1.missing_revisions(br2)
305
>>> wt1.commit("lala!", rev_id="REVISION-ID-2B")
306
>>> br1.missing_revisions(br2)
307
Traceback (most recent call last):
308
DivergedBranches: These branches have diverged. Try merge.
310
self_history = self.revision_history()
311
self_len = len(self_history)
312
other_history = other.revision_history()
313
other_len = len(other_history)
314
common_index = min(self_len, other_len) -1
315
if common_index >= 0 and \
316
self_history[common_index] != other_history[common_index]:
317
raise DivergedBranches(self, other)
319
if stop_revision is None:
320
stop_revision = other_len
322
assert isinstance(stop_revision, int)
323
if stop_revision > other_len:
324
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
325
return other_history[self_len:stop_revision]
327
def update_revisions(self, other, stop_revision=None):
328
"""Pull in new perfect-fit revisions.
330
:param other: Another Branch to pull from
331
:param stop_revision: Updated until the given revision
334
raise NotImplementedError('update_revisions is abstract')
336
def revision_id_to_revno(self, revision_id):
337
"""Given a revision id, return its revno"""
338
if revision_id is None:
340
history = self.revision_history()
342
return history.index(revision_id) + 1
344
raise bzrlib.errors.NoSuchRevision(self, revision_id)
346
def get_rev_id(self, revno, history=None):
347
"""Find the revision id of the specified revno."""
351
history = self.revision_history()
352
elif revno <= 0 or revno > len(history):
353
raise bzrlib.errors.NoSuchRevision(self, revno)
354
return history[revno - 1]
356
def pull(self, source, overwrite=False, stop_revision=None):
357
raise NotImplementedError('pull is abstract')
359
def basis_tree(self):
360
"""Return `Tree` object for last revision.
362
If there are no revisions yet, return an `EmptyTree`.
364
return self.repository.revision_tree(self.last_revision())
366
def rename_one(self, from_rel, to_rel):
369
This can change the directory or the filename or both.
371
raise NotImplementedError('rename_one is abstract')
373
def move(self, from_paths, to_name):
376
to_name must exist as a versioned directory.
378
If to_name exists and is a directory, the files are moved into
379
it, keeping their old names. If it is a directory,
381
Note that to_name is only the last component of the new name;
382
this doesn't change the directory.
384
This returns a list of (from_path, to_path) pairs for each
387
raise NotImplementedError('move is abstract')
389
def get_parent(self):
390
"""Return the parent location of the branch.
392
This is the default location for push/pull/missing. The usual
393
pattern is that the user can override it by specifying a
396
raise NotImplementedError('get_parent is abstract')
398
def get_push_location(self):
399
"""Return the None or the location to push this branch to."""
400
raise NotImplementedError('get_push_location is abstract')
402
def set_push_location(self, location):
403
"""Set a new push location for this branch."""
404
raise NotImplementedError('set_push_location is abstract')
406
def set_parent(self, url):
407
raise NotImplementedError('set_parent is abstract')
411
"""Synchronise this branch with the master branch if any.
413
:return: None or the last_revision pivoted out during the update.
417
def check_revno(self, revno):
419
Check whether a revno corresponds to any revision.
420
Zero (the NULL revision) is considered valid.
423
self.check_real_revno(revno)
425
def check_real_revno(self, revno):
427
Check whether a revno corresponds to a real revision.
428
Zero (the NULL revision) is considered invalid
430
if revno < 1 or revno > self.revno():
431
raise InvalidRevisionNumber(revno)
434
def clone(self, *args, **kwargs):
435
"""Clone this branch into to_bzrdir preserving all semantic values.
437
revision_id: if not None, the revision history in the new branch will
438
be truncated to end with revision_id.
440
# for API compatability, until 0.8 releases we provide the old api:
441
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
442
# after 0.8 releases, the *args and **kwargs should be changed:
443
# def clone(self, to_bzrdir, revision_id=None):
444
if (kwargs.get('to_location', None) or
445
kwargs.get('revision', None) or
446
kwargs.get('basis_branch', None) or
447
(len(args) and isinstance(args[0], basestring))):
448
# backwards compatability api:
449
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
450
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
453
basis_branch = args[2]
455
basis_branch = kwargs.get('basis_branch', None)
457
basis = basis_branch.bzrdir
462
revision_id = args[1]
464
revision_id = kwargs.get('revision', None)
469
# no default to raise if not provided.
470
url = kwargs.get('to_location')
471
return self.bzrdir.clone(url,
472
revision_id=revision_id,
473
basis=basis).open_branch()
475
# generate args by hand
477
revision_id = args[1]
479
revision_id = kwargs.get('revision_id', None)
483
# no default to raise if not provided.
484
to_bzrdir = kwargs.get('to_bzrdir')
485
result = self._format.initialize(to_bzrdir)
486
self.copy_content_into(result, revision_id=revision_id)
490
def sprout(self, to_bzrdir, revision_id=None):
491
"""Create a new line of development from the branch, into to_bzrdir.
493
revision_id: if not None, the revision history in the new branch will
494
be truncated to end with revision_id.
496
result = self._format.initialize(to_bzrdir)
497
self.copy_content_into(result, revision_id=revision_id)
498
result.set_parent(self.bzrdir.root_transport.base)
502
def copy_content_into(self, destination, revision_id=None):
503
"""Copy the content of self into destination.
505
revision_id: if not None, the revision history in the new branch will
506
be truncated to end with revision_id.
508
new_history = self.revision_history()
509
if revision_id is not None:
511
new_history = new_history[:new_history.index(revision_id) + 1]
513
rev = self.repository.get_revision(revision_id)
514
new_history = rev.get_history(self.repository)[1:]
515
destination.set_revision_history(new_history)
516
parent = self.get_parent()
518
destination.set_parent(parent)
521
class BranchFormat(object):
522
"""An encapsulation of the initialization and open routines for a format.
524
Formats provide three things:
525
* An initialization routine,
529
Formats are placed in an dict by their format string for reference
530
during branch opening. Its not required that these be instances, they
531
can be classes themselves with class methods - it simply depends on
532
whether state is needed for a given format or not.
534
Once a format is deprecated, just deprecate the initialize and open
535
methods on the format class. Do not deprecate the object, as the
536
object will be created every time regardless.
539
_default_format = None
540
"""The default format used for new branches."""
543
"""The known formats."""
546
def find_format(klass, a_bzrdir):
547
"""Return the format for the branch object in a_bzrdir."""
549
transport = a_bzrdir.get_branch_transport(None)
550
format_string = transport.get("format").read()
551
return klass._formats[format_string]
553
raise NotBranchError(path=transport.base)
555
raise errors.UnknownFormatError(format_string)
558
def get_default_format(klass):
559
"""Return the current default format."""
560
return klass._default_format
562
def get_format_string(self):
563
"""Return the ASCII format string that identifies this format."""
564
raise NotImplementedError(self.get_format_string)
566
def get_format_description(self):
567
"""Return the short format description for this format."""
568
raise NotImplementedError(self.get_format_string)
570
def initialize(self, a_bzrdir):
571
"""Create a branch of this format in a_bzrdir."""
572
raise NotImplementedError(self.initialized)
574
def is_supported(self):
575
"""Is this format supported?
577
Supported formats can be initialized and opened.
578
Unsupported formats may not support initialization or committing or
579
some other features depending on the reason for not being supported.
583
def open(self, a_bzrdir, _found=False):
584
"""Return the branch object for a_bzrdir
586
_found is a private parameter, do not use it. It is used to indicate
587
if format probing has already be done.
589
raise NotImplementedError(self.open)
592
def register_format(klass, format):
593
klass._formats[format.get_format_string()] = format
596
def set_default_format(klass, format):
597
klass._default_format = format
600
def unregister_format(klass, format):
601
assert klass._formats[format.get_format_string()] is format
602
del klass._formats[format.get_format_string()]
605
return self.get_format_string().rstrip()
608
class BzrBranchFormat4(BranchFormat):
609
"""Bzr branch format 4.
612
- a revision-history file.
613
- a branch-lock lock file [ to be shared with the bzrdir ]
616
def get_format_description(self):
617
"""See BranchFormat.get_format_description()."""
618
return "Branch format 4"
620
def initialize(self, a_bzrdir):
621
"""Create a branch of this format in a_bzrdir."""
622
mutter('creating branch in %s', a_bzrdir.transport.base)
623
branch_transport = a_bzrdir.get_branch_transport(self)
624
utf8_files = [('revision-history', ''),
627
control_files = LockableFiles(branch_transport, 'branch-lock',
629
control_files.create_lock()
630
control_files.lock_write()
632
for file, content in utf8_files:
633
control_files.put_utf8(file, content)
635
control_files.unlock()
636
return self.open(a_bzrdir, _found=True)
639
super(BzrBranchFormat4, self).__init__()
640
self._matchingbzrdir = bzrdir.BzrDirFormat6()
642
def open(self, a_bzrdir, _found=False):
643
"""Return the branch object for a_bzrdir
645
_found is a private parameter, do not use it. It is used to indicate
646
if format probing has already be done.
649
# we are being called directly and must probe.
650
raise NotImplementedError
651
return BzrBranch(_format=self,
652
_control_files=a_bzrdir._control_files,
654
_repository=a_bzrdir.open_repository())
657
return "Bazaar-NG branch format 4"
660
class BzrBranchFormat5(BranchFormat):
661
"""Bzr branch format 5.
664
- a revision-history file.
666
- a lock dir guarding the branch itself
667
- all of this stored in a branch/ subdirectory
668
- works with shared repositories.
670
This format is new in bzr 0.8.
673
def get_format_string(self):
674
"""See BranchFormat.get_format_string()."""
675
return "Bazaar-NG branch format 5\n"
677
def get_format_description(self):
678
"""See BranchFormat.get_format_description()."""
679
return "Branch format 5"
681
def initialize(self, a_bzrdir):
682
"""Create a branch of this format in a_bzrdir."""
683
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
684
branch_transport = a_bzrdir.get_branch_transport(self)
685
utf8_files = [('revision-history', ''),
688
control_files = LockableFiles(branch_transport, 'lock', LockDir)
689
control_files.create_lock()
690
control_files.lock_write()
691
control_files.put_utf8('format', self.get_format_string())
693
for file, content in utf8_files:
694
control_files.put_utf8(file, content)
696
control_files.unlock()
697
return self.open(a_bzrdir, _found=True, )
700
super(BzrBranchFormat5, self).__init__()
701
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
703
def open(self, a_bzrdir, _found=False):
704
"""Return the branch object for a_bzrdir
706
_found is a private parameter, do not use it. It is used to indicate
707
if format probing has already be done.
710
format = BranchFormat.find_format(a_bzrdir)
711
assert format.__class__ == self.__class__
712
transport = a_bzrdir.get_branch_transport(None)
713
control_files = LockableFiles(transport, 'lock', LockDir)
714
return BzrBranch5(_format=self,
715
_control_files=control_files,
717
_repository=a_bzrdir.find_repository())
720
return "Bazaar-NG Metadir branch format 5"
723
class BranchReferenceFormat(BranchFormat):
724
"""Bzr branch reference format.
726
Branch references are used in implementing checkouts, they
727
act as an alias to the real branch which is at some other url.
734
def get_format_string(self):
735
"""See BranchFormat.get_format_string()."""
736
return "Bazaar-NG Branch Reference Format 1\n"
738
def get_format_description(self):
739
"""See BranchFormat.get_format_description()."""
740
return "Checkout reference format 1"
742
def initialize(self, a_bzrdir, target_branch=None):
743
"""Create a branch of this format in a_bzrdir."""
744
if target_branch is None:
745
# this format does not implement branch itself, thus the implicit
746
# creation contract must see it as uninitializable
747
raise errors.UninitializableFormat(self)
748
mutter('creating branch reference in %s', a_bzrdir.transport.base)
749
branch_transport = a_bzrdir.get_branch_transport(self)
750
# FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.
751
branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base)))
752
branch_transport.put('format', StringIO(self.get_format_string()))
753
return self.open(a_bzrdir, _found=True)
756
super(BranchReferenceFormat, self).__init__()
757
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
759
def _make_reference_clone_function(format, a_branch):
760
"""Create a clone() routine for a branch dynamically."""
761
def clone(to_bzrdir, revision_id=None):
762
"""See Branch.clone()."""
763
return format.initialize(to_bzrdir, a_branch)
764
# cannot obey revision_id limits when cloning a reference ...
765
# FIXME RBC 20060210 either nuke revision_id for clone, or
766
# emit some sort of warning/error to the caller ?!
769
def open(self, a_bzrdir, _found=False):
770
"""Return the branch that the branch reference in a_bzrdir points at.
772
_found is a private parameter, do not use it. It is used to indicate
773
if format probing has already be done.
776
format = BranchFormat.find_format(a_bzrdir)
777
assert format.__class__ == self.__class__
778
transport = a_bzrdir.get_branch_transport(None)
779
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
780
result = real_bzrdir.open_branch()
781
# this changes the behaviour of result.clone to create a new reference
782
# rather than a copy of the content of the branch.
783
# I did not use a proxy object because that needs much more extensive
784
# testing, and we are only changing one behaviour at the moment.
785
# If we decide to alter more behaviours - i.e. the implicit nickname
786
# then this should be refactored to introduce a tested proxy branch
787
# and a subclass of that for use in overriding clone() and ....
789
result.clone = self._make_reference_clone_function(result)
793
# formats which have no format string are not discoverable
794
# and not independently creatable, so are not registered.
795
__default_format = BzrBranchFormat5()
796
BranchFormat.register_format(__default_format)
797
BranchFormat.register_format(BranchReferenceFormat())
798
BranchFormat.set_default_format(__default_format)
799
_legacy_formats = [BzrBranchFormat4(),
802
class BzrBranch(Branch):
803
"""A branch stored in the actual filesystem.
805
Note that it's "local" in the context of the filesystem; it doesn't
806
really matter if it's on an nfs/smb/afs/coda/... share, as long as
807
it's writable, and can be accessed via the normal filesystem API.
810
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
811
relax_version_check=DEPRECATED_PARAMETER, _format=None,
812
_control_files=None, a_bzrdir=None, _repository=None):
813
"""Create new branch object at a particular location.
815
transport -- A Transport object, defining how to access files.
817
init -- If True, create new control files in a previously
818
unversioned directory. If False, the branch must already
821
relax_version_check -- If true, the usual check for the branch
822
version is not applied. This is intended only for
823
upgrade/recovery type use; it's not guaranteed that
824
all operations will work on old format branches.
827
self.bzrdir = bzrdir.BzrDir.open(transport.base)
829
self.bzrdir = a_bzrdir
830
self._transport = self.bzrdir.transport.clone('..')
831
self._base = self._transport.base
832
self._format = _format
833
if _control_files is None:
834
raise BzrBadParameterMissing('_control_files')
835
self.control_files = _control_files
836
if deprecated_passed(init):
837
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
838
"deprecated as of bzr 0.8. Please use Branch.create().",
842
# this is slower than before deprecation, oh well never mind.
844
self._initialize(transport.base)
845
self._check_format(_format)
846
if deprecated_passed(relax_version_check):
847
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
848
"relax_version_check parameter is deprecated as of bzr 0.8. "
849
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
853
if (not relax_version_check
854
and not self._format.is_supported()):
855
raise errors.UnsupportedFormatError(
856
'sorry, branch format %r not supported' % fmt,
857
['use a different bzr version',
858
'or remove the .bzr directory'
859
' and "bzr init" again'])
860
if deprecated_passed(transport):
861
warn("BzrBranch.__init__(transport=XXX...): The transport "
862
"parameter is deprecated as of bzr 0.8. "
863
"Please use Branch.open, or bzrdir.open_branch().",
866
self.repository = _repository
869
return '%s(%r)' % (self.__class__.__name__, self.base)
874
# TODO: It might be best to do this somewhere else,
875
# but it is nice for a Branch object to automatically
876
# cache it's information.
877
# Alternatively, we could have the Transport objects cache requests
878
# See the earlier discussion about how major objects (like Branch)
879
# should never expect their __del__ function to run.
880
# XXX: cache_root seems to be unused, 2006-01-13 mbp
881
if hasattr(self, 'cache_root') and self.cache_root is not None:
883
shutil.rmtree(self.cache_root)
886
self.cache_root = None
891
base = property(_get_base, doc="The URL for the root of this branch.")
893
def _finish_transaction(self):
894
"""Exit the current transaction."""
895
return self.control_files._finish_transaction()
897
def get_transaction(self):
898
"""Return the current active transaction.
900
If no transaction is active, this returns a passthrough object
901
for which all data is immediately flushed and no caching happens.
903
# this is an explicit function so that we can do tricky stuff
904
# when the storage in rev_storage is elsewhere.
905
# we probably need to hook the two 'lock a location' and
906
# 'have a transaction' together more delicately, so that
907
# we can have two locks (branch and storage) and one transaction
908
# ... and finishing the transaction unlocks both, but unlocking
909
# does not. - RBC 20051121
910
return self.control_files.get_transaction()
912
def _set_transaction(self, transaction):
913
"""Set a new active transaction."""
914
return self.control_files._set_transaction(transaction)
916
def abspath(self, name):
917
"""See Branch.abspath."""
918
return self.control_files._transport.abspath(name)
920
def _check_format(self, format):
921
"""Identify the branch format if needed.
923
The format is stored as a reference to the format object in
924
self._format for code that needs to check it later.
926
The format parameter is either None or the branch format class
927
used to open this branch.
929
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
932
format = BzrBranchFormat.find_format(self.bzrdir)
933
self._format = format
934
mutter("got branch format %s", self._format)
937
def get_root_id(self):
938
"""See Branch.get_root_id."""
939
tree = self.repository.revision_tree(self.last_revision())
940
return tree.inventory.root.file_id
942
def lock_write(self):
943
# TODO: test for failed two phase locks. This is known broken.
944
self.control_files.lock_write()
945
self.repository.lock_write()
948
# TODO: test for failed two phase locks. This is known broken.
949
self.control_files.lock_read()
950
self.repository.lock_read()
953
# TODO: test for failed two phase locks. This is known broken.
954
self.repository.unlock()
955
self.control_files.unlock()
957
def peek_lock_mode(self):
958
if self.control_files._lock_count == 0:
961
return self.control_files._lock_mode
964
def print_file(self, file, revision_id):
965
"""See Branch.print_file."""
966
return self.repository.print_file(file, revision_id)
969
def append_revision(self, *revision_ids):
970
"""See Branch.append_revision."""
971
for revision_id in revision_ids:
972
mutter("add {%s} to revision-history" % revision_id)
973
rev_history = self.revision_history()
974
rev_history.extend(revision_ids)
975
self.set_revision_history(rev_history)
978
def set_revision_history(self, rev_history):
979
"""See Branch.set_revision_history."""
980
self.control_files.put_utf8(
981
'revision-history', '\n'.join(rev_history))
982
transaction = self.get_transaction()
983
history = transaction.map.find_revision_history()
984
if history is not None:
985
# update the revision history in the identity map.
986
history[:] = list(rev_history)
987
# this call is disabled because revision_history is
988
# not really an object yet, and the transaction is for objects.
989
# transaction.register_dirty(history)
991
transaction.map.add_revision_history(rev_history)
992
# this call is disabled because revision_history is
993
# not really an object yet, and the transaction is for objects.
994
# transaction.register_clean(history)
996
def get_revision_delta(self, revno):
997
"""Return the delta for one revision.
999
The delta is relative to its mainline predecessor, or the
1000
empty tree for revision 1.
1002
assert isinstance(revno, int)
1003
rh = self.revision_history()
1004
if not (1 <= revno <= len(rh)):
1005
raise InvalidRevisionNumber(revno)
1007
# revno is 1-based; list is 0-based
1009
new_tree = self.repository.revision_tree(rh[revno-1])
1011
old_tree = EmptyTree()
1013
old_tree = self.repository.revision_tree(rh[revno-2])
1014
return compare_trees(old_tree, new_tree)
1017
def revision_history(self):
1018
"""See Branch.revision_history."""
1019
transaction = self.get_transaction()
1020
history = transaction.map.find_revision_history()
1021
if history is not None:
1022
mutter("cache hit for revision-history in %s", self)
1023
return list(history)
1024
history = [l.rstrip('\r\n') for l in
1025
self.control_files.get_utf8('revision-history').readlines()]
1026
transaction.map.add_revision_history(history)
1027
# this call is disabled because revision_history is
1028
# not really an object yet, and the transaction is for objects.
1029
# transaction.register_clean(history, precious=True)
1030
return list(history)
1033
def update_revisions(self, other, stop_revision=None):
1034
"""See Branch.update_revisions."""
1037
if stop_revision is None:
1038
stop_revision = other.last_revision()
1039
if stop_revision is None:
1040
# if there are no commits, we're done.
1042
# whats the current last revision, before we fetch [and change it
1044
last_rev = self.last_revision()
1045
# we fetch here regardless of whether we need to so that we pickup
1047
self.fetch(other, stop_revision)
1048
my_ancestry = self.repository.get_ancestry(last_rev)
1049
if stop_revision in my_ancestry:
1050
# last_revision is a descendant of stop_revision
1052
# stop_revision must be a descendant of last_revision
1053
stop_graph = self.repository.get_revision_graph(stop_revision)
1054
if last_rev is not None and last_rev not in stop_graph:
1055
# our previous tip is not merged into stop_revision
1056
raise errors.DivergedBranches(self, other)
1057
# make a new revision history from the graph
1058
current_rev_id = stop_revision
1060
while current_rev_id not in (None, NULL_REVISION):
1061
new_history.append(current_rev_id)
1062
current_rev_id_parents = stop_graph[current_rev_id]
1064
current_rev_id = current_rev_id_parents[0]
1066
current_rev_id = None
1067
new_history.reverse()
1068
self.set_revision_history(new_history)
1072
@deprecated_method(zero_eight)
1073
def pullable_revisions(self, other, stop_revision):
1074
"""Please use bzrlib.missing instead."""
1075
other_revno = other.revision_id_to_revno(stop_revision)
1077
return self.missing_revisions(other, other_revno)
1078
except DivergedBranches, e:
1080
pullable_revs = get_intervening_revisions(self.last_revision(),
1083
assert self.last_revision() not in pullable_revs
1084
return pullable_revs
1085
except bzrlib.errors.NotAncestor:
1086
if is_ancestor(self.last_revision(), stop_revision, self):
1091
def basis_tree(self):
1092
"""See Branch.basis_tree."""
1093
return self.repository.revision_tree(self.last_revision())
1095
@deprecated_method(zero_eight)
1096
def working_tree(self):
1097
"""Create a Working tree object for this branch."""
1098
from bzrlib.workingtree import WorkingTree
1099
from bzrlib.transport.local import LocalTransport
1100
if (self.base.find('://') != -1 or
1101
not isinstance(self._transport, LocalTransport)):
1102
raise NoWorkingTree(self.base)
1103
return self.bzrdir.open_workingtree()
1106
def pull(self, source, overwrite=False, stop_revision=None):
1107
"""See Branch.pull."""
1110
old_count = len(self.revision_history())
1112
self.update_revisions(source,stop_revision)
1113
except DivergedBranches:
1117
self.set_revision_history(source.revision_history())
1118
new_count = len(self.revision_history())
1119
return new_count - old_count
1123
def get_parent(self):
1124
"""See Branch.get_parent."""
1126
_locs = ['parent', 'pull', 'x-pull']
1129
return self.control_files.get_utf8(l).read().strip('\n')
1134
def get_push_location(self):
1135
"""See Branch.get_push_location."""
1136
config = bzrlib.config.BranchConfig(self)
1137
push_loc = config.get_user_option('push_location')
1140
def set_push_location(self, location):
1141
"""See Branch.set_push_location."""
1142
config = bzrlib.config.LocationConfig(self.base)
1143
config.set_user_option('push_location', location)
1146
def set_parent(self, url):
1147
"""See Branch.set_parent."""
1148
# TODO: Maybe delete old location files?
1149
# URLs should never be unicode, even on the local fs,
1150
# FIXUP this and get_parent in a future branch format bump:
1151
# read and rewrite the file, and have the new format code read
1152
# using .get not .get_utf8. RBC 20060125
1154
self.control_files._transport.delete('parent')
1156
self.control_files.put_utf8('parent', url + '\n')
1158
def tree_config(self):
1159
return TreeConfig(self)
1162
class BzrBranch5(BzrBranch):
1163
"""A format 5 branch. This supports new features over plan branches.
1165
It has support for a master_branch which is the data for bound branches.
1173
super(BzrBranch5, self).__init__(_format=_format,
1174
_control_files=_control_files,
1176
_repository=_repository)
1179
def pull(self, source, overwrite=False, stop_revision=None):
1180
"""Updates branch.pull to be bound branch aware."""
1181
bound_location = self.get_bound_location()
1182
if source.base != bound_location:
1183
# not pulling from master, so we need to update master.
1184
master_branch = self.get_master_branch()
1186
master_branch.pull(source)
1187
source = master_branch
1188
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1190
def get_bound_location(self):
1192
return self.control_files.get_utf8('bound').read()[:-1]
1193
except errors.NoSuchFile:
1197
def get_master_branch(self):
1198
"""Return the branch we are bound to.
1200
:return: Either a Branch, or None
1202
This could memoise the branch, but if thats done
1203
it must be revalidated on each new lock.
1204
So for now we just dont memoise it.
1205
# RBC 20060304 review this decision.
1207
bound_loc = self.get_bound_location()
1211
return Branch.open(bound_loc)
1212
except (errors.NotBranchError, errors.ConnectionError), e:
1213
raise errors.BoundBranchConnectionFailure(
1217
def set_bound_location(self, location):
1218
"""Set the target where this branch is bound to.
1220
:param location: URL to the target branch
1223
self.control_files.put_utf8('bound', location+'\n')
1226
self.control_files._transport.delete('bound')
1232
def bind(self, other):
1233
"""Bind the local branch the other branch.
1235
:param other: The branch to bind to
1238
# TODO: jam 20051230 Consider checking if the target is bound
1239
# It is debatable whether you should be able to bind to
1240
# a branch which is itself bound.
1241
# Committing is obviously forbidden,
1242
# but binding itself may not be.
1243
# Since we *have* to check at commit time, we don't
1244
# *need* to check here
1247
# we are now equal to or a suffix of other.
1249
# Since we have 'pulled' from the remote location,
1250
# now we should try to pull in the opposite direction
1251
# in case the local tree has more revisions than the
1253
# There may be a different check you could do here
1254
# rather than actually trying to install revisions remotely.
1255
# TODO: capture an exception which indicates the remote branch
1257
# If it is up-to-date, this probably should not be a failure
1259
# lock other for write so the revision-history syncing cannot race
1263
# if this does not error, other now has the same last rev we do
1264
# it can only error if the pull from other was concurrent with
1265
# a commit to other from someone else.
1267
# until we ditch revision-history, we need to sync them up:
1268
self.set_revision_history(other.revision_history())
1269
# now other and self are up to date with each other and have the
1270
# same revision-history.
1274
self.set_bound_location(other.base)
1278
"""If bound, unbind"""
1279
return self.set_bound_location(None)
1283
"""Synchronise this branch with the master branch if any.
1285
:return: None or the last_revision that was pivoted out during the
1288
master = self.get_master_branch()
1289
if master is not None:
1290
old_tip = self.last_revision()
1291
self.pull(master, overwrite=True)
1292
if old_tip in self.repository.get_ancestry(self.last_revision()):
1298
class BranchTestProviderAdapter(object):
1299
"""A tool to generate a suite testing multiple branch formats at once.
1301
This is done by copying the test once for each transport and injecting
1302
the transport_server, transport_readonly_server, and branch_format
1303
classes into each copy. Each copy is also given a new id() to make it
1307
def __init__(self, transport_server, transport_readonly_server, formats):
1308
self._transport_server = transport_server
1309
self._transport_readonly_server = transport_readonly_server
1310
self._formats = formats
1312
def adapt(self, test):
1313
result = TestSuite()
1314
for branch_format, bzrdir_format in self._formats:
1315
new_test = deepcopy(test)
1316
new_test.transport_server = self._transport_server
1317
new_test.transport_readonly_server = self._transport_readonly_server
1318
new_test.bzrdir_format = bzrdir_format
1319
new_test.branch_format = branch_format
1320
def make_new_test_id():
1321
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1322
return lambda: new_id
1323
new_test.id = make_new_test_id()
1324
result.addTest(new_test)
1328
######################################################################
1332
@deprecated_function(zero_eight)
1333
def ScratchBranch(*args, **kwargs):
1334
"""See bzrlib.bzrdir.ScratchDir."""
1335
d = ScratchDir(*args, **kwargs)
1336
return d.open_branch()
1339
@deprecated_function(zero_eight)
1340
def is_control_file(*args, **kwargs):
1341
"""See bzrlib.workingtree.is_control_file."""
1342
return bzrlib.workingtree.is_control_file(*args, **kwargs)
added
removed
bzrlib/branch.py
