1
# Copyright (C) 2005, 2006, 2007 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,
42
from bzrlib.config import BranchConfig, TreeConfig
43
from bzrlib.lockable_files import LockableFiles, TransportLock
44
from bzrlib.tag import (
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
51
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
52
HistoryMissing, InvalidRevisionId,
53
InvalidRevisionNumber, LockError, NoSuchFile,
54
NoSuchRevision, NoWorkingTree, NotVersionedError,
55
NotBranchError, UninitializableFormat,
56
UnlistableStore, UnlistableBranch,
58
from bzrlib.hooks import Hooks
59
from bzrlib.symbol_versioning import (deprecated_function,
63
zero_eight, zero_nine, zero_sixteen,
65
from bzrlib.trace import mutter, note
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 Branch Format 6 (bzr 0.15)\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
hooks: An instance of BranchHooks.
93
# this is really an instance variable - FIXME move it there
97
# override this to set the strategy for storing tags
99
return DisabledTags(self)
101
def __init__(self, *ignored, **ignored_too):
102
self.tags = self._make_tags()
103
self._revision_history_cache = None
104
self._revision_id_to_revno_cache = None
106
def break_lock(self):
107
"""Break a lock if one is present from another instance.
109
Uses the ui factory to ask for confirmation if the lock may be from
112
This will probe the repository for its lock as well.
114
self.control_files.break_lock()
115
self.repository.break_lock()
116
master = self.get_master_branch()
117
if master is not None:
121
@deprecated_method(zero_eight)
122
def open_downlevel(base):
123
"""Open a branch which may be of an old format."""
124
return Branch.open(base, _unsupported=True)
127
def open(base, _unsupported=False):
128
"""Open the branch rooted at base.
130
For instance, if the branch is at URL/.bzr/branch,
131
Branch.open(URL) -> a Branch instance.
133
control = bzrdir.BzrDir.open(base, _unsupported)
134
return control.open_branch(_unsupported)
137
def open_containing(url):
138
"""Open an existing branch which contains url.
140
This probes for a branch at url, and searches upwards from there.
142
Basically we keep looking up until we find the control directory or
143
run into the root. If there isn't one, raises NotBranchError.
144
If there is one and it is either an unrecognised format or an unsupported
145
format, UnknownFormatError or UnsupportedFormatError are raised.
146
If there is one, it is returned, along with the unused portion of url.
148
control, relpath = bzrdir.BzrDir.open_containing(url)
149
return control.open_branch(), relpath
152
@deprecated_function(zero_eight)
153
def initialize(base):
154
"""Create a new working tree and branch, rooted at 'base' (url)
156
NOTE: This will soon be deprecated in favour of creation
159
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
161
@deprecated_function(zero_eight)
162
def setup_caching(self, cache_root):
163
"""Subclasses that care about caching should override this, and set
164
up cached stores located under cache_root.
166
NOTE: This is unused.
170
def get_config(self):
171
return BranchConfig(self)
174
return self.get_config().get_nickname()
176
def _set_nick(self, nick):
177
self.get_config().set_user_option('nickname', nick)
179
nick = property(_get_nick, _set_nick)
182
raise NotImplementedError(self.is_locked)
184
def lock_write(self):
185
raise NotImplementedError(self.lock_write)
188
raise NotImplementedError(self.lock_read)
191
raise NotImplementedError(self.unlock)
193
def peek_lock_mode(self):
194
"""Return lock mode for the Branch: 'r', 'w' or None"""
195
raise NotImplementedError(self.peek_lock_mode)
197
def get_physical_lock_status(self):
198
raise NotImplementedError(self.get_physical_lock_status)
201
def get_revision_id_to_revno_map(self):
202
"""Return the revision_id => dotted revno map.
204
This will be regenerated on demand, but will be cached.
206
:return: A dictionary mapping revision_id => dotted revno.
207
This dictionary should not be modified by the caller.
209
if self._revision_id_to_revno_cache is not None:
210
mapping = self._revision_id_to_revno_cache
212
mapping = self._gen_revno_map()
213
self._cache_revision_id_to_revno(mapping)
214
# TODO: jam 20070417 Since this is being cached, should we be returning
216
# I would rather not, and instead just declare that users should not
217
# modify the return value.
220
def _gen_revno_map(self):
221
"""Create a new mapping from revision ids to dotted revnos.
223
Dotted revnos are generated based on the current tip in the revision
225
This is the worker function for get_revision_id_to_revno_map, which
226
just caches the return value.
228
:return: A dictionary mapping revision_id => dotted revno.
230
last_revision = self.last_revision()
231
revision_graph = self.repository.get_revision_graph(last_revision)
232
merge_sorted_revisions = tsort.merge_sort(
237
revision_id_to_revno = dict((rev_id, revno)
238
for seq_num, rev_id, depth, revno, end_of_merge
239
in merge_sorted_revisions)
240
return revision_id_to_revno
242
def leave_lock_in_place(self):
243
"""Tell this branch object not to release the physical lock when this
246
If lock_write doesn't return a token, then this method is not supported.
248
self.control_files.leave_in_place()
250
def dont_leave_lock_in_place(self):
251
"""Tell this branch object to release the physical lock when this
252
object is unlocked, even if it didn't originally acquire it.
254
If lock_write doesn't return a token, then this method is not supported.
256
self.control_files.dont_leave_in_place()
258
def abspath(self, name):
259
"""Return absolute filename for something in the branch
261
XXX: Robert Collins 20051017 what is this used for? why is it a branch
262
method and not a tree method.
264
raise NotImplementedError(self.abspath)
266
def bind(self, other):
267
"""Bind the local branch the other branch.
269
:param other: The branch to bind to
272
raise errors.UpgradeRequired(self.base)
275
def fetch(self, from_branch, last_revision=None, pb=None):
276
"""Copy revisions from from_branch into this branch.
278
:param from_branch: Where to copy from.
279
:param last_revision: What revision to stop at (None for at the end
281
:param pb: An optional progress bar to use.
283
Returns the copied revision count and the failed revisions in a tuple:
286
if self.base == from_branch.base:
289
nested_pb = ui.ui_factory.nested_progress_bar()
294
from_branch.lock_read()
296
if last_revision is None:
297
pb.update('get source history')
298
last_revision = from_branch.last_revision()
299
if last_revision is None:
300
last_revision = _mod_revision.NULL_REVISION
301
return self.repository.fetch(from_branch.repository,
302
revision_id=last_revision,
305
if nested_pb is not None:
309
def get_bound_location(self):
310
"""Return the URL of the branch we are bound to.
312
Older format branches cannot bind, please be sure to use a metadir
317
def get_old_bound_location(self):
318
"""Return the URL of the branch we used to be bound to
320
raise errors.UpgradeRequired(self.base)
322
def get_commit_builder(self, parents, config=None, timestamp=None,
323
timezone=None, committer=None, revprops=None,
325
"""Obtain a CommitBuilder for this branch.
327
:param parents: Revision ids of the parents of the new revision.
328
:param config: Optional configuration to use.
329
:param timestamp: Optional timestamp recorded for commit.
330
:param timezone: Optional timezone for timestamp.
331
:param committer: Optional committer to set for commit.
332
:param revprops: Optional dictionary of revision properties.
333
:param revision_id: Optional revision id.
337
config = self.get_config()
339
return self.repository.get_commit_builder(self, parents, config,
340
timestamp, timezone, committer, revprops, revision_id)
342
def get_master_branch(self):
343
"""Return the branch we are bound to.
345
:return: Either a Branch, or None
349
def get_revision_delta(self, revno):
350
"""Return the delta for one revision.
352
The delta is relative to its mainline predecessor, or the
353
empty tree for revision 1.
355
assert isinstance(revno, int)
356
rh = self.revision_history()
357
if not (1 <= revno <= len(rh)):
358
raise InvalidRevisionNumber(revno)
359
return self.repository.get_revision_delta(rh[revno-1])
361
@deprecated_method(zero_sixteen)
362
def get_root_id(self):
363
"""Return the id of this branches root
365
Deprecated: branches don't have root ids-- trees do.
366
Use basis_tree().get_root_id() instead.
368
raise NotImplementedError(self.get_root_id)
370
def print_file(self, file, revision_id):
371
"""Print `file` to stdout."""
372
raise NotImplementedError(self.print_file)
374
def append_revision(self, *revision_ids):
375
raise NotImplementedError(self.append_revision)
377
def set_revision_history(self, rev_history):
378
raise NotImplementedError(self.set_revision_history)
380
def _cache_revision_history(self, rev_history):
381
"""Set the cached revision history to rev_history.
383
The revision_history method will use this cache to avoid regenerating
384
the revision history.
386
This API is semi-public; it only for use by subclasses, all other code
387
should consider it to be private.
389
self._revision_history_cache = rev_history
391
def _cache_revision_id_to_revno(self, revision_id_to_revno):
392
"""Set the cached revision_id => revno map to revision_id_to_revno.
394
This API is semi-public; it only for use by subclasses, all other code
395
should consider it to be private.
397
self._revision_id_to_revno_cache = revision_id_to_revno
399
def _clear_cached_state(self):
400
"""Clear any cached data on this branch, e.g. cached revision history.
402
This means the next call to revision_history will need to call
403
_gen_revision_history.
405
This API is semi-public; it only for use by subclasses, all other code
406
should consider it to be private.
408
self._revision_history_cache = None
409
self._revision_id_to_revno_cache = None
411
def _gen_revision_history(self):
412
"""Return sequence of revision hashes on to this branch.
414
Unlike revision_history, this method always regenerates or rereads the
415
revision history, i.e. it does not cache the result, so repeated calls
418
Concrete subclasses should override this instead of revision_history so
419
that subclasses do not need to deal with caching logic.
421
This API is semi-public; it only for use by subclasses, all other code
422
should consider it to be private.
424
raise NotImplementedError(self._gen_revision_history)
427
def revision_history(self):
428
"""Return sequence of revision hashes on to this branch.
430
This method will cache the revision history for as long as it is safe to
433
if self._revision_history_cache is not None:
434
history = self._revision_history_cache
436
history = self._gen_revision_history()
437
self._cache_revision_history(history)
441
"""Return current revision number for this branch.
443
That is equivalent to the number of revisions committed to
446
return len(self.revision_history())
449
"""Older format branches cannot bind or unbind."""
450
raise errors.UpgradeRequired(self.base)
452
def set_append_revisions_only(self, enabled):
453
"""Older format branches are never restricted to append-only"""
454
raise errors.UpgradeRequired(self.base)
456
def last_revision(self):
457
"""Return last revision id, or None"""
458
ph = self.revision_history()
464
def last_revision_info(self):
465
"""Return information about the last revision.
467
:return: A tuple (revno, last_revision_id).
469
rh = self.revision_history()
472
return (revno, rh[-1])
474
return (0, _mod_revision.NULL_REVISION)
476
def missing_revisions(self, other, stop_revision=None):
477
"""Return a list of new revisions that would perfectly fit.
479
If self and other have not diverged, return a list of the revisions
480
present in other, but missing from self.
482
self_history = self.revision_history()
483
self_len = len(self_history)
484
other_history = other.revision_history()
485
other_len = len(other_history)
486
common_index = min(self_len, other_len) -1
487
if common_index >= 0 and \
488
self_history[common_index] != other_history[common_index]:
489
raise DivergedBranches(self, other)
491
if stop_revision is None:
492
stop_revision = other_len
494
assert isinstance(stop_revision, int)
495
if stop_revision > other_len:
496
raise errors.NoSuchRevision(self, stop_revision)
497
return other_history[self_len:stop_revision]
499
def update_revisions(self, other, stop_revision=None):
500
"""Pull in new perfect-fit revisions.
502
:param other: Another Branch to pull from
503
:param stop_revision: Updated until the given revision
506
raise NotImplementedError(self.update_revisions)
508
def revision_id_to_revno(self, revision_id):
509
"""Given a revision id, return its revno"""
510
if revision_id is None:
512
revision_id = osutils.safe_revision_id(revision_id)
513
history = self.revision_history()
515
return history.index(revision_id) + 1
517
raise errors.NoSuchRevision(self, revision_id)
519
def get_rev_id(self, revno, history=None):
520
"""Find the revision id of the specified revno."""
524
history = self.revision_history()
525
if revno <= 0 or revno > len(history):
526
raise errors.NoSuchRevision(self, revno)
527
return history[revno - 1]
529
def pull(self, source, overwrite=False, stop_revision=None):
530
"""Mirror source into this branch.
532
This branch is considered to be 'local', having low latency.
534
:returns: PullResult instance
536
raise NotImplementedError(self.pull)
538
def push(self, target, overwrite=False, stop_revision=None):
539
"""Mirror this branch into target.
541
This branch is considered to be 'local', having low latency.
543
raise NotImplementedError(self.push)
545
def basis_tree(self):
546
"""Return `Tree` object for last revision."""
547
return self.repository.revision_tree(self.last_revision())
549
def rename_one(self, from_rel, to_rel):
552
This can change the directory or the filename or both.
554
raise NotImplementedError(self.rename_one)
556
def move(self, from_paths, to_name):
559
to_name must exist as a versioned directory.
561
If to_name exists and is a directory, the files are moved into
562
it, keeping their old names. If it is a directory,
564
Note that to_name is only the last component of the new name;
565
this doesn't change the directory.
567
This returns a list of (from_path, to_path) pairs for each
570
raise NotImplementedError(self.move)
572
def get_parent(self):
573
"""Return the parent location of the branch.
575
This is the default location for push/pull/missing. The usual
576
pattern is that the user can override it by specifying a
579
raise NotImplementedError(self.get_parent)
581
def _set_config_location(self, name, url, config=None,
582
make_relative=False):
584
config = self.get_config()
588
url = urlutils.relative_url(self.base, url)
589
config.set_user_option(name, url)
591
def _get_config_location(self, name, config=None):
593
config = self.get_config()
594
location = config.get_user_option(name)
599
def get_submit_branch(self):
600
"""Return the submit location of the branch.
602
This is the default location for bundle. The usual
603
pattern is that the user can override it by specifying a
606
return self.get_config().get_user_option('submit_branch')
608
def set_submit_branch(self, location):
609
"""Return the submit location of the branch.
611
This is the default location for bundle. The usual
612
pattern is that the user can override it by specifying a
615
self.get_config().set_user_option('submit_branch', location)
617
def get_public_branch(self):
618
"""Return the public location of the branch.
620
This is is used by merge directives.
622
return self._get_config_location('public_branch')
624
def set_public_branch(self, location):
625
"""Return the submit location of the branch.
627
This is the default location for bundle. The usual
628
pattern is that the user can override it by specifying a
631
self._set_config_location('public_branch', location)
633
def get_push_location(self):
634
"""Return the None or the location to push this branch to."""
635
push_loc = self.get_config().get_user_option('push_location')
638
def set_push_location(self, location):
639
"""Set a new push location for this branch."""
640
raise NotImplementedError(self.set_push_location)
642
def set_parent(self, url):
643
raise NotImplementedError(self.set_parent)
647
"""Synchronise this branch with the master branch if any.
649
:return: None or the last_revision pivoted out during the update.
653
def check_revno(self, revno):
655
Check whether a revno corresponds to any revision.
656
Zero (the NULL revision) is considered valid.
659
self.check_real_revno(revno)
661
def check_real_revno(self, revno):
663
Check whether a revno corresponds to a real revision.
664
Zero (the NULL revision) is considered invalid
666
if revno < 1 or revno > self.revno():
667
raise InvalidRevisionNumber(revno)
670
def clone(self, to_bzrdir, revision_id=None):
671
"""Clone this branch into to_bzrdir preserving all semantic values.
673
revision_id: if not None, the revision history in the new branch will
674
be truncated to end with revision_id.
676
result = self._format.initialize(to_bzrdir)
677
self.copy_content_into(result, revision_id=revision_id)
681
def sprout(self, to_bzrdir, revision_id=None):
682
"""Create a new line of development from the branch, into to_bzrdir.
684
revision_id: if not None, the revision history in the new branch will
685
be truncated to end with revision_id.
687
result = self._format.initialize(to_bzrdir)
688
self.copy_content_into(result, revision_id=revision_id)
689
result.set_parent(self.bzrdir.root_transport.base)
692
def _synchronize_history(self, destination, revision_id):
693
"""Synchronize last revision and revision history between branches.
695
This version is most efficient when the destination is also a
696
BzrBranch5, but works for BzrBranch6 as long as the revision
697
history is the true lefthand parent history, and all of the revisions
698
are in the destination's repository. If not, set_revision_history
701
:param destination: The branch to copy the history into
702
:param revision_id: The revision-id to truncate history at. May
703
be None to copy complete history.
705
new_history = self.revision_history()
706
if revision_id is not None:
707
revision_id = osutils.safe_revision_id(revision_id)
709
new_history = new_history[:new_history.index(revision_id) + 1]
711
rev = self.repository.get_revision(revision_id)
712
new_history = rev.get_history(self.repository)[1:]
713
destination.set_revision_history(new_history)
716
def copy_content_into(self, destination, revision_id=None):
717
"""Copy the content of self into destination.
719
revision_id: if not None, the revision history in the new branch will
720
be truncated to end with revision_id.
722
self._synchronize_history(destination, revision_id)
724
parent = self.get_parent()
725
except errors.InaccessibleParent, e:
726
mutter('parent was not accessible to copy: %s', e)
729
destination.set_parent(parent)
730
self.tags.merge_to(destination.tags)
734
"""Check consistency of the branch.
736
In particular this checks that revisions given in the revision-history
737
do actually match up in the revision graph, and that they're all
738
present in the repository.
740
Callers will typically also want to check the repository.
742
:return: A BranchCheckResult.
744
mainline_parent_id = None
745
for revision_id in self.revision_history():
747
revision = self.repository.get_revision(revision_id)
748
except errors.NoSuchRevision, e:
749
raise errors.BzrCheckError("mainline revision {%s} not in repository"
751
# In general the first entry on the revision history has no parents.
752
# But it's not illegal for it to have parents listed; this can happen
753
# in imports from Arch when the parents weren't reachable.
754
if mainline_parent_id is not None:
755
if mainline_parent_id not in revision.parent_ids:
756
raise errors.BzrCheckError("previous revision {%s} not listed among "
758
% (mainline_parent_id, revision_id))
759
mainline_parent_id = revision_id
760
return BranchCheckResult(self)
762
def _get_checkout_format(self):
763
"""Return the most suitable metadir for a checkout of this branch.
764
Weaves are used if this branch's repository uses weaves.
766
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
767
from bzrlib.repofmt import weaverepo
768
format = bzrdir.BzrDirMetaFormat1()
769
format.repository_format = weaverepo.RepositoryFormat7()
771
format = self.repository.bzrdir.checkout_metadir()
772
format.set_branch_format(self._format)
775
def create_checkout(self, to_location, revision_id=None,
777
"""Create a checkout of a branch.
779
:param to_location: The url to produce the checkout at
780
:param revision_id: The revision to check out
781
:param lightweight: If True, produce a lightweight checkout, otherwise,
782
produce a bound branch (heavyweight checkout)
783
:return: The tree of the created checkout
785
t = transport.get_transport(to_location)
788
format = self._get_checkout_format()
789
checkout = format.initialize_on_transport(t)
790
BranchReferenceFormat().initialize(checkout, self)
792
format = self._get_checkout_format()
793
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
794
to_location, force_new_tree=False, format=format)
795
checkout = checkout_branch.bzrdir
796
checkout_branch.bind(self)
797
# pull up to the specified revision_id to set the initial
798
# branch tip correctly, and seed it with history.
799
checkout_branch.pull(self, stop_revision=revision_id)
800
tree = checkout.create_workingtree(revision_id)
801
basis_tree = tree.basis_tree()
802
basis_tree.lock_read()
804
for path, file_id in basis_tree.iter_references():
805
reference_parent = self.reference_parent(file_id, path)
806
reference_parent.create_checkout(tree.abspath(path),
807
basis_tree.get_reference_revision(file_id, path),
813
def reference_parent(self, file_id, path):
814
"""Return the parent branch for a tree-reference file_id
815
:param file_id: The file_id of the tree reference
816
:param path: The path of the file_id in the tree
817
:return: A branch associated with the file_id
819
# FIXME should provide multiple branches, based on config
820
return Branch.open(self.bzrdir.root_transport.clone(path).base)
822
def supports_tags(self):
823
return self._format.supports_tags()
826
class BranchFormat(object):
827
"""An encapsulation of the initialization and open routines for a format.
829
Formats provide three things:
830
* An initialization routine,
834
Formats are placed in an dict by their format string for reference
835
during branch opening. Its not required that these be instances, they
836
can be classes themselves with class methods - it simply depends on
837
whether state is needed for a given format or not.
839
Once a format is deprecated, just deprecate the initialize and open
840
methods on the format class. Do not deprecate the object, as the
841
object will be created every time regardless.
844
_default_format = None
845
"""The default format used for new branches."""
848
"""The known formats."""
850
def __eq__(self, other):
851
return self.__class__ is other.__class__
853
def __ne__(self, other):
854
return not (self == other)
857
def find_format(klass, a_bzrdir):
858
"""Return the format for the branch object in a_bzrdir."""
860
transport = a_bzrdir.get_branch_transport(None)
861
format_string = transport.get("format").read()
862
return klass._formats[format_string]
864
raise NotBranchError(path=transport.base)
866
raise errors.UnknownFormatError(format=format_string)
869
def get_default_format(klass):
870
"""Return the current default format."""
871
return klass._default_format
873
def get_reference(self, a_bzrdir):
874
"""Get the target reference of the branch in a_bzrdir.
876
format probing must have been completed before calling
877
this method - it is assumed that the format of the branch
878
in a_bzrdir is correct.
880
:param a_bzrdir: The bzrdir to get the branch data from.
881
:return: None if the branch is not a reference branch.
885
def get_format_string(self):
886
"""Return the ASCII format string that identifies this format."""
887
raise NotImplementedError(self.get_format_string)
889
def get_format_description(self):
890
"""Return the short format description for this format."""
891
raise NotImplementedError(self.get_format_description)
893
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
895
"""Initialize a branch in a bzrdir, with specified files
897
:param a_bzrdir: The bzrdir to initialize the branch in
898
:param utf8_files: The files to create as a list of
899
(filename, content) tuples
900
:param set_format: If True, set the format with
901
self.get_format_string. (BzrBranch4 has its format set
903
:return: a branch in this format
905
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
906
branch_transport = a_bzrdir.get_branch_transport(self)
908
'metadir': ('lock', lockdir.LockDir),
909
'branch4': ('branch-lock', lockable_files.TransportLock),
911
lock_name, lock_class = lock_map[lock_type]
912
control_files = lockable_files.LockableFiles(branch_transport,
913
lock_name, lock_class)
914
control_files.create_lock()
915
control_files.lock_write()
917
control_files.put_utf8('format', self.get_format_string())
919
for file, content in utf8_files:
920
control_files.put_utf8(file, content)
922
control_files.unlock()
923
return self.open(a_bzrdir, _found=True)
925
def initialize(self, a_bzrdir):
926
"""Create a branch of this format in a_bzrdir."""
927
raise NotImplementedError(self.initialize)
929
def is_supported(self):
930
"""Is this format supported?
932
Supported formats can be initialized and opened.
933
Unsupported formats may not support initialization or committing or
934
some other features depending on the reason for not being supported.
938
def open(self, a_bzrdir, _found=False):
939
"""Return the branch object for a_bzrdir
941
_found is a private parameter, do not use it. It is used to indicate
942
if format probing has already be done.
944
raise NotImplementedError(self.open)
947
def register_format(klass, format):
948
klass._formats[format.get_format_string()] = format
951
def set_default_format(klass, format):
952
klass._default_format = format
955
def unregister_format(klass, format):
956
assert klass._formats[format.get_format_string()] is format
957
del klass._formats[format.get_format_string()]
960
return self.get_format_string().rstrip()
962
def supports_tags(self):
963
"""True if this format supports tags stored in the branch"""
964
return False # by default
966
# XXX: Probably doesn't really belong here -- mbp 20070212
967
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
969
branch_transport = a_bzrdir.get_branch_transport(self)
970
control_files = lockable_files.LockableFiles(branch_transport,
971
lock_filename, lock_class)
972
control_files.create_lock()
973
control_files.lock_write()
975
for filename, content in utf8_files:
976
control_files.put_utf8(filename, content)
978
control_files.unlock()
981
class BranchHooks(Hooks):
982
"""A dictionary mapping hook name to a list of callables for branch hooks.
984
e.g. ['set_rh'] Is the list of items to be called when the
985
set_revision_history function is invoked.
989
"""Create the default hooks.
991
These are all empty initially, because by default nothing should get
995
# Introduced in 0.15:
996
# invoked whenever the revision history has been set
997
# with set_revision_history. The api signature is
998
# (branch, revision_history), and the branch will
1001
# invoked after a push operation completes.
1002
# the api signature is
1004
# containing the members
1005
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1006
# where local is the local target branch or None, master is the target
1007
# master branch, and the rest should be self explanatory. The source
1008
# is read locked and the target branches write locked. Source will
1009
# be the local low-latency branch.
1010
self['post_push'] = []
1011
# invoked after a pull operation completes.
1012
# the api signature is
1014
# containing the members
1015
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1016
# where local is the local branch or None, master is the target
1017
# master branch, and the rest should be self explanatory. The source
1018
# is read locked and the target branches write locked. The local
1019
# branch is the low-latency branch.
1020
self['post_pull'] = []
1021
# invoked after a commit operation completes.
1022
# the api signature is
1023
# (local, master, old_revno, old_revid, new_revno, new_revid)
1024
# old_revid is NULL_REVISION for the first commit to a branch.
1025
self['post_commit'] = []
1026
# invoked after a uncommit operation completes.
1027
# the api signature is
1028
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1029
# local is the local branch or None, master is the target branch,
1030
# and an empty branch recieves new_revno of 0, new_revid of None.
1031
self['post_uncommit'] = []
1034
# install the default hooks into the Branch class.
1035
Branch.hooks = BranchHooks()
1038
class BzrBranchFormat4(BranchFormat):
1039
"""Bzr branch format 4.
1042
- a revision-history file.
1043
- a branch-lock lock file [ to be shared with the bzrdir ]
1046
def get_format_description(self):
1047
"""See BranchFormat.get_format_description()."""
1048
return "Branch format 4"
1050
def initialize(self, a_bzrdir):
1051
"""Create a branch of this format in a_bzrdir."""
1052
utf8_files = [('revision-history', ''),
1053
('branch-name', ''),
1055
return self._initialize_helper(a_bzrdir, utf8_files,
1056
lock_type='branch4', set_format=False)
1059
super(BzrBranchFormat4, self).__init__()
1060
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1062
def open(self, a_bzrdir, _found=False):
1063
"""Return the branch object for a_bzrdir
1065
_found is a private parameter, do not use it. It is used to indicate
1066
if format probing has already be done.
1069
# we are being called directly and must probe.
1070
raise NotImplementedError
1071
return BzrBranch(_format=self,
1072
_control_files=a_bzrdir._control_files,
1074
_repository=a_bzrdir.open_repository())
1077
return "Bazaar-NG branch format 4"
1080
class BzrBranchFormat5(BranchFormat):
1081
"""Bzr branch format 5.
1084
- a revision-history file.
1086
- a lock dir guarding the branch itself
1087
- all of this stored in a branch/ subdirectory
1088
- works with shared repositories.
1090
This format is new in bzr 0.8.
1093
def get_format_string(self):
1094
"""See BranchFormat.get_format_string()."""
1095
return "Bazaar-NG branch format 5\n"
1097
def get_format_description(self):
1098
"""See BranchFormat.get_format_description()."""
1099
return "Branch format 5"
1101
def initialize(self, a_bzrdir):
1102
"""Create a branch of this format in a_bzrdir."""
1103
utf8_files = [('revision-history', ''),
1104
('branch-name', ''),
1106
return self._initialize_helper(a_bzrdir, utf8_files)
1109
super(BzrBranchFormat5, self).__init__()
1110
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1112
def open(self, a_bzrdir, _found=False):
1113
"""Return the branch object for a_bzrdir
1115
_found is a private parameter, do not use it. It is used to indicate
1116
if format probing has already be done.
1119
format = BranchFormat.find_format(a_bzrdir)
1120
assert format.__class__ == self.__class__
1122
transport = a_bzrdir.get_branch_transport(None)
1123
control_files = lockable_files.LockableFiles(transport, 'lock',
1125
return BzrBranch5(_format=self,
1126
_control_files=control_files,
1128
_repository=a_bzrdir.find_repository())
1130
raise NotBranchError(path=transport.base)
1133
class BzrBranchFormat6(BzrBranchFormat5):
1134
"""Branch format with last-revision
1136
Unlike previous formats, this has no explicit revision history. Instead,
1137
this just stores the last-revision, and the left-hand history leading
1138
up to there is the history.
1140
This format was introduced in bzr 0.15
1143
def get_format_string(self):
1144
"""See BranchFormat.get_format_string()."""
1145
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1147
def get_format_description(self):
1148
"""See BranchFormat.get_format_description()."""
1149
return "Branch format 6"
1151
def initialize(self, a_bzrdir):
1152
"""Create a branch of this format in a_bzrdir."""
1153
utf8_files = [('last-revision', '0 null:\n'),
1154
('branch-name', ''),
1155
('branch.conf', ''),
1158
return self._initialize_helper(a_bzrdir, utf8_files)
1160
def open(self, a_bzrdir, _found=False):
1161
"""Return the branch object for a_bzrdir
1163
_found is a private parameter, do not use it. It is used to indicate
1164
if format probing has already be done.
1167
format = BranchFormat.find_format(a_bzrdir)
1168
assert format.__class__ == self.__class__
1169
transport = a_bzrdir.get_branch_transport(None)
1170
control_files = lockable_files.LockableFiles(transport, 'lock',
1172
return BzrBranch6(_format=self,
1173
_control_files=control_files,
1175
_repository=a_bzrdir.find_repository())
1177
def supports_tags(self):
1181
class BranchReferenceFormat(BranchFormat):
1182
"""Bzr branch reference format.
1184
Branch references are used in implementing checkouts, they
1185
act as an alias to the real branch which is at some other url.
1192
def get_format_string(self):
1193
"""See BranchFormat.get_format_string()."""
1194
return "Bazaar-NG Branch Reference Format 1\n"
1196
def get_format_description(self):
1197
"""See BranchFormat.get_format_description()."""
1198
return "Checkout reference format 1"
1200
def get_reference(self, a_bzrdir):
1201
"""See BranchFormat.get_reference()."""
1202
transport = a_bzrdir.get_branch_transport(None)
1203
return transport.get('location').read()
1205
def initialize(self, a_bzrdir, target_branch=None):
1206
"""Create a branch of this format in a_bzrdir."""
1207
if target_branch is None:
1208
# this format does not implement branch itself, thus the implicit
1209
# creation contract must see it as uninitializable
1210
raise errors.UninitializableFormat(self)
1211
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1212
branch_transport = a_bzrdir.get_branch_transport(self)
1213
branch_transport.put_bytes('location',
1214
target_branch.bzrdir.root_transport.base)
1215
branch_transport.put_bytes('format', self.get_format_string())
1216
return self.open(a_bzrdir, _found=True)
1219
super(BranchReferenceFormat, self).__init__()
1220
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1222
def _make_reference_clone_function(format, a_branch):
1223
"""Create a clone() routine for a branch dynamically."""
1224
def clone(to_bzrdir, revision_id=None):
1225
"""See Branch.clone()."""
1226
return format.initialize(to_bzrdir, a_branch)
1227
# cannot obey revision_id limits when cloning a reference ...
1228
# FIXME RBC 20060210 either nuke revision_id for clone, or
1229
# emit some sort of warning/error to the caller ?!
1232
def open(self, a_bzrdir, _found=False, location=None):
1233
"""Return the branch that the branch reference in a_bzrdir points at.
1235
_found is a private parameter, do not use it. It is used to indicate
1236
if format probing has already be done.
1239
format = BranchFormat.find_format(a_bzrdir)
1240
assert format.__class__ == self.__class__
1241
if location is None:
1242
location = self.get_reference(a_bzrdir)
1243
real_bzrdir = bzrdir.BzrDir.open(location)
1244
result = real_bzrdir.open_branch()
1245
# this changes the behaviour of result.clone to create a new reference
1246
# rather than a copy of the content of the branch.
1247
# I did not use a proxy object because that needs much more extensive
1248
# testing, and we are only changing one behaviour at the moment.
1249
# If we decide to alter more behaviours - i.e. the implicit nickname
1250
# then this should be refactored to introduce a tested proxy branch
1251
# and a subclass of that for use in overriding clone() and ....
1253
result.clone = self._make_reference_clone_function(result)
1257
# formats which have no format string are not discoverable
1258
# and not independently creatable, so are not registered.
1259
__default_format = BzrBranchFormat5()
1260
BranchFormat.register_format(__default_format)
1261
BranchFormat.register_format(BranchReferenceFormat())
1262
BranchFormat.register_format(BzrBranchFormat6())
1263
BranchFormat.set_default_format(__default_format)
1264
_legacy_formats = [BzrBranchFormat4(),
1267
class BzrBranch(Branch):
1268
"""A branch stored in the actual filesystem.
1270
Note that it's "local" in the context of the filesystem; it doesn't
1271
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1272
it's writable, and can be accessed via the normal filesystem API.
1275
def __init__(self, _format=None,
1276
_control_files=None, a_bzrdir=None, _repository=None):
1277
"""Create new branch object at a particular location."""
1278
Branch.__init__(self)
1279
if a_bzrdir is None:
1280
raise ValueError('a_bzrdir must be supplied')
1282
self.bzrdir = a_bzrdir
1283
# self._transport used to point to the directory containing the
1284
# control directory, but was not used - now it's just the transport
1285
# for the branch control files. mbp 20070212
1286
self._base = self.bzrdir.transport.clone('..').base
1287
self._format = _format
1288
if _control_files is None:
1289
raise ValueError('BzrBranch _control_files is None')
1290
self.control_files = _control_files
1291
self._transport = _control_files._transport
1292
self.repository = _repository
1295
return '%s(%r)' % (self.__class__.__name__, self.base)
1299
def _get_base(self):
1300
"""Returns the directory containing the control directory."""
1303
base = property(_get_base, doc="The URL for the root of this branch.")
1305
def abspath(self, name):
1306
"""See Branch.abspath."""
1307
return self.control_files._transport.abspath(name)
1310
@deprecated_method(zero_sixteen)
1312
def get_root_id(self):
1313
"""See Branch.get_root_id."""
1314
tree = self.repository.revision_tree(self.last_revision())
1315
return tree.inventory.root.file_id
1317
def is_locked(self):
1318
return self.control_files.is_locked()
1320
def lock_write(self, token=None):
1321
repo_token = self.repository.lock_write()
1323
token = self.control_files.lock_write(token=token)
1325
self.repository.unlock()
1329
def lock_read(self):
1330
self.repository.lock_read()
1332
self.control_files.lock_read()
1334
self.repository.unlock()
1338
# TODO: test for failed two phase locks. This is known broken.
1340
self.control_files.unlock()
1342
self.repository.unlock()
1343
if not self.control_files.is_locked():
1344
# we just released the lock
1345
self._clear_cached_state()
1347
def peek_lock_mode(self):
1348
if self.control_files._lock_count == 0:
1351
return self.control_files._lock_mode
1353
def get_physical_lock_status(self):
1354
return self.control_files.get_physical_lock_status()
1357
def print_file(self, file, revision_id):
1358
"""See Branch.print_file."""
1359
return self.repository.print_file(file, revision_id)
1362
def append_revision(self, *revision_ids):
1363
"""See Branch.append_revision."""
1364
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1365
for revision_id in revision_ids:
1366
_mod_revision.check_not_reserved_id(revision_id)
1367
mutter("add {%s} to revision-history" % revision_id)
1368
rev_history = self.revision_history()
1369
rev_history.extend(revision_ids)
1370
self.set_revision_history(rev_history)
1372
def _write_revision_history(self, history):
1373
"""Factored out of set_revision_history.
1375
This performs the actual writing to disk.
1376
It is intended to be called by BzrBranch5.set_revision_history."""
1377
self.control_files.put_bytes(
1378
'revision-history', '\n'.join(history))
1381
def set_revision_history(self, rev_history):
1382
"""See Branch.set_revision_history."""
1383
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
1384
self._clear_cached_state()
1385
self._write_revision_history(rev_history)
1386
self._cache_revision_history(rev_history)
1387
for hook in Branch.hooks['set_rh']:
1388
hook(self, rev_history)
1391
def set_last_revision_info(self, revno, revision_id):
1392
revision_id = osutils.safe_revision_id(revision_id)
1393
history = self._lefthand_history(revision_id)
1394
assert len(history) == revno, '%d != %d' % (len(history), revno)
1395
self.set_revision_history(history)
1397
def _gen_revision_history(self):
1398
history = self.control_files.get('revision-history').read().split('\n')
1399
if history[-1:] == ['']:
1400
# There shouldn't be a trailing newline, but just in case.
1404
def _lefthand_history(self, revision_id, last_rev=None,
1406
# stop_revision must be a descendant of last_revision
1407
stop_graph = self.repository.get_revision_graph(revision_id)
1408
if last_rev is not None and last_rev not in stop_graph:
1409
# our previous tip is not merged into stop_revision
1410
raise errors.DivergedBranches(self, other_branch)
1411
# make a new revision history from the graph
1412
current_rev_id = revision_id
1414
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1415
new_history.append(current_rev_id)
1416
current_rev_id_parents = stop_graph[current_rev_id]
1418
current_rev_id = current_rev_id_parents[0]
1420
current_rev_id = None
1421
new_history.reverse()
1425
def generate_revision_history(self, revision_id, last_rev=None,
1427
"""Create a new revision history that will finish with revision_id.
1429
:param revision_id: the new tip to use.
1430
:param last_rev: The previous last_revision. If not None, then this
1431
must be a ancestory of revision_id, or DivergedBranches is raised.
1432
:param other_branch: The other branch that DivergedBranches should
1433
raise with respect to.
1435
revision_id = osutils.safe_revision_id(revision_id)
1436
self.set_revision_history(self._lefthand_history(revision_id,
1437
last_rev, other_branch))
1440
def update_revisions(self, other, stop_revision=None):
1441
"""See Branch.update_revisions."""
1444
if stop_revision is None:
1445
stop_revision = other.last_revision()
1446
if stop_revision is None:
1447
# if there are no commits, we're done.
1450
stop_revision = osutils.safe_revision_id(stop_revision)
1451
# whats the current last revision, before we fetch [and change it
1453
last_rev = self.last_revision()
1454
# we fetch here regardless of whether we need to so that we pickup
1456
self.fetch(other, stop_revision)
1457
my_ancestry = self.repository.get_ancestry(last_rev)
1458
if stop_revision in my_ancestry:
1459
# last_revision is a descendant of stop_revision
1461
self.generate_revision_history(stop_revision, last_rev=last_rev,
1466
def basis_tree(self):
1467
"""See Branch.basis_tree."""
1468
return self.repository.revision_tree(self.last_revision())
1470
@deprecated_method(zero_eight)
1471
def working_tree(self):
1472
"""Create a Working tree object for this branch."""
1474
from bzrlib.transport.local import LocalTransport
1475
if (self.base.find('://') != -1 or
1476
not isinstance(self._transport, LocalTransport)):
1477
raise NoWorkingTree(self.base)
1478
return self.bzrdir.open_workingtree()
1481
def pull(self, source, overwrite=False, stop_revision=None,
1482
_hook_master=None, run_hooks=True):
1485
:param _hook_master: Private parameter - set the branch to
1486
be supplied as the master to push hooks.
1487
:param run_hooks: Private parameter - if false, this branch
1488
is being called because it's the master of the primary branch,
1489
so it should not run its hooks.
1491
result = PullResult()
1492
result.source_branch = source
1493
result.target_branch = self
1496
result.old_revno, result.old_revid = self.last_revision_info()
1498
self.update_revisions(source, stop_revision)
1499
except DivergedBranches:
1503
if stop_revision is None:
1504
stop_revision = source.last_revision()
1505
self.generate_revision_history(stop_revision)
1506
result.tag_conflicts = source.tags.merge_to(self.tags)
1507
result.new_revno, result.new_revid = self.last_revision_info()
1509
result.master_branch = _hook_master
1510
result.local_branch = self
1512
result.master_branch = self
1513
result.local_branch = None
1515
for hook in Branch.hooks['post_pull']:
1521
def _get_parent_location(self):
1522
_locs = ['parent', 'pull', 'x-pull']
1525
return self.control_files.get(l).read().strip('\n')
1531
def push(self, target, overwrite=False, stop_revision=None,
1532
_override_hook_source_branch=None):
1535
This is the basic concrete implementation of push()
1537
:param _override_hook_source_branch: If specified, run
1538
the hooks passing this Branch as the source, rather than self.
1539
This is for use of RemoteBranch, where push is delegated to the
1540
underlying vfs-based Branch.
1542
# TODO: Public option to disable running hooks - should be trivial but
1546
result = self._push_with_bound_branches(target, overwrite,
1548
_override_hook_source_branch=_override_hook_source_branch)
1553
def _push_with_bound_branches(self, target, overwrite,
1555
_override_hook_source_branch=None):
1556
"""Push from self into target, and into target's master if any.
1558
This is on the base BzrBranch class even though it doesn't support
1559
bound branches because the *target* might be bound.
1562
if _override_hook_source_branch:
1563
result.source_branch = _override_hook_source_branch
1564
for hook in Branch.hooks['post_push']:
1567
bound_location = target.get_bound_location()
1568
if bound_location and target.base != bound_location:
1569
# there is a master branch.
1571
# XXX: Why the second check? Is it even supported for a branch to
1572
# be bound to itself? -- mbp 20070507
1573
master_branch = target.get_master_branch()
1574
master_branch.lock_write()
1576
# push into the master from this branch.
1577
self._basic_push(master_branch, overwrite, stop_revision)
1578
# and push into the target branch from this. Note that we push from
1579
# this branch again, because its considered the highest bandwidth
1581
result = self._basic_push(target, overwrite, stop_revision)
1582
result.master_branch = master_branch
1583
result.local_branch = target
1587
master_branch.unlock()
1590
result = self._basic_push(target, overwrite, stop_revision)
1591
# TODO: Why set master_branch and local_branch if there's no
1592
# binding? Maybe cleaner to just leave them unset? -- mbp
1594
result.master_branch = target
1595
result.local_branch = None
1599
def _basic_push(self, target, overwrite, stop_revision):
1600
"""Basic implementation of push without bound branches or hooks.
1602
Must be called with self read locked and target write locked.
1604
result = PushResult()
1605
result.source_branch = self
1606
result.target_branch = target
1607
result.old_revno, result.old_revid = target.last_revision_info()
1609
target.update_revisions(self, stop_revision)
1610
except DivergedBranches:
1614
target.set_revision_history(self.revision_history())
1615
result.tag_conflicts = self.tags.merge_to(target.tags)
1616
result.new_revno, result.new_revid = target.last_revision_info()
1619
def get_parent(self):
1620
"""See Branch.get_parent."""
1622
assert self.base[-1] == '/'
1623
parent = self._get_parent_location()
1626
# This is an old-format absolute path to a local branch
1627
# turn it into a url
1628
if parent.startswith('/'):
1629
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1631
return urlutils.join(self.base[:-1], parent)
1632
except errors.InvalidURLJoin, e:
1633
raise errors.InaccessibleParent(parent, self.base)
1635
def set_push_location(self, location):
1636
"""See Branch.set_push_location."""
1637
self.get_config().set_user_option(
1638
'push_location', location,
1639
store=_mod_config.STORE_LOCATION_NORECURSE)
1642
def set_parent(self, url):
1643
"""See Branch.set_parent."""
1644
# TODO: Maybe delete old location files?
1645
# URLs should never be unicode, even on the local fs,
1646
# FIXUP this and get_parent in a future branch format bump:
1647
# read and rewrite the file, and have the new format code read
1648
# using .get not .get_utf8. RBC 20060125
1650
if isinstance(url, unicode):
1652
url = url.encode('ascii')
1653
except UnicodeEncodeError:
1654
raise errors.InvalidURL(url,
1655
"Urls must be 7-bit ascii, "
1656
"use bzrlib.urlutils.escape")
1657
url = urlutils.relative_url(self.base, url)
1658
self._set_parent_location(url)
1660
def _set_parent_location(self, url):
1662
self.control_files._transport.delete('parent')
1664
assert isinstance(url, str)
1665
self.control_files.put_bytes('parent', url + '\n')
1667
@deprecated_function(zero_nine)
1668
def tree_config(self):
1669
"""DEPRECATED; call get_config instead.
1670
TreeConfig has become part of BranchConfig."""
1671
return TreeConfig(self)
1674
class BzrBranch5(BzrBranch):
1675
"""A format 5 branch. This supports new features over plan branches.
1677
It has support for a master_branch which is the data for bound branches.
1685
super(BzrBranch5, self).__init__(_format=_format,
1686
_control_files=_control_files,
1688
_repository=_repository)
1691
def pull(self, source, overwrite=False, stop_revision=None,
1693
"""Pull from source into self, updating my master if any.
1695
:param run_hooks: Private parameter - if false, this branch
1696
is being called because it's the master of the primary branch,
1697
so it should not run its hooks.
1699
bound_location = self.get_bound_location()
1700
master_branch = None
1701
if bound_location and source.base != bound_location:
1702
# not pulling from master, so we need to update master.
1703
master_branch = self.get_master_branch()
1704
master_branch.lock_write()
1707
# pull from source into master.
1708
master_branch.pull(source, overwrite, stop_revision,
1710
return super(BzrBranch5, self).pull(source, overwrite,
1711
stop_revision, _hook_master=master_branch,
1712
run_hooks=run_hooks)
1715
master_branch.unlock()
1717
def get_bound_location(self):
1719
return self.control_files.get_utf8('bound').read()[:-1]
1720
except errors.NoSuchFile:
1724
def get_master_branch(self):
1725
"""Return the branch we are bound to.
1727
:return: Either a Branch, or None
1729
This could memoise the branch, but if thats done
1730
it must be revalidated on each new lock.
1731
So for now we just don't memoise it.
1732
# RBC 20060304 review this decision.
1734
bound_loc = self.get_bound_location()
1738
return Branch.open(bound_loc)
1739
except (errors.NotBranchError, errors.ConnectionError), e:
1740
raise errors.BoundBranchConnectionFailure(
1744
def set_bound_location(self, location):
1745
"""Set the target where this branch is bound to.
1747
:param location: URL to the target branch
1750
self.control_files.put_utf8('bound', location+'\n')
1753
self.control_files._transport.delete('bound')
1759
def bind(self, other):
1760
"""Bind this branch to the branch other.
1762
This does not push or pull data between the branches, though it does
1763
check for divergence to raise an error when the branches are not
1764
either the same, or one a prefix of the other. That behaviour may not
1765
be useful, so that check may be removed in future.
1767
:param other: The branch to bind to
1770
# TODO: jam 20051230 Consider checking if the target is bound
1771
# It is debatable whether you should be able to bind to
1772
# a branch which is itself bound.
1773
# Committing is obviously forbidden,
1774
# but binding itself may not be.
1775
# Since we *have* to check at commit time, we don't
1776
# *need* to check here
1778
# we want to raise diverged if:
1779
# last_rev is not in the other_last_rev history, AND
1780
# other_last_rev is not in our history, and do it without pulling
1782
last_rev = self.last_revision()
1783
if last_rev is not None:
1786
other_last_rev = other.last_revision()
1787
if other_last_rev is not None:
1788
# neither branch is new, we have to do some work to
1789
# ascertain diversion.
1790
remote_graph = other.repository.get_revision_graph(
1792
local_graph = self.repository.get_revision_graph(last_rev)
1793
if (last_rev not in remote_graph and
1794
other_last_rev not in local_graph):
1795
raise errors.DivergedBranches(self, other)
1798
self.set_bound_location(other.base)
1802
"""If bound, unbind"""
1803
return self.set_bound_location(None)
1807
"""Synchronise this branch with the master branch if any.
1809
:return: None or the last_revision that was pivoted out during the
1812
master = self.get_master_branch()
1813
if master is not None:
1814
old_tip = self.last_revision()
1815
self.pull(master, overwrite=True)
1816
if old_tip in self.repository.get_ancestry(self.last_revision()):
1822
class BzrBranchExperimental(BzrBranch5):
1823
"""Bzr experimental branch format
1826
- a revision-history file.
1828
- a lock dir guarding the branch itself
1829
- all of this stored in a branch/ subdirectory
1830
- works with shared repositories.
1831
- a tag dictionary in the branch
1833
This format is new in bzr 0.15, but shouldn't be used for real data,
1836
This class acts as it's own BranchFormat.
1839
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1842
def get_format_string(cls):
1843
"""See BranchFormat.get_format_string()."""
1844
return "Bazaar-NG branch format experimental\n"
1847
def get_format_description(cls):
1848
"""See BranchFormat.get_format_description()."""
1849
return "Experimental branch format"
1852
def get_reference(cls, a_bzrdir):
1853
"""Get the target reference of the branch in a_bzrdir.
1855
format probing must have been completed before calling
1856
this method - it is assumed that the format of the branch
1857
in a_bzrdir is correct.
1859
:param a_bzrdir: The bzrdir to get the branch data from.
1860
:return: None if the branch is not a reference branch.
1865
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1867
branch_transport = a_bzrdir.get_branch_transport(cls)
1868
control_files = lockable_files.LockableFiles(branch_transport,
1869
lock_filename, lock_class)
1870
control_files.create_lock()
1871
control_files.lock_write()
1873
for filename, content in utf8_files:
1874
control_files.put_utf8(filename, content)
1876
control_files.unlock()
1879
def initialize(cls, a_bzrdir):
1880
"""Create a branch of this format in a_bzrdir."""
1881
utf8_files = [('format', cls.get_format_string()),
1882
('revision-history', ''),
1883
('branch-name', ''),
1886
cls._initialize_control_files(a_bzrdir, utf8_files,
1887
'lock', lockdir.LockDir)
1888
return cls.open(a_bzrdir, _found=True)
1891
def open(cls, a_bzrdir, _found=False):
1892
"""Return the branch object for a_bzrdir
1894
_found is a private parameter, do not use it. It is used to indicate
1895
if format probing has already be done.
1898
format = BranchFormat.find_format(a_bzrdir)
1899
assert format.__class__ == cls
1900
transport = a_bzrdir.get_branch_transport(None)
1901
control_files = lockable_files.LockableFiles(transport, 'lock',
1903
return cls(_format=cls,
1904
_control_files=control_files,
1906
_repository=a_bzrdir.find_repository())
1909
def is_supported(cls):
1912
def _make_tags(self):
1913
return BasicTags(self)
1916
def supports_tags(cls):
1920
BranchFormat.register_format(BzrBranchExperimental)
1923
class BzrBranch6(BzrBranch5):
1926
def last_revision_info(self):
1927
revision_string = self.control_files.get('last-revision').read()
1928
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1929
revision_id = cache_utf8.get_cached_utf8(revision_id)
1931
return revno, revision_id
1933
def last_revision(self):
1934
"""Return last revision id, or None"""
1935
revision_id = self.last_revision_info()[1]
1936
if revision_id == _mod_revision.NULL_REVISION:
1940
def _write_last_revision_info(self, revno, revision_id):
1941
"""Simply write out the revision id, with no checks.
1943
Use set_last_revision_info to perform this safely.
1945
Does not update the revision_history cache.
1946
Intended to be called by set_last_revision_info and
1947
_write_revision_history.
1949
if revision_id is None:
1950
revision_id = 'null:'
1951
out_string = '%d %s\n' % (revno, revision_id)
1952
self.control_files.put_bytes('last-revision', out_string)
1955
def set_last_revision_info(self, revno, revision_id):
1956
revision_id = osutils.safe_revision_id(revision_id)
1957
if self._get_append_revisions_only():
1958
self._check_history_violation(revision_id)
1959
self._write_last_revision_info(revno, revision_id)
1960
self._clear_cached_state()
1962
def _check_history_violation(self, revision_id):
1963
last_revision = self.last_revision()
1964
if last_revision is None:
1966
if last_revision not in self._lefthand_history(revision_id):
1967
raise errors.AppendRevisionsOnlyViolation(self.base)
1969
def _gen_revision_history(self):
1970
"""Generate the revision history from last revision
1972
history = list(self.repository.iter_reverse_revision_history(
1973
self.last_revision()))
1977
def _write_revision_history(self, history):
1978
"""Factored out of set_revision_history.
1980
This performs the actual writing to disk, with format-specific checks.
1981
It is intended to be called by BzrBranch5.set_revision_history.
1983
if len(history) == 0:
1984
last_revision = 'null:'
1986
if history != self._lefthand_history(history[-1]):
1987
raise errors.NotLefthandHistory(history)
1988
last_revision = history[-1]
1989
if self._get_append_revisions_only():
1990
self._check_history_violation(last_revision)
1991
self._write_last_revision_info(len(history), last_revision)
1994
def append_revision(self, *revision_ids):
1995
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1996
if len(revision_ids) == 0:
1998
prev_revno, prev_revision = self.last_revision_info()
1999
for revision in self.repository.get_revisions(revision_ids):
2000
if prev_revision == _mod_revision.NULL_REVISION:
2001
if revision.parent_ids != []:
2002
raise errors.NotLeftParentDescendant(self, prev_revision,
2003
revision.revision_id)
2005
if revision.parent_ids[0] != prev_revision:
2006
raise errors.NotLeftParentDescendant(self, prev_revision,
2007
revision.revision_id)
2008
prev_revision = revision.revision_id
2009
self.set_last_revision_info(prev_revno + len(revision_ids),
2013
def _set_parent_location(self, url):
2014
"""Set the parent branch"""
2015
self._set_config_location('parent_location', url, make_relative=True)
2018
def _get_parent_location(self):
2019
"""Set the parent branch"""
2020
return self._get_config_location('parent_location')
2022
def set_push_location(self, location):
2023
"""See Branch.set_push_location."""
2024
self._set_config_location('push_location', location)
2026
def set_bound_location(self, location):
2027
"""See Branch.set_push_location."""
2029
config = self.get_config()
2030
if location is None:
2031
if config.get_user_option('bound') != 'True':
2034
config.set_user_option('bound', 'False')
2037
self._set_config_location('bound_location', location,
2039
config.set_user_option('bound', 'True')
2042
def _get_bound_location(self, bound):
2043
"""Return the bound location in the config file.
2045
Return None if the bound parameter does not match"""
2046
config = self.get_config()
2047
config_bound = (config.get_user_option('bound') == 'True')
2048
if config_bound != bound:
2050
return self._get_config_location('bound_location', config=config)
2052
def get_bound_location(self):
2053
"""See Branch.set_push_location."""
2054
return self._get_bound_location(True)
2056
def get_old_bound_location(self):
2057
"""See Branch.get_old_bound_location"""
2058
return self._get_bound_location(False)
2060
def set_append_revisions_only(self, enabled):
2065
self.get_config().set_user_option('append_revisions_only', value)
2067
def _get_append_revisions_only(self):
2068
value = self.get_config().get_user_option('append_revisions_only')
2069
return value == 'True'
2071
def _synchronize_history(self, destination, revision_id):
2072
"""Synchronize last revision and revision history between branches.
2074
This version is most efficient when the destination is also a
2075
BzrBranch6, but works for BzrBranch5, as long as the destination's
2076
repository contains all the lefthand ancestors of the intended
2077
last_revision. If not, set_last_revision_info will fail.
2079
:param destination: The branch to copy the history into
2080
:param revision_id: The revision-id to truncate history at. May
2081
be None to copy complete history.
2083
if revision_id is None:
2084
revno, revision_id = self.last_revision_info()
2086
# To figure out the revno for a random revision, we need to build
2087
# the revision history, and count its length.
2088
# We don't care about the order, just how long it is.
2089
# Alternatively, we could start at the current location, and count
2090
# backwards. But there is no guarantee that we will find it since
2091
# it may be a merged revision.
2092
revno = len(list(self.repository.iter_reverse_revision_history(
2094
destination.set_last_revision_info(revno, revision_id)
2096
def _make_tags(self):
2097
return BasicTags(self)
2100
class BranchTestProviderAdapter(object):
2101
"""A tool to generate a suite testing multiple branch formats at once.
2103
This is done by copying the test once for each transport and injecting
2104
the transport_server, transport_readonly_server, and branch_format
2105
classes into each copy. Each copy is also given a new id() to make it
2109
def __init__(self, transport_server, transport_readonly_server, formats,
2110
vfs_transport_factory=None):
2111
self._transport_server = transport_server
2112
self._transport_readonly_server = transport_readonly_server
2113
self._formats = formats
2115
def adapt(self, test):
2116
result = TestSuite()
2117
for branch_format, bzrdir_format in self._formats:
2118
new_test = deepcopy(test)
2119
new_test.transport_server = self._transport_server
2120
new_test.transport_readonly_server = self._transport_readonly_server
2121
new_test.bzrdir_format = bzrdir_format
2122
new_test.branch_format = branch_format
2123
def make_new_test_id():
2124
# the format can be either a class or an instance
2125
name = getattr(branch_format, '__name__',
2126
branch_format.__class__.__name__)
2127
new_id = "%s(%s)" % (new_test.id(), name)
2128
return lambda: new_id
2129
new_test.id = make_new_test_id()
2130
result.addTest(new_test)
2134
######################################################################
2135
# results of operations
2138
class _Result(object):
2140
def _show_tag_conficts(self, to_file):
2141
if not getattr(self, 'tag_conflicts', None):
2143
to_file.write('Conflicting tags:\n')
2144
for name, value1, value2 in self.tag_conflicts:
2145
to_file.write(' %s\n' % (name, ))
2148
class PullResult(_Result):
2149
"""Result of a Branch.pull operation.
2151
:ivar old_revno: Revision number before pull.
2152
:ivar new_revno: Revision number after pull.
2153
:ivar old_revid: Tip revision id before pull.
2154
:ivar new_revid: Tip revision id after pull.
2155
:ivar source_branch: Source (local) branch object.
2156
:ivar master_branch: Master branch of the target, or None.
2157
:ivar target_branch: Target/destination branch object.
2161
# DEPRECATED: pull used to return the change in revno
2162
return self.new_revno - self.old_revno
2164
def report(self, to_file):
2165
if self.old_revid == self.new_revid:
2166
to_file.write('No revisions to pull.\n')
2168
to_file.write('Now on revision %d.\n' % self.new_revno)
2169
self._show_tag_conficts(to_file)
2172
class PushResult(_Result):
2173
"""Result of a Branch.push operation.
2175
:ivar old_revno: Revision number before push.
2176
:ivar new_revno: Revision number after push.
2177
:ivar old_revid: Tip revision id before push.
2178
:ivar new_revid: Tip revision id after push.
2179
:ivar source_branch: Source branch object.
2180
:ivar master_branch: Master branch of the target, or None.
2181
:ivar target_branch: Target/destination branch object.
2185
# DEPRECATED: push used to return the change in revno
2186
return self.new_revno - self.old_revno
2188
def report(self, to_file):
2189
"""Write a human-readable description of the result."""
2190
if self.old_revid == self.new_revid:
2191
to_file.write('No new revisions to push.\n')
2193
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2194
self._show_tag_conficts(to_file)
2197
class BranchCheckResult(object):
2198
"""Results of checking branch consistency.
2203
def __init__(self, branch):
2204
self.branch = branch
2206
def report_results(self, verbose):
2207
"""Report the check results via trace.note.
2209
:param verbose: Requests more detailed display of what was checked,
2212
note('checked branch %s format %s',
2214
self.branch._format)
2217
class Converter5to6(object):
2218
"""Perform an in-place upgrade of format 5 to format 6"""
2220
def convert(self, branch):
2221
# Data for 5 and 6 can peacefully coexist.
2222
format = BzrBranchFormat6()
2223
new_branch = format.open(branch.bzrdir, _found=True)
2225
# Copy source data into target
2226
new_branch.set_last_revision_info(*branch.last_revision_info())
2227
new_branch.set_parent(branch.get_parent())
2228
new_branch.set_bound_location(branch.get_bound_location())
2229
new_branch.set_push_location(branch.get_push_location())
2231
# New branch has no tags by default
2232
new_branch.tags._set_tag_dict({})
2234
# Copying done; now update target format
2235
new_branch.control_files.put_utf8('format',
2236
format.get_format_string())
2238
# Clean up old files
2239
new_branch.control_files._transport.delete('revision-history')
2241
branch.set_parent(None)
2244
branch.set_bound_location(None)
added
removed
bzrlib/branch.py
