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:
200
raise Exception("can't fetch from a branch to itself %s, %s" %
201
(self.base, to_branch.base))
203
nested_pb = bzrlib.ui.ui_factory.nested_progress_bar()
208
from_branch.lock_read()
210
if last_revision is None:
211
pb.update('get source history')
212
from_history = from_branch.revision_history()
214
last_revision = from_history[-1]
216
# no history in the source branch
217
last_revision = NULL_REVISION
218
return self.repository.fetch(from_branch.repository,
219
revision_id=last_revision,
222
if nested_pb is not None:
226
def get_bound_location(self):
227
"""Return the URL of the rbanch we are bound to.
229
Older format branches cannot bind, please be sure to use a metadir
234
def get_master_branch(self):
235
"""Return the branch we are bound to.
237
:return: Either a Branch, or None
241
def get_root_id(self):
242
"""Return the id of this branches root"""
243
raise NotImplementedError('get_root_id is abstract')
245
def print_file(self, file, revision_id):
246
"""Print `file` to stdout."""
247
raise NotImplementedError('print_file is abstract')
249
def append_revision(self, *revision_ids):
250
raise NotImplementedError('append_revision is abstract')
252
def set_revision_history(self, rev_history):
253
raise NotImplementedError('set_revision_history is abstract')
255
def revision_history(self):
256
"""Return sequence of revision hashes on to this branch."""
257
raise NotImplementedError('revision_history is abstract')
260
"""Return current revision number for this branch.
262
That is equivalent to the number of revisions committed to
265
return len(self.revision_history())
268
"""Older format branches cannot bind or unbind."""
269
raise errors.UpgradeRequired(self.base)
271
def last_revision(self):
272
"""Return last patch hash, or None if no history."""
273
ph = self.revision_history()
279
def missing_revisions(self, other, stop_revision=None):
280
"""Return a list of new revisions that would perfectly fit.
282
If self and other have not diverged, return a list of the revisions
283
present in other, but missing from self.
285
>>> from bzrlib.workingtree import WorkingTree
286
>>> bzrlib.trace.silent = True
287
>>> d1 = bzrdir.ScratchDir()
288
>>> br1 = d1.open_branch()
289
>>> wt1 = d1.open_workingtree()
290
>>> d2 = bzrdir.ScratchDir()
291
>>> br2 = d2.open_branch()
292
>>> wt2 = d2.open_workingtree()
293
>>> br1.missing_revisions(br2)
295
>>> wt2.commit("lala!", rev_id="REVISION-ID-1")
296
>>> br1.missing_revisions(br2)
298
>>> br2.missing_revisions(br1)
300
>>> wt1.commit("lala!", rev_id="REVISION-ID-1")
301
>>> br1.missing_revisions(br2)
303
>>> wt2.commit("lala!", rev_id="REVISION-ID-2A")
304
>>> br1.missing_revisions(br2)
306
>>> wt1.commit("lala!", rev_id="REVISION-ID-2B")
307
>>> br1.missing_revisions(br2)
308
Traceback (most recent call last):
309
DivergedBranches: These branches have diverged. Try merge.
311
self_history = self.revision_history()
312
self_len = len(self_history)
313
other_history = other.revision_history()
314
other_len = len(other_history)
315
common_index = min(self_len, other_len) -1
316
if common_index >= 0 and \
317
self_history[common_index] != other_history[common_index]:
318
raise DivergedBranches(self, other)
320
if stop_revision is None:
321
stop_revision = other_len
323
assert isinstance(stop_revision, int)
324
if stop_revision > other_len:
325
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
326
return other_history[self_len:stop_revision]
328
def update_revisions(self, other, stop_revision=None):
329
"""Pull in new perfect-fit revisions.
331
:param other: Another Branch to pull from
332
:param stop_revision: Updated until the given revision
335
raise NotImplementedError('update_revisions is abstract')
337
def pullable_revisions(self, other, stop_revision):
338
raise NotImplementedError('pullable_revisions is abstract')
340
def revision_id_to_revno(self, revision_id):
341
"""Given a revision id, return its revno"""
342
if revision_id is None:
344
history = self.revision_history()
346
return history.index(revision_id) + 1
348
raise bzrlib.errors.NoSuchRevision(self, revision_id)
350
def get_rev_id(self, revno, history=None):
351
"""Find the revision id of the specified revno."""
355
history = self.revision_history()
356
elif revno <= 0 or revno > len(history):
357
raise bzrlib.errors.NoSuchRevision(self, revno)
358
return history[revno - 1]
360
def pull(self, source, overwrite=False, stop_revision=None):
361
raise NotImplementedError('pull is abstract')
363
def basis_tree(self):
364
"""Return `Tree` object for last revision.
366
If there are no revisions yet, return an `EmptyTree`.
368
return self.repository.revision_tree(self.last_revision())
370
def rename_one(self, from_rel, to_rel):
373
This can change the directory or the filename or both.
375
raise NotImplementedError('rename_one is abstract')
377
def move(self, from_paths, to_name):
380
to_name must exist as a versioned directory.
382
If to_name exists and is a directory, the files are moved into
383
it, keeping their old names. If it is a directory,
385
Note that to_name is only the last component of the new name;
386
this doesn't change the directory.
388
This returns a list of (from_path, to_path) pairs for each
391
raise NotImplementedError('move is abstract')
393
def get_parent(self):
394
"""Return the parent location of the branch.
396
This is the default location for push/pull/missing. The usual
397
pattern is that the user can override it by specifying a
400
raise NotImplementedError('get_parent is abstract')
402
def get_push_location(self):
403
"""Return the None or the location to push this branch to."""
404
raise NotImplementedError('get_push_location is abstract')
406
def set_push_location(self, location):
407
"""Set a new push location for this branch."""
408
raise NotImplementedError('set_push_location is abstract')
410
def set_parent(self, url):
411
raise NotImplementedError('set_parent is abstract')
415
"""Synchronise this branch with the master branch if any.
417
:return: None or the last_revision pivoted out during the update.
421
def check_revno(self, revno):
423
Check whether a revno corresponds to any revision.
424
Zero (the NULL revision) is considered valid.
427
self.check_real_revno(revno)
429
def check_real_revno(self, revno):
431
Check whether a revno corresponds to a real revision.
432
Zero (the NULL revision) is considered invalid
434
if revno < 1 or revno > self.revno():
435
raise InvalidRevisionNumber(revno)
438
def clone(self, *args, **kwargs):
439
"""Clone this branch into to_bzrdir preserving all semantic values.
441
revision_id: if not None, the revision history in the new branch will
442
be truncated to end with revision_id.
444
# for API compatability, until 0.8 releases we provide the old api:
445
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
446
# after 0.8 releases, the *args and **kwargs should be changed:
447
# def clone(self, to_bzrdir, revision_id=None):
448
if (kwargs.get('to_location', None) or
449
kwargs.get('revision', None) or
450
kwargs.get('basis_branch', None) or
451
(len(args) and isinstance(args[0], basestring))):
452
# backwards compatability api:
453
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
454
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
457
basis_branch = args[2]
459
basis_branch = kwargs.get('basis_branch', None)
461
basis = basis_branch.bzrdir
466
revision_id = args[1]
468
revision_id = kwargs.get('revision', None)
473
# no default to raise if not provided.
474
url = kwargs.get('to_location')
475
return self.bzrdir.clone(url,
476
revision_id=revision_id,
477
basis=basis).open_branch()
479
# generate args by hand
481
revision_id = args[1]
483
revision_id = kwargs.get('revision_id', None)
487
# no default to raise if not provided.
488
to_bzrdir = kwargs.get('to_bzrdir')
489
result = self._format.initialize(to_bzrdir)
490
self.copy_content_into(result, revision_id=revision_id)
494
def sprout(self, to_bzrdir, revision_id=None):
495
"""Create a new line of development from the branch, into to_bzrdir.
497
revision_id: if not None, the revision history in the new branch will
498
be truncated to end with revision_id.
500
result = self._format.initialize(to_bzrdir)
501
self.copy_content_into(result, revision_id=revision_id)
502
result.set_parent(self.bzrdir.root_transport.base)
506
def copy_content_into(self, destination, revision_id=None):
507
"""Copy the content of self into destination.
509
revision_id: if not None, the revision history in the new branch will
510
be truncated to end with revision_id.
512
new_history = self.revision_history()
513
if revision_id is not None:
515
new_history = new_history[:new_history.index(revision_id) + 1]
517
rev = self.repository.get_revision(revision_id)
518
new_history = rev.get_history(self.repository)[1:]
519
destination.set_revision_history(new_history)
520
parent = self.get_parent()
522
destination.set_parent(parent)
525
class BranchFormat(object):
526
"""An encapsulation of the initialization and open routines for a format.
528
Formats provide three things:
529
* An initialization routine,
533
Formats are placed in an dict by their format string for reference
534
during branch opening. Its not required that these be instances, they
535
can be classes themselves with class methods - it simply depends on
536
whether state is needed for a given format or not.
538
Once a format is deprecated, just deprecate the initialize and open
539
methods on the format class. Do not deprecate the object, as the
540
object will be created every time regardless.
543
_default_format = None
544
"""The default format used for new branches."""
547
"""The known formats."""
550
def find_format(klass, a_bzrdir):
551
"""Return the format for the branch object in a_bzrdir."""
553
transport = a_bzrdir.get_branch_transport(None)
554
format_string = transport.get("format").read()
555
return klass._formats[format_string]
557
raise NotBranchError(path=transport.base)
559
raise errors.UnknownFormatError(format_string)
562
def get_default_format(klass):
563
"""Return the current default format."""
564
return klass._default_format
566
def get_format_string(self):
567
"""Return the ASCII format string that identifies 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 initialize(self, a_bzrdir):
617
"""Create a branch of this format in a_bzrdir."""
618
mutter('creating branch in %s', a_bzrdir.transport.base)
619
branch_transport = a_bzrdir.get_branch_transport(self)
620
utf8_files = [('revision-history', ''),
623
control_files = LockableFiles(branch_transport, 'branch-lock',
625
control_files.create_lock()
626
control_files.lock_write()
628
for file, content in utf8_files:
629
control_files.put_utf8(file, content)
631
control_files.unlock()
632
return self.open(a_bzrdir, _found=True)
635
super(BzrBranchFormat4, self).__init__()
636
self._matchingbzrdir = bzrdir.BzrDirFormat6()
638
def open(self, a_bzrdir, _found=False):
639
"""Return the branch object for a_bzrdir
641
_found is a private parameter, do not use it. It is used to indicate
642
if format probing has already be done.
645
# we are being called directly and must probe.
646
raise NotImplementedError
647
return BzrBranch(_format=self,
648
_control_files=a_bzrdir._control_files,
650
_repository=a_bzrdir.open_repository())
653
return "Bazaar-NG branch format 4"
656
class BzrBranchFormat5(BranchFormat):
657
"""Bzr branch format 5.
660
- a revision-history file.
662
- a lock dir guarding the branch itself
663
- all of this stored in a branch/ subdirectory
664
- works with shared repositories.
666
This format is new in bzr 0.8.
669
def get_format_string(self):
670
"""See BranchFormat.get_format_string()."""
671
return "Bazaar-NG branch format 5\n"
673
def initialize(self, a_bzrdir):
674
"""Create a branch of this format in a_bzrdir."""
675
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
676
branch_transport = a_bzrdir.get_branch_transport(self)
677
utf8_files = [('revision-history', ''),
680
control_files = LockableFiles(branch_transport, 'lock', LockDir)
681
control_files.create_lock()
682
control_files.lock_write()
683
control_files.put_utf8('format', self.get_format_string())
685
for file, content in utf8_files:
686
control_files.put_utf8(file, content)
688
control_files.unlock()
689
return self.open(a_bzrdir, _found=True, )
692
super(BzrBranchFormat5, self).__init__()
693
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
695
def open(self, a_bzrdir, _found=False):
696
"""Return the branch object for a_bzrdir
698
_found is a private parameter, do not use it. It is used to indicate
699
if format probing has already be done.
702
format = BranchFormat.find_format(a_bzrdir)
703
assert format.__class__ == self.__class__
704
transport = a_bzrdir.get_branch_transport(None)
705
control_files = LockableFiles(transport, 'lock', LockDir)
706
return BzrBranch5(_format=self,
707
_control_files=control_files,
709
_repository=a_bzrdir.find_repository())
712
return "Bazaar-NG Metadir branch format 5"
715
class BranchReferenceFormat(BranchFormat):
716
"""Bzr branch reference format.
718
Branch references are used in implementing checkouts, they
719
act as an alias to the real branch which is at some other url.
726
def get_format_string(self):
727
"""See BranchFormat.get_format_string()."""
728
return "Bazaar-NG Branch Reference Format 1\n"
730
def initialize(self, a_bzrdir, target_branch=None):
731
"""Create a branch of this format in a_bzrdir."""
732
if target_branch is None:
733
# this format does not implement branch itself, thus the implicit
734
# creation contract must see it as uninitializable
735
raise errors.UninitializableFormat(self)
736
mutter('creating branch reference in %s', a_bzrdir.transport.base)
737
branch_transport = a_bzrdir.get_branch_transport(self)
738
# FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.
739
branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base)))
740
branch_transport.put('format', StringIO(self.get_format_string()))
741
return self.open(a_bzrdir, _found=True)
744
super(BranchReferenceFormat, self).__init__()
745
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
747
def _make_reference_clone_function(format, a_branch):
748
"""Create a clone() routine for a branch dynamically."""
749
def clone(to_bzrdir, revision_id=None):
750
"""See Branch.clone()."""
751
return format.initialize(to_bzrdir, a_branch)
752
# cannot obey revision_id limits when cloning a reference ...
753
# FIXME RBC 20060210 either nuke revision_id for clone, or
754
# emit some sort of warning/error to the caller ?!
757
def open(self, a_bzrdir, _found=False):
758
"""Return the branch that the branch reference in a_bzrdir points at.
760
_found is a private parameter, do not use it. It is used to indicate
761
if format probing has already be done.
764
format = BranchFormat.find_format(a_bzrdir)
765
assert format.__class__ == self.__class__
766
transport = a_bzrdir.get_branch_transport(None)
767
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
768
result = real_bzrdir.open_branch()
769
# this changes the behaviour of result.clone to create a new reference
770
# rather than a copy of the content of the branch.
771
# I did not use a proxy object because that needs much more extensive
772
# testing, and we are only changing one behaviour at the moment.
773
# If we decide to alter more behaviours - i.e. the implicit nickname
774
# then this should be refactored to introduce a tested proxy branch
775
# and a subclass of that for use in overriding clone() and ....
777
result.clone = self._make_reference_clone_function(result)
781
# formats which have no format string are not discoverable
782
# and not independently creatable, so are not registered.
783
__default_format = BzrBranchFormat5()
784
BranchFormat.register_format(__default_format)
785
BranchFormat.register_format(BranchReferenceFormat())
786
BranchFormat.set_default_format(__default_format)
787
_legacy_formats = [BzrBranchFormat4(),
790
class BzrBranch(Branch):
791
"""A branch stored in the actual filesystem.
793
Note that it's "local" in the context of the filesystem; it doesn't
794
really matter if it's on an nfs/smb/afs/coda/... share, as long as
795
it's writable, and can be accessed via the normal filesystem API.
798
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
799
relax_version_check=DEPRECATED_PARAMETER, _format=None,
800
_control_files=None, a_bzrdir=None, _repository=None):
801
"""Create new branch object at a particular location.
803
transport -- A Transport object, defining how to access files.
805
init -- If True, create new control files in a previously
806
unversioned directory. If False, the branch must already
809
relax_version_check -- If true, the usual check for the branch
810
version is not applied. This is intended only for
811
upgrade/recovery type use; it's not guaranteed that
812
all operations will work on old format branches.
815
self.bzrdir = bzrdir.BzrDir.open(transport.base)
817
self.bzrdir = a_bzrdir
818
self._transport = self.bzrdir.transport.clone('..')
819
self._base = self._transport.base
820
self._format = _format
821
if _control_files is None:
822
raise BzrBadParameterMissing('_control_files')
823
self.control_files = _control_files
824
if deprecated_passed(init):
825
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
826
"deprecated as of bzr 0.8. Please use Branch.create().",
830
# this is slower than before deprecation, oh well never mind.
832
self._initialize(transport.base)
833
self._check_format(_format)
834
if deprecated_passed(relax_version_check):
835
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
836
"relax_version_check parameter is deprecated as of bzr 0.8. "
837
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
841
if (not relax_version_check
842
and not self._format.is_supported()):
843
raise errors.UnsupportedFormatError(
844
'sorry, branch format %r not supported' % fmt,
845
['use a different bzr version',
846
'or remove the .bzr directory'
847
' and "bzr init" again'])
848
if deprecated_passed(transport):
849
warn("BzrBranch.__init__(transport=XXX...): The transport "
850
"parameter is deprecated as of bzr 0.8. "
851
"Please use Branch.open, or bzrdir.open_branch().",
854
self.repository = _repository
857
return '%s(%r)' % (self.__class__.__name__, self.base)
862
# TODO: It might be best to do this somewhere else,
863
# but it is nice for a Branch object to automatically
864
# cache it's information.
865
# Alternatively, we could have the Transport objects cache requests
866
# See the earlier discussion about how major objects (like Branch)
867
# should never expect their __del__ function to run.
868
# XXX: cache_root seems to be unused, 2006-01-13 mbp
869
if hasattr(self, 'cache_root') and self.cache_root is not None:
871
shutil.rmtree(self.cache_root)
874
self.cache_root = None
879
base = property(_get_base, doc="The URL for the root of this branch.")
881
def _finish_transaction(self):
882
"""Exit the current transaction."""
883
return self.control_files._finish_transaction()
885
def get_transaction(self):
886
"""Return the current active transaction.
888
If no transaction is active, this returns a passthrough object
889
for which all data is immediately flushed and no caching happens.
891
# this is an explicit function so that we can do tricky stuff
892
# when the storage in rev_storage is elsewhere.
893
# we probably need to hook the two 'lock a location' and
894
# 'have a transaction' together more delicately, so that
895
# we can have two locks (branch and storage) and one transaction
896
# ... and finishing the transaction unlocks both, but unlocking
897
# does not. - RBC 20051121
898
return self.control_files.get_transaction()
900
def _set_transaction(self, transaction):
901
"""Set a new active transaction."""
902
return self.control_files._set_transaction(transaction)
904
def abspath(self, name):
905
"""See Branch.abspath."""
906
return self.control_files._transport.abspath(name)
908
def _check_format(self, format):
909
"""Identify the branch format if needed.
911
The format is stored as a reference to the format object in
912
self._format for code that needs to check it later.
914
The format parameter is either None or the branch format class
915
used to open this branch.
917
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
920
format = BzrBranchFormat.find_format(self.bzrdir)
921
self._format = format
922
mutter("got branch format %s", self._format)
925
def get_root_id(self):
926
"""See Branch.get_root_id."""
927
tree = self.repository.revision_tree(self.last_revision())
928
return tree.inventory.root.file_id
930
def lock_write(self):
931
# TODO: test for failed two phase locks. This is known broken.
932
self.control_files.lock_write()
933
self.repository.lock_write()
936
# TODO: test for failed two phase locks. This is known broken.
937
self.control_files.lock_read()
938
self.repository.lock_read()
941
# TODO: test for failed two phase locks. This is known broken.
942
self.repository.unlock()
943
self.control_files.unlock()
945
def peek_lock_mode(self):
946
if self.control_files._lock_count == 0:
949
return self.control_files._lock_mode
952
def print_file(self, file, revision_id):
953
"""See Branch.print_file."""
954
return self.repository.print_file(file, revision_id)
957
def append_revision(self, *revision_ids):
958
"""See Branch.append_revision."""
959
for revision_id in revision_ids:
960
mutter("add {%s} to revision-history" % revision_id)
961
rev_history = self.revision_history()
962
rev_history.extend(revision_ids)
963
self.set_revision_history(rev_history)
966
def set_revision_history(self, rev_history):
967
"""See Branch.set_revision_history."""
968
self.control_files.put_utf8(
969
'revision-history', '\n'.join(rev_history))
970
transaction = self.get_transaction()
971
history = transaction.map.find_revision_history()
972
if history is not None:
973
# update the revision history in the identity map.
974
history[:] = list(rev_history)
975
# this call is disabled because revision_history is
976
# not really an object yet, and the transaction is for objects.
977
# transaction.register_dirty(history)
979
transaction.map.add_revision_history(rev_history)
980
# this call is disabled because revision_history is
981
# not really an object yet, and the transaction is for objects.
982
# transaction.register_clean(history)
984
def get_revision_delta(self, revno):
985
"""Return the delta for one revision.
987
The delta is relative to its mainline predecessor, or the
988
empty tree for revision 1.
990
assert isinstance(revno, int)
991
rh = self.revision_history()
992
if not (1 <= revno <= len(rh)):
993
raise InvalidRevisionNumber(revno)
995
# revno is 1-based; list is 0-based
997
new_tree = self.repository.revision_tree(rh[revno-1])
999
old_tree = EmptyTree()
1001
old_tree = self.repository.revision_tree(rh[revno-2])
1002
return compare_trees(old_tree, new_tree)
1005
def revision_history(self):
1006
"""See Branch.revision_history."""
1007
transaction = self.get_transaction()
1008
history = transaction.map.find_revision_history()
1009
if history is not None:
1010
mutter("cache hit for revision-history in %s", self)
1011
return list(history)
1012
history = [l.rstrip('\r\n') for l in
1013
self.control_files.get_utf8('revision-history').readlines()]
1014
transaction.map.add_revision_history(history)
1015
# this call is disabled because revision_history is
1016
# not really an object yet, and the transaction is for objects.
1017
# transaction.register_clean(history, precious=True)
1018
return list(history)
1020
def update_revisions(self, other, stop_revision=None):
1021
"""See Branch.update_revisions."""
1022
if stop_revision is None:
1023
stop_revision = other.last_revision()
1024
### Should this be checking is_ancestor instead of revision_history?
1025
if (stop_revision is not None and
1026
stop_revision in self.revision_history()):
1028
self.fetch(other, stop_revision)
1029
pullable_revs = self.pullable_revisions(other, stop_revision)
1030
if len(pullable_revs) > 0:
1031
self.append_revision(*pullable_revs)
1033
def pullable_revisions(self, other, stop_revision):
1034
other_revno = other.revision_id_to_revno(stop_revision)
1036
return self.missing_revisions(other, other_revno)
1037
except DivergedBranches, e:
1039
pullable_revs = get_intervening_revisions(self.last_revision(),
1042
assert self.last_revision() not in pullable_revs
1043
return pullable_revs
1044
except bzrlib.errors.NotAncestor:
1045
if is_ancestor(self.last_revision(), stop_revision, self):
1050
def basis_tree(self):
1051
"""See Branch.basis_tree."""
1052
return self.repository.revision_tree(self.last_revision())
1054
@deprecated_method(zero_eight)
1055
def working_tree(self):
1056
"""Create a Working tree object for this branch."""
1057
from bzrlib.workingtree import WorkingTree
1058
from bzrlib.transport.local import LocalTransport
1059
if (self.base.find('://') != -1 or
1060
not isinstance(self._transport, LocalTransport)):
1061
raise NoWorkingTree(self.base)
1062
return self.bzrdir.open_workingtree()
1065
def pull(self, source, overwrite=False, stop_revision=None):
1066
"""See Branch.pull."""
1069
old_count = len(self.revision_history())
1071
self.update_revisions(source,stop_revision)
1072
except DivergedBranches:
1076
self.set_revision_history(source.revision_history())
1077
new_count = len(self.revision_history())
1078
return new_count - old_count
1082
def get_parent(self):
1083
"""See Branch.get_parent."""
1085
_locs = ['parent', 'pull', 'x-pull']
1088
return self.control_files.get_utf8(l).read().strip('\n')
1093
def get_push_location(self):
1094
"""See Branch.get_push_location."""
1095
config = bzrlib.config.BranchConfig(self)
1096
push_loc = config.get_user_option('push_location')
1099
def set_push_location(self, location):
1100
"""See Branch.set_push_location."""
1101
config = bzrlib.config.LocationConfig(self.base)
1102
config.set_user_option('push_location', location)
1105
def set_parent(self, url):
1106
"""See Branch.set_parent."""
1107
# TODO: Maybe delete old location files?
1108
# URLs should never be unicode, even on the local fs,
1109
# FIXUP this and get_parent in a future branch format bump:
1110
# read and rewrite the file, and have the new format code read
1111
# using .get not .get_utf8. RBC 20060125
1112
self.control_files.put_utf8('parent', url + '\n')
1114
def tree_config(self):
1115
return TreeConfig(self)
1118
class BzrBranch5(BzrBranch):
1119
"""A format 5 branch. This supports new features over plan branches.
1121
It has support for a master_branch which is the data for bound branches.
1129
super(BzrBranch5, self).__init__(_format=_format,
1130
_control_files=_control_files,
1132
_repository=_repository)
1135
def pull(self, source, overwrite=False, stop_revision=None):
1136
"""Updates branch.pull to be bound branch aware."""
1137
bound_location = self.get_bound_location()
1138
if source.base != bound_location:
1139
# not pulling from master, so we need to update master.
1140
master_branch = self.get_master_branch()
1142
master_branch.pull(source)
1143
source = master_branch
1144
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1146
def get_bound_location(self):
1148
return self.control_files.get_utf8('bound').read()[:-1]
1149
except errors.NoSuchFile:
1153
def get_master_branch(self):
1154
"""Return the branch we are bound to.
1156
:return: Either a Branch, or None
1158
This could memoise the branch, but if thats done
1159
it must be revalidated on each new lock.
1160
So for now we just dont memoise it.
1161
# RBC 20060304 review this decision.
1163
bound_loc = self.get_bound_location()
1167
return Branch.open(bound_loc)
1168
except (errors.NotBranchError, errors.ConnectionError), e:
1169
raise errors.BoundBranchConnectionFailure(
1173
def set_bound_location(self, location):
1174
"""Set the target where this branch is bound to.
1176
:param location: URL to the target branch
1179
self.control_files.put_utf8('bound', location+'\n')
1182
self.control_files._transport.delete('bound')
1188
def bind(self, other):
1189
"""Bind the local branch the other branch.
1191
:param other: The branch to bind to
1194
# TODO: jam 20051230 Consider checking if the target is bound
1195
# It is debatable whether you should be able to bind to
1196
# a branch which is itself bound.
1197
# Committing is obviously forbidden,
1198
# but binding itself may not be.
1199
# Since we *have* to check at commit time, we don't
1200
# *need* to check here
1203
# we are now equal to or a suffix of other.
1205
# Since we have 'pulled' from the remote location,
1206
# now we should try to pull in the opposite direction
1207
# in case the local tree has more revisions than the
1209
# There may be a different check you could do here
1210
# rather than actually trying to install revisions remotely.
1211
# TODO: capture an exception which indicates the remote branch
1213
# If it is up-to-date, this probably should not be a failure
1215
# lock other for write so the revision-history syncing cannot race
1219
# if this does not error, other now has the same last rev we do
1220
# it can only error if the pull from other was concurrent with
1221
# a commit to other from someone else.
1223
# until we ditch revision-history, we need to sync them up:
1224
self.set_revision_history(other.revision_history())
1225
# now other and self are up to date with each other and have the
1226
# same revision-history.
1230
self.set_bound_location(other.base)
1234
"""If bound, unbind"""
1235
return self.set_bound_location(None)
1239
"""Synchronise this branch with the master branch if any.
1241
:return: None or the last_revision that was pivoted out during the
1244
master = self.get_master_branch()
1245
if master is not None:
1246
old_tip = self.last_revision()
1247
self.pull(master, overwrite=True)
1248
if old_tip in self.repository.get_ancestry(self.last_revision()):
1254
class BranchTestProviderAdapter(object):
1255
"""A tool to generate a suite testing multiple branch formats at once.
1257
This is done by copying the test once for each transport and injecting
1258
the transport_server, transport_readonly_server, and branch_format
1259
classes into each copy. Each copy is also given a new id() to make it
1263
def __init__(self, transport_server, transport_readonly_server, formats):
1264
self._transport_server = transport_server
1265
self._transport_readonly_server = transport_readonly_server
1266
self._formats = formats
1268
def adapt(self, test):
1269
result = TestSuite()
1270
for branch_format, bzrdir_format in self._formats:
1271
new_test = deepcopy(test)
1272
new_test.transport_server = self._transport_server
1273
new_test.transport_readonly_server = self._transport_readonly_server
1274
new_test.bzrdir_format = bzrdir_format
1275
new_test.branch_format = branch_format
1276
def make_new_test_id():
1277
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1278
return lambda: new_id
1279
new_test.id = make_new_test_id()
1280
result.addTest(new_test)
1284
######################################################################
1288
@deprecated_function(zero_eight)
1289
def ScratchBranch(*args, **kwargs):
1290
"""See bzrlib.bzrdir.ScratchDir."""
1291
d = ScratchDir(*args, **kwargs)
1292
return d.open_branch()
1295
@deprecated_function(zero_eight)
1296
def is_control_file(*args, **kwargs):
1297
"""See bzrlib.workingtree.is_control_file."""
1298
return bzrlib.workingtree.is_control_file(*args, **kwargs)
added
removed
bzrlib/branch.py
