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 cStringIO import StringIO
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
22
from copy import deepcopy
23
from unittest import TestSuite
24
from warnings import warn
30
config as _mod_config,
35
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
45
from bzrlib.decorators import needs_read_lock, needs_write_lock
46
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
47
HistoryMissing, InvalidRevisionId,
48
InvalidRevisionNumber, LockError, NoSuchFile,
49
NoSuchRevision, NoWorkingTree, NotVersionedError,
50
NotBranchError, UninitializableFormat,
51
UnlistableStore, UnlistableBranch,
53
from bzrlib.symbol_versioning import (deprecated_function,
57
zero_eight, zero_nine,
59
from bzrlib.trace import mutter, note
62
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
63
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
64
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
67
# TODO: Maybe include checks for common corruption of newlines, etc?
69
# TODO: Some operations like log might retrieve the same revisions
70
# repeatedly to calculate deltas. We could perhaps have a weakref
71
# cache in memory to make this faster. In general anything can be
72
# cached in memory between lock and unlock operations. .. nb thats
73
# what the transaction identity map provides
76
######################################################################
80
"""Branch holding a history of revisions.
83
Base directory/url of the branch.
85
# this is really an instance variable - FIXME move it there
89
def __init__(self, *ignored, **ignored_too):
90
raise NotImplementedError('The Branch class is abstract')
93
"""Break a lock if one is present from another instance.
95
Uses the ui factory to ask for confirmation if the lock may be from
98
This will probe the repository for its lock as well.
100
self.control_files.break_lock()
101
self.repository.break_lock()
102
master = self.get_master_branch()
103
if master is not None:
107
@deprecated_method(zero_eight)
108
def open_downlevel(base):
109
"""Open a branch which may be of an old format."""
110
return Branch.open(base, _unsupported=True)
113
def open(base, _unsupported=False):
114
"""Open the branch rooted at base.
116
For instance, if the branch is at URL/.bzr/branch,
117
Branch.open(URL) -> a Branch instance.
119
control = bzrdir.BzrDir.open(base, _unsupported)
120
return control.open_branch(_unsupported)
123
def open_containing(url):
124
"""Open an existing branch which contains url.
126
This probes for a branch at url, and searches upwards from there.
128
Basically we keep looking up until we find the control directory or
129
run into the root. If there isn't one, raises NotBranchError.
130
If there is one and it is either an unrecognised format or an unsupported
131
format, UnknownFormatError or UnsupportedFormatError are raised.
132
If there is one, it is returned, along with the unused portion of url.
134
control, relpath = bzrdir.BzrDir.open_containing(url)
135
return control.open_branch(), relpath
138
@deprecated_function(zero_eight)
139
def initialize(base):
140
"""Create a new working tree and branch, rooted at 'base' (url)
142
NOTE: This will soon be deprecated in favour of creation
145
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
147
@deprecated_function(zero_eight)
148
def setup_caching(self, cache_root):
149
"""Subclasses that care about caching should override this, and set
150
up cached stores located under cache_root.
152
NOTE: This is unused.
156
def get_config(self):
157
return BranchConfig(self)
160
return self.get_config().get_nickname()
162
def _set_nick(self, nick):
163
self.get_config().set_user_option('nickname', nick)
165
nick = property(_get_nick, _set_nick)
168
raise NotImplementedError(self.is_locked)
170
def lock_write(self):
171
raise NotImplementedError(self.lock_write)
174
raise NotImplementedError(self.lock_read)
177
raise NotImplementedError(self.unlock)
179
def peek_lock_mode(self):
180
"""Return lock mode for the Branch: 'r', 'w' or None"""
181
raise NotImplementedError(self.peek_lock_mode)
183
def get_physical_lock_status(self):
184
raise NotImplementedError(self.get_physical_lock_status)
186
def abspath(self, name):
187
"""Return absolute filename for something in the branch
189
XXX: Robert Collins 20051017 what is this used for? why is it a branch
190
method and not a tree method.
192
raise NotImplementedError(self.abspath)
194
def bind(self, other):
195
"""Bind the local branch the other branch.
197
:param other: The branch to bind to
200
raise errors.UpgradeRequired(self.base)
203
def fetch(self, from_branch, last_revision=None, pb=None):
204
"""Copy revisions from from_branch into this branch.
206
:param from_branch: Where to copy from.
207
:param last_revision: What revision to stop at (None for at the end
209
:param pb: An optional progress bar to use.
211
Returns the copied revision count and the failed revisions in a tuple:
214
if self.base == from_branch.base:
217
nested_pb = ui.ui_factory.nested_progress_bar()
222
from_branch.lock_read()
224
if last_revision is None:
225
pb.update('get source history')
226
from_history = from_branch.revision_history()
228
last_revision = from_history[-1]
230
# no history in the source branch
231
last_revision = _mod_revision.NULL_REVISION
232
return self.repository.fetch(from_branch.repository,
233
revision_id=last_revision,
236
if nested_pb is not None:
240
def get_bound_location(self):
241
"""Return the URL of the branch we are bound to.
243
Older format branches cannot bind, please be sure to use a metadir
248
def get_commit_builder(self, parents, config=None, timestamp=None,
249
timezone=None, committer=None, revprops=None,
251
"""Obtain a CommitBuilder for this branch.
253
:param parents: Revision ids of the parents of the new revision.
254
:param config: Optional configuration to use.
255
:param timestamp: Optional timestamp recorded for commit.
256
:param timezone: Optional timezone for timestamp.
257
:param committer: Optional committer to set for commit.
258
:param revprops: Optional dictionary of revision properties.
259
:param revision_id: Optional revision id.
263
config = self.get_config()
265
return self.repository.get_commit_builder(self, parents, config,
266
timestamp, timezone, committer, revprops, revision_id)
268
def get_master_branch(self):
269
"""Return the branch we are bound to.
271
:return: Either a Branch, or None
275
def get_revision_delta(self, revno):
276
"""Return the delta for one revision.
278
The delta is relative to its mainline predecessor, or the
279
empty tree for revision 1.
281
assert isinstance(revno, int)
282
rh = self.revision_history()
283
if not (1 <= revno <= len(rh)):
284
raise InvalidRevisionNumber(revno)
285
return self.repository.get_revision_delta(rh[revno-1])
287
def get_root_id(self):
288
"""Return the id of this branches root"""
289
raise NotImplementedError(self.get_root_id)
291
def print_file(self, file, revision_id):
292
"""Print `file` to stdout."""
293
raise NotImplementedError(self.print_file)
295
def append_revision(self, *revision_ids):
296
raise NotImplementedError(self.append_revision)
298
def set_revision_history(self, rev_history):
299
raise NotImplementedError(self.set_revision_history)
301
def revision_history(self):
302
"""Return sequence of revision hashes on to this branch."""
303
raise NotImplementedError(self.revision_history)
306
"""Return current revision number for this branch.
308
That is equivalent to the number of revisions committed to
311
return len(self.revision_history())
314
"""Older format branches cannot bind or unbind."""
315
raise errors.UpgradeRequired(self.base)
317
def last_revision(self):
318
"""Return last revision id, or None"""
319
ph = self.revision_history()
325
def missing_revisions(self, other, stop_revision=None):
326
"""Return a list of new revisions that would perfectly fit.
328
If self and other have not diverged, return a list of the revisions
329
present in other, but missing from self.
331
self_history = self.revision_history()
332
self_len = len(self_history)
333
other_history = other.revision_history()
334
other_len = len(other_history)
335
common_index = min(self_len, other_len) -1
336
if common_index >= 0 and \
337
self_history[common_index] != other_history[common_index]:
338
raise DivergedBranches(self, other)
340
if stop_revision is None:
341
stop_revision = other_len
343
assert isinstance(stop_revision, int)
344
if stop_revision > other_len:
345
raise errors.NoSuchRevision(self, stop_revision)
346
return other_history[self_len:stop_revision]
348
def update_revisions(self, other, stop_revision=None):
349
"""Pull in new perfect-fit revisions.
351
:param other: Another Branch to pull from
352
:param stop_revision: Updated until the given revision
355
raise NotImplementedError(self.update_revisions)
357
def revision_id_to_revno(self, revision_id):
358
"""Given a revision id, return its revno"""
359
if revision_id is None:
361
history = self.revision_history()
363
return history.index(revision_id) + 1
365
raise bzrlib.errors.NoSuchRevision(self, revision_id)
367
def get_rev_id(self, revno, history=None):
368
"""Find the revision id of the specified revno."""
372
history = self.revision_history()
373
if revno <= 0 or revno > len(history):
374
raise bzrlib.errors.NoSuchRevision(self, revno)
375
return history[revno - 1]
377
def pull(self, source, overwrite=False, stop_revision=None):
378
raise NotImplementedError(self.pull)
380
def basis_tree(self):
381
"""Return `Tree` object for last revision."""
382
return self.repository.revision_tree(self.last_revision())
384
def rename_one(self, from_rel, to_rel):
387
This can change the directory or the filename or both.
389
raise NotImplementedError(self.rename_one)
391
def move(self, from_paths, to_name):
394
to_name must exist as a versioned directory.
396
If to_name exists and is a directory, the files are moved into
397
it, keeping their old names. If it is a directory,
399
Note that to_name is only the last component of the new name;
400
this doesn't change the directory.
402
This returns a list of (from_path, to_path) pairs for each
405
raise NotImplementedError(self.move)
407
def get_parent(self):
408
"""Return the parent location of the branch.
410
This is the default location for push/pull/missing. The usual
411
pattern is that the user can override it by specifying a
414
raise NotImplementedError(self.get_parent)
416
def get_submit_branch(self):
417
"""Return the submit location of the branch.
419
This is the default location for bundle. The usual
420
pattern is that the user can override it by specifying a
423
return self.get_config().get_user_option('submit_branch')
425
def set_submit_branch(self, location):
426
"""Return the submit location of the branch.
428
This is the default location for bundle. The usual
429
pattern is that the user can override it by specifying a
432
self.get_config().set_user_option('submit_branch', location)
434
def get_push_location(self):
435
"""Return the None or the location to push this branch to."""
436
raise NotImplementedError(self.get_push_location)
438
def set_push_location(self, location):
439
"""Set a new push location for this branch."""
440
raise NotImplementedError(self.set_push_location)
442
def set_parent(self, url):
443
raise NotImplementedError(self.set_parent)
447
"""Synchronise this branch with the master branch if any.
449
:return: None or the last_revision pivoted out during the update.
453
def check_revno(self, revno):
455
Check whether a revno corresponds to any revision.
456
Zero (the NULL revision) is considered valid.
459
self.check_real_revno(revno)
461
def check_real_revno(self, revno):
463
Check whether a revno corresponds to a real revision.
464
Zero (the NULL revision) is considered invalid
466
if revno < 1 or revno > self.revno():
467
raise InvalidRevisionNumber(revno)
470
def clone(self, *args, **kwargs):
471
"""Clone this branch into to_bzrdir preserving all semantic values.
473
revision_id: if not None, the revision history in the new branch will
474
be truncated to end with revision_id.
476
# for API compatibility, until 0.8 releases we provide the old api:
477
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
478
# after 0.8 releases, the *args and **kwargs should be changed:
479
# def clone(self, to_bzrdir, revision_id=None):
480
if (kwargs.get('to_location', None) or
481
kwargs.get('revision', None) or
482
kwargs.get('basis_branch', None) or
483
(len(args) and isinstance(args[0], basestring))):
484
# backwards compatibility api:
485
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
486
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
489
basis_branch = args[2]
491
basis_branch = kwargs.get('basis_branch', None)
493
basis = basis_branch.bzrdir
498
revision_id = args[1]
500
revision_id = kwargs.get('revision', None)
505
# no default to raise if not provided.
506
url = kwargs.get('to_location')
507
return self.bzrdir.clone(url,
508
revision_id=revision_id,
509
basis=basis).open_branch()
511
# generate args by hand
513
revision_id = args[1]
515
revision_id = kwargs.get('revision_id', None)
519
# no default to raise if not provided.
520
to_bzrdir = kwargs.get('to_bzrdir')
521
result = self._format.initialize(to_bzrdir)
522
self.copy_content_into(result, revision_id=revision_id)
526
def sprout(self, to_bzrdir, revision_id=None):
527
"""Create a new line of development from the branch, into to_bzrdir.
529
revision_id: if not None, the revision history in the new branch will
530
be truncated to end with revision_id.
532
result = self._format.initialize(to_bzrdir)
533
self.copy_content_into(result, revision_id=revision_id)
534
result.set_parent(self.bzrdir.root_transport.base)
538
def copy_content_into(self, destination, revision_id=None):
539
"""Copy the content of self into destination.
541
revision_id: if not None, the revision history in the new branch will
542
be truncated to end with revision_id.
544
new_history = self.revision_history()
545
if revision_id is not None:
547
new_history = new_history[:new_history.index(revision_id) + 1]
549
rev = self.repository.get_revision(revision_id)
550
new_history = rev.get_history(self.repository)[1:]
551
destination.set_revision_history(new_history)
553
parent = self.get_parent()
554
except errors.InaccessibleParent, e:
555
mutter('parent was not accessible to copy: %s', e)
558
destination.set_parent(parent)
562
"""Check consistency of the branch.
564
In particular this checks that revisions given in the revision-history
565
do actually match up in the revision graph, and that they're all
566
present in the repository.
568
Callers will typically also want to check the repository.
570
:return: A BranchCheckResult.
572
mainline_parent_id = None
573
for revision_id in self.revision_history():
575
revision = self.repository.get_revision(revision_id)
576
except errors.NoSuchRevision, e:
577
raise errors.BzrCheckError("mainline revision {%s} not in repository"
579
# In general the first entry on the revision history has no parents.
580
# But it's not illegal for it to have parents listed; this can happen
581
# in imports from Arch when the parents weren't reachable.
582
if mainline_parent_id is not None:
583
if mainline_parent_id not in revision.parent_ids:
584
raise errors.BzrCheckError("previous revision {%s} not listed among "
586
% (mainline_parent_id, revision_id))
587
mainline_parent_id = revision_id
588
return BranchCheckResult(self)
590
def _get_checkout_format(self):
591
"""Return the most suitable metadir for a checkout of this branch.
592
Weaves are used if this branch's repostory uses weaves.
594
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
595
from bzrlib import repository
596
format = bzrdir.BzrDirMetaFormat1()
597
format.repository_format = repository.RepositoryFormat7()
599
format = self.repository.bzrdir.cloning_metadir()
602
def create_checkout(self, to_location, revision_id=None,
604
"""Create a checkout of a branch.
606
:param to_location: The url to produce the checkout at
607
:param revision_id: The revision to check out
608
:param lightweight: If True, produce a lightweight checkout, otherwise,
609
produce a bound branch (heavyweight checkout)
610
:return: The tree of the created checkout
612
t = transport.get_transport(to_location)
615
except errors.FileExists:
618
checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
619
BranchReferenceFormat().initialize(checkout, self)
621
format = self._get_checkout_format()
622
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
623
to_location, force_new_tree=False, format=format)
624
checkout = checkout_branch.bzrdir
625
checkout_branch.bind(self)
626
# pull up to the specified revision_id to set the initial
627
# branch tip correctly, and seed it with history.
628
checkout_branch.pull(self, stop_revision=revision_id)
629
return checkout.create_workingtree(revision_id)
632
class BranchFormat(object):
633
"""An encapsulation of the initialization and open routines for a format.
635
Formats provide three things:
636
* An initialization routine,
640
Formats are placed in an dict by their format string for reference
641
during branch opening. Its not required that these be instances, they
642
can be classes themselves with class methods - it simply depends on
643
whether state is needed for a given format or not.
645
Once a format is deprecated, just deprecate the initialize and open
646
methods on the format class. Do not deprecate the object, as the
647
object will be created every time regardless.
650
_default_format = None
651
"""The default format used for new branches."""
654
"""The known formats."""
657
def find_format(klass, a_bzrdir):
658
"""Return the format for the branch object in a_bzrdir."""
660
transport = a_bzrdir.get_branch_transport(None)
661
format_string = transport.get("format").read()
662
return klass._formats[format_string]
664
raise NotBranchError(path=transport.base)
666
raise errors.UnknownFormatError(format=format_string)
669
def get_default_format(klass):
670
"""Return the current default format."""
671
return klass._default_format
673
def get_format_string(self):
674
"""Return the ASCII format string that identifies this format."""
675
raise NotImplementedError(self.get_format_string)
677
def get_format_description(self):
678
"""Return the short format description for this format."""
679
raise NotImplementedError(self.get_format_string)
681
def initialize(self, a_bzrdir):
682
"""Create a branch of this format in a_bzrdir."""
683
raise NotImplementedError(self.initialize)
685
def is_supported(self):
686
"""Is this format supported?
688
Supported formats can be initialized and opened.
689
Unsupported formats may not support initialization or committing or
690
some other features depending on the reason for not being supported.
694
def open(self, a_bzrdir, _found=False):
695
"""Return the branch object for a_bzrdir
697
_found is a private parameter, do not use it. It is used to indicate
698
if format probing has already be done.
700
raise NotImplementedError(self.open)
703
def register_format(klass, format):
704
klass._formats[format.get_format_string()] = format
707
def set_default_format(klass, format):
708
klass._default_format = format
711
def unregister_format(klass, format):
712
assert klass._formats[format.get_format_string()] is format
713
del klass._formats[format.get_format_string()]
716
return self.get_format_string().rstrip()
719
class BzrBranchFormat4(BranchFormat):
720
"""Bzr branch format 4.
723
- a revision-history file.
724
- a branch-lock lock file [ to be shared with the bzrdir ]
727
def get_format_description(self):
728
"""See BranchFormat.get_format_description()."""
729
return "Branch format 4"
731
def initialize(self, a_bzrdir):
732
"""Create a branch of this format in a_bzrdir."""
733
mutter('creating branch in %s', a_bzrdir.transport.base)
734
branch_transport = a_bzrdir.get_branch_transport(self)
735
utf8_files = [('revision-history', ''),
738
control_files = lockable_files.LockableFiles(branch_transport,
739
'branch-lock', lockable_files.TransportLock)
740
control_files.create_lock()
741
control_files.lock_write()
743
for file, content in utf8_files:
744
control_files.put_utf8(file, content)
746
control_files.unlock()
747
return self.open(a_bzrdir, _found=True)
750
super(BzrBranchFormat4, self).__init__()
751
self._matchingbzrdir = bzrdir.BzrDirFormat6()
753
def open(self, a_bzrdir, _found=False):
754
"""Return the branch object for a_bzrdir
756
_found is a private parameter, do not use it. It is used to indicate
757
if format probing has already be done.
760
# we are being called directly and must probe.
761
raise NotImplementedError
762
return BzrBranch(_format=self,
763
_control_files=a_bzrdir._control_files,
765
_repository=a_bzrdir.open_repository())
768
return "Bazaar-NG branch format 4"
771
class BzrBranchFormat5(BranchFormat):
772
"""Bzr branch format 5.
775
- a revision-history file.
777
- a lock dir guarding the branch itself
778
- all of this stored in a branch/ subdirectory
779
- works with shared repositories.
781
This format is new in bzr 0.8.
784
def get_format_string(self):
785
"""See BranchFormat.get_format_string()."""
786
return "Bazaar-NG branch format 5\n"
788
def get_format_description(self):
789
"""See BranchFormat.get_format_description()."""
790
return "Branch format 5"
792
def initialize(self, a_bzrdir):
793
"""Create a branch of this format in a_bzrdir."""
794
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
795
branch_transport = a_bzrdir.get_branch_transport(self)
796
utf8_files = [('revision-history', ''),
799
control_files = lockable_files.LockableFiles(branch_transport, 'lock',
801
control_files.create_lock()
802
control_files.lock_write()
803
control_files.put_utf8('format', self.get_format_string())
805
for file, content in utf8_files:
806
control_files.put_utf8(file, content)
808
control_files.unlock()
809
return self.open(a_bzrdir, _found=True, )
812
super(BzrBranchFormat5, self).__init__()
813
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
815
def open(self, a_bzrdir, _found=False):
816
"""Return the branch object for a_bzrdir
818
_found is a private parameter, do not use it. It is used to indicate
819
if format probing has already be done.
822
format = BranchFormat.find_format(a_bzrdir)
823
assert format.__class__ == self.__class__
824
transport = a_bzrdir.get_branch_transport(None)
825
control_files = lockable_files.LockableFiles(transport, 'lock',
827
return BzrBranch5(_format=self,
828
_control_files=control_files,
830
_repository=a_bzrdir.find_repository())
833
return "Bazaar-NG Metadir branch format 5"
836
class BzrBranchFormat6(BzrBranchFormat5):
837
"""Branch format with last-revision
839
Unlike previous formats, this has no explicit revision history, instead
840
the left-parent revision history is used.
843
def get_format_string(self):
844
"""See BranchFormat.get_format_string()."""
845
return "Bazaar-NG branch format 6\n"
847
def get_format_description(self):
848
"""See BranchFormat.get_format_description()."""
849
return "Branch format 6"
851
def initialize(self, a_bzrdir):
852
"""Create a branch of this format in a_bzrdir."""
853
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
854
branch_transport = a_bzrdir.get_branch_transport(self)
855
utf8_files = [('last-revision', 'null:\n'),
859
control_files = lockable_files.LockableFiles(branch_transport, 'lock',
861
control_files.create_lock()
862
control_files.lock_write()
863
control_files.put_utf8('format', self.get_format_string())
865
for file, content in utf8_files:
866
control_files.put_utf8(file, content)
868
control_files.unlock()
869
return self.open(a_bzrdir, _found=True, )
871
def open(self, a_bzrdir, _found=False):
872
"""Return the branch object for a_bzrdir
874
_found is a private parameter, do not use it. It is used to indicate
875
if format probing has already be done.
878
format = BranchFormat.find_format(a_bzrdir)
879
assert format.__class__ == self.__class__
880
transport = a_bzrdir.get_branch_transport(None)
881
control_files = lockable_files.LockableFiles(transport, 'lock',
883
return BzrBranch6(_format=self,
884
_control_files=control_files,
886
_repository=a_bzrdir.find_repository())
889
class BranchReferenceFormat(BranchFormat):
890
"""Bzr branch reference format.
892
Branch references are used in implementing checkouts, they
893
act as an alias to the real branch which is at some other url.
900
def get_format_string(self):
901
"""See BranchFormat.get_format_string()."""
902
return "Bazaar-NG Branch Reference Format 1\n"
904
def get_format_description(self):
905
"""See BranchFormat.get_format_description()."""
906
return "Checkout reference format 1"
908
def initialize(self, a_bzrdir, target_branch=None):
909
"""Create a branch of this format in a_bzrdir."""
910
if target_branch is None:
911
# this format does not implement branch itself, thus the implicit
912
# creation contract must see it as uninitializable
913
raise errors.UninitializableFormat(self)
914
mutter('creating branch reference in %s', a_bzrdir.transport.base)
915
branch_transport = a_bzrdir.get_branch_transport(self)
916
branch_transport.put_bytes('location',
917
target_branch.bzrdir.root_transport.base)
918
branch_transport.put_bytes('format', self.get_format_string())
919
return self.open(a_bzrdir, _found=True)
922
super(BranchReferenceFormat, self).__init__()
923
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
925
def _make_reference_clone_function(format, a_branch):
926
"""Create a clone() routine for a branch dynamically."""
927
def clone(to_bzrdir, revision_id=None):
928
"""See Branch.clone()."""
929
return format.initialize(to_bzrdir, a_branch)
930
# cannot obey revision_id limits when cloning a reference ...
931
# FIXME RBC 20060210 either nuke revision_id for clone, or
932
# emit some sort of warning/error to the caller ?!
935
def open(self, a_bzrdir, _found=False):
936
"""Return the branch that the branch reference in a_bzrdir points at.
938
_found is a private parameter, do not use it. It is used to indicate
939
if format probing has already be done.
942
format = BranchFormat.find_format(a_bzrdir)
943
assert format.__class__ == self.__class__
944
transport = a_bzrdir.get_branch_transport(None)
945
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
946
result = real_bzrdir.open_branch()
947
# this changes the behaviour of result.clone to create a new reference
948
# rather than a copy of the content of the branch.
949
# I did not use a proxy object because that needs much more extensive
950
# testing, and we are only changing one behaviour at the moment.
951
# If we decide to alter more behaviours - i.e. the implicit nickname
952
# then this should be refactored to introduce a tested proxy branch
953
# and a subclass of that for use in overriding clone() and ....
955
result.clone = self._make_reference_clone_function(result)
959
# formats which have no format string are not discoverable
960
# and not independently creatable, so are not registered.
961
__default_format = BzrBranchFormat5()
962
BranchFormat.register_format(__default_format)
963
BranchFormat.register_format(BranchReferenceFormat())
964
BranchFormat.register_format(BzrBranchFormat6())
965
BranchFormat.set_default_format(__default_format)
966
_legacy_formats = [BzrBranchFormat4(),
969
class BzrBranch(Branch):
970
"""A branch stored in the actual filesystem.
972
Note that it's "local" in the context of the filesystem; it doesn't
973
really matter if it's on an nfs/smb/afs/coda/... share, as long as
974
it's writable, and can be accessed via the normal filesystem API.
977
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
978
relax_version_check=DEPRECATED_PARAMETER, _format=None,
979
_control_files=None, a_bzrdir=None, _repository=None):
980
"""Create new branch object at a particular location.
982
transport -- A Transport object, defining how to access files.
984
init -- If True, create new control files in a previously
985
unversioned directory. If False, the branch must already
988
relax_version_check -- If true, the usual check for the branch
989
version is not applied. This is intended only for
990
upgrade/recovery type use; it's not guaranteed that
991
all operations will work on old format branches.
994
self.bzrdir = bzrdir.BzrDir.open(transport.base)
996
self.bzrdir = a_bzrdir
997
self._transport = self.bzrdir.transport.clone('..')
998
self._base = self._transport.base
999
self._format = _format
1000
if _control_files is None:
1001
raise ValueError('BzrBranch _control_files is None')
1002
self.control_files = _control_files
1003
if deprecated_passed(init):
1004
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
1005
"deprecated as of bzr 0.8. Please use Branch.create().",
1009
# this is slower than before deprecation, oh well never mind.
1010
# -> its deprecated.
1011
self._initialize(transport.base)
1012
self._check_format(_format)
1013
if deprecated_passed(relax_version_check):
1014
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1015
"relax_version_check parameter is deprecated as of bzr 0.8. "
1016
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
1020
if (not relax_version_check
1021
and not self._format.is_supported()):
1022
raise errors.UnsupportedFormatError(format=fmt)
1023
if deprecated_passed(transport):
1024
warn("BzrBranch.__init__(transport=XXX...): The transport "
1025
"parameter is deprecated as of bzr 0.8. "
1026
"Please use Branch.open, or bzrdir.open_branch().",
1029
self.repository = _repository
1032
return '%s(%r)' % (self.__class__.__name__, self.base)
1036
def _get_base(self):
1039
base = property(_get_base, doc="The URL for the root of this branch.")
1041
def _finish_transaction(self):
1042
"""Exit the current transaction."""
1043
return self.control_files._finish_transaction()
1045
def get_transaction(self):
1046
"""Return the current active transaction.
1048
If no transaction is active, this returns a passthrough object
1049
for which all data is immediately flushed and no caching happens.
1051
# this is an explicit function so that we can do tricky stuff
1052
# when the storage in rev_storage is elsewhere.
1053
# we probably need to hook the two 'lock a location' and
1054
# 'have a transaction' together more delicately, so that
1055
# we can have two locks (branch and storage) and one transaction
1056
# ... and finishing the transaction unlocks both, but unlocking
1057
# does not. - RBC 20051121
1058
return self.control_files.get_transaction()
1060
def _set_transaction(self, transaction):
1061
"""Set a new active transaction."""
1062
return self.control_files._set_transaction(transaction)
1064
def abspath(self, name):
1065
"""See Branch.abspath."""
1066
return self.control_files._transport.abspath(name)
1068
def _check_format(self, format):
1069
"""Identify the branch format if needed.
1071
The format is stored as a reference to the format object in
1072
self._format for code that needs to check it later.
1074
The format parameter is either None or the branch format class
1075
used to open this branch.
1077
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
1080
format = BranchFormat.find_format(self.bzrdir)
1081
self._format = format
1082
mutter("got branch format %s", self._format)
1085
def get_root_id(self):
1086
"""See Branch.get_root_id."""
1087
tree = self.repository.revision_tree(self.last_revision())
1088
return tree.inventory.root.file_id
1090
def is_locked(self):
1091
return self.control_files.is_locked()
1093
def lock_write(self):
1094
self.repository.lock_write()
1096
self.control_files.lock_write()
1098
self.repository.unlock()
1101
def lock_read(self):
1102
self.repository.lock_read()
1104
self.control_files.lock_read()
1106
self.repository.unlock()
1110
# TODO: test for failed two phase locks. This is known broken.
1112
self.control_files.unlock()
1114
self.repository.unlock()
1116
def peek_lock_mode(self):
1117
if self.control_files._lock_count == 0:
1120
return self.control_files._lock_mode
1122
def get_physical_lock_status(self):
1123
return self.control_files.get_physical_lock_status()
1126
def print_file(self, file, revision_id):
1127
"""See Branch.print_file."""
1128
return self.repository.print_file(file, revision_id)
1131
def append_revision(self, *revision_ids):
1132
"""See Branch.append_revision."""
1133
for revision_id in revision_ids:
1134
mutter("add {%s} to revision-history" % revision_id)
1135
rev_history = self.revision_history()
1136
rev_history.extend(revision_ids)
1137
self.set_revision_history(rev_history)
1140
def set_revision_history(self, rev_history):
1141
"""See Branch.set_revision_history."""
1142
self.control_files.put_utf8(
1143
'revision-history', '\n'.join(rev_history))
1144
transaction = self.get_transaction()
1145
history = transaction.map.find_revision_history()
1146
if history is not None:
1147
# update the revision history in the identity map.
1148
history[:] = list(rev_history)
1149
# this call is disabled because revision_history is
1150
# not really an object yet, and the transaction is for objects.
1151
# transaction.register_dirty(history)
1153
transaction.map.add_revision_history(rev_history)
1154
# this call is disabled because revision_history is
1155
# not really an object yet, and the transaction is for objects.
1156
# transaction.register_clean(history)
1159
def revision_history(self):
1160
"""See Branch.revision_history."""
1161
transaction = self.get_transaction()
1162
history = transaction.map.find_revision_history()
1163
if history is not None:
1164
# mutter("cache hit for revision-history in %s", self)
1165
return list(history)
1166
decode_utf8 = cache_utf8.decode
1167
history = [decode_utf8(l.rstrip('\r\n')) for l in
1168
self.control_files.get('revision-history').readlines()]
1169
transaction.map.add_revision_history(history)
1170
# this call is disabled because revision_history is
1171
# not really an object yet, and the transaction is for objects.
1172
# transaction.register_clean(history, precious=True)
1173
return list(history)
1175
def _lefthand_history(self, revision_id, last_rev=None,
1177
# stop_revision must be a descendant of last_revision
1178
stop_graph = self.repository.get_revision_graph(revision_id)
1179
if last_rev is not None and last_rev not in stop_graph:
1180
# our previous tip is not merged into stop_revision
1181
raise errors.DivergedBranches(self, other_branch)
1182
# make a new revision history from the graph
1183
current_rev_id = revision_id
1185
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1186
new_history.append(current_rev_id)
1187
current_rev_id_parents = stop_graph[current_rev_id]
1189
current_rev_id = current_rev_id_parents[0]
1191
current_rev_id = None
1192
new_history.reverse()
1196
def generate_revision_history(self, revision_id, last_rev=None,
1198
"""Create a new revision history that will finish with revision_id.
1200
:param revision_id: the new tip to use.
1201
:param last_rev: The previous last_revision. If not None, then this
1202
must be a ancestory of revision_id, or DivergedBranches is raised.
1203
:param other_branch: The other branch that DivergedBranches should
1204
raise with respect to.
1206
self.set_revision_history(self._lefthand_history(revision_id,
1207
last_rev, other_branch))
1210
def update_revisions(self, other, stop_revision=None):
1211
"""See Branch.update_revisions."""
1214
if stop_revision is None:
1215
stop_revision = other.last_revision()
1216
if stop_revision is None:
1217
# if there are no commits, we're done.
1219
# whats the current last revision, before we fetch [and change it
1221
last_rev = self.last_revision()
1222
# we fetch here regardless of whether we need to so that we pickup
1224
self.fetch(other, stop_revision)
1225
my_ancestry = self.repository.get_ancestry(last_rev)
1226
if stop_revision in my_ancestry:
1227
# last_revision is a descendant of stop_revision
1229
self.generate_revision_history(stop_revision, last_rev=last_rev,
1234
def basis_tree(self):
1235
"""See Branch.basis_tree."""
1236
return self.repository.revision_tree(self.last_revision())
1238
@deprecated_method(zero_eight)
1239
def working_tree(self):
1240
"""Create a Working tree object for this branch."""
1242
from bzrlib.transport.local import LocalTransport
1243
if (self.base.find('://') != -1 or
1244
not isinstance(self._transport, LocalTransport)):
1245
raise NoWorkingTree(self.base)
1246
return self.bzrdir.open_workingtree()
1249
def pull(self, source, overwrite=False, stop_revision=None):
1250
"""See Branch.pull."""
1253
old_count = len(self.revision_history())
1255
self.update_revisions(source, stop_revision)
1256
except DivergedBranches:
1260
self.set_revision_history(source.revision_history())
1261
new_count = len(self.revision_history())
1262
return new_count - old_count
1266
def get_parent(self):
1267
"""See Branch.get_parent."""
1269
_locs = ['parent', 'pull', 'x-pull']
1270
assert self.base[-1] == '/'
1273
parent = self.control_files.get(l).read().strip('\n')
1276
# This is an old-format absolute path to a local branch
1277
# turn it into a url
1278
if parent.startswith('/'):
1279
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1281
return urlutils.join(self.base[:-1], parent)
1282
except errors.InvalidURLJoin, e:
1283
raise errors.InaccessibleParent(parent, self.base)
1286
def get_push_location(self):
1287
"""See Branch.get_push_location."""
1288
push_loc = self.get_config().get_user_option('push_location')
1291
def set_push_location(self, location):
1292
"""See Branch.set_push_location."""
1293
self.get_config().set_user_option(
1294
'push_location', location,
1295
store=_mod_config.STORE_LOCATION_NORECURSE)
1298
def set_parent(self, url):
1299
"""See Branch.set_parent."""
1300
# TODO: Maybe delete old location files?
1301
# URLs should never be unicode, even on the local fs,
1302
# FIXUP this and get_parent in a future branch format bump:
1303
# read and rewrite the file, and have the new format code read
1304
# using .get not .get_utf8. RBC 20060125
1306
self.control_files._transport.delete('parent')
1308
if isinstance(url, unicode):
1310
url = url.encode('ascii')
1311
except UnicodeEncodeError:
1312
raise bzrlib.errors.InvalidURL(url,
1313
"Urls must be 7-bit ascii, "
1314
"use bzrlib.urlutils.escape")
1316
url = urlutils.relative_url(self.base, url)
1317
self.control_files.put('parent', StringIO(url + '\n'))
1319
@deprecated_function(zero_nine)
1320
def tree_config(self):
1321
"""DEPRECATED; call get_config instead.
1322
TreeConfig has become part of BranchConfig."""
1323
return TreeConfig(self)
1326
class BzrBranch5(BzrBranch):
1327
"""A format 5 branch. This supports new features over plan branches.
1329
It has support for a master_branch which is the data for bound branches.
1337
super(BzrBranch5, self).__init__(_format=_format,
1338
_control_files=_control_files,
1340
_repository=_repository)
1343
def pull(self, source, overwrite=False, stop_revision=None):
1344
"""Updates branch.pull to be bound branch aware."""
1345
bound_location = self.get_bound_location()
1346
if source.base != bound_location:
1347
# not pulling from master, so we need to update master.
1348
master_branch = self.get_master_branch()
1350
master_branch.pull(source)
1351
source = master_branch
1352
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1354
def get_bound_location(self):
1356
return self.control_files.get_utf8('bound').read()[:-1]
1357
except errors.NoSuchFile:
1361
def get_master_branch(self):
1362
"""Return the branch we are bound to.
1364
:return: Either a Branch, or None
1366
This could memoise the branch, but if thats done
1367
it must be revalidated on each new lock.
1368
So for now we just don't memoise it.
1369
# RBC 20060304 review this decision.
1371
bound_loc = self.get_bound_location()
1375
return Branch.open(bound_loc)
1376
except (errors.NotBranchError, errors.ConnectionError), e:
1377
raise errors.BoundBranchConnectionFailure(
1381
def set_bound_location(self, location):
1382
"""Set the target where this branch is bound to.
1384
:param location: URL to the target branch
1387
self.control_files.put_utf8('bound', location+'\n')
1390
self.control_files._transport.delete('bound')
1396
def bind(self, other):
1397
"""Bind this branch to the branch other.
1399
This does not push or pull data between the branches, though it does
1400
check for divergence to raise an error when the branches are not
1401
either the same, or one a prefix of the other. That behaviour may not
1402
be useful, so that check may be removed in future.
1404
:param other: The branch to bind to
1407
# TODO: jam 20051230 Consider checking if the target is bound
1408
# It is debatable whether you should be able to bind to
1409
# a branch which is itself bound.
1410
# Committing is obviously forbidden,
1411
# but binding itself may not be.
1412
# Since we *have* to check at commit time, we don't
1413
# *need* to check here
1415
# we want to raise diverged if:
1416
# last_rev is not in the other_last_rev history, AND
1417
# other_last_rev is not in our history, and do it without pulling
1419
last_rev = self.last_revision()
1420
if last_rev is not None:
1423
other_last_rev = other.last_revision()
1424
if other_last_rev is not None:
1425
# neither branch is new, we have to do some work to
1426
# ascertain diversion.
1427
remote_graph = other.repository.get_revision_graph(
1429
local_graph = self.repository.get_revision_graph(last_rev)
1430
if (last_rev not in remote_graph and
1431
other_last_rev not in local_graph):
1432
raise errors.DivergedBranches(self, other)
1435
self.set_bound_location(other.base)
1439
"""If bound, unbind"""
1440
return self.set_bound_location(None)
1444
"""Synchronise this branch with the master branch if any.
1446
:return: None or the last_revision that was pivoted out during the
1449
master = self.get_master_branch()
1450
if master is not None:
1451
old_tip = self.last_revision()
1452
self.pull(master, overwrite=True)
1453
if old_tip in self.repository.get_ancestry(self.last_revision()):
1459
class BzrBranch6(BzrBranch5):
1462
def last_revision(self):
1463
"""Return last revision id, or None"""
1464
revision_id = self.control_files.get_utf8('last-revision').read()
1465
revision_id = revision_id.rstrip('\n')
1466
if revision_id == _mod_revision.NULL_REVISION:
1471
def set_last_revision(self, revision_id):
1472
self.control_files.put_utf8('last-revision', revision_id + '\n')
1475
def revision_history(self):
1476
"""Generate the revision history from last revision
1478
return self._lefthand_history(self.last_revision())
1481
def set_revision_history(self, history):
1482
"""Set the last_revision, not revision history"""
1483
if len(history) == 0:
1484
self.set_last_revision('null:')
1486
assert history == self._lefthand_history(history[-1])
1487
self.set_last_revision(history[-1])
1490
def set_parent(self, url):
1491
"""Set the parent branch"""
1492
if isinstance(url, unicode):
1494
url = url.encode('ascii')
1495
except UnicodeEncodeError:
1496
raise bzrlib.errors.InvalidURL(url,
1497
"Urls must be 7-bit ascii, "
1498
"use bzrlib.urlutils.escape")
1500
url = urlutils.relative_url(self.base, url)
1501
self.get_config().set_user_option('parent_location', url)
1504
def get_parent(self):
1505
"""Set the parent branch"""
1506
return self.get_config().get_user_option('parent_location')
1508
def set_push_location(self, location):
1509
"""See Branch.set_push_location."""
1510
self.get_config().set_user_option('push_location', location)
1512
def set_bound_location(self, location):
1513
"""See Branch.set_push_location."""
1514
self.get_config().set_user_option('bound_location', location)
1516
def get_bound_location(self):
1517
"""See Branch.set_push_location."""
1518
return self.get_config().get_user_option('bound_location')
1521
class BranchTestProviderAdapter(object):
1522
"""A tool to generate a suite testing multiple branch formats at once.
1524
This is done by copying the test once for each transport and injecting
1525
the transport_server, transport_readonly_server, and branch_format
1526
classes into each copy. Each copy is also given a new id() to make it
1530
def __init__(self, transport_server, transport_readonly_server, formats):
1531
self._transport_server = transport_server
1532
self._transport_readonly_server = transport_readonly_server
1533
self._formats = formats
1535
def adapt(self, test):
1536
result = TestSuite()
1537
for branch_format, bzrdir_format in self._formats:
1538
new_test = deepcopy(test)
1539
new_test.transport_server = self._transport_server
1540
new_test.transport_readonly_server = self._transport_readonly_server
1541
new_test.bzrdir_format = bzrdir_format
1542
new_test.branch_format = branch_format
1543
def make_new_test_id():
1544
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1545
return lambda: new_id
1546
new_test.id = make_new_test_id()
1547
result.addTest(new_test)
1551
class BranchCheckResult(object):
1552
"""Results of checking branch consistency.
1557
def __init__(self, branch):
1558
self.branch = branch
1560
def report_results(self, verbose):
1561
"""Report the check results via trace.note.
1563
:param verbose: Requests more detailed display of what was checked,
1566
note('checked branch %s format %s',
1568
self.branch._format)
1571
######################################################################
1575
@deprecated_function(zero_eight)
1576
def is_control_file(*args, **kwargs):
1577
"""See bzrlib.workingtree.is_control_file."""
1578
from bzrlib import workingtree
1579
return workingtree.is_control_file(*args, **kwargs)
added
removed
bzrlib/branch.py
