140
128
Basically we keep looking up until we find the control directory or
141
129
run into the root. If there isn't one, raises NotBranchError.
142
If there is one and it is either an unrecognised format or an unsupported
143
format, UnknownFormatError or UnsupportedFormatError are raised.
144
If there is one, it is returned, along with the unused portion of url.
146
control, relpath = bzrdir.BzrDir.open_containing(url)
147
return control.open_branch(), relpath
131
t = get_transport(url)
135
except NotBranchError:
137
new_t = t.clone('..')
138
if new_t.base == t.base:
139
# reached the root, whatever that may be
140
raise NotBranchError('%s is not in a branch' % url)
150
@deprecated_function(zero_eight)
151
144
def initialize(base):
152
"""Create a new working tree and branch, rooted at 'base' (url)
154
NOTE: This will soon be deprecated in favour of creation
157
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
159
@deprecated_function(zero_eight)
145
"""Create a new branch, rooted at 'base' (url)"""
146
t = get_transport(base)
147
return _Branch(t, init=True)
160
149
def setup_caching(self, cache_root):
161
150
"""Subclasses that care about caching should override this, and set
162
151
up cached stores located under cache_root.
153
self.cache_root = cache_root
156
class _Branch(Branch):
157
"""A branch stored in the actual filesystem.
159
Note that it's "local" in the context of the filesystem; it doesn't
160
really matter if it's on an nfs/smb/afs/coda/... share, as long as
161
it's writable, and can be accessed via the normal filesystem API.
167
If _lock_mode is true, a positive count of the number of times the
171
Lock object from bzrlib.lock.
173
# We actually expect this class to be somewhat short-lived; part of its
174
# purpose is to try to isolate what bits of the branch logic are tied to
175
# filesystem access, so that in a later step, we can extricate them to
176
# a separarte ("storage") class.
180
_inventory_weave = None
182
# Map some sort of prefix into a namespace
183
# stuff like "revno:10", "revid:", etc.
184
# This should match a prefix with a function which accepts
185
REVISION_NAMESPACES = {}
187
def push_stores(self, branch_to):
188
"""Copy the content of this branches store to branch_to."""
189
if (self._branch_format != branch_to._branch_format
190
or self._branch_format != 4):
191
from bzrlib.fetch import greedy_fetch
192
mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
193
self, self._branch_format, branch_to, branch_to._branch_format)
194
greedy_fetch(to_branch=branch_to, from_branch=self,
195
revision=self.last_revision())
198
store_pairs = ((self.text_store, branch_to.text_store),
199
(self.inventory_store, branch_to.inventory_store),
200
(self.revision_store, branch_to.revision_store))
202
for from_store, to_store in store_pairs:
203
copy_all(from_store, to_store)
204
except UnlistableStore:
205
raise UnlistableBranch(from_store)
207
def __init__(self, transport, init=False,
208
relax_version_check=False):
209
"""Create new branch object at a particular location.
211
transport -- A Transport object, defining how to access files.
212
(If a string, transport.transport() will be used to
213
create a Transport object)
164
NOTE: This is unused.
168
def get_config(self):
169
return BranchConfig(self)
172
return self.get_config().get_nickname()
174
def _set_nick(self, nick):
175
self.get_config().set_user_option('nickname', nick, warn_masked=True)
177
nick = property(_get_nick, _set_nick)
180
raise NotImplementedError(self.is_locked)
215
init -- If True, create new control files in a previously
216
unversioned directory. If False, the branch must already
219
relax_version_check -- If true, the usual check for the branch
220
version is not applied. This is intended only for
221
upgrade/recovery type use; it's not guaranteed that
222
all operations will work on old format branches.
224
In the test suite, creation of new trees is tested using the
225
`ScratchBranch` class.
227
assert isinstance(transport, Transport), \
228
"%r is not a Transport" % transport
229
self._transport = transport
232
self._check_format(relax_version_check)
234
def get_store(name, compressed=True, prefixed=False):
235
# FIXME: This approach of assuming stores are all entirely compressed
236
# or entirely uncompressed is tidy, but breaks upgrade from
237
# some existing branches where there's a mixture; we probably
238
# still want the option to look for both.
239
relpath = self._rel_controlfilename(name)
241
store = CompressedTextStore(self._transport.clone(relpath),
244
store = TextStore(self._transport.clone(relpath),
246
#if self._transport.should_cache():
247
# cache_path = os.path.join(self.cache_root, name)
248
# os.mkdir(cache_path)
249
# store = bzrlib.store.CachedStore(store, cache_path)
251
def get_weave(name, prefixed=False):
252
relpath = self._rel_controlfilename(name)
253
ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
254
if self._transport.should_cache():
255
ws.enable_cache = True
258
if self._branch_format == 4:
259
self.inventory_store = get_store('inventory-store')
260
self.text_store = get_store('text-store')
261
self.revision_store = get_store('revision-store')
262
elif self._branch_format == 5:
263
self.control_weaves = get_weave([])
264
self.weave_store = get_weave('weaves')
265
self.revision_store = get_store('revision-store', compressed=False)
266
elif self._branch_format == 6:
267
self.control_weaves = get_weave([])
268
self.weave_store = get_weave('weaves', prefixed=True)
269
self.revision_store = get_store('revision-store', compressed=False,
271
self._transaction = None
274
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
281
if self._lock_mode or self._lock:
282
# XXX: This should show something every time, and be suitable for
283
# headless operation and embedding
284
warn("branch %r was not explicitly unlocked" % self)
287
# TODO: It might be best to do this somewhere else,
288
# but it is nice for a Branch object to automatically
289
# cache it's information.
290
# Alternatively, we could have the Transport objects cache requests
291
# See the earlier discussion about how major objects (like Branch)
292
# should never expect their __del__ function to run.
293
if hasattr(self, 'cache_root') and self.cache_root is not None:
296
shutil.rmtree(self.cache_root)
299
self.cache_root = None
303
return self._transport.base
306
base = property(_get_base)
308
def _finish_transaction(self):
309
"""Exit the current transaction."""
310
if self._transaction is None:
311
raise errors.LockError('Branch %s is not in a transaction' %
313
transaction = self._transaction
314
self._transaction = None
317
def get_transaction(self):
318
"""Return the current active transaction.
320
If no transaction is active, this returns a passthrough object
321
for which all data is immedaitely flushed and no caching happens.
323
if self._transaction is None:
324
return transactions.PassThroughTransaction()
326
return self._transaction
328
def _set_transaction(self, new_transaction):
329
"""Set a new active transaction."""
330
if self._transaction is not None:
331
raise errors.LockError('Branch %s is in a transaction already.' %
333
self._transaction = new_transaction
182
335
def lock_write(self):
183
raise NotImplementedError(self.lock_write)
336
mutter("lock write: %s (%s)", self, self._lock_count)
337
# TODO: Upgrade locking to support using a Transport,
338
# and potentially a remote locking protocol
340
if self._lock_mode != 'w':
341
raise LockError("can't upgrade to a write lock from %r" %
343
self._lock_count += 1
345
self._lock = self._transport.lock_write(
346
self._rel_controlfilename('branch-lock'))
347
self._lock_mode = 'w'
349
self._set_transaction(transactions.PassThroughTransaction())
185
351
def lock_read(self):
186
raise NotImplementedError(self.lock_read)
352
mutter("lock read: %s (%s)", self, self._lock_count)
354
assert self._lock_mode in ('r', 'w'), \
355
"invalid lock mode %r" % self._lock_mode
356
self._lock_count += 1
358
self._lock = self._transport.lock_read(
359
self._rel_controlfilename('branch-lock'))
360
self._lock_mode = 'r'
362
self._set_transaction(transactions.ReadOnlyTransaction())
363
# 5K may be excessive, but hey, its a knob.
364
self.get_transaction().set_cache_size(5000)
188
366
def unlock(self):
189
raise NotImplementedError(self.unlock)
191
def peek_lock_mode(self):
192
"""Return lock mode for the Branch: 'r', 'w' or None"""
193
raise NotImplementedError(self.peek_lock_mode)
195
def get_physical_lock_status(self):
196
raise NotImplementedError(self.get_physical_lock_status)
199
def get_revision_id_to_revno_map(self):
200
"""Return the revision_id => dotted revno map.
202
This will be regenerated on demand, but will be cached.
204
:return: A dictionary mapping revision_id => dotted revno.
205
This dictionary should not be modified by the caller.
207
if self._revision_id_to_revno_cache is not None:
208
mapping = self._revision_id_to_revno_cache
367
mutter("unlock: %s (%s)", self, self._lock_count)
368
if not self._lock_mode:
369
raise LockError('branch %r is not locked' % (self))
371
if self._lock_count > 1:
372
self._lock_count -= 1
210
mapping = self._gen_revno_map()
211
self._cache_revision_id_to_revno(mapping)
212
# TODO: jam 20070417 Since this is being cached, should we be returning
214
# I would rather not, and instead just declare that users should not
215
# modify the return value.
218
def _gen_revno_map(self):
219
"""Create a new mapping from revision ids to dotted revnos.
221
Dotted revnos are generated based on the current tip in the revision
223
This is the worker function for get_revision_id_to_revno_map, which
224
just caches the return value.
226
:return: A dictionary mapping revision_id => dotted revno.
228
last_revision = self.last_revision()
229
revision_graph = self.repository.get_revision_graph(last_revision)
230
merge_sorted_revisions = tsort.merge_sort(
235
revision_id_to_revno = dict((rev_id, revno)
236
for seq_num, rev_id, depth, revno, end_of_merge
237
in merge_sorted_revisions)
238
return revision_id_to_revno
240
def leave_lock_in_place(self):
241
"""Tell this branch object not to release the physical lock when this
244
If lock_write doesn't return a token, then this method is not supported.
246
self.control_files.leave_in_place()
248
def dont_leave_lock_in_place(self):
249
"""Tell this branch object to release the physical lock when this
250
object is unlocked, even if it didn't originally acquire it.
252
If lock_write doesn't return a token, then this method is not supported.
254
self.control_files.dont_leave_in_place()
374
self._finish_transaction()
377
self._lock_mode = self._lock_count = None
256
379
def abspath(self, name):
257
"""Return absolute filename for something in the branch
259
XXX: Robert Collins 20051017 what is this used for? why is it a branch
260
method and not a tree method.
262
raise NotImplementedError(self.abspath)
264
def bind(self, other):
265
"""Bind the local branch the other branch.
267
:param other: The branch to bind to
270
raise errors.UpgradeRequired(self.base)
273
def fetch(self, from_branch, last_revision=None, pb=None):
274
"""Copy revisions from from_branch into this branch.
276
:param from_branch: Where to copy from.
277
:param last_revision: What revision to stop at (None for at the end
279
:param pb: An optional progress bar to use.
281
Returns the copied revision count and the failed revisions in a tuple:
284
if self.base == from_branch.base:
287
nested_pb = ui.ui_factory.nested_progress_bar()
292
from_branch.lock_read()
294
if last_revision is None:
295
pb.update('get source history')
296
last_revision = from_branch.last_revision()
297
if last_revision is None:
298
last_revision = _mod_revision.NULL_REVISION
299
return self.repository.fetch(from_branch.repository,
300
revision_id=last_revision,
303
if nested_pb is not None:
307
def get_bound_location(self):
308
"""Return the URL of the branch we are bound to.
310
Older format branches cannot bind, please be sure to use a metadir
315
def get_old_bound_location(self):
316
"""Return the URL of the branch we used to be bound to
318
raise errors.UpgradeRequired(self.base)
320
def get_commit_builder(self, parents, config=None, timestamp=None,
321
timezone=None, committer=None, revprops=None,
323
"""Obtain a CommitBuilder for this branch.
325
:param parents: Revision ids of the parents of the new revision.
326
:param config: Optional configuration to use.
327
:param timestamp: Optional timestamp recorded for commit.
328
:param timezone: Optional timezone for timestamp.
329
:param committer: Optional committer to set for commit.
330
:param revprops: Optional dictionary of revision properties.
331
:param revision_id: Optional revision id.
335
config = self.get_config()
337
return self.repository.get_commit_builder(self, parents, config,
338
timestamp, timezone, committer, revprops, revision_id)
340
def get_master_branch(self):
341
"""Return the branch we are bound to.
343
:return: Either a Branch, or None
380
"""Return absolute filename for something in the branch"""
381
return self._transport.abspath(name)
383
def relpath(self, path):
384
"""Return path relative to this branch of something inside it.
386
Raises an error if path is not in this branch."""
387
return self._transport.relpath(path)
390
def _rel_controlfilename(self, file_or_path):
391
if isinstance(file_or_path, basestring):
392
file_or_path = [file_or_path]
393
return [bzrlib.BZRDIR] + file_or_path
395
def controlfilename(self, file_or_path):
396
"""Return location relative to branch."""
397
return self._transport.abspath(self._rel_controlfilename(file_or_path))
400
def controlfile(self, file_or_path, mode='r'):
401
"""Open a control file for this branch.
403
There are two classes of file in the control directory: text
404
and binary. binary files are untranslated byte streams. Text
405
control files are stored with Unix newlines and in UTF-8, even
406
if the platform or locale defaults are different.
408
Controlfiles should almost never be opened in write mode but
409
rather should be atomically copied and replaced using atomicfile.
413
relpath = self._rel_controlfilename(file_or_path)
414
#TODO: codecs.open() buffers linewise, so it was overloaded with
415
# a much larger buffer, do we need to do the same for getreader/getwriter?
417
return self._transport.get(relpath)
419
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
421
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
423
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
425
raise BzrError("invalid controlfile mode %r" % mode)
427
def put_controlfile(self, path, f, encode=True):
428
"""Write an entry as a controlfile.
430
:param path: The path to put the file, relative to the .bzr control
432
:param f: A file-like or string object whose contents should be copied.
433
:param encode: If true, encode the contents as utf-8
435
self.put_controlfiles([(path, f)], encode=encode)
437
def put_controlfiles(self, files, encode=True):
438
"""Write several entries as controlfiles.
440
:param files: A list of [(path, file)] pairs, where the path is the directory
441
underneath the bzr control directory
442
:param encode: If true, encode the contents as utf-8
446
for path, f in files:
448
if isinstance(f, basestring):
449
f = f.encode('utf-8', 'replace')
451
f = codecs.getwriter('utf-8')(f, errors='replace')
452
path = self._rel_controlfilename(path)
453
ctrl_files.append((path, f))
454
self._transport.put_multi(ctrl_files)
456
def _make_control(self):
457
from bzrlib.inventory import Inventory
458
from bzrlib.weavefile import write_weave_v5
459
from bzrlib.weave import Weave
461
# Create an empty inventory
463
# if we want per-tree root ids then this is the place to set
464
# them; they're not needed for now and so ommitted for
466
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
467
empty_inv = sio.getvalue()
469
bzrlib.weavefile.write_weave_v5(Weave(), sio)
470
empty_weave = sio.getvalue()
472
dirs = [[], 'revision-store', 'weaves']
474
"This is a Bazaar-NG control directory.\n"
475
"Do not change any files in this directory.\n"),
476
('branch-format', BZR_BRANCH_FORMAT_6),
477
('revision-history', ''),
480
('pending-merges', ''),
481
('inventory', empty_inv),
482
('inventory.weave', empty_weave),
483
('ancestry.weave', empty_weave)
485
cfn = self._rel_controlfilename
486
self._transport.mkdir_multi([cfn(d) for d in dirs])
487
self.put_controlfiles(files)
488
mutter('created control directory in ' + self._transport.base)
490
def _check_format(self, relax_version_check):
491
"""Check this branch format is supported.
493
The format level is stored, as an integer, in
494
self._branch_format for code that needs to check it later.
496
In the future, we might need different in-memory Branch
497
classes to support downlevel branches. But not yet.
500
fmt = self.controlfile('branch-format', 'r').read()
502
raise NotBranchError(self.base)
503
mutter("got branch format %r", fmt)
504
if fmt == BZR_BRANCH_FORMAT_6:
505
self._branch_format = 6
506
elif fmt == BZR_BRANCH_FORMAT_5:
507
self._branch_format = 5
508
elif fmt == BZR_BRANCH_FORMAT_4:
509
self._branch_format = 4
511
if (not relax_version_check
512
and self._branch_format not in (5, 6)):
513
raise errors.UnsupportedFormatError(
514
'sorry, branch format %r not supported' % fmt,
515
['use a different bzr version',
516
'or remove the .bzr directory'
517
' and "bzr init" again'])
519
def get_root_id(self):
520
"""Return the id of this branches root"""
521
inv = self.read_working_inventory()
522
return inv.root.file_id
524
def set_root_id(self, file_id):
525
inv = self.read_working_inventory()
526
orig_root_id = inv.root.file_id
527
del inv._byid[inv.root.file_id]
528
inv.root.file_id = file_id
529
inv._byid[inv.root.file_id] = inv.root
532
if entry.parent_id in (None, orig_root_id):
533
entry.parent_id = inv.root.file_id
534
self._write_inventory(inv)
536
def read_working_inventory(self):
537
"""Read the working inventory."""
540
# ElementTree does its own conversion from UTF-8, so open in
542
f = self.controlfile('inventory', 'rb')
543
return bzrlib.xml5.serializer_v5.read_inventory(f)
548
def _write_inventory(self, inv):
549
"""Update the working inventory.
551
That is to say, the inventory describing changes underway, that
552
will be committed to the next revision.
554
from cStringIO import StringIO
558
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
560
# Transport handles atomicity
561
self.put_controlfile('inventory', sio)
565
mutter('wrote working inventory')
567
inventory = property(read_working_inventory, _write_inventory, None,
568
"""Inventory for the working copy.""")
570
def add(self, files, ids=None):
571
"""Make files versioned.
573
Note that the command line normally calls smart_add instead,
574
which can automatically recurse.
576
This puts the files in the Added state, so that they will be
577
recorded by the next commit.
580
List of paths to add, relative to the base of the tree.
583
If set, use these instead of automatically generated ids.
584
Must be the same length as the list of files, but may
585
contain None for ids that are to be autogenerated.
587
TODO: Perhaps have an option to add the ids even if the files do
590
TODO: Perhaps yield the ids and paths as they're added.
592
# TODO: Re-adding a file that is removed in the working copy
593
# should probably put it back with the previous ID.
594
if isinstance(files, basestring):
595
assert(ids is None or isinstance(ids, basestring))
601
ids = [None] * len(files)
603
assert(len(ids) == len(files))
607
inv = self.read_working_inventory()
608
for f,file_id in zip(files, ids):
609
if is_control_file(f):
610
raise BzrError("cannot add control file %s" % quotefn(f))
615
raise BzrError("cannot add top-level %r" % f)
617
fullpath = os.path.normpath(self.abspath(f))
620
kind = file_kind(fullpath)
622
# maybe something better?
623
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
625
if not InventoryEntry.versionable_kind(kind):
626
raise BzrError('cannot add: not a versionable file ('
627
'i.e. regular file, symlink or directory): %s' % quotefn(f))
630
file_id = gen_file_id(f)
631
inv.add_path(f, kind=kind, file_id=file_id)
633
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
635
self._write_inventory(inv)
640
def print_file(self, file, revno):
641
"""Print `file` to stdout."""
644
tree = self.revision_tree(self.get_rev_id(revno))
645
# use inventory as it was in that revision
646
file_id = tree.inventory.path2id(file)
648
raise BzrError("%r is not present in revision %s" % (file, revno))
649
tree.print_file(file_id)
654
def remove(self, files, verbose=False):
655
"""Mark nominated files for removal from the inventory.
657
This does not remove their text. This does not run on
659
TODO: Refuse to remove modified files unless --force is given?
661
TODO: Do something useful with directories.
663
TODO: Should this remove the text or not? Tough call; not
664
removing may be useful and the user can just use use rm, and
665
is the opposite of add. Removing it is consistent with most
666
other tools. Maybe an option.
668
## TODO: Normalize names
669
## TODO: Remove nested loops; better scalability
670
if isinstance(files, basestring):
676
tree = self.working_tree()
679
# do this before any modifications
683
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
684
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
686
# having remove it, it must be either ignored or unknown
687
if tree.is_ignored(f):
691
show_status(new_status, inv[fid].kind, quotefn(f))
694
self._write_inventory(inv)
698
# FIXME: this doesn't need to be a branch method
699
def set_inventory(self, new_inventory_list):
700
from bzrlib.inventory import Inventory, InventoryEntry
701
inv = Inventory(self.get_root_id())
702
for path, file_id, parent, kind in new_inventory_list:
703
name = os.path.basename(path)
706
# fixme, there should be a factory function inv,add_??
707
if kind == 'directory':
708
inv.add(inventory.InventoryDirectory(file_id, name, parent))
710
inv.add(inventory.InventoryFile(file_id, name, parent))
711
elif kind == 'symlink':
712
inv.add(inventory.InventoryLink(file_id, name, parent))
714
raise BzrError("unknown kind %r" % kind)
715
self._write_inventory(inv)
718
"""Return all unknown files.
720
These are files in the working directory that are not versioned or
721
control files or ignored.
723
>>> b = ScratchBranch(files=['foo', 'foo~'])
724
>>> list(b.unknowns())
727
>>> list(b.unknowns())
730
>>> list(b.unknowns())
733
return self.working_tree().unknowns()
736
def append_revision(self, *revision_ids):
737
for revision_id in revision_ids:
738
mutter("add {%s} to revision-history" % revision_id)
741
rev_history = self.revision_history()
742
rev_history.extend(revision_ids)
743
self.put_controlfile('revision-history', '\n'.join(rev_history))
747
def has_revision(self, revision_id):
748
"""True if this branch has a copy of the revision.
750
This does not necessarily imply the revision is merge
751
or on the mainline."""
752
return (revision_id is None
753
or revision_id in self.revision_store)
755
def get_revision_xml_file(self, revision_id):
756
"""Return XML file object for revision object."""
757
if not revision_id or not isinstance(revision_id, basestring):
758
raise InvalidRevisionId(revision_id)
763
return self.revision_store[revision_id]
764
except (IndexError, KeyError):
765
raise bzrlib.errors.NoSuchRevision(self, revision_id)
770
get_revision_xml = get_revision_xml_file
772
def get_revision_xml(self, revision_id):
773
return self.get_revision_xml_file(revision_id).read()
776
def get_revision(self, revision_id):
777
"""Return the Revision object for a named revision"""
778
xml_file = self.get_revision_xml_file(revision_id)
781
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
782
except SyntaxError, e:
783
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
787
assert r.revision_id == revision_id
347
790
def get_revision_delta(self, revno):
348
791
"""Return the delta for one revision.
665
1273
if revno < 1 or revno > self.revno():
666
1274
raise InvalidRevisionNumber(revno)
669
def clone(self, to_bzrdir, revision_id=None):
670
"""Clone this branch into to_bzrdir preserving all semantic values.
672
revision_id: if not None, the revision history in the new branch will
673
be truncated to end with revision_id.
675
result = self._format.initialize(to_bzrdir)
676
self.copy_content_into(result, revision_id=revision_id)
680
def sprout(self, to_bzrdir, revision_id=None):
681
"""Create a new line of development from the branch, into to_bzrdir.
683
revision_id: if not None, the revision history in the new branch will
684
be truncated to end with revision_id.
686
result = self._format.initialize(to_bzrdir)
687
self.copy_content_into(result, revision_id=revision_id)
688
result.set_parent(self.bzrdir.root_transport.base)
691
def _synchronize_history(self, destination, revision_id):
692
"""Synchronize last revision and revision history between branches.
694
This version is most efficient when the destination is also a
695
BzrBranch5, but works for BzrBranch6 as long as the revision
696
history is the true lefthand parent history, and all of the revisions
697
are in the destination's repository. If not, set_revision_history
700
:param destination: The branch to copy the history into
701
:param revision_id: The revision-id to truncate history at. May
702
be None to copy complete history.
704
if revision_id == _mod_revision.NULL_REVISION:
706
new_history = self.revision_history()
707
if revision_id is not None and new_history != []:
708
revision_id = osutils.safe_revision_id(revision_id)
710
new_history = new_history[:new_history.index(revision_id) + 1]
712
rev = self.repository.get_revision(revision_id)
713
new_history = rev.get_history(self.repository)[1:]
714
destination.set_revision_history(new_history)
717
def copy_content_into(self, destination, revision_id=None):
718
"""Copy the content of self into destination.
720
revision_id: if not None, the revision history in the new branch will
721
be truncated to end with revision_id.
723
self._synchronize_history(destination, revision_id)
725
parent = self.get_parent()
726
except errors.InaccessibleParent, e:
727
mutter('parent was not accessible to copy: %s', e)
730
destination.set_parent(parent)
731
self.tags.merge_to(destination.tags)
735
"""Check consistency of the branch.
737
In particular this checks that revisions given in the revision-history
738
do actually match up in the revision graph, and that they're all
739
present in the repository.
741
Callers will typically also want to check the repository.
743
:return: A BranchCheckResult.
745
mainline_parent_id = None
746
for revision_id in self.revision_history():
748
revision = self.repository.get_revision(revision_id)
749
except errors.NoSuchRevision, e:
750
raise errors.BzrCheckError("mainline revision {%s} not in repository"
752
# In general the first entry on the revision history has no parents.
753
# But it's not illegal for it to have parents listed; this can happen
754
# in imports from Arch when the parents weren't reachable.
755
if mainline_parent_id is not None:
756
if mainline_parent_id not in revision.parent_ids:
757
raise errors.BzrCheckError("previous revision {%s} not listed among "
759
% (mainline_parent_id, revision_id))
760
mainline_parent_id = revision_id
761
return BranchCheckResult(self)
763
def _get_checkout_format(self):
764
"""Return the most suitable metadir for a checkout of this branch.
765
Weaves are used if this branch's repository uses weaves.
767
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
768
from bzrlib.repofmt import weaverepo
769
format = bzrdir.BzrDirMetaFormat1()
770
format.repository_format = weaverepo.RepositoryFormat7()
772
format = self.repository.bzrdir.checkout_metadir()
773
format.set_branch_format(self._format)
776
def create_checkout(self, to_location, revision_id=None,
778
"""Create a checkout of a branch.
780
:param to_location: The url to produce the checkout at
781
:param revision_id: The revision to check out
782
:param lightweight: If True, produce a lightweight checkout, otherwise,
783
produce a bound branch (heavyweight checkout)
784
:return: The tree of the created checkout
786
t = transport.get_transport(to_location)
789
format = self._get_checkout_format()
790
checkout = format.initialize_on_transport(t)
791
BranchReferenceFormat().initialize(checkout, self)
793
format = self._get_checkout_format()
794
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
795
to_location, force_new_tree=False, format=format)
796
checkout = checkout_branch.bzrdir
797
checkout_branch.bind(self)
798
# pull up to the specified revision_id to set the initial
799
# branch tip correctly, and seed it with history.
800
checkout_branch.pull(self, stop_revision=revision_id)
801
tree = checkout.create_workingtree(revision_id)
802
basis_tree = tree.basis_tree()
803
basis_tree.lock_read()
805
for path, file_id in basis_tree.iter_references():
806
reference_parent = self.reference_parent(file_id, path)
807
reference_parent.create_checkout(tree.abspath(path),
808
basis_tree.get_reference_revision(file_id, path),
814
def reference_parent(self, file_id, path):
815
"""Return the parent branch for a tree-reference file_id
816
:param file_id: The file_id of the tree reference
817
:param path: The path of the file_id in the tree
818
:return: A branch associated with the file_id
820
# FIXME should provide multiple branches, based on config
821
return Branch.open(self.bzrdir.root_transport.clone(path).base)
823
def supports_tags(self):
824
return self._format.supports_tags()
827
class BranchFormat(object):
828
"""An encapsulation of the initialization and open routines for a format.
830
Formats provide three things:
831
* An initialization routine,
835
Formats are placed in an dict by their format string for reference
836
during branch opening. Its not required that these be instances, they
837
can be classes themselves with class methods - it simply depends on
838
whether state is needed for a given format or not.
840
Once a format is deprecated, just deprecate the initialize and open
841
methods on the format class. Do not deprecate the object, as the
842
object will be created every time regardless.
845
_default_format = None
846
"""The default format used for new branches."""
849
"""The known formats."""
851
def __eq__(self, other):
852
return self.__class__ is other.__class__
854
def __ne__(self, other):
855
return not (self == other)
858
def find_format(klass, a_bzrdir):
859
"""Return the format for the branch object in a_bzrdir."""
861
transport = a_bzrdir.get_branch_transport(None)
862
format_string = transport.get("format").read()
863
return klass._formats[format_string]
865
raise NotBranchError(path=transport.base)
867
raise errors.UnknownFormatError(format=format_string)
870
def get_default_format(klass):
871
"""Return the current default format."""
872
return klass._default_format
874
def get_reference(self, a_bzrdir):
875
"""Get the target reference of the branch in a_bzrdir.
877
format probing must have been completed before calling
878
this method - it is assumed that the format of the branch
879
in a_bzrdir is correct.
881
:param a_bzrdir: The bzrdir to get the branch data from.
882
:return: None if the branch is not a reference branch.
886
def get_format_string(self):
887
"""Return the ASCII format string that identifies this format."""
888
raise NotImplementedError(self.get_format_string)
890
def get_format_description(self):
891
"""Return the short format description for this format."""
892
raise NotImplementedError(self.get_format_description)
894
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
896
"""Initialize a branch in a bzrdir, with specified files
898
:param a_bzrdir: The bzrdir to initialize the branch in
899
:param utf8_files: The files to create as a list of
900
(filename, content) tuples
901
:param set_format: If True, set the format with
902
self.get_format_string. (BzrBranch4 has its format set
904
:return: a branch in this format
906
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
907
branch_transport = a_bzrdir.get_branch_transport(self)
909
'metadir': ('lock', lockdir.LockDir),
910
'branch4': ('branch-lock', lockable_files.TransportLock),
912
lock_name, lock_class = lock_map[lock_type]
913
control_files = lockable_files.LockableFiles(branch_transport,
914
lock_name, lock_class)
915
control_files.create_lock()
916
control_files.lock_write()
918
control_files.put_utf8('format', self.get_format_string())
920
for file, content in utf8_files:
921
control_files.put_utf8(file, content)
923
control_files.unlock()
924
return self.open(a_bzrdir, _found=True)
926
def initialize(self, a_bzrdir):
927
"""Create a branch of this format in a_bzrdir."""
928
raise NotImplementedError(self.initialize)
930
def is_supported(self):
931
"""Is this format supported?
933
Supported formats can be initialized and opened.
934
Unsupported formats may not support initialization or committing or
935
some other features depending on the reason for not being supported.
939
def open(self, a_bzrdir, _found=False):
940
"""Return the branch object for a_bzrdir
942
_found is a private parameter, do not use it. It is used to indicate
943
if format probing has already be done.
945
raise NotImplementedError(self.open)
948
def register_format(klass, format):
949
klass._formats[format.get_format_string()] = format
952
def set_default_format(klass, format):
953
klass._default_format = format
956
def unregister_format(klass, format):
957
assert klass._formats[format.get_format_string()] is format
958
del klass._formats[format.get_format_string()]
961
return self.get_format_string().rstrip()
963
def supports_tags(self):
964
"""True if this format supports tags stored in the branch"""
965
return False # by default
967
# XXX: Probably doesn't really belong here -- mbp 20070212
968
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
970
branch_transport = a_bzrdir.get_branch_transport(self)
971
control_files = lockable_files.LockableFiles(branch_transport,
972
lock_filename, lock_class)
973
control_files.create_lock()
974
control_files.lock_write()
976
for filename, content in utf8_files:
977
control_files.put_utf8(filename, content)
979
control_files.unlock()
982
class BranchHooks(Hooks):
983
"""A dictionary mapping hook name to a list of callables for branch hooks.
985
e.g. ['set_rh'] Is the list of items to be called when the
986
set_revision_history function is invoked.
990
"""Create the default hooks.
992
These are all empty initially, because by default nothing should get
996
# Introduced in 0.15:
997
# invoked whenever the revision history has been set
998
# with set_revision_history. The api signature is
999
# (branch, revision_history), and the branch will
1002
# invoked after a push operation completes.
1003
# the api signature is
1005
# containing the members
1006
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1007
# where local is the local target branch or None, master is the target
1008
# master branch, and the rest should be self explanatory. The source
1009
# is read locked and the target branches write locked. Source will
1010
# be the local low-latency branch.
1011
self['post_push'] = []
1012
# invoked after a pull operation completes.
1013
# the api signature is
1015
# containing the members
1016
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1017
# where local is the local branch or None, master is the target
1018
# master branch, and the rest should be self explanatory. The source
1019
# is read locked and the target branches write locked. The local
1020
# branch is the low-latency branch.
1021
self['post_pull'] = []
1022
# invoked after a commit operation completes.
1023
# the api signature is
1024
# (local, master, old_revno, old_revid, new_revno, new_revid)
1025
# old_revid is NULL_REVISION for the first commit to a branch.
1026
self['post_commit'] = []
1027
# invoked after a uncommit operation completes.
1028
# the api signature is
1029
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1030
# local is the local branch or None, master is the target branch,
1031
# and an empty branch recieves new_revno of 0, new_revid of None.
1032
self['post_uncommit'] = []
1035
# install the default hooks into the Branch class.
1036
Branch.hooks = BranchHooks()
1039
class BzrBranchFormat4(BranchFormat):
1040
"""Bzr branch format 4.
1043
- a revision-history file.
1044
- a branch-lock lock file [ to be shared with the bzrdir ]
1047
def get_format_description(self):
1048
"""See BranchFormat.get_format_description()."""
1049
return "Branch format 4"
1051
def initialize(self, a_bzrdir):
1052
"""Create a branch of this format in a_bzrdir."""
1053
utf8_files = [('revision-history', ''),
1054
('branch-name', ''),
1056
return self._initialize_helper(a_bzrdir, utf8_files,
1057
lock_type='branch4', set_format=False)
1060
super(BzrBranchFormat4, self).__init__()
1061
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1063
def open(self, a_bzrdir, _found=False):
1064
"""Return the branch object for a_bzrdir
1066
_found is a private parameter, do not use it. It is used to indicate
1067
if format probing has already be done.
1070
# we are being called directly and must probe.
1071
raise NotImplementedError
1072
return BzrBranch(_format=self,
1073
_control_files=a_bzrdir._control_files,
1075
_repository=a_bzrdir.open_repository())
1078
return "Bazaar-NG branch format 4"
1081
class BzrBranchFormat5(BranchFormat):
1082
"""Bzr branch format 5.
1085
- a revision-history file.
1087
- a lock dir guarding the branch itself
1088
- all of this stored in a branch/ subdirectory
1089
- works with shared repositories.
1091
This format is new in bzr 0.8.
1094
def get_format_string(self):
1095
"""See BranchFormat.get_format_string()."""
1096
return "Bazaar-NG branch format 5\n"
1098
def get_format_description(self):
1099
"""See BranchFormat.get_format_description()."""
1100
return "Branch format 5"
1102
def initialize(self, a_bzrdir):
1103
"""Create a branch of this format in a_bzrdir."""
1104
utf8_files = [('revision-history', ''),
1105
('branch-name', ''),
1107
return self._initialize_helper(a_bzrdir, utf8_files)
1110
super(BzrBranchFormat5, self).__init__()
1111
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1113
def open(self, a_bzrdir, _found=False):
1114
"""Return the branch object for a_bzrdir
1116
_found is a private parameter, do not use it. It is used to indicate
1117
if format probing has already be done.
1120
format = BranchFormat.find_format(a_bzrdir)
1121
assert format.__class__ == self.__class__
1123
transport = a_bzrdir.get_branch_transport(None)
1124
control_files = lockable_files.LockableFiles(transport, 'lock',
1126
return BzrBranch5(_format=self,
1127
_control_files=control_files,
1129
_repository=a_bzrdir.find_repository())
1131
raise NotBranchError(path=transport.base)
1134
class BzrBranchFormat6(BzrBranchFormat5):
1135
"""Branch format with last-revision
1137
Unlike previous formats, this has no explicit revision history. Instead,
1138
this just stores the last-revision, and the left-hand history leading
1139
up to there is the history.
1141
This format was introduced in bzr 0.15
1144
def get_format_string(self):
1145
"""See BranchFormat.get_format_string()."""
1146
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1148
def get_format_description(self):
1149
"""See BranchFormat.get_format_description()."""
1150
return "Branch format 6"
1152
def initialize(self, a_bzrdir):
1153
"""Create a branch of this format in a_bzrdir."""
1154
utf8_files = [('last-revision', '0 null:\n'),
1155
('branch-name', ''),
1156
('branch.conf', ''),
1159
return self._initialize_helper(a_bzrdir, utf8_files)
1161
def open(self, a_bzrdir, _found=False):
1162
"""Return the branch object for a_bzrdir
1164
_found is a private parameter, do not use it. It is used to indicate
1165
if format probing has already be done.
1168
format = BranchFormat.find_format(a_bzrdir)
1169
assert format.__class__ == self.__class__
1170
transport = a_bzrdir.get_branch_transport(None)
1171
control_files = lockable_files.LockableFiles(transport, 'lock',
1173
return BzrBranch6(_format=self,
1174
_control_files=control_files,
1176
_repository=a_bzrdir.find_repository())
1178
def supports_tags(self):
1182
class BranchReferenceFormat(BranchFormat):
1183
"""Bzr branch reference format.
1185
Branch references are used in implementing checkouts, they
1186
act as an alias to the real branch which is at some other url.
1193
def get_format_string(self):
1194
"""See BranchFormat.get_format_string()."""
1195
return "Bazaar-NG Branch Reference Format 1\n"
1197
def get_format_description(self):
1198
"""See BranchFormat.get_format_description()."""
1199
return "Checkout reference format 1"
1201
def get_reference(self, a_bzrdir):
1202
"""See BranchFormat.get_reference()."""
1203
transport = a_bzrdir.get_branch_transport(None)
1204
return transport.get('location').read()
1206
def initialize(self, a_bzrdir, target_branch=None):
1207
"""Create a branch of this format in a_bzrdir."""
1208
if target_branch is None:
1209
# this format does not implement branch itself, thus the implicit
1210
# creation contract must see it as uninitializable
1211
raise errors.UninitializableFormat(self)
1212
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1213
branch_transport = a_bzrdir.get_branch_transport(self)
1214
branch_transport.put_bytes('location',
1215
target_branch.bzrdir.root_transport.base)
1216
branch_transport.put_bytes('format', self.get_format_string())
1217
return self.open(a_bzrdir, _found=True)
1220
super(BranchReferenceFormat, self).__init__()
1221
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1223
def _make_reference_clone_function(format, a_branch):
1224
"""Create a clone() routine for a branch dynamically."""
1225
def clone(to_bzrdir, revision_id=None):
1226
"""See Branch.clone()."""
1227
return format.initialize(to_bzrdir, a_branch)
1228
# cannot obey revision_id limits when cloning a reference ...
1229
# FIXME RBC 20060210 either nuke revision_id for clone, or
1230
# emit some sort of warning/error to the caller ?!
1233
def open(self, a_bzrdir, _found=False, location=None):
1234
"""Return the branch that the branch reference in a_bzrdir points at.
1236
_found is a private parameter, do not use it. It is used to indicate
1237
if format probing has already be done.
1240
format = BranchFormat.find_format(a_bzrdir)
1241
assert format.__class__ == self.__class__
1242
if location is None:
1243
location = self.get_reference(a_bzrdir)
1244
real_bzrdir = bzrdir.BzrDir.open(location)
1245
result = real_bzrdir.open_branch()
1246
# this changes the behaviour of result.clone to create a new reference
1247
# rather than a copy of the content of the branch.
1248
# I did not use a proxy object because that needs much more extensive
1249
# testing, and we are only changing one behaviour at the moment.
1250
# If we decide to alter more behaviours - i.e. the implicit nickname
1251
# then this should be refactored to introduce a tested proxy branch
1252
# and a subclass of that for use in overriding clone() and ....
1254
result.clone = self._make_reference_clone_function(result)
1258
# formats which have no format string are not discoverable
1259
# and not independently creatable, so are not registered.
1260
__default_format = BzrBranchFormat5()
1261
BranchFormat.register_format(__default_format)
1262
BranchFormat.register_format(BranchReferenceFormat())
1263
BranchFormat.register_format(BzrBranchFormat6())
1264
BranchFormat.set_default_format(__default_format)
1265
_legacy_formats = [BzrBranchFormat4(),
1268
class BzrBranch(Branch):
1269
"""A branch stored in the actual filesystem.
1271
Note that it's "local" in the context of the filesystem; it doesn't
1272
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1273
it's writable, and can be accessed via the normal filesystem API.
1276
def __init__(self, _format=None,
1277
_control_files=None, a_bzrdir=None, _repository=None):
1278
"""Create new branch object at a particular location."""
1279
Branch.__init__(self)
1280
if a_bzrdir is None:
1281
raise ValueError('a_bzrdir must be supplied')
1283
self.bzrdir = a_bzrdir
1284
# self._transport used to point to the directory containing the
1285
# control directory, but was not used - now it's just the transport
1286
# for the branch control files. mbp 20070212
1287
self._base = self.bzrdir.transport.clone('..').base
1288
self._format = _format
1289
if _control_files is None:
1290
raise ValueError('BzrBranch _control_files is None')
1291
self.control_files = _control_files
1292
self._transport = _control_files._transport
1293
self.repository = _repository
1296
return '%s(%r)' % (self.__class__.__name__, self.base)
1300
def _get_base(self):
1301
"""Returns the directory containing the control directory."""
1304
base = property(_get_base, doc="The URL for the root of this branch.")
1306
def abspath(self, name):
1307
"""See Branch.abspath."""
1308
return self.control_files._transport.abspath(name)
1311
@deprecated_method(zero_sixteen)
1313
def get_root_id(self):
1314
"""See Branch.get_root_id."""
1315
tree = self.repository.revision_tree(self.last_revision())
1316
return tree.inventory.root.file_id
1318
def is_locked(self):
1319
return self.control_files.is_locked()
1321
def lock_write(self, token=None):
1322
repo_token = self.repository.lock_write()
1324
token = self.control_files.lock_write(token=token)
1326
self.repository.unlock()
1330
def lock_read(self):
1331
self.repository.lock_read()
1333
self.control_files.lock_read()
1335
self.repository.unlock()
1339
# TODO: test for failed two phase locks. This is known broken.
1341
self.control_files.unlock()
1343
self.repository.unlock()
1344
if not self.control_files.is_locked():
1345
# we just released the lock
1346
self._clear_cached_state()
1348
def peek_lock_mode(self):
1349
if self.control_files._lock_count == 0:
1352
return self.control_files._lock_mode
1354
def get_physical_lock_status(self):
1355
return self.control_files.get_physical_lock_status()
1358
def print_file(self, file, revision_id):
1359
"""See Branch.print_file."""
1360
return self.repository.print_file(file, revision_id)
1363
def append_revision(self, *revision_ids):
1364
"""See Branch.append_revision."""
1365
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1366
for revision_id in revision_ids:
1367
_mod_revision.check_not_reserved_id(revision_id)
1368
mutter("add {%s} to revision-history" % revision_id)
1369
rev_history = self.revision_history()
1370
rev_history.extend(revision_ids)
1371
self.set_revision_history(rev_history)
1373
def _write_revision_history(self, history):
1374
"""Factored out of set_revision_history.
1376
This performs the actual writing to disk.
1377
It is intended to be called by BzrBranch5.set_revision_history."""
1378
self.control_files.put_bytes(
1379
'revision-history', '\n'.join(history))
1382
def set_revision_history(self, rev_history):
1383
"""See Branch.set_revision_history."""
1384
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
1385
self._clear_cached_state()
1386
self._write_revision_history(rev_history)
1387
self._cache_revision_history(rev_history)
1388
for hook in Branch.hooks['set_rh']:
1389
hook(self, rev_history)
1392
def set_last_revision_info(self, revno, revision_id):
1393
revision_id = osutils.safe_revision_id(revision_id)
1394
history = self._lefthand_history(revision_id)
1395
assert len(history) == revno, '%d != %d' % (len(history), revno)
1396
self.set_revision_history(history)
1398
def _gen_revision_history(self):
1399
history = self.control_files.get('revision-history').read().split('\n')
1400
if history[-1:] == ['']:
1401
# There shouldn't be a trailing newline, but just in case.
1405
def _lefthand_history(self, revision_id, last_rev=None,
1407
# stop_revision must be a descendant of last_revision
1408
stop_graph = self.repository.get_revision_graph(revision_id)
1409
if (last_rev is not None and last_rev != _mod_revision.NULL_REVISION
1410
and last_rev not in stop_graph):
1411
# our previous tip is not merged into stop_revision
1412
raise errors.DivergedBranches(self, other_branch)
1413
# make a new revision history from the graph
1414
current_rev_id = revision_id
1416
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1417
new_history.append(current_rev_id)
1418
current_rev_id_parents = stop_graph[current_rev_id]
1420
current_rev_id = current_rev_id_parents[0]
1422
current_rev_id = None
1423
new_history.reverse()
1427
def generate_revision_history(self, revision_id, last_rev=None,
1429
"""Create a new revision history that will finish with revision_id.
1431
:param revision_id: the new tip to use.
1432
:param last_rev: The previous last_revision. If not None, then this
1433
must be a ancestory of revision_id, or DivergedBranches is raised.
1434
:param other_branch: The other branch that DivergedBranches should
1435
raise with respect to.
1437
revision_id = osutils.safe_revision_id(revision_id)
1438
self.set_revision_history(self._lefthand_history(revision_id,
1439
last_rev, other_branch))
1442
def update_revisions(self, other, stop_revision=None):
1443
"""See Branch.update_revisions."""
1446
if stop_revision is None:
1447
stop_revision = other.last_revision()
1448
if stop_revision is None:
1449
# if there are no commits, we're done.
1452
stop_revision = osutils.safe_revision_id(stop_revision)
1453
# whats the current last revision, before we fetch [and change it
1455
last_rev = _mod_revision.ensure_null(self.last_revision())
1456
# we fetch here regardless of whether we need to so that we pickup
1458
self.fetch(other, stop_revision)
1459
my_ancestry = self.repository.get_ancestry(last_rev,
1461
if stop_revision in my_ancestry:
1462
# last_revision is a descendant of stop_revision
1464
self.generate_revision_history(stop_revision, last_rev=last_rev,
1469
def basis_tree(self):
1470
"""See Branch.basis_tree."""
1471
return self.repository.revision_tree(self.last_revision())
1473
@deprecated_method(zero_eight)
1474
def working_tree(self):
1475
"""Create a Working tree object for this branch."""
1477
from bzrlib.transport.local import LocalTransport
1478
if (self.base.find('://') != -1 or
1479
not isinstance(self._transport, LocalTransport)):
1480
raise NoWorkingTree(self.base)
1481
return self.bzrdir.open_workingtree()
1484
def pull(self, source, overwrite=False, stop_revision=None,
1485
_hook_master=None, run_hooks=True):
1488
:param _hook_master: Private parameter - set the branch to
1489
be supplied as the master to push hooks.
1490
:param run_hooks: Private parameter - if false, this branch
1491
is being called because it's the master of the primary branch,
1492
so it should not run its hooks.
1494
result = PullResult()
1495
result.source_branch = source
1496
result.target_branch = self
1499
result.old_revno, result.old_revid = self.last_revision_info()
1501
self.update_revisions(source, stop_revision)
1502
except DivergedBranches:
1506
if stop_revision is None:
1507
stop_revision = source.last_revision()
1508
self.generate_revision_history(stop_revision)
1509
result.tag_conflicts = source.tags.merge_to(self.tags)
1510
result.new_revno, result.new_revid = self.last_revision_info()
1512
result.master_branch = _hook_master
1513
result.local_branch = self
1515
result.master_branch = self
1516
result.local_branch = None
1518
for hook in Branch.hooks['post_pull']:
1524
def _get_parent_location(self):
1525
_locs = ['parent', 'pull', 'x-pull']
1528
return self.control_files.get(l).read().strip('\n')
1534
def push(self, target, overwrite=False, stop_revision=None,
1535
_override_hook_source_branch=None):
1538
This is the basic concrete implementation of push()
1540
:param _override_hook_source_branch: If specified, run
1541
the hooks passing this Branch as the source, rather than self.
1542
This is for use of RemoteBranch, where push is delegated to the
1543
underlying vfs-based Branch.
1545
# TODO: Public option to disable running hooks - should be trivial but
1549
result = self._push_with_bound_branches(target, overwrite,
1551
_override_hook_source_branch=_override_hook_source_branch)
1556
def _push_with_bound_branches(self, target, overwrite,
1558
_override_hook_source_branch=None):
1559
"""Push from self into target, and into target's master if any.
1561
This is on the base BzrBranch class even though it doesn't support
1562
bound branches because the *target* might be bound.
1565
if _override_hook_source_branch:
1566
result.source_branch = _override_hook_source_branch
1567
for hook in Branch.hooks['post_push']:
1570
bound_location = target.get_bound_location()
1571
if bound_location and target.base != bound_location:
1572
# there is a master branch.
1574
# XXX: Why the second check? Is it even supported for a branch to
1575
# be bound to itself? -- mbp 20070507
1576
master_branch = target.get_master_branch()
1577
master_branch.lock_write()
1579
# push into the master from this branch.
1580
self._basic_push(master_branch, overwrite, stop_revision)
1581
# and push into the target branch from this. Note that we push from
1582
# this branch again, because its considered the highest bandwidth
1584
result = self._basic_push(target, overwrite, stop_revision)
1585
result.master_branch = master_branch
1586
result.local_branch = target
1590
master_branch.unlock()
1593
result = self._basic_push(target, overwrite, stop_revision)
1594
# TODO: Why set master_branch and local_branch if there's no
1595
# binding? Maybe cleaner to just leave them unset? -- mbp
1597
result.master_branch = target
1598
result.local_branch = None
1602
def _basic_push(self, target, overwrite, stop_revision):
1603
"""Basic implementation of push without bound branches or hooks.
1605
Must be called with self read locked and target write locked.
1607
result = PushResult()
1608
result.source_branch = self
1609
result.target_branch = target
1610
result.old_revno, result.old_revid = target.last_revision_info()
1612
target.update_revisions(self, stop_revision)
1613
except DivergedBranches:
1617
target.set_revision_history(self.revision_history())
1618
result.tag_conflicts = self.tags.merge_to(target.tags)
1619
result.new_revno, result.new_revid = target.last_revision_info()
1622
def get_parent(self):
1623
"""See Branch.get_parent."""
1625
assert self.base[-1] == '/'
1626
parent = self._get_parent_location()
1629
# This is an old-format absolute path to a local branch
1630
# turn it into a url
1631
if parent.startswith('/'):
1632
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1634
return urlutils.join(self.base[:-1], parent)
1635
except errors.InvalidURLJoin, e:
1636
raise errors.InaccessibleParent(parent, self.base)
1638
def set_push_location(self, location):
1639
"""See Branch.set_push_location."""
1640
self.get_config().set_user_option(
1641
'push_location', location,
1642
store=_mod_config.STORE_LOCATION_NORECURSE)
1645
def set_parent(self, url):
1646
"""See Branch.set_parent."""
1647
# TODO: Maybe delete old location files?
1648
# URLs should never be unicode, even on the local fs,
1649
# FIXUP this and get_parent in a future branch format bump:
1650
# read and rewrite the file, and have the new format code read
1651
# using .get not .get_utf8. RBC 20060125
1653
if isinstance(url, unicode):
1655
url = url.encode('ascii')
1656
except UnicodeEncodeError:
1657
raise errors.InvalidURL(url,
1658
"Urls must be 7-bit ascii, "
1659
"use bzrlib.urlutils.escape")
1660
url = urlutils.relative_url(self.base, url)
1661
self._set_parent_location(url)
1663
def _set_parent_location(self, url):
1665
self.control_files._transport.delete('parent')
1667
assert isinstance(url, str)
1668
self.control_files.put_bytes('parent', url + '\n')
1670
@deprecated_function(zero_nine)
1671
def tree_config(self):
1672
"""DEPRECATED; call get_config instead.
1673
TreeConfig has become part of BranchConfig."""
1674
return TreeConfig(self)
1677
class BzrBranch5(BzrBranch):
1678
"""A format 5 branch. This supports new features over plan branches.
1680
It has support for a master_branch which is the data for bound branches.
1688
super(BzrBranch5, self).__init__(_format=_format,
1689
_control_files=_control_files,
1691
_repository=_repository)
1694
def pull(self, source, overwrite=False, stop_revision=None,
1696
"""Pull from source into self, updating my master if any.
1698
:param run_hooks: Private parameter - if false, this branch
1699
is being called because it's the master of the primary branch,
1700
so it should not run its hooks.
1702
bound_location = self.get_bound_location()
1703
master_branch = None
1704
if bound_location and source.base != bound_location:
1705
# not pulling from master, so we need to update master.
1706
master_branch = self.get_master_branch()
1707
master_branch.lock_write()
1710
# pull from source into master.
1711
master_branch.pull(source, overwrite, stop_revision,
1713
return super(BzrBranch5, self).pull(source, overwrite,
1714
stop_revision, _hook_master=master_branch,
1715
run_hooks=run_hooks)
1718
master_branch.unlock()
1720
def get_bound_location(self):
1722
return self.control_files.get_utf8('bound').read()[:-1]
1723
except errors.NoSuchFile:
1727
def get_master_branch(self):
1728
"""Return the branch we are bound to.
1730
:return: Either a Branch, or None
1732
This could memoise the branch, but if thats done
1733
it must be revalidated on each new lock.
1734
So for now we just don't memoise it.
1735
# RBC 20060304 review this decision.
1737
bound_loc = self.get_bound_location()
1741
return Branch.open(bound_loc)
1742
except (errors.NotBranchError, errors.ConnectionError), e:
1743
raise errors.BoundBranchConnectionFailure(
1747
def set_bound_location(self, location):
1748
"""Set the target where this branch is bound to.
1750
:param location: URL to the target branch
1753
self.control_files.put_utf8('bound', location+'\n')
1756
self.control_files._transport.delete('bound')
1280
class ScratchBranch(_Branch):
1281
"""Special test class: a branch that cleans up after itself.
1283
>>> b = ScratchBranch()
1291
def __init__(self, files=[], dirs=[], base=None):
1292
"""Make a test branch.
1294
This creates a temporary directory and runs init-tree in it.
1296
If any files are listed, they are created in the working copy.
1298
from tempfile import mkdtemp
1303
if isinstance(base, basestring):
1304
base = get_transport(base)
1305
_Branch.__init__(self, base, init=init)
1307
self._transport.mkdir(d)
1310
self._transport.put(f, 'content of %s' % f)
1315
>>> orig = ScratchBranch(files=["file1", "file2"])
1316
>>> clone = orig.clone()
1317
>>> if os.name != 'nt':
1318
... os.path.samefile(orig.base, clone.base)
1320
... orig.base == clone.base
1323
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1326
from shutil import copytree
1327
from tempfile import mkdtemp
1330
copytree(self.base, base, symlinks=True)
1331
return ScratchBranch(base=base)
1337
"""Destroy the test branch, removing the scratch directory."""
1338
from shutil import rmtree
1341
mutter("delete ScratchBranch %s" % self.base)
1344
# Work around for shutil.rmtree failing on Windows when
1345
# readonly files are encountered
1346
mutter("hit exception in destroying ScratchBranch: %s" % e)
1347
for root, dirs, files in os.walk(self.base, topdown=False):
1349
os.chmod(os.path.join(root, name), 0700)
1351
self._transport = None
1355
######################################################################
1359
def is_control_file(filename):
1360
## FIXME: better check
1361
filename = os.path.normpath(filename)
1362
while filename != '':
1363
head, tail = os.path.split(filename)
1364
## mutter('check %r for control file' % ((head, tail), ))
1365
if tail == bzrlib.BZRDIR:
1762
def bind(self, other):
1763
"""Bind this branch to the branch other.
1765
This does not push or pull data between the branches, though it does
1766
check for divergence to raise an error when the branches are not
1767
either the same, or one a prefix of the other. That behaviour may not
1768
be useful, so that check may be removed in future.
1770
:param other: The branch to bind to
1773
# TODO: jam 20051230 Consider checking if the target is bound
1774
# It is debatable whether you should be able to bind to
1775
# a branch which is itself bound.
1776
# Committing is obviously forbidden,
1777
# but binding itself may not be.
1778
# Since we *have* to check at commit time, we don't
1779
# *need* to check here
1781
# we want to raise diverged if:
1782
# last_rev is not in the other_last_rev history, AND
1783
# other_last_rev is not in our history, and do it without pulling
1785
last_rev = _mod_revision.ensure_null(self.last_revision())
1786
if last_rev != _mod_revision.NULL_REVISION:
1789
other_last_rev = other.last_revision()
1790
if not _mod_revision.is_null(other_last_rev):
1791
# neither branch is new, we have to do some work to
1792
# ascertain diversion.
1793
remote_graph = other.repository.get_revision_graph(
1795
local_graph = self.repository.get_revision_graph(last_rev)
1796
if (last_rev not in remote_graph and
1797
other_last_rev not in local_graph):
1798
raise errors.DivergedBranches(self, other)
1801
self.set_bound_location(other.base)
1805
"""If bound, unbind"""
1806
return self.set_bound_location(None)
1810
"""Synchronise this branch with the master branch if any.
1812
:return: None or the last_revision that was pivoted out during the
1815
master = self.get_master_branch()
1816
if master is not None:
1817
old_tip = self.last_revision()
1818
self.pull(master, overwrite=True)
1819
if old_tip in self.repository.get_ancestry(
1820
_mod_revision.ensure_null(self.last_revision()),
1827
class BzrBranchExperimental(BzrBranch5):
1828
"""Bzr experimental branch format
1831
- a revision-history file.
1833
- a lock dir guarding the branch itself
1834
- all of this stored in a branch/ subdirectory
1835
- works with shared repositories.
1836
- a tag dictionary in the branch
1838
This format is new in bzr 0.15, but shouldn't be used for real data,
1841
This class acts as it's own BranchFormat.
1844
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1847
def get_format_string(cls):
1848
"""See BranchFormat.get_format_string()."""
1849
return "Bazaar-NG branch format experimental\n"
1852
def get_format_description(cls):
1853
"""See BranchFormat.get_format_description()."""
1854
return "Experimental branch format"
1857
def get_reference(cls, a_bzrdir):
1858
"""Get the target reference of the branch in a_bzrdir.
1860
format probing must have been completed before calling
1861
this method - it is assumed that the format of the branch
1862
in a_bzrdir is correct.
1864
:param a_bzrdir: The bzrdir to get the branch data from.
1865
:return: None if the branch is not a reference branch.
1870
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1872
branch_transport = a_bzrdir.get_branch_transport(cls)
1873
control_files = lockable_files.LockableFiles(branch_transport,
1874
lock_filename, lock_class)
1875
control_files.create_lock()
1876
control_files.lock_write()
1878
for filename, content in utf8_files:
1879
control_files.put_utf8(filename, content)
1881
control_files.unlock()
1884
def initialize(cls, a_bzrdir):
1885
"""Create a branch of this format in a_bzrdir."""
1886
utf8_files = [('format', cls.get_format_string()),
1887
('revision-history', ''),
1888
('branch-name', ''),
1891
cls._initialize_control_files(a_bzrdir, utf8_files,
1892
'lock', lockdir.LockDir)
1893
return cls.open(a_bzrdir, _found=True)
1896
def open(cls, a_bzrdir, _found=False):
1897
"""Return the branch object for a_bzrdir
1899
_found is a private parameter, do not use it. It is used to indicate
1900
if format probing has already be done.
1903
format = BranchFormat.find_format(a_bzrdir)
1904
assert format.__class__ == cls
1905
transport = a_bzrdir.get_branch_transport(None)
1906
control_files = lockable_files.LockableFiles(transport, 'lock',
1908
return cls(_format=cls,
1909
_control_files=control_files,
1911
_repository=a_bzrdir.find_repository())
1914
def is_supported(cls):
1917
def _make_tags(self):
1918
return BasicTags(self)
1921
def supports_tags(cls):
1925
BranchFormat.register_format(BzrBranchExperimental)
1928
class BzrBranch6(BzrBranch5):
1931
def last_revision_info(self):
1932
revision_string = self.control_files.get('last-revision').read()
1933
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1934
revision_id = cache_utf8.get_cached_utf8(revision_id)
1936
return revno, revision_id
1938
def last_revision(self):
1939
"""Return last revision id, or None"""
1940
revision_id = self.last_revision_info()[1]
1941
if revision_id == _mod_revision.NULL_REVISION:
1945
def _write_last_revision_info(self, revno, revision_id):
1946
"""Simply write out the revision id, with no checks.
1948
Use set_last_revision_info to perform this safely.
1950
Does not update the revision_history cache.
1951
Intended to be called by set_last_revision_info and
1952
_write_revision_history.
1954
if revision_id is None:
1955
revision_id = 'null:'
1956
out_string = '%d %s\n' % (revno, revision_id)
1957
self.control_files.put_bytes('last-revision', out_string)
1960
def set_last_revision_info(self, revno, revision_id):
1961
revision_id = osutils.safe_revision_id(revision_id)
1962
if self._get_append_revisions_only():
1963
self._check_history_violation(revision_id)
1964
self._write_last_revision_info(revno, revision_id)
1965
self._clear_cached_state()
1967
def _check_history_violation(self, revision_id):
1968
last_revision = _mod_revision.ensure_null(self.last_revision())
1969
if _mod_revision.is_null(last_revision):
1971
if last_revision not in self._lefthand_history(revision_id):
1972
raise errors.AppendRevisionsOnlyViolation(self.base)
1974
def _gen_revision_history(self):
1975
"""Generate the revision history from last revision
1977
history = list(self.repository.iter_reverse_revision_history(
1978
self.last_revision()))
1982
def _write_revision_history(self, history):
1983
"""Factored out of set_revision_history.
1985
This performs the actual writing to disk, with format-specific checks.
1986
It is intended to be called by BzrBranch5.set_revision_history.
1988
if len(history) == 0:
1989
last_revision = 'null:'
1991
if history != self._lefthand_history(history[-1]):
1992
raise errors.NotLefthandHistory(history)
1993
last_revision = history[-1]
1994
if self._get_append_revisions_only():
1995
self._check_history_violation(last_revision)
1996
self._write_last_revision_info(len(history), last_revision)
1999
def append_revision(self, *revision_ids):
2000
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
2001
if len(revision_ids) == 0:
2003
prev_revno, prev_revision = self.last_revision_info()
2004
for revision in self.repository.get_revisions(revision_ids):
2005
if prev_revision == _mod_revision.NULL_REVISION:
2006
if revision.parent_ids != []:
2007
raise errors.NotLeftParentDescendant(self, prev_revision,
2008
revision.revision_id)
2010
if revision.parent_ids[0] != prev_revision:
2011
raise errors.NotLeftParentDescendant(self, prev_revision,
2012
revision.revision_id)
2013
prev_revision = revision.revision_id
2014
self.set_last_revision_info(prev_revno + len(revision_ids),
2018
def _set_parent_location(self, url):
2019
"""Set the parent branch"""
2020
self._set_config_location('parent_location', url, make_relative=True)
2023
def _get_parent_location(self):
2024
"""Set the parent branch"""
2025
return self._get_config_location('parent_location')
2027
def set_push_location(self, location):
2028
"""See Branch.set_push_location."""
2029
self._set_config_location('push_location', location)
2031
def set_bound_location(self, location):
2032
"""See Branch.set_push_location."""
2034
config = self.get_config()
2035
if location is None:
2036
if config.get_user_option('bound') != 'True':
2039
config.set_user_option('bound', 'False', warn_masked=True)
2042
self._set_config_location('bound_location', location,
2044
config.set_user_option('bound', 'True', warn_masked=True)
2047
def _get_bound_location(self, bound):
2048
"""Return the bound location in the config file.
2050
Return None if the bound parameter does not match"""
2051
config = self.get_config()
2052
config_bound = (config.get_user_option('bound') == 'True')
2053
if config_bound != bound:
2055
return self._get_config_location('bound_location', config=config)
2057
def get_bound_location(self):
2058
"""See Branch.set_push_location."""
2059
return self._get_bound_location(True)
2061
def get_old_bound_location(self):
2062
"""See Branch.get_old_bound_location"""
2063
return self._get_bound_location(False)
2065
def set_append_revisions_only(self, enabled):
2070
self.get_config().set_user_option('append_revisions_only', value,
2073
def _get_append_revisions_only(self):
2074
value = self.get_config().get_user_option('append_revisions_only')
2075
return value == 'True'
2077
def _synchronize_history(self, destination, revision_id):
2078
"""Synchronize last revision and revision history between branches.
2080
This version is most efficient when the destination is also a
2081
BzrBranch6, but works for BzrBranch5, as long as the destination's
2082
repository contains all the lefthand ancestors of the intended
2083
last_revision. If not, set_last_revision_info will fail.
2085
:param destination: The branch to copy the history into
2086
:param revision_id: The revision-id to truncate history at. May
2087
be None to copy complete history.
2089
if revision_id is None:
2090
revno, revision_id = self.last_revision_info()
2092
# To figure out the revno for a random revision, we need to build
2093
# the revision history, and count its length.
2094
# We don't care about the order, just how long it is.
2095
# Alternatively, we could start at the current location, and count
2096
# backwards. But there is no guarantee that we will find it since
2097
# it may be a merged revision.
2098
revno = len(list(self.repository.iter_reverse_revision_history(
2100
destination.set_last_revision_info(revno, revision_id)
2102
def _make_tags(self):
2103
return BasicTags(self)
2106
######################################################################
2107
# results of operations
2110
class _Result(object):
2112
def _show_tag_conficts(self, to_file):
2113
if not getattr(self, 'tag_conflicts', None):
2115
to_file.write('Conflicting tags:\n')
2116
for name, value1, value2 in self.tag_conflicts:
2117
to_file.write(' %s\n' % (name, ))
2120
class PullResult(_Result):
2121
"""Result of a Branch.pull operation.
2123
:ivar old_revno: Revision number before pull.
2124
:ivar new_revno: Revision number after pull.
2125
:ivar old_revid: Tip revision id before pull.
2126
:ivar new_revid: Tip revision id after pull.
2127
:ivar source_branch: Source (local) branch object.
2128
:ivar master_branch: Master branch of the target, or None.
2129
:ivar target_branch: Target/destination branch object.
2133
# DEPRECATED: pull used to return the change in revno
2134
return self.new_revno - self.old_revno
2136
def report(self, to_file):
2137
if self.old_revid == self.new_revid:
2138
to_file.write('No revisions to pull.\n')
2140
to_file.write('Now on revision %d.\n' % self.new_revno)
2141
self._show_tag_conficts(to_file)
2144
class PushResult(_Result):
2145
"""Result of a Branch.push operation.
2147
:ivar old_revno: Revision number before push.
2148
:ivar new_revno: Revision number after push.
2149
:ivar old_revid: Tip revision id before push.
2150
:ivar new_revid: Tip revision id after push.
2151
:ivar source_branch: Source branch object.
2152
:ivar master_branch: Master branch of the target, or None.
2153
:ivar target_branch: Target/destination branch object.
2157
# DEPRECATED: push used to return the change in revno
2158
return self.new_revno - self.old_revno
2160
def report(self, to_file):
2161
"""Write a human-readable description of the result."""
2162
if self.old_revid == self.new_revid:
2163
to_file.write('No new revisions to push.\n')
2165
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2166
self._show_tag_conficts(to_file)
2169
class BranchCheckResult(object):
2170
"""Results of checking branch consistency.
2175
def __init__(self, branch):
2176
self.branch = branch
2178
def report_results(self, verbose):
2179
"""Report the check results via trace.note.
2181
:param verbose: Requests more detailed display of what was checked,
2184
note('checked branch %s format %s',
2186
self.branch._format)
2189
class Converter5to6(object):
2190
"""Perform an in-place upgrade of format 5 to format 6"""
2192
def convert(self, branch):
2193
# Data for 5 and 6 can peacefully coexist.
2194
format = BzrBranchFormat6()
2195
new_branch = format.open(branch.bzrdir, _found=True)
2197
# Copy source data into target
2198
new_branch.set_last_revision_info(*branch.last_revision_info())
2199
new_branch.set_parent(branch.get_parent())
2200
new_branch.set_bound_location(branch.get_bound_location())
2201
new_branch.set_push_location(branch.get_push_location())
2203
# New branch has no tags by default
2204
new_branch.tags._set_tag_dict({})
2206
# Copying done; now update target format
2207
new_branch.control_files.put_utf8('format',
2208
format.get_format_string())
2210
# Clean up old files
2211
new_branch.control_files._transport.delete('revision-history')
2213
branch.set_parent(None)
2216
branch.set_bound_location(None)
1367
if filename == head:
1374
def gen_file_id(name):
1375
"""Return new file id.
1377
This should probably generate proper UUIDs, but for the moment we
1378
cope with just randomness because running uuidgen every time is
1381
from binascii import hexlify
1382
from time import time
1384
# get last component
1385
idx = name.rfind('/')
1387
name = name[idx+1 : ]
1388
idx = name.rfind('\\')
1390
name = name[idx+1 : ]
1392
# make it not a hidden file
1393
name = name.lstrip('.')
1395
# remove any wierd characters; we don't escape them but rather
1396
# just pull them out
1397
name = re.sub(r'[^\w.]', '', name)
1399
s = hexlify(rand_bytes(8))
1400
return '-'.join((name, compact_date(time()), s))
1404
"""Return a new tree-root file id."""
1405
return gen_file_id('TREE_ROOT')
added
removed
bzrlib/branch.py
