137
78
"""Branch holding a history of revisions.
140
Base directory of the branch.
146
If _lock_mode is true, a positive count of the number of times the
150
Lock object from bzrlib.lock.
81
Base directory/url of the branch.
83
hooks: An instance of BranchHooks.
85
# this is really an instance variable - FIXME move it there
157
# Map some sort of prefix into a namespace
158
# stuff like "revno:10", "revid:", etc.
159
# This should match a prefix with a function which accepts
160
REVISION_NAMESPACES = {}
162
def __init__(self, base, init=False, find_root=True):
163
"""Create new branch object at a particular location.
165
base -- Base directory for the branch.
167
init -- If True, create new control files in a previously
168
unversioned directory. If False, the branch must already
171
find_root -- If true and init is false, find the root of the
172
existing branch containing base.
174
In the test suite, creation of new trees is tested using the
175
`ScratchBranch` class.
177
from bzrlib.store import ImmutableStore
179
self.base = os.path.realpath(base)
182
self.base = find_branch_root(base)
184
self.base = os.path.realpath(base)
185
if not isdir(self.controlfilename('.')):
186
from errors import NotBranchError
187
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
188
['use "bzr init" to initialize a new working tree',
189
'current bzr can only operate from top-of-tree'])
192
self.text_store = ImmutableStore(self.controlfilename('text-store'))
193
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
194
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
198
return '%s(%r)' % (self.__class__.__name__, self.base)
205
if self._lock_mode or self._lock:
206
from warnings import warn
207
warn("branch %r was not explicitly unlocked" % self)
89
def __init__(self, *ignored, **ignored_too):
90
self.tags = self._format.make_tags(self)
91
self._revision_history_cache = None
92
self._revision_id_to_revno_cache = None
93
self._partial_revision_id_to_revno_cache = {}
94
self._partial_revision_history_cache = []
95
self._last_revision_info_cache = None
96
self._merge_sorted_revisions_cache = None
98
hooks = Branch.hooks['open']
102
def _open_hook(self):
103
"""Called by init to allow simpler extension of the base class."""
105
def _activate_fallback_location(self, url):
106
"""Activate the branch/repository from url as a fallback repository."""
107
repo = self._get_fallback_repository(url)
108
if repo.has_same_location(self.repository):
109
raise errors.UnstackableLocationError(self.base, url)
110
self.repository.add_fallback_repository(repo)
112
def break_lock(self):
113
"""Break a lock if one is present from another instance.
115
Uses the ui factory to ask for confirmation if the lock may be from
118
This will probe the repository for its lock as well.
120
self.control_files.break_lock()
121
self.repository.break_lock()
122
master = self.get_master_branch()
123
if master is not None:
126
def _check_stackable_repo(self):
127
if not self.repository._format.supports_external_lookups:
128
raise errors.UnstackableRepositoryFormat(self.repository._format,
129
self.repository.base)
131
def _extend_partial_history(self, stop_index=None, stop_revision=None):
132
"""Extend the partial history to include a given index
134
If a stop_index is supplied, stop when that index has been reached.
135
If a stop_revision is supplied, stop when that revision is
136
encountered. Otherwise, stop when the beginning of history is
139
:param stop_index: The index which should be present. When it is
140
present, history extension will stop.
141
:param stop_revision: The revision id which should be present. When
142
it is encountered, history extension will stop.
144
if len(self._partial_revision_history_cache) == 0:
145
self._partial_revision_history_cache = [self.last_revision()]
146
repository._iter_for_revno(
147
self.repository, self._partial_revision_history_cache,
148
stop_index=stop_index, stop_revision=stop_revision)
149
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
150
self._partial_revision_history_cache.pop()
152
def _get_check_refs(self):
153
"""Get the references needed for check().
157
revid = self.last_revision()
158
return [('revision-existence', revid), ('lefthand-distance', revid)]
161
def open(base, _unsupported=False, possible_transports=None):
162
"""Open the branch rooted at base.
164
For instance, if the branch is at URL/.bzr/branch,
165
Branch.open(URL) -> a Branch instance.
167
control = bzrdir.BzrDir.open(base, _unsupported,
168
possible_transports=possible_transports)
169
return control.open_branch(_unsupported)
172
def open_from_transport(transport, _unsupported=False):
173
"""Open the branch rooted at transport"""
174
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
175
return control.open_branch(_unsupported)
178
def open_containing(url, possible_transports=None):
179
"""Open an existing branch which contains url.
181
This probes for a branch at url, and searches upwards from there.
183
Basically we keep looking up until we find the control directory or
184
run into the root. If there isn't one, raises NotBranchError.
185
If there is one and it is either an unrecognised format or an unsupported
186
format, UnknownFormatError or UnsupportedFormatError are raised.
187
If there is one, it is returned, along with the unused portion of url.
189
control, relpath = bzrdir.BzrDir.open_containing(url,
191
return control.open_branch(), relpath
193
def _push_should_merge_tags(self):
194
"""Should _basic_push merge this branch's tags into the target?
196
The default implementation returns False if this branch has no tags,
197
and True the rest of the time. Subclasses may override this.
199
return self.supports_tags() and self.tags.get_tag_dict()
201
def get_config(self):
202
return BranchConfig(self)
204
def _get_config(self):
205
"""Get the concrete config for just the config in this branch.
207
This is not intended for client use; see Branch.get_config for the
212
:return: An object supporting get_option and set_option.
214
raise NotImplementedError(self._get_config)
216
def _get_fallback_repository(self, url):
217
"""Get the repository we fallback to at url."""
218
url = urlutils.join(self.base, url)
219
a_bzrdir = bzrdir.BzrDir.open(url,
220
possible_transports=[self.bzrdir.root_transport])
221
return a_bzrdir.open_branch().repository
223
def _get_tags_bytes(self):
224
"""Get the bytes of a serialised tags dict.
226
Note that not all branches support tags, nor do all use the same tags
227
logic: this method is specific to BasicTags. Other tag implementations
228
may use the same method name and behave differently, safely, because
229
of the double-dispatch via
230
format.make_tags->tags_instance->get_tags_dict.
232
:return: The bytes of the tags file.
233
:seealso: Branch._set_tags_bytes.
235
return self._transport.get_bytes('tags')
237
def _get_nick(self, local=False, possible_transports=None):
238
config = self.get_config()
239
# explicit overrides master, but don't look for master if local is True
240
if not local and not config.has_explicit_nickname():
242
master = self.get_master_branch(possible_transports)
243
if master is not None:
244
# return the master branch value
246
except errors.BzrError, e:
247
# Silently fall back to local implicit nick if the master is
249
mutter("Could not connect to bound branch, "
250
"falling back to local nick.\n " + str(e))
251
return config.get_nickname()
253
def _set_nick(self, nick):
254
self.get_config().set_user_option('nickname', nick, warn_masked=True)
256
nick = property(_get_nick, _set_nick)
259
raise NotImplementedError(self.is_locked)
261
def _lefthand_history(self, revision_id, last_rev=None,
263
if 'evil' in debug.debug_flags:
264
mutter_callsite(4, "_lefthand_history scales with history.")
265
# stop_revision must be a descendant of last_revision
266
graph = self.repository.get_graph()
267
if last_rev is not None:
268
if not graph.is_ancestor(last_rev, revision_id):
269
# our previous tip is not merged into stop_revision
270
raise errors.DivergedBranches(self, other_branch)
271
# make a new revision history from the graph
272
parents_map = graph.get_parent_map([revision_id])
273
if revision_id not in parents_map:
274
raise errors.NoSuchRevision(self, revision_id)
275
current_rev_id = revision_id
277
check_not_reserved_id = _mod_revision.check_not_reserved_id
278
# Do not include ghosts or graph origin in revision_history
279
while (current_rev_id in parents_map and
280
len(parents_map[current_rev_id]) > 0):
281
check_not_reserved_id(current_rev_id)
282
new_history.append(current_rev_id)
283
current_rev_id = parents_map[current_rev_id][0]
284
parents_map = graph.get_parent_map([current_rev_id])
285
new_history.reverse()
212
288
def lock_write(self):
214
if self._lock_mode != 'w':
215
from errors import LockError
216
raise LockError("can't upgrade to a write lock from %r" %
218
self._lock_count += 1
220
from bzrlib.lock import WriteLock
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
223
self._lock_mode = 'w'
289
raise NotImplementedError(self.lock_write)
228
291
def lock_read(self):
230
assert self._lock_mode in ('r', 'w'), \
231
"invalid lock mode %r" % self._lock_mode
232
self._lock_count += 1
234
from bzrlib.lock import ReadLock
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
237
self._lock_mode = 'r'
292
raise NotImplementedError(self.lock_read)
242
294
def unlock(self):
243
if not self._lock_mode:
244
from errors import LockError
245
raise LockError('branch %r is not locked' % (self))
247
if self._lock_count > 1:
248
self._lock_count -= 1
252
self._lock_mode = self._lock_count = None
255
def abspath(self, name):
256
"""Return absolute filename for something in the branch"""
257
return os.path.join(self.base, name)
260
def relpath(self, path):
261
"""Return path relative to this branch of something inside it.
263
Raises an error if path is not in this branch."""
264
return _relpath(self.base, path)
267
def controlfilename(self, file_or_path):
268
"""Return location relative to branch."""
269
if isinstance(file_or_path, basestring):
270
file_or_path = [file_or_path]
271
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
274
def controlfile(self, file_or_path, mode='r'):
275
"""Open a control file for this branch.
277
There are two classes of file in the control directory: text
278
and binary. binary files are untranslated byte streams. Text
279
control files are stored with Unix newlines and in UTF-8, even
280
if the platform or locale defaults are different.
282
Controlfiles should almost never be opened in write mode but
283
rather should be atomically copied and replaced using atomicfile.
286
fn = self.controlfilename(file_or_path)
288
if mode == 'rb' or mode == 'wb':
289
return file(fn, mode)
290
elif mode == 'r' or mode == 'w':
291
# open in binary mode anyhow so there's no newline translation;
292
# codecs uses line buffering by default; don't want that.
294
return codecs.open(fn, mode + 'b', 'utf-8',
297
raise BzrError("invalid controlfile mode %r" % mode)
301
def _make_control(self):
302
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
305
os.mkdir(self.controlfilename([]))
306
self.controlfile('README', 'w').write(
307
"This is a Bazaar-NG control directory.\n"
308
"Do not change any files in this directory.\n")
309
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
310
for d in ('text-store', 'inventory-store', 'revision-store'):
311
os.mkdir(self.controlfilename(d))
312
for f in ('revision-history', 'merged-patches',
313
'pending-merged-patches', 'branch-name',
316
self.controlfile(f, 'w').write('')
317
mutter('created control directory in ' + self.base)
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
322
def _check_format(self):
323
"""Check this branch format is supported.
325
The current tool only supports the current unstable format.
327
In the future, we might need different in-memory Branch
328
classes to support downlevel branches. But not yet.
330
# This ignores newlines so that we can open branches created
331
# on Windows from Linux and so on. I think it might be better
332
# to always make all internal files in unix format.
333
fmt = self.controlfile('branch-format', 'r').read()
334
fmt.replace('\r\n', '')
335
if fmt != BZR_BRANCH_FORMAT:
336
raise BzrError('sorry, branch format %r not supported' % fmt,
337
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
340
def get_root_id(self):
341
"""Return the id of this branches root"""
342
inv = self.read_working_inventory()
343
return inv.root.file_id
345
def set_root_id(self, file_id):
346
inv = self.read_working_inventory()
347
orig_root_id = inv.root.file_id
348
del inv._byid[inv.root.file_id]
349
inv.root.file_id = file_id
350
inv._byid[inv.root.file_id] = inv.root
353
if entry.parent_id in (None, orig_root_id):
354
entry.parent_id = inv.root.file_id
355
self._write_inventory(inv)
357
def read_working_inventory(self):
358
"""Read the working inventory."""
359
from bzrlib.inventory import Inventory
360
from bzrlib.xml import unpack_xml
361
from time import time
365
# ElementTree does its own conversion from UTF-8, so open in
367
inv = unpack_xml(Inventory,
368
self.controlfile('inventory', 'rb'))
369
mutter("loaded inventory of %d items in %f"
370
% (len(inv), time() - before))
376
def _write_inventory(self, inv):
377
"""Update the working inventory.
379
That is to say, the inventory describing changes underway, that
380
will be committed to the next revision.
382
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
396
mutter('wrote working inventory')
399
inventory = property(read_working_inventory, _write_inventory, None,
400
"""Inventory for the working copy.""")
403
def add(self, files, verbose=False, ids=None):
404
"""Make files versioned.
406
Note that the command line normally calls smart_add instead.
408
This puts the files in the Added state, so that they will be
409
recorded by the next commit.
412
List of paths to add, relative to the base of the tree.
415
If set, use these instead of automatically generated ids.
416
Must be the same length as the list of files, but may
417
contain None for ids that are to be autogenerated.
419
TODO: Perhaps have an option to add the ids even if the files do
422
TODO: Perhaps return the ids of the files? But then again it
423
is easy to retrieve them if they're needed.
425
TODO: Adding a directory should optionally recurse down and
426
add all non-ignored children. Perhaps do that in a
429
# TODO: Re-adding a file that is removed in the working copy
430
# should probably put it back with the previous ID.
431
if isinstance(files, basestring):
432
assert(ids is None or isinstance(ids, basestring))
438
ids = [None] * len(files)
440
assert(len(ids) == len(files))
444
inv = self.read_working_inventory()
445
for f,file_id in zip(files, ids):
446
if is_control_file(f):
447
raise BzrError("cannot add control file %s" % quotefn(f))
452
raise BzrError("cannot add top-level %r" % f)
454
fullpath = os.path.normpath(self.abspath(f))
457
kind = file_kind(fullpath)
459
# maybe something better?
460
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
462
if kind != 'file' and kind != 'directory':
463
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
466
file_id = gen_file_id(f)
467
inv.add_path(f, kind=kind, file_id=file_id)
470
print 'added', quotefn(f)
472
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
474
self._write_inventory(inv)
479
def print_file(self, file, revno):
480
"""Print `file` to stdout."""
483
tree = self.revision_tree(self.lookup_revision(revno))
484
# use inventory as it was in that revision
485
file_id = tree.inventory.path2id(file)
487
raise BzrError("%r is not present in revision %s" % (file, revno))
488
tree.print_file(file_id)
493
def remove(self, files, verbose=False):
494
"""Mark nominated files for removal from the inventory.
496
This does not remove their text. This does not run on
498
TODO: Refuse to remove modified files unless --force is given?
500
TODO: Do something useful with directories.
502
TODO: Should this remove the text or not? Tough call; not
503
removing may be useful and the user can just use use rm, and
504
is the opposite of add. Removing it is consistent with most
505
other tools. Maybe an option.
507
## TODO: Normalize names
508
## TODO: Remove nested loops; better scalability
509
if isinstance(files, basestring):
515
tree = self.working_tree()
518
# do this before any modifications
522
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
523
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
525
# having remove it, it must be either ignored or unknown
526
if tree.is_ignored(f):
530
show_status(new_status, inv[fid].kind, quotefn(f))
533
self._write_inventory(inv)
538
# FIXME: this doesn't need to be a branch method
539
def set_inventory(self, new_inventory_list):
540
from bzrlib.inventory import Inventory, InventoryEntry
541
inv = Inventory(self.get_root_id())
542
for path, file_id, parent, kind in new_inventory_list:
543
name = os.path.basename(path)
546
inv.add(InventoryEntry(file_id, name, kind, parent))
547
self._write_inventory(inv)
551
"""Return all unknown files.
553
These are files in the working directory that are not versioned or
554
control files or ignored.
556
>>> b = ScratchBranch(files=['foo', 'foo~'])
557
>>> list(b.unknowns())
560
>>> list(b.unknowns())
563
>>> list(b.unknowns())
566
return self.working_tree().unknowns()
569
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
572
for revision_id in revision_ids:
573
mutter("add {%s} to revision-history" % revision_id)
575
rev_history = self.revision_history()
576
rev_history.extend(revision_ids)
578
f = AtomicFile(self.controlfilename('revision-history'))
580
for rev_id in rev_history:
587
def get_revision_xml(self, revision_id):
588
"""Return XML file object for revision object."""
589
if not revision_id or not isinstance(revision_id, basestring):
590
raise InvalidRevisionId(revision_id)
595
return self.revision_store[revision_id]
597
raise bzrlib.errors.NoSuchRevision(revision_id)
602
def get_revision(self, revision_id):
603
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
607
r = unpack_xml(Revision, xml_file)
608
except SyntaxError, e:
609
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
613
assert r.revision_id == revision_id
295
raise NotImplementedError(self.unlock)
297
def peek_lock_mode(self):
298
"""Return lock mode for the Branch: 'r', 'w' or None"""
299
raise NotImplementedError(self.peek_lock_mode)
301
def get_physical_lock_status(self):
302
raise NotImplementedError(self.get_physical_lock_status)
305
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
306
"""Return the revision_id for a dotted revno.
308
:param revno: a tuple like (1,) or (1,1,2)
309
:param _cache_reverse: a private parameter enabling storage
310
of the reverse mapping in a top level cache. (This should
311
only be done in selective circumstances as we want to
312
avoid having the mapping cached multiple times.)
313
:return: the revision_id
314
:raises errors.NoSuchRevision: if the revno doesn't exist
316
rev_id = self._do_dotted_revno_to_revision_id(revno)
318
self._partial_revision_id_to_revno_cache[rev_id] = revno
321
def _do_dotted_revno_to_revision_id(self, revno):
322
"""Worker function for dotted_revno_to_revision_id.
324
Subclasses should override this if they wish to
325
provide a more efficient implementation.
328
return self.get_rev_id(revno[0])
329
revision_id_to_revno = self.get_revision_id_to_revno_map()
330
revision_ids = [revision_id for revision_id, this_revno
331
in revision_id_to_revno.iteritems()
332
if revno == this_revno]
333
if len(revision_ids) == 1:
334
return revision_ids[0]
336
revno_str = '.'.join(map(str, revno))
337
raise errors.NoSuchRevision(self, revno_str)
340
def revision_id_to_dotted_revno(self, revision_id):
341
"""Given a revision id, return its dotted revno.
343
:return: a tuple like (1,) or (400,1,3).
345
return self._do_revision_id_to_dotted_revno(revision_id)
347
def _do_revision_id_to_dotted_revno(self, revision_id):
348
"""Worker function for revision_id_to_revno."""
349
# Try the caches if they are loaded
350
result = self._partial_revision_id_to_revno_cache.get(revision_id)
351
if result is not None:
353
if self._revision_id_to_revno_cache:
354
result = self._revision_id_to_revno_cache.get(revision_id)
356
raise errors.NoSuchRevision(self, revision_id)
357
# Try the mainline as it's optimised
359
revno = self.revision_id_to_revno(revision_id)
361
except errors.NoSuchRevision:
362
# We need to load and use the full revno map after all
363
result = self.get_revision_id_to_revno_map().get(revision_id)
365
raise errors.NoSuchRevision(self, revision_id)
369
def get_revision_id_to_revno_map(self):
370
"""Return the revision_id => dotted revno map.
372
This will be regenerated on demand, but will be cached.
374
:return: A dictionary mapping revision_id => dotted revno.
375
This dictionary should not be modified by the caller.
377
if self._revision_id_to_revno_cache is not None:
378
mapping = self._revision_id_to_revno_cache
380
mapping = self._gen_revno_map()
381
self._cache_revision_id_to_revno(mapping)
382
# TODO: jam 20070417 Since this is being cached, should we be returning
384
# I would rather not, and instead just declare that users should not
385
# modify the return value.
388
def _gen_revno_map(self):
389
"""Create a new mapping from revision ids to dotted revnos.
391
Dotted revnos are generated based on the current tip in the revision
393
This is the worker function for get_revision_id_to_revno_map, which
394
just caches the return value.
396
:return: A dictionary mapping revision_id => dotted revno.
398
revision_id_to_revno = dict((rev_id, revno)
399
for rev_id, depth, revno, end_of_merge
400
in self.iter_merge_sorted_revisions())
401
return revision_id_to_revno
404
def iter_merge_sorted_revisions(self, start_revision_id=None,
405
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
406
"""Walk the revisions for a branch in merge sorted order.
408
Merge sorted order is the output from a merge-aware,
409
topological sort, i.e. all parents come before their
410
children going forward; the opposite for reverse.
412
:param start_revision_id: the revision_id to begin walking from.
413
If None, the branch tip is used.
414
:param stop_revision_id: the revision_id to terminate the walk
415
after. If None, the rest of history is included.
416
:param stop_rule: if stop_revision_id is not None, the precise rule
417
to use for termination:
418
* 'exclude' - leave the stop revision out of the result (default)
419
* 'include' - the stop revision is the last item in the result
420
* 'with-merges' - include the stop revision and all of its
421
merged revisions in the result
422
:param direction: either 'reverse' or 'forward':
423
* reverse means return the start_revision_id first, i.e.
424
start at the most recent revision and go backwards in history
425
* forward returns tuples in the opposite order to reverse.
426
Note in particular that forward does *not* do any intelligent
427
ordering w.r.t. depth as some clients of this API may like.
428
(If required, that ought to be done at higher layers.)
430
:return: an iterator over (revision_id, depth, revno, end_of_merge)
433
* revision_id: the unique id of the revision
434
* depth: How many levels of merging deep this node has been
436
* revno_sequence: This field provides a sequence of
437
revision numbers for all revisions. The format is:
438
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
439
branch that the revno is on. From left to right the REVNO numbers
440
are the sequence numbers within that branch of the revision.
441
* end_of_merge: When True the next node (earlier in history) is
442
part of a different merge.
444
# Note: depth and revno values are in the context of the branch so
445
# we need the full graph to get stable numbers, regardless of the
447
if self._merge_sorted_revisions_cache is None:
448
last_revision = self.last_revision()
449
graph = self.repository.get_graph()
450
parent_map = dict(((key, value) for key, value in
451
graph.iter_ancestry([last_revision]) if value is not None))
452
revision_graph = repository._strip_NULL_ghosts(parent_map)
453
revs = tsort.merge_sort(revision_graph, last_revision, None,
455
# Drop the sequence # before caching
456
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
458
filtered = self._filter_merge_sorted_revisions(
459
self._merge_sorted_revisions_cache, start_revision_id,
460
stop_revision_id, stop_rule)
461
if direction == 'reverse':
463
if direction == 'forward':
464
return reversed(list(filtered))
466
raise ValueError('invalid direction %r' % direction)
468
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
469
start_revision_id, stop_revision_id, stop_rule):
470
"""Iterate over an inclusive range of sorted revisions."""
471
rev_iter = iter(merge_sorted_revisions)
472
if start_revision_id is not None:
473
for rev_id, depth, revno, end_of_merge in rev_iter:
474
if rev_id != start_revision_id:
477
# The decision to include the start or not
478
# depends on the stop_rule if a stop is provided
480
iter([(rev_id, depth, revno, end_of_merge)]),
483
if stop_revision_id is None:
484
for rev_id, depth, revno, end_of_merge in rev_iter:
485
yield rev_id, depth, revno, end_of_merge
486
elif stop_rule == 'exclude':
487
for rev_id, depth, revno, end_of_merge in rev_iter:
488
if rev_id == stop_revision_id:
490
yield rev_id, depth, revno, end_of_merge
491
elif stop_rule == 'include':
492
for rev_id, depth, revno, end_of_merge in rev_iter:
493
yield rev_id, depth, revno, end_of_merge
494
if rev_id == stop_revision_id:
496
elif stop_rule == 'with-merges':
497
stop_rev = self.repository.get_revision(stop_revision_id)
498
if stop_rev.parent_ids:
499
left_parent = stop_rev.parent_ids[0]
501
left_parent = _mod_revision.NULL_REVISION
502
for rev_id, depth, revno, end_of_merge in rev_iter:
503
if rev_id == left_parent:
505
yield rev_id, depth, revno, end_of_merge
507
raise ValueError('invalid stop_rule %r' % stop_rule)
509
def leave_lock_in_place(self):
510
"""Tell this branch object not to release the physical lock when this
513
If lock_write doesn't return a token, then this method is not supported.
515
self.control_files.leave_in_place()
517
def dont_leave_lock_in_place(self):
518
"""Tell this branch object to release the physical lock when this
519
object is unlocked, even if it didn't originally acquire it.
521
If lock_write doesn't return a token, then this method is not supported.
523
self.control_files.dont_leave_in_place()
525
def bind(self, other):
526
"""Bind the local branch the other branch.
528
:param other: The branch to bind to
531
raise errors.UpgradeRequired(self.base)
533
def set_append_revisions_only(self, enabled):
534
if not self._format.supports_set_append_revisions_only():
535
raise errors.UpgradeRequired(self.base)
540
self.get_config().set_user_option('append_revisions_only', value,
543
def set_reference_info(self, file_id, tree_path, branch_location):
544
"""Set the branch location to use for a tree reference."""
545
raise errors.UnsupportedOperation(self.set_reference_info, self)
547
def get_reference_info(self, file_id):
548
"""Get the tree_path and branch_location for a tree reference."""
549
raise errors.UnsupportedOperation(self.get_reference_info, self)
552
def fetch(self, from_branch, last_revision=None, pb=None):
553
"""Copy revisions from from_branch into this branch.
555
:param from_branch: Where to copy from.
556
:param last_revision: What revision to stop at (None for at the end
558
:param pb: An optional progress bar to use.
561
if self.base == from_branch.base:
564
symbol_versioning.warn(
565
symbol_versioning.deprecated_in((1, 14, 0))
566
% "pb parameter to fetch()")
567
from_branch.lock_read()
569
if last_revision is None:
570
last_revision = from_branch.last_revision()
571
last_revision = _mod_revision.ensure_null(last_revision)
572
return self.repository.fetch(from_branch.repository,
573
revision_id=last_revision,
578
def get_bound_location(self):
579
"""Return the URL of the branch we are bound to.
581
Older format branches cannot bind, please be sure to use a metadir
586
def get_old_bound_location(self):
587
"""Return the URL of the branch we used to be bound to
589
raise errors.UpgradeRequired(self.base)
591
def get_commit_builder(self, parents, config=None, timestamp=None,
592
timezone=None, committer=None, revprops=None,
594
"""Obtain a CommitBuilder for this branch.
596
:param parents: Revision ids of the parents of the new revision.
597
:param config: Optional configuration to use.
598
:param timestamp: Optional timestamp recorded for commit.
599
:param timezone: Optional timezone for timestamp.
600
:param committer: Optional committer to set for commit.
601
:param revprops: Optional dictionary of revision properties.
602
:param revision_id: Optional revision id.
606
config = self.get_config()
608
return self.repository.get_commit_builder(self, parents, config,
609
timestamp, timezone, committer, revprops, revision_id)
611
def get_master_branch(self, possible_transports=None):
612
"""Return the branch we are bound to.
614
:return: Either a Branch, or None
617
618
def get_revision_delta(self, revno):
618
619
"""Return the delta for one revision.
789
865
common_index = min(self_len, other_len) -1
790
866
if common_index >= 0 and \
791
867
self_history[common_index] != other_history[common_index]:
792
raise DivergedBranches(self, other)
868
raise errors.DivergedBranches(self, other)
794
870
if stop_revision is None:
795
871
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
873
if stop_revision > other_len:
874
raise errors.NoSuchRevision(self, stop_revision)
799
875
return other_history[self_len:stop_revision]
802
def update_revisions(self, other, stop_revision=None):
803
"""Pull in all new revisions from other branch.
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
816
>>> br2.revision_history()
818
>>> br2.update_revisions(br1)
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
825
from bzrlib.progress import ProgressBar
829
pb.update('comparing histories')
830
revision_ids = self.missing_revisions(other, stop_revision)
832
if hasattr(other.revision_store, "prefetch"):
833
other.revision_store.prefetch(revision_ids)
834
if hasattr(other.inventory_store, "prefetch"):
835
inventory_ids = [other.get_revision(r).inventory_id
836
for r in revision_ids]
837
other.inventory_store.prefetch(inventory_ids)
842
for rev_id in revision_ids:
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
846
revisions.append(rev)
847
inv = other.get_inventory(str(rev.inventory_id))
848
for key, entry in inv.iter_entries():
849
if entry.text_id is None:
851
if entry.text_id not in self.text_store:
852
needed_texts.add(entry.text_id)
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
857
print "Added %d texts." % count
858
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
861
print "Added %d inventories." % count
862
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
870
def commit(self, *args, **kw):
871
from bzrlib.commit import commit
872
commit(self, *args, **kw)
875
def lookup_revision(self, revision):
876
"""Return the revision identifier for a given revision information."""
877
revno, info = self.get_revision_info(revision)
880
def get_revision_info(self, revision):
881
"""Return (revno, revision id) for revision identifier.
883
revision can be an integer, in which case it is assumed to be revno (though
884
this will translate negative values into positive ones)
885
revision can also be a string, in which case it is parsed for something like
886
'date:' or 'revid:' etc.
891
try:# Convert to int if possible
892
revision = int(revision)
878
def update_revisions(self, other, stop_revision=None, overwrite=False,
880
"""Pull in new perfect-fit revisions.
882
:param other: Another Branch to pull from
883
:param stop_revision: Updated until the given revision
884
:param overwrite: Always set the branch pointer, rather than checking
885
to see if it is a proper descendant.
886
:param graph: A Graph object that can be used to query history
887
information. This can be None.
890
return InterBranch.get(other, self).update_revisions(stop_revision,
893
def import_last_revision_info(self, source_repo, revno, revid):
894
"""Set the last revision info, importing from another repo if necessary.
896
This is used by the bound branch code to upload a revision to
897
the master branch first before updating the tip of the local branch.
899
:param source_repo: Source repository to optionally fetch from
900
:param revno: Revision number of the new tip
901
:param revid: Revision id of the new tip
903
if not self.repository.has_same_location(source_repo):
904
self.repository.fetch(source_repo, revision_id=revid)
905
self.set_last_revision_info(revno, revid)
907
def revision_id_to_revno(self, revision_id):
908
"""Given a revision id, return its revno"""
909
if _mod_revision.is_null(revision_id):
911
history = self.revision_history()
913
return history.index(revision_id) + 1
893
914
except ValueError:
915
raise errors.NoSuchRevision(self, revision_id)
918
def get_rev_id(self, revno, history=None):
919
"""Find the revision id of the specified revno."""
921
return _mod_revision.NULL_REVISION
922
last_revno, last_revid = self.last_revision_info()
923
if revno == last_revno:
925
if revno <= 0 or revno > last_revno:
926
raise errors.NoSuchRevision(self, revno)
927
distance_from_last = last_revno - revno
928
if len(self._partial_revision_history_cache) <= distance_from_last:
929
self._extend_partial_history(distance_from_last)
930
return self._partial_revision_history_cache[distance_from_last]
933
def pull(self, source, overwrite=False, stop_revision=None,
934
possible_transports=None, *args, **kwargs):
935
"""Mirror source into this branch.
937
This branch is considered to be 'local', having low latency.
939
:returns: PullResult instance
941
return InterBranch.get(source, self).pull(overwrite=overwrite,
942
stop_revision=stop_revision,
943
possible_transports=possible_transports, *args, **kwargs)
945
def push(self, target, overwrite=False, stop_revision=None, *args,
947
"""Mirror this branch into target.
949
This branch is considered to be 'local', having low latency.
951
return InterBranch.get(self, target).push(overwrite, stop_revision,
954
def lossy_push(self, target, stop_revision=None):
955
"""Push deltas into another branch.
957
:note: This does not, like push, retain the revision ids from
958
the source branch and will, rather than adding bzr-specific
959
metadata, push only those semantics of the revision that can be
960
natively represented by this branch' VCS.
962
:param target: Target branch
963
:param stop_revision: Revision to push, defaults to last revision.
964
:return: BranchPushResult with an extra member revidmap:
965
A dictionary mapping revision ids from the target branch
966
to new revision ids in the target branch, for each
967
revision that was pushed.
969
inter = InterBranch.get(self, target)
970
lossy_push = getattr(inter, "lossy_push", None)
971
if lossy_push is None:
972
raise errors.LossyPushToSameVCS(self, target)
973
return lossy_push(stop_revision)
975
def basis_tree(self):
976
"""Return `Tree` object for last revision."""
977
return self.repository.revision_tree(self.last_revision())
979
def get_parent(self):
980
"""Return the parent location of the branch.
982
This is the default location for pull/missing. The usual
983
pattern is that the user can override it by specifying a
986
parent = self._get_parent_location()
989
# This is an old-format absolute path to a local branch
991
if parent.startswith('/'):
992
parent = urlutils.local_path_to_url(parent.decode('utf8'))
994
return urlutils.join(self.base[:-1], parent)
995
except errors.InvalidURLJoin, e:
996
raise errors.InaccessibleParent(parent, self.base)
998
def _get_parent_location(self):
999
raise NotImplementedError(self._get_parent_location)
1001
def _set_config_location(self, name, url, config=None,
1002
make_relative=False):
1004
config = self.get_config()
1008
url = urlutils.relative_url(self.base, url)
1009
config.set_user_option(name, url, warn_masked=True)
1011
def _get_config_location(self, name, config=None):
1013
config = self.get_config()
1014
location = config.get_user_option(name)
1019
def get_child_submit_format(self):
1020
"""Return the preferred format of submissions to this branch."""
1021
return self.get_config().get_user_option("child_submit_format")
1023
def get_submit_branch(self):
1024
"""Return the submit location of the branch.
1026
This is the default location for bundle. The usual
1027
pattern is that the user can override it by specifying a
1030
return self.get_config().get_user_option('submit_branch')
1032
def set_submit_branch(self, location):
1033
"""Return the submit location of the branch.
1035
This is the default location for bundle. The usual
1036
pattern is that the user can override it by specifying a
1039
self.get_config().set_user_option('submit_branch', location,
1042
def get_public_branch(self):
1043
"""Return the public location of the branch.
1045
This is used by merge directives.
1047
return self._get_config_location('public_branch')
1049
def set_public_branch(self, location):
1050
"""Return the submit location of the branch.
1052
This is the default location for bundle. The usual
1053
pattern is that the user can override it by specifying a
1056
self._set_config_location('public_branch', location)
1058
def get_push_location(self):
1059
"""Return the None or the location to push this branch to."""
1060
push_loc = self.get_config().get_user_option('push_location')
1063
def set_push_location(self, location):
1064
"""Set a new push location for this branch."""
1065
raise NotImplementedError(self.set_push_location)
1067
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1068
"""Run the post_change_branch_tip hooks."""
1069
hooks = Branch.hooks['post_change_branch_tip']
1072
new_revno, new_revid = self.last_revision_info()
1073
params = ChangeBranchTipParams(
1074
self, old_revno, new_revno, old_revid, new_revid)
1078
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1079
"""Run the pre_change_branch_tip hooks."""
1080
hooks = Branch.hooks['pre_change_branch_tip']
1083
old_revno, old_revid = self.last_revision_info()
1084
params = ChangeBranchTipParams(
1085
self, old_revno, new_revno, old_revid, new_revid)
1089
except errors.TipChangeRejected:
1092
exc_info = sys.exc_info()
1093
hook_name = Branch.hooks.get_hook_name(hook)
1094
raise errors.HookFailed(
1095
'pre_change_branch_tip', hook_name, exc_info)
1099
"""Synchronise this branch with the master branch if any.
1101
:return: None or the last_revision pivoted out during the update.
1105
def check_revno(self, revno):
1107
Check whether a revno corresponds to any revision.
1108
Zero (the NULL revision) is considered valid.
1111
self.check_real_revno(revno)
1113
def check_real_revno(self, revno):
1115
Check whether a revno corresponds to a real revision.
1116
Zero (the NULL revision) is considered invalid
1118
if revno < 1 or revno > self.revno():
1119
raise errors.InvalidRevisionNumber(revno)
1122
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
1123
"""Clone this branch into to_bzrdir preserving all semantic values.
1125
Most API users will want 'create_clone_on_transport', which creates a
1126
new bzrdir and branch on the fly.
1128
revision_id: if not None, the revision history in the new branch will
1129
be truncated to end with revision_id.
1131
result = to_bzrdir.create_branch()
1134
if repository_policy is not None:
1135
repository_policy.configure_branch(result)
1136
self.copy_content_into(result, revision_id=revision_id)
1142
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
1143
"""Create a new line of development from the branch, into to_bzrdir.
1145
to_bzrdir controls the branch format.
1147
revision_id: if not None, the revision history in the new branch will
1148
be truncated to end with revision_id.
1150
result = to_bzrdir.create_branch()
1153
if repository_policy is not None:
1154
repository_policy.configure_branch(result)
1155
self.copy_content_into(result, revision_id=revision_id)
1156
result.set_parent(self.bzrdir.root_transport.base)
1161
def _synchronize_history(self, destination, revision_id):
1162
"""Synchronize last revision and revision history between branches.
1164
This version is most efficient when the destination is also a
1165
BzrBranch6, but works for BzrBranch5, as long as the destination's
1166
repository contains all the lefthand ancestors of the intended
1167
last_revision. If not, set_last_revision_info will fail.
1169
:param destination: The branch to copy the history into
1170
:param revision_id: The revision-id to truncate history at. May
1171
be None to copy complete history.
1173
source_revno, source_revision_id = self.last_revision_info()
1174
if revision_id is None:
1175
revno, revision_id = source_revno, source_revision_id
1177
graph = self.repository.get_graph()
1179
revno = graph.find_distance_to_null(revision_id,
1180
[(source_revision_id, source_revno)])
1181
except errors.GhostRevisionsHaveNoRevno:
1182
# Default to 1, if we can't find anything else
1184
destination.set_last_revision_info(revno, revision_id)
1187
def copy_content_into(self, destination, revision_id=None):
1188
"""Copy the content of self into destination.
1190
revision_id: if not None, the revision history in the new branch will
1191
be truncated to end with revision_id.
1193
self.update_references(destination)
1194
self._synchronize_history(destination, revision_id)
1196
parent = self.get_parent()
1197
except errors.InaccessibleParent, e:
1198
mutter('parent was not accessible to copy: %s', e)
1201
destination.set_parent(parent)
1202
if self._push_should_merge_tags():
1203
self.tags.merge_to(destination.tags)
1205
def update_references(self, target):
1206
if not getattr(self._format, 'supports_reference_locations', False):
1208
reference_dict = self._get_all_reference_info()
1209
if len(reference_dict) == 0:
1211
old_base = self.base
1212
new_base = target.base
1213
target_reference_dict = target._get_all_reference_info()
1214
for file_id, (tree_path, branch_location) in (
1215
reference_dict.items()):
1216
branch_location = urlutils.rebase_url(branch_location,
1218
target_reference_dict.setdefault(
1219
file_id, (tree_path, branch_location))
1220
target._set_all_reference_info(target_reference_dict)
1223
def check(self, refs):
1224
"""Check consistency of the branch.
1226
In particular this checks that revisions given in the revision-history
1227
do actually match up in the revision graph, and that they're all
1228
present in the repository.
1230
Callers will typically also want to check the repository.
1232
:param refs: Calculated refs for this branch as specified by
1233
branch._get_check_refs()
1234
:return: A BranchCheckResult.
1236
result = BranchCheckResult(self)
1237
last_revno, last_revision_id = self.last_revision_info()
1238
actual_revno = refs[('lefthand-distance', last_revision_id)]
1239
if actual_revno != last_revno:
1240
result.errors.append(errors.BzrCheckError(
1241
'revno does not match len(mainline) %s != %s' % (
1242
last_revno, actual_revno)))
1243
# TODO: We should probably also check that self.revision_history
1244
# matches the repository for older branch formats.
1245
# If looking for the code that cross-checks repository parents against
1246
# the iter_reverse_revision_history output, that is now a repository
1250
def _get_checkout_format(self):
1251
"""Return the most suitable metadir for a checkout of this branch.
1252
Weaves are used if this branch's repository uses weaves.
1254
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1255
from bzrlib.repofmt import weaverepo
1256
format = bzrdir.BzrDirMetaFormat1()
1257
format.repository_format = weaverepo.RepositoryFormat7()
1259
format = self.repository.bzrdir.checkout_metadir()
1260
format.set_branch_format(self._format)
1263
def create_clone_on_transport(self, to_transport, revision_id=None,
1264
stacked_on=None, create_prefix=False, use_existing_dir=False):
1265
"""Create a clone of this branch and its bzrdir.
1267
:param to_transport: The transport to clone onto.
1268
:param revision_id: The revision id to use as tip in the new branch.
1269
If None the tip is obtained from this branch.
1270
:param stacked_on: An optional URL to stack the clone on.
1271
:param create_prefix: Create any missing directories leading up to
1273
:param use_existing_dir: Use an existing directory if one exists.
1275
# XXX: Fix the bzrdir API to allow getting the branch back from the
1276
# clone call. Or something. 20090224 RBC/spiv.
1277
if revision_id is None:
1278
revision_id = self.last_revision()
1280
dir_to = self.bzrdir.clone_on_transport(to_transport,
1281
revision_id=revision_id, stacked_on=stacked_on,
1282
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1283
except errors.FileExists:
1284
if not use_existing_dir:
1286
except errors.NoSuchFile:
1287
if not create_prefix:
1289
return dir_to.open_branch()
1291
def create_checkout(self, to_location, revision_id=None,
1292
lightweight=False, accelerator_tree=None,
1294
"""Create a checkout of a branch.
1296
:param to_location: The url to produce the checkout at
1297
:param revision_id: The revision to check out
1298
:param lightweight: If True, produce a lightweight checkout, otherwise,
1299
produce a bound branch (heavyweight checkout)
1300
:param accelerator_tree: A tree which can be used for retrieving file
1301
contents more quickly than the revision tree, i.e. a workingtree.
1302
The revision tree will be used for cases where accelerator_tree's
1303
content is different.
1304
:param hardlink: If true, hard-link files from accelerator_tree,
1306
:return: The tree of the created checkout
1308
t = transport.get_transport(to_location)
1311
format = self._get_checkout_format()
1312
checkout = format.initialize_on_transport(t)
1313
from_branch = BranchReferenceFormat().initialize(checkout, self)
1315
format = self._get_checkout_format()
1316
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1317
to_location, force_new_tree=False, format=format)
1318
checkout = checkout_branch.bzrdir
1319
checkout_branch.bind(self)
1320
# pull up to the specified revision_id to set the initial
1321
# branch tip correctly, and seed it with history.
1322
checkout_branch.pull(self, stop_revision=revision_id)
1324
tree = checkout.create_workingtree(revision_id,
1325
from_branch=from_branch,
1326
accelerator_tree=accelerator_tree,
1328
basis_tree = tree.basis_tree()
1329
basis_tree.lock_read()
1331
for path, file_id in basis_tree.iter_references():
1332
reference_parent = self.reference_parent(file_id, path)
1333
reference_parent.create_checkout(tree.abspath(path),
1334
basis_tree.get_reference_revision(file_id, path),
1341
def reconcile(self, thorough=True):
1342
"""Make sure the data stored in this branch is consistent."""
1343
from bzrlib.reconcile import BranchReconciler
1344
reconciler = BranchReconciler(self, thorough=thorough)
1345
reconciler.reconcile()
1348
def reference_parent(self, file_id, path, possible_transports=None):
1349
"""Return the parent branch for a tree-reference file_id
1350
:param file_id: The file_id of the tree reference
1351
:param path: The path of the file_id in the tree
1352
:return: A branch associated with the file_id
1354
# FIXME should provide multiple branches, based on config
1355
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1356
possible_transports=possible_transports)
1358
def supports_tags(self):
1359
return self._format.supports_tags()
1361
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1363
"""Ensure that revision_b is a descendant of revision_a.
1365
This is a helper function for update_revisions.
1367
:raises: DivergedBranches if revision_b has diverged from revision_a.
1368
:returns: True if revision_b is a descendant of revision_a.
1370
relation = self._revision_relations(revision_a, revision_b, graph)
1371
if relation == 'b_descends_from_a':
1373
elif relation == 'diverged':
1374
raise errors.DivergedBranches(self, other_branch)
1375
elif relation == 'a_descends_from_b':
1378
raise AssertionError("invalid relation: %r" % (relation,))
1380
def _revision_relations(self, revision_a, revision_b, graph):
1381
"""Determine the relationship between two revisions.
1383
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1385
heads = graph.heads([revision_a, revision_b])
1386
if heads == set([revision_b]):
1387
return 'b_descends_from_a'
1388
elif heads == set([revision_a, revision_b]):
1389
# These branches have diverged
1391
elif heads == set([revision_a]):
1392
return 'a_descends_from_b'
1394
raise AssertionError("invalid heads: %r" % (heads,))
1397
class BranchFormat(object):
1398
"""An encapsulation of the initialization and open routines for a format.
1400
Formats provide three things:
1401
* An initialization routine,
1405
Formats are placed in an dict by their format string for reference
1406
during branch opening. Its not required that these be instances, they
1407
can be classes themselves with class methods - it simply depends on
1408
whether state is needed for a given format or not.
1410
Once a format is deprecated, just deprecate the initialize and open
1411
methods on the format class. Do not deprecate the object, as the
1412
object will be created every time regardless.
1415
_default_format = None
1416
"""The default format used for new branches."""
1419
"""The known formats."""
1421
can_set_append_revisions_only = True
1423
def __eq__(self, other):
1424
return self.__class__ is other.__class__
1426
def __ne__(self, other):
1427
return not (self == other)
1430
def find_format(klass, a_bzrdir):
1431
"""Return the format for the branch object in a_bzrdir."""
1433
transport = a_bzrdir.get_branch_transport(None)
1434
format_string = transport.get("format").read()
1435
return klass._formats[format_string]
1436
except errors.NoSuchFile:
1437
raise errors.NotBranchError(path=transport.base)
1439
raise errors.UnknownFormatError(format=format_string, kind='branch')
1442
def get_default_format(klass):
1443
"""Return the current default format."""
1444
return klass._default_format
1446
def get_reference(self, a_bzrdir):
1447
"""Get the target reference of the branch in a_bzrdir.
1449
format probing must have been completed before calling
1450
this method - it is assumed that the format of the branch
1451
in a_bzrdir is correct.
1453
:param a_bzrdir: The bzrdir to get the branch data from.
1454
:return: None if the branch is not a reference branch.
1459
def set_reference(self, a_bzrdir, to_branch):
1460
"""Set the target reference of the branch in a_bzrdir.
1462
format probing must have been completed before calling
1463
this method - it is assumed that the format of the branch
1464
in a_bzrdir is correct.
1466
:param a_bzrdir: The bzrdir to set the branch reference for.
1467
:param to_branch: branch that the checkout is to reference
1469
raise NotImplementedError(self.set_reference)
1471
def get_format_string(self):
1472
"""Return the ASCII format string that identifies this format."""
1473
raise NotImplementedError(self.get_format_string)
1475
def get_format_description(self):
1476
"""Return the short format description for this format."""
1477
raise NotImplementedError(self.get_format_description)
1479
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1481
"""Initialize a branch in a bzrdir, with specified files
1483
:param a_bzrdir: The bzrdir to initialize the branch in
1484
:param utf8_files: The files to create as a list of
1485
(filename, content) tuples
1486
:param set_format: If True, set the format with
1487
self.get_format_string. (BzrBranch4 has its format set
1489
:return: a branch in this format
1491
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1492
branch_transport = a_bzrdir.get_branch_transport(self)
1494
'metadir': ('lock', lockdir.LockDir),
1495
'branch4': ('branch-lock', lockable_files.TransportLock),
1497
lock_name, lock_class = lock_map[lock_type]
1498
control_files = lockable_files.LockableFiles(branch_transport,
1499
lock_name, lock_class)
1500
control_files.create_lock()
1502
control_files.lock_write()
1503
except errors.LockContention:
1504
if lock_type != 'branch4':
1510
utf8_files += [('format', self.get_format_string())]
1512
for (filename, content) in utf8_files:
1513
branch_transport.put_bytes(
1515
mode=a_bzrdir._get_file_mode())
1518
control_files.unlock()
1519
return self.open(a_bzrdir, _found=True)
1521
def initialize(self, a_bzrdir):
1522
"""Create a branch of this format in a_bzrdir."""
1523
raise NotImplementedError(self.initialize)
1525
def is_supported(self):
1526
"""Is this format supported?
1528
Supported formats can be initialized and opened.
1529
Unsupported formats may not support initialization or committing or
1530
some other features depending on the reason for not being supported.
1534
def make_tags(self, branch):
1535
"""Create a tags object for branch.
1537
This method is on BranchFormat, because BranchFormats are reflected
1538
over the wire via network_name(), whereas full Branch instances require
1539
multiple VFS method calls to operate at all.
1541
The default implementation returns a disabled-tags instance.
1543
Note that it is normal for branch to be a RemoteBranch when using tags
1546
return DisabledTags(branch)
1548
def network_name(self):
1549
"""A simple byte string uniquely identifying this format for RPC calls.
1551
MetaDir branch formats use their disk format string to identify the
1552
repository over the wire. All in one formats such as bzr < 0.8, and
1553
foreign formats like svn/git and hg should use some marker which is
1554
unique and immutable.
1556
raise NotImplementedError(self.network_name)
1558
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1559
"""Return the branch object for a_bzrdir
1561
:param a_bzrdir: A BzrDir that contains a branch.
1562
:param _found: a private parameter, do not use it. It is used to
1563
indicate if format probing has already be done.
1564
:param ignore_fallbacks: when set, no fallback branches will be opened
1565
(if there are any). Default is to open fallbacks.
1567
raise NotImplementedError(self.open)
1570
def register_format(klass, format):
1571
"""Register a metadir format."""
1572
klass._formats[format.get_format_string()] = format
1573
# Metadir formats have a network name of their format string, and get
1574
# registered as class factories.
1575
network_format_registry.register(format.get_format_string(), format.__class__)
1578
def set_default_format(klass, format):
1579
klass._default_format = format
1581
def supports_set_append_revisions_only(self):
1582
"""True if this format supports set_append_revisions_only."""
1585
def supports_stacking(self):
1586
"""True if this format records a stacked-on branch."""
1590
def unregister_format(klass, format):
1591
del klass._formats[format.get_format_string()]
1594
return self.get_format_description().rstrip()
1596
def supports_tags(self):
1597
"""True if this format supports tags stored in the branch"""
1598
return False # by default
1601
class BranchHooks(Hooks):
1602
"""A dictionary mapping hook name to a list of callables for branch hooks.
1604
e.g. ['set_rh'] Is the list of items to be called when the
1605
set_revision_history function is invoked.
1609
"""Create the default hooks.
1611
These are all empty initially, because by default nothing should get
1614
Hooks.__init__(self)
1615
self.create_hook(HookPoint('set_rh',
1616
"Invoked whenever the revision history has been set via "
1617
"set_revision_history. The api signature is (branch, "
1618
"revision_history), and the branch will be write-locked. "
1619
"The set_rh hook can be expensive for bzr to trigger, a better "
1620
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1621
self.create_hook(HookPoint('open',
1622
"Called with the Branch object that has been opened after a "
1623
"branch is opened.", (1, 8), None))
1624
self.create_hook(HookPoint('post_push',
1625
"Called after a push operation completes. post_push is called "
1626
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1627
"bzr client.", (0, 15), None))
1628
self.create_hook(HookPoint('post_pull',
1629
"Called after a pull operation completes. post_pull is called "
1630
"with a bzrlib.branch.PullResult object and only runs in the "
1631
"bzr client.", (0, 15), None))
1632
self.create_hook(HookPoint('pre_commit',
1633
"Called after a commit is calculated but before it is is "
1634
"completed. pre_commit is called with (local, master, old_revno, "
1635
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1636
"). old_revid is NULL_REVISION for the first commit to a branch, "
1637
"tree_delta is a TreeDelta object describing changes from the "
1638
"basis revision. hooks MUST NOT modify this delta. "
1639
" future_tree is an in-memory tree obtained from "
1640
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1641
"tree.", (0,91), None))
1642
self.create_hook(HookPoint('post_commit',
1643
"Called in the bzr client after a commit has completed. "
1644
"post_commit is called with (local, master, old_revno, old_revid, "
1645
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1646
"commit to a branch.", (0, 15), None))
1647
self.create_hook(HookPoint('post_uncommit',
1648
"Called in the bzr client after an uncommit completes. "
1649
"post_uncommit is called with (local, master, old_revno, "
1650
"old_revid, new_revno, new_revid) where local is the local branch "
1651
"or None, master is the target branch, and an empty branch "
1652
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1653
self.create_hook(HookPoint('pre_change_branch_tip',
1654
"Called in bzr client and server before a change to the tip of a "
1655
"branch is made. pre_change_branch_tip is called with a "
1656
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1657
"commit, uncommit will all trigger this hook.", (1, 6), None))
1658
self.create_hook(HookPoint('post_change_branch_tip',
1659
"Called in bzr client and server after a change to the tip of a "
1660
"branch is made. post_change_branch_tip is called with a "
1661
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1662
"commit, uncommit will all trigger this hook.", (1, 4), None))
1663
self.create_hook(HookPoint('transform_fallback_location',
1664
"Called when a stacked branch is activating its fallback "
1665
"locations. transform_fallback_location is called with (branch, "
1666
"url), and should return a new url. Returning the same url "
1667
"allows it to be used as-is, returning a different one can be "
1668
"used to cause the branch to stack on a closer copy of that "
1669
"fallback_location. Note that the branch cannot have history "
1670
"accessing methods called on it during this hook because the "
1671
"fallback locations have not been activated. When there are "
1672
"multiple hooks installed for transform_fallback_location, "
1673
"all are called with the url returned from the previous hook."
1674
"The order is however undefined.", (1, 9), None))
1677
# install the default hooks into the Branch class.
1678
Branch.hooks = BranchHooks()
1681
class ChangeBranchTipParams(object):
1682
"""Object holding parameters passed to *_change_branch_tip hooks.
1684
There are 5 fields that hooks may wish to access:
1686
:ivar branch: the branch being changed
1687
:ivar old_revno: revision number before the change
1688
:ivar new_revno: revision number after the change
1689
:ivar old_revid: revision id before the change
1690
:ivar new_revid: revision id after the change
1692
The revid fields are strings. The revno fields are integers.
1695
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1696
"""Create a group of ChangeBranchTip parameters.
1698
:param branch: The branch being changed.
1699
:param old_revno: Revision number before the change.
1700
:param new_revno: Revision number after the change.
1701
:param old_revid: Tip revision id before the change.
1702
:param new_revid: Tip revision id after the change.
1704
self.branch = branch
1705
self.old_revno = old_revno
1706
self.new_revno = new_revno
1707
self.old_revid = old_revid
1708
self.new_revid = new_revid
1710
def __eq__(self, other):
1711
return self.__dict__ == other.__dict__
1714
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1715
self.__class__.__name__, self.branch,
1716
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1719
class BzrBranchFormat4(BranchFormat):
1720
"""Bzr branch format 4.
1723
- a revision-history file.
1724
- a branch-lock lock file [ to be shared with the bzrdir ]
1727
def get_format_description(self):
1728
"""See BranchFormat.get_format_description()."""
1729
return "Branch format 4"
1731
def initialize(self, a_bzrdir):
1732
"""Create a branch of this format in a_bzrdir."""
1733
utf8_files = [('revision-history', ''),
1734
('branch-name', ''),
1736
return self._initialize_helper(a_bzrdir, utf8_files,
1737
lock_type='branch4', set_format=False)
1740
super(BzrBranchFormat4, self).__init__()
1741
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1743
def network_name(self):
1744
"""The network name for this format is the control dirs disk label."""
1745
return self._matchingbzrdir.get_format_string()
1747
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1748
"""See BranchFormat.open()."""
1750
# we are being called directly and must probe.
1751
raise NotImplementedError
1752
return BzrBranch(_format=self,
1753
_control_files=a_bzrdir._control_files,
1755
_repository=a_bzrdir.open_repository())
1758
return "Bazaar-NG branch format 4"
1761
class BranchFormatMetadir(BranchFormat):
1762
"""Common logic for meta-dir based branch formats."""
1764
def _branch_class(self):
1765
"""What class to instantiate on open calls."""
1766
raise NotImplementedError(self._branch_class)
1768
def network_name(self):
1769
"""A simple byte string uniquely identifying this format for RPC calls.
1771
Metadir branch formats use their format string.
1773
return self.get_format_string()
1775
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1776
"""See BranchFormat.open()."""
1778
format = BranchFormat.find_format(a_bzrdir)
1779
if format.__class__ != self.__class__:
1780
raise AssertionError("wrong format %r found for %r" %
1783
transport = a_bzrdir.get_branch_transport(None)
1784
control_files = lockable_files.LockableFiles(transport, 'lock',
1786
return self._branch_class()(_format=self,
1787
_control_files=control_files,
1789
_repository=a_bzrdir.find_repository(),
1790
ignore_fallbacks=ignore_fallbacks)
1791
except errors.NoSuchFile:
1792
raise errors.NotBranchError(path=transport.base)
1795
super(BranchFormatMetadir, self).__init__()
1796
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1797
self._matchingbzrdir.set_branch_format(self)
1799
def supports_tags(self):
1803
class BzrBranchFormat5(BranchFormatMetadir):
1804
"""Bzr branch format 5.
1807
- a revision-history file.
1809
- a lock dir guarding the branch itself
1810
- all of this stored in a branch/ subdirectory
1811
- works with shared repositories.
1813
This format is new in bzr 0.8.
1816
def _branch_class(self):
1819
def get_format_string(self):
1820
"""See BranchFormat.get_format_string()."""
1821
return "Bazaar-NG branch format 5\n"
1823
def get_format_description(self):
1824
"""See BranchFormat.get_format_description()."""
1825
return "Branch format 5"
1827
def initialize(self, a_bzrdir):
1828
"""Create a branch of this format in a_bzrdir."""
1829
utf8_files = [('revision-history', ''),
1830
('branch-name', ''),
1832
return self._initialize_helper(a_bzrdir, utf8_files)
1834
def supports_tags(self):
1838
class BzrBranchFormat6(BranchFormatMetadir):
1839
"""Branch format with last-revision and tags.
1841
Unlike previous formats, this has no explicit revision history. Instead,
1842
this just stores the last-revision, and the left-hand history leading
1843
up to there is the history.
1845
This format was introduced in bzr 0.15
1846
and became the default in 0.91.
1849
def _branch_class(self):
1852
def get_format_string(self):
1853
"""See BranchFormat.get_format_string()."""
1854
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1856
def get_format_description(self):
1857
"""See BranchFormat.get_format_description()."""
1858
return "Branch format 6"
1860
def initialize(self, a_bzrdir):
1861
"""Create a branch of this format in a_bzrdir."""
1862
utf8_files = [('last-revision', '0 null:\n'),
1863
('branch.conf', ''),
1866
return self._initialize_helper(a_bzrdir, utf8_files)
1868
def make_tags(self, branch):
1869
"""See bzrlib.branch.BranchFormat.make_tags()."""
1870
return BasicTags(branch)
1872
def supports_set_append_revisions_only(self):
1876
class BzrBranchFormat8(BranchFormatMetadir):
1877
"""Metadir format supporting storing locations of subtree branches."""
1879
def _branch_class(self):
1882
def get_format_string(self):
1883
"""See BranchFormat.get_format_string()."""
1884
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
1886
def get_format_description(self):
1887
"""See BranchFormat.get_format_description()."""
1888
return "Branch format 8"
1890
def initialize(self, a_bzrdir):
1891
"""Create a branch of this format in a_bzrdir."""
1892
utf8_files = [('last-revision', '0 null:\n'),
1893
('branch.conf', ''),
1897
return self._initialize_helper(a_bzrdir, utf8_files)
1900
super(BzrBranchFormat8, self).__init__()
1901
self._matchingbzrdir.repository_format = \
1902
RepositoryFormatKnitPack5RichRoot()
1904
def make_tags(self, branch):
1905
"""See bzrlib.branch.BranchFormat.make_tags()."""
1906
return BasicTags(branch)
1908
def supports_set_append_revisions_only(self):
1911
def supports_stacking(self):
1914
supports_reference_locations = True
1917
class BzrBranchFormat7(BzrBranchFormat8):
1918
"""Branch format with last-revision, tags, and a stacked location pointer.
1920
The stacked location pointer is passed down to the repository and requires
1921
a repository format with supports_external_lookups = True.
1923
This format was introduced in bzr 1.6.
1926
def initialize(self, a_bzrdir):
1927
"""Create a branch of this format in a_bzrdir."""
1928
utf8_files = [('last-revision', '0 null:\n'),
1929
('branch.conf', ''),
1932
return self._initialize_helper(a_bzrdir, utf8_files)
1934
def _branch_class(self):
1937
def get_format_string(self):
1938
"""See BranchFormat.get_format_string()."""
1939
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1941
def get_format_description(self):
1942
"""See BranchFormat.get_format_description()."""
1943
return "Branch format 7"
1945
def supports_set_append_revisions_only(self):
1948
supports_reference_locations = False
1951
class BranchReferenceFormat(BranchFormat):
1952
"""Bzr branch reference format.
1954
Branch references are used in implementing checkouts, they
1955
act as an alias to the real branch which is at some other url.
1962
def get_format_string(self):
1963
"""See BranchFormat.get_format_string()."""
1964
return "Bazaar-NG Branch Reference Format 1\n"
1966
def get_format_description(self):
1967
"""See BranchFormat.get_format_description()."""
1968
return "Checkout reference format 1"
1970
def get_reference(self, a_bzrdir):
1971
"""See BranchFormat.get_reference()."""
1972
transport = a_bzrdir.get_branch_transport(None)
1973
return transport.get('location').read()
1975
def set_reference(self, a_bzrdir, to_branch):
1976
"""See BranchFormat.set_reference()."""
1977
transport = a_bzrdir.get_branch_transport(None)
1978
location = transport.put_bytes('location', to_branch.base)
1980
def initialize(self, a_bzrdir, target_branch=None):
1981
"""Create a branch of this format in a_bzrdir."""
1982
if target_branch is None:
1983
# this format does not implement branch itself, thus the implicit
1984
# creation contract must see it as uninitializable
1985
raise errors.UninitializableFormat(self)
1986
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1987
branch_transport = a_bzrdir.get_branch_transport(self)
1988
branch_transport.put_bytes('location',
1989
target_branch.bzrdir.root_transport.base)
1990
branch_transport.put_bytes('format', self.get_format_string())
1992
a_bzrdir, _found=True,
1993
possible_transports=[target_branch.bzrdir.root_transport])
1996
super(BranchReferenceFormat, self).__init__()
1997
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1998
self._matchingbzrdir.set_branch_format(self)
2000
def _make_reference_clone_function(format, a_branch):
2001
"""Create a clone() routine for a branch dynamically."""
2002
def clone(to_bzrdir, revision_id=None,
2003
repository_policy=None):
2004
"""See Branch.clone()."""
2005
return format.initialize(to_bzrdir, a_branch)
2006
# cannot obey revision_id limits when cloning a reference ...
2007
# FIXME RBC 20060210 either nuke revision_id for clone, or
2008
# emit some sort of warning/error to the caller ?!
2011
def open(self, a_bzrdir, _found=False, location=None,
2012
possible_transports=None, ignore_fallbacks=False):
2013
"""Return the branch that the branch reference in a_bzrdir points at.
2015
:param a_bzrdir: A BzrDir that contains a branch.
2016
:param _found: a private parameter, do not use it. It is used to
2017
indicate if format probing has already be done.
2018
:param ignore_fallbacks: when set, no fallback branches will be opened
2019
(if there are any). Default is to open fallbacks.
2020
:param location: The location of the referenced branch. If
2021
unspecified, this will be determined from the branch reference in
2023
:param possible_transports: An optional reusable transports list.
2026
format = BranchFormat.find_format(a_bzrdir)
2027
if format.__class__ != self.__class__:
2028
raise AssertionError("wrong format %r found for %r" %
2030
if location is None:
2031
location = self.get_reference(a_bzrdir)
2032
real_bzrdir = bzrdir.BzrDir.open(
2033
location, possible_transports=possible_transports)
2034
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2035
# this changes the behaviour of result.clone to create a new reference
2036
# rather than a copy of the content of the branch.
2037
# I did not use a proxy object because that needs much more extensive
2038
# testing, and we are only changing one behaviour at the moment.
2039
# If we decide to alter more behaviours - i.e. the implicit nickname
2040
# then this should be refactored to introduce a tested proxy branch
2041
# and a subclass of that for use in overriding clone() and ....
2043
result.clone = self._make_reference_clone_function(result)
2047
network_format_registry = registry.FormatRegistry()
2048
"""Registry of formats indexed by their network name.
2050
The network name for a branch format is an identifier that can be used when
2051
referring to formats with smart server operations. See
2052
BranchFormat.network_name() for more detail.
2056
# formats which have no format string are not discoverable
2057
# and not independently creatable, so are not registered.
2058
__format5 = BzrBranchFormat5()
2059
__format6 = BzrBranchFormat6()
2060
__format7 = BzrBranchFormat7()
2061
__format8 = BzrBranchFormat8()
2062
BranchFormat.register_format(__format5)
2063
BranchFormat.register_format(BranchReferenceFormat())
2064
BranchFormat.register_format(__format6)
2065
BranchFormat.register_format(__format7)
2066
BranchFormat.register_format(__format8)
2067
BranchFormat.set_default_format(__format6)
2068
_legacy_formats = [BzrBranchFormat4(),
2070
network_format_registry.register(
2071
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2074
class BzrBranch(Branch):
2075
"""A branch stored in the actual filesystem.
2077
Note that it's "local" in the context of the filesystem; it doesn't
2078
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2079
it's writable, and can be accessed via the normal filesystem API.
2081
:ivar _transport: Transport for file operations on this branch's
2082
control files, typically pointing to the .bzr/branch directory.
2083
:ivar repository: Repository for this branch.
2084
:ivar base: The url of the base directory for this branch; the one
2085
containing the .bzr directory.
2088
def __init__(self, _format=None,
2089
_control_files=None, a_bzrdir=None, _repository=None,
2090
ignore_fallbacks=False):
2091
"""Create new branch object at a particular location."""
2092
if a_bzrdir is None:
2093
raise ValueError('a_bzrdir must be supplied')
2095
self.bzrdir = a_bzrdir
2096
self._base = self.bzrdir.transport.clone('..').base
2097
# XXX: We should be able to just do
2098
# self.base = self.bzrdir.root_transport.base
2099
# but this does not quite work yet -- mbp 20080522
2100
self._format = _format
2101
if _control_files is None:
2102
raise ValueError('BzrBranch _control_files is None')
2103
self.control_files = _control_files
2104
self._transport = _control_files._transport
2105
self.repository = _repository
2106
Branch.__init__(self)
2109
return '%s(%r)' % (self.__class__.__name__, self.base)
2113
def _get_base(self):
2114
"""Returns the directory containing the control directory."""
2117
base = property(_get_base, doc="The URL for the root of this branch.")
2119
def _get_config(self):
2120
return TransportConfig(self._transport, 'branch.conf')
2122
def is_locked(self):
2123
return self.control_files.is_locked()
2125
def lock_write(self, token=None):
2126
# All-in-one needs to always unlock/lock.
2127
repo_control = getattr(self.repository, 'control_files', None)
2128
if self.control_files == repo_control or not self.is_locked():
2129
self.repository.lock_write()
2134
return self.control_files.lock_write(token=token)
2137
self.repository.unlock()
2140
def lock_read(self):
2141
# All-in-one needs to always unlock/lock.
2142
repo_control = getattr(self.repository, 'control_files', None)
2143
if self.control_files == repo_control or not self.is_locked():
2144
self.repository.lock_read()
2149
self.control_files.lock_read()
2152
self.repository.unlock()
2157
self.control_files.unlock()
2159
# All-in-one needs to always unlock/lock.
2160
repo_control = getattr(self.repository, 'control_files', None)
2161
if (self.control_files == repo_control or
2162
not self.control_files.is_locked()):
2163
self.repository.unlock()
2164
if not self.control_files.is_locked():
2165
# we just released the lock
2166
self._clear_cached_state()
2168
def peek_lock_mode(self):
2169
if self.control_files._lock_count == 0:
2172
return self.control_files._lock_mode
2174
def get_physical_lock_status(self):
2175
return self.control_files.get_physical_lock_status()
2178
def print_file(self, file, revision_id):
2179
"""See Branch.print_file."""
2180
return self.repository.print_file(file, revision_id)
2182
def _write_revision_history(self, history):
2183
"""Factored out of set_revision_history.
2185
This performs the actual writing to disk.
2186
It is intended to be called by BzrBranch5.set_revision_history."""
2187
self._transport.put_bytes(
2188
'revision-history', '\n'.join(history),
2189
mode=self.bzrdir._get_file_mode())
2192
def set_revision_history(self, rev_history):
2193
"""See Branch.set_revision_history."""
2194
if 'evil' in debug.debug_flags:
2195
mutter_callsite(3, "set_revision_history scales with history.")
2196
check_not_reserved_id = _mod_revision.check_not_reserved_id
2197
for rev_id in rev_history:
2198
check_not_reserved_id(rev_id)
2199
if Branch.hooks['post_change_branch_tip']:
2200
# Don't calculate the last_revision_info() if there are no hooks
2202
old_revno, old_revid = self.last_revision_info()
2203
if len(rev_history) == 0:
2204
revid = _mod_revision.NULL_REVISION
2206
revid = rev_history[-1]
2207
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2208
self._write_revision_history(rev_history)
2209
self._clear_cached_state()
2210
self._cache_revision_history(rev_history)
2211
for hook in Branch.hooks['set_rh']:
2212
hook(self, rev_history)
2213
if Branch.hooks['post_change_branch_tip']:
2214
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2216
def _synchronize_history(self, destination, revision_id):
2217
"""Synchronize last revision and revision history between branches.
2219
This version is most efficient when the destination is also a
2220
BzrBranch5, but works for BzrBranch6 as long as the revision
2221
history is the true lefthand parent history, and all of the revisions
2222
are in the destination's repository. If not, set_revision_history
2225
:param destination: The branch to copy the history into
2226
:param revision_id: The revision-id to truncate history at. May
2227
be None to copy complete history.
2229
if not isinstance(destination._format, BzrBranchFormat5):
2230
super(BzrBranch, self)._synchronize_history(
2231
destination, revision_id)
2233
if revision_id == _mod_revision.NULL_REVISION:
2236
new_history = self.revision_history()
2237
if revision_id is not None and new_history != []:
2239
new_history = new_history[:new_history.index(revision_id) + 1]
2241
rev = self.repository.get_revision(revision_id)
2242
new_history = rev.get_history(self.repository)[1:]
2243
destination.set_revision_history(new_history)
2246
def set_last_revision_info(self, revno, revision_id):
2247
"""Set the last revision of this branch.
2249
The caller is responsible for checking that the revno is correct
2250
for this revision id.
2252
It may be possible to set the branch last revision to an id not
2253
present in the repository. However, branches can also be
2254
configured to check constraints on history, in which case this may not
2257
revision_id = _mod_revision.ensure_null(revision_id)
2258
# this old format stores the full history, but this api doesn't
2259
# provide it, so we must generate, and might as well check it's
2261
history = self._lefthand_history(revision_id)
2262
if len(history) != revno:
2263
raise AssertionError('%d != %d' % (len(history), revno))
2264
self.set_revision_history(history)
2266
def _gen_revision_history(self):
2267
history = self._transport.get_bytes('revision-history').split('\n')
2268
if history[-1:] == ['']:
2269
# There shouldn't be a trailing newline, but just in case.
2274
def generate_revision_history(self, revision_id, last_rev=None,
2276
"""Create a new revision history that will finish with revision_id.
2278
:param revision_id: the new tip to use.
2279
:param last_rev: The previous last_revision. If not None, then this
2280
must be a ancestory of revision_id, or DivergedBranches is raised.
2281
:param other_branch: The other branch that DivergedBranches should
2282
raise with respect to.
2284
self.set_revision_history(self._lefthand_history(revision_id,
2285
last_rev, other_branch))
2287
def basis_tree(self):
2288
"""See Branch.basis_tree."""
2289
return self.repository.revision_tree(self.last_revision())
2291
def _get_parent_location(self):
2292
_locs = ['parent', 'pull', 'x-pull']
2295
return self._transport.get_bytes(l).strip('\n')
2296
except errors.NoSuchFile:
2300
def _basic_push(self, target, overwrite, stop_revision):
2301
"""Basic implementation of push without bound branches or hooks.
2303
Must be called with source read locked and target write locked.
2305
result = BranchPushResult()
2306
result.source_branch = self
2307
result.target_branch = target
2308
result.old_revno, result.old_revid = target.last_revision_info()
2309
self.update_references(target)
2310
if result.old_revid != self.last_revision():
2311
# We assume that during 'push' this repository is closer than
2313
graph = self.repository.get_graph(target.repository)
2314
target.update_revisions(self, stop_revision,
2315
overwrite=overwrite, graph=graph)
2316
if self._push_should_merge_tags():
2317
result.tag_conflicts = self.tags.merge_to(target.tags,
2319
result.new_revno, result.new_revid = target.last_revision_info()
2322
def get_stacked_on_url(self):
2323
raise errors.UnstackableBranchFormat(self._format, self.base)
2325
def set_push_location(self, location):
2326
"""See Branch.set_push_location."""
2327
self.get_config().set_user_option(
2328
'push_location', location,
2329
store=_mod_config.STORE_LOCATION_NORECURSE)
2331
def _set_parent_location(self, url):
2333
self._transport.delete('parent')
2335
self._transport.put_bytes('parent', url + '\n',
2336
mode=self.bzrdir._get_file_mode())
2339
class BzrBranch5(BzrBranch):
2340
"""A format 5 branch. This supports new features over plain branches.
2342
It has support for a master_branch which is the data for bound branches.
2345
def get_bound_location(self):
2347
return self._transport.get_bytes('bound')[:-1]
2348
except errors.NoSuchFile:
2352
def get_master_branch(self, possible_transports=None):
2353
"""Return the branch we are bound to.
2355
:return: Either a Branch, or None
2357
This could memoise the branch, but if thats done
2358
it must be revalidated on each new lock.
2359
So for now we just don't memoise it.
2360
# RBC 20060304 review this decision.
2362
bound_loc = self.get_bound_location()
2366
return Branch.open(bound_loc,
2367
possible_transports=possible_transports)
2368
except (errors.NotBranchError, errors.ConnectionError), e:
2369
raise errors.BoundBranchConnectionFailure(
2373
def set_bound_location(self, location):
2374
"""Set the target where this branch is bound to.
2376
:param location: URL to the target branch
2379
self._transport.put_bytes('bound', location+'\n',
2380
mode=self.bzrdir._get_file_mode())
2383
self._transport.delete('bound')
2384
except errors.NoSuchFile:
2389
def bind(self, other):
2390
"""Bind this branch to the branch other.
2392
This does not push or pull data between the branches, though it does
2393
check for divergence to raise an error when the branches are not
2394
either the same, or one a prefix of the other. That behaviour may not
2395
be useful, so that check may be removed in future.
2397
:param other: The branch to bind to
2400
# TODO: jam 20051230 Consider checking if the target is bound
2401
# It is debatable whether you should be able to bind to
2402
# a branch which is itself bound.
2403
# Committing is obviously forbidden,
2404
# but binding itself may not be.
2405
# Since we *have* to check at commit time, we don't
2406
# *need* to check here
2408
# we want to raise diverged if:
2409
# last_rev is not in the other_last_rev history, AND
2410
# other_last_rev is not in our history, and do it without pulling
2412
self.set_bound_location(other.base)
2416
"""If bound, unbind"""
2417
return self.set_bound_location(None)
2420
def update(self, possible_transports=None):
2421
"""Synchronise this branch with the master branch if any.
2423
:return: None or the last_revision that was pivoted out during the
2426
master = self.get_master_branch(possible_transports)
2427
if master is not None:
2428
old_tip = _mod_revision.ensure_null(self.last_revision())
2429
self.pull(master, overwrite=True)
2430
if self.repository.get_graph().is_ancestor(old_tip,
2431
_mod_revision.ensure_null(self.last_revision())):
2437
class BzrBranch8(BzrBranch5):
2438
"""A branch that stores tree-reference locations."""
2440
def _open_hook(self):
2441
if self._ignore_fallbacks:
2444
url = self.get_stacked_on_url()
2445
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2446
errors.UnstackableBranchFormat):
895
revs = self.revision_history()
896
if isinstance(revision, int):
899
# Mabye we should do this first, but we don't need it if revision == 0
901
revno = len(revs) + revision + 1
904
elif isinstance(revision, basestring):
905
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
906
if revision.startswith(prefix):
907
revno = func(self, revs, revision)
910
raise BzrError('No namespace registered for string: %r' % revision)
912
if revno is None or revno <= 0 or revno > len(revs):
913
raise BzrError("no such revision %s" % revision)
914
return revno, revs[revno-1]
916
def _namespace_revno(self, revs, revision):
917
"""Lookup a revision by revision number"""
918
assert revision.startswith('revno:')
920
return int(revision[6:])
923
REVISION_NAMESPACES['revno:'] = _namespace_revno
925
def _namespace_revid(self, revs, revision):
926
assert revision.startswith('revid:')
928
return revs.index(revision[6:]) + 1
931
REVISION_NAMESPACES['revid:'] = _namespace_revid
933
def _namespace_last(self, revs, revision):
934
assert revision.startswith('last:')
936
offset = int(revision[5:])
941
raise BzrError('You must supply a positive value for --revision last:XXX')
942
return len(revs) - offset + 1
943
REVISION_NAMESPACES['last:'] = _namespace_last
945
def _namespace_tag(self, revs, revision):
946
assert revision.startswith('tag:')
947
raise BzrError('tag: namespace registered, but not implemented.')
948
REVISION_NAMESPACES['tag:'] = _namespace_tag
950
def _namespace_date(self, revs, revision):
951
assert revision.startswith('date:')
953
# Spec for date revisions:
955
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
956
# it can also start with a '+/-/='. '+' says match the first
957
# entry after the given date. '-' is match the first entry before the date
958
# '=' is match the first entry after, but still on the given date.
960
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
961
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
962
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
963
# May 13th, 2005 at 0:00
965
# So the proper way of saying 'give me all entries for today' is:
966
# -r {date:+today}:{date:-tomorrow}
967
# The default is '=' when not supplied
970
if val[:1] in ('+', '-', '='):
971
match_style = val[:1]
974
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
975
if val.lower() == 'yesterday':
976
dt = today - datetime.timedelta(days=1)
977
elif val.lower() == 'today':
979
elif val.lower() == 'tomorrow':
980
dt = today + datetime.timedelta(days=1)
983
# This should be done outside the function to avoid recompiling it.
984
_date_re = re.compile(
985
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
987
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
989
m = _date_re.match(val)
990
if not m or (not m.group('date') and not m.group('time')):
991
raise BzrError('Invalid revision date %r' % revision)
994
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
996
year, month, day = today.year, today.month, today.day
998
hour = int(m.group('hour'))
999
minute = int(m.group('minute'))
1000
if m.group('second'):
1001
second = int(m.group('second'))
1005
hour, minute, second = 0,0,0
1007
dt = datetime.datetime(year=year, month=month, day=day,
1008
hour=hour, minute=minute, second=second)
1012
if match_style == '-':
1014
elif match_style == '=':
1015
last = dt + datetime.timedelta(days=1)
1018
for i in range(len(revs)-1, -1, -1):
1019
r = self.get_revision(revs[i])
1020
# TODO: Handle timezone.
1021
dt = datetime.datetime.fromtimestamp(r.timestamp)
1022
if first >= dt and (last is None or dt >= last):
1025
for i in range(len(revs)):
1026
r = self.get_revision(revs[i])
1027
# TODO: Handle timezone.
1028
dt = datetime.datetime.fromtimestamp(r.timestamp)
1029
if first <= dt and (last is None or dt <= last):
1031
REVISION_NAMESPACES['date:'] = _namespace_date
1033
def revision_tree(self, revision_id):
1034
"""Return Tree for a revision on this branch.
1036
`revision_id` may be None for the null revision, in which case
1037
an `EmptyTree` is returned."""
1038
# TODO: refactor this to use an existing revision object
1039
# so we don't need to read it in twice.
1040
if revision_id == None:
1043
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
1047
def working_tree(self):
1048
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
return WorkingTree(self.base, self.read_working_inventory())
1053
def basis_tree(self):
1054
"""Return `Tree` object for last revision.
1056
If there are no revisions yet, return an `EmptyTree`.
1058
r = self.last_patch()
1062
return RevisionTree(self.text_store, self.get_revision_inventory(r))
1066
def rename_one(self, from_rel, to_rel):
1069
This can change the directory or the filename or both.
1073
tree = self.working_tree()
1074
inv = tree.inventory
1075
if not tree.has_filename(from_rel):
1076
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1077
if tree.has_filename(to_rel):
1078
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1080
file_id = inv.path2id(from_rel)
1082
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1084
if inv.path2id(to_rel):
1085
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1087
to_dir, to_tail = os.path.split(to_rel)
1088
to_dir_id = inv.path2id(to_dir)
1089
if to_dir_id == None and to_dir != '':
1090
raise BzrError("can't determine destination directory id for %r" % to_dir)
1092
mutter("rename_one:")
1093
mutter(" file_id {%s}" % file_id)
1094
mutter(" from_rel %r" % from_rel)
1095
mutter(" to_rel %r" % to_rel)
1096
mutter(" to_dir %r" % to_dir)
1097
mutter(" to_dir_id {%s}" % to_dir_id)
1099
inv.rename(file_id, to_dir_id, to_tail)
1101
print "%s => %s" % (from_rel, to_rel)
1103
from_abs = self.abspath(from_rel)
1104
to_abs = self.abspath(to_rel)
1106
os.rename(from_abs, to_abs)
1108
raise BzrError("failed to rename %r to %r: %s"
1109
% (from_abs, to_abs, e[1]),
1110
["rename rolled back"])
1112
self._write_inventory(inv)
1117
def move(self, from_paths, to_name):
1120
to_name must exist as a versioned directory.
1122
If to_name exists and is a directory, the files are moved into
1123
it, keeping their old names. If it is a directory,
1125
Note that to_name is only the last component of the new name;
1126
this doesn't change the directory.
1130
## TODO: Option to move IDs only
1131
assert not isinstance(from_paths, basestring)
1132
tree = self.working_tree()
1133
inv = tree.inventory
1134
to_abs = self.abspath(to_name)
1135
if not isdir(to_abs):
1136
raise BzrError("destination %r is not a directory" % to_abs)
1137
if not tree.has_filename(to_name):
1138
raise BzrError("destination %r not in working directory" % to_abs)
1139
to_dir_id = inv.path2id(to_name)
1140
if to_dir_id == None and to_name != '':
1141
raise BzrError("destination %r is not a versioned directory" % to_name)
1142
to_dir_ie = inv[to_dir_id]
1143
if to_dir_ie.kind not in ('directory', 'root_directory'):
1144
raise BzrError("destination %r is not a directory" % to_abs)
1146
to_idpath = inv.get_idpath(to_dir_id)
1148
for f in from_paths:
1149
if not tree.has_filename(f):
1150
raise BzrError("%r does not exist in working tree" % f)
1151
f_id = inv.path2id(f)
1153
raise BzrError("%r is not versioned" % f)
1154
name_tail = splitpath(f)[-1]
1155
dest_path = appendpath(to_name, name_tail)
1156
if tree.has_filename(dest_path):
1157
raise BzrError("destination %r already exists" % dest_path)
1158
if f_id in to_idpath:
1159
raise BzrError("can't move %r to a subdirectory of itself" % f)
1161
# OK, so there's a race here, it's possible that someone will
1162
# create a file in this interval and then the rename might be
1163
# left half-done. But we should have caught most problems.
1165
for f in from_paths:
1166
name_tail = splitpath(f)[-1]
1167
dest_path = appendpath(to_name, name_tail)
1168
print "%s => %s" % (f, dest_path)
1169
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1171
os.rename(self.abspath(f), self.abspath(dest_path))
1173
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1174
["rename rolled back"])
1176
self._write_inventory(inv)
1181
def revert(self, filenames, old_tree=None, backups=True):
1182
"""Restore selected files to the versions from a previous tree.
1185
If true (default) backups are made of files before
1188
from bzrlib.errors import NotVersionedError, BzrError
1189
from bzrlib.atomicfile import AtomicFile
1190
from bzrlib.osutils import backup_file
1192
inv = self.read_working_inventory()
1193
if old_tree is None:
1194
old_tree = self.basis_tree()
1195
old_inv = old_tree.inventory
1198
for fn in filenames:
1199
file_id = inv.path2id(fn)
1201
raise NotVersionedError("not a versioned file", fn)
1202
if not old_inv.has_id(file_id):
1203
raise BzrError("file not present in old tree", fn, file_id)
1204
nids.append((fn, file_id))
1206
# TODO: Rename back if it was previously at a different location
1208
# TODO: If given a directory, restore the entire contents from
1209
# the previous version.
1211
# TODO: Make a backup to a temporary file.
1213
# TODO: If the file previously didn't exist, delete it?
1214
for fn, file_id in nids:
1217
f = AtomicFile(fn, 'wb')
1219
f.write(old_tree.get_file(file_id).read())
1225
def pending_merges(self):
1226
"""Return a list of pending merges.
1228
These are revisions that have been merged into the working
1229
directory but not yet committed.
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1235
for l in self.controlfile('pending-merges', 'r').readlines():
1236
p.append(l.rstrip('\n'))
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1243
validate_revision_id(revision_id)
1245
p = self.pending_merges()
1246
if revision_id in p:
2449
for hook in Branch.hooks['transform_fallback_location']:
2450
url = hook(self, url)
2452
hook_name = Branch.hooks.get_hook_name(hook)
2453
raise AssertionError(
2454
"'transform_fallback_location' hook %s returned "
2455
"None, not a URL." % hook_name)
2456
self._activate_fallback_location(url)
2458
def __init__(self, *args, **kwargs):
2459
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2460
super(BzrBranch8, self).__init__(*args, **kwargs)
2461
self._last_revision_info_cache = None
2462
self._reference_info = None
2464
def _clear_cached_state(self):
2465
super(BzrBranch8, self)._clear_cached_state()
2466
self._last_revision_info_cache = None
2467
self._reference_info = None
2469
def _last_revision_info(self):
2470
revision_string = self._transport.get_bytes('last-revision')
2471
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2472
revision_id = cache_utf8.get_cached_utf8(revision_id)
2474
return revno, revision_id
2476
def _write_last_revision_info(self, revno, revision_id):
2477
"""Simply write out the revision id, with no checks.
2479
Use set_last_revision_info to perform this safely.
2481
Does not update the revision_history cache.
2482
Intended to be called by set_last_revision_info and
2483
_write_revision_history.
2485
revision_id = _mod_revision.ensure_null(revision_id)
2486
out_string = '%d %s\n' % (revno, revision_id)
2487
self._transport.put_bytes('last-revision', out_string,
2488
mode=self.bzrdir._get_file_mode())
2491
def set_last_revision_info(self, revno, revision_id):
2492
revision_id = _mod_revision.ensure_null(revision_id)
2493
old_revno, old_revid = self.last_revision_info()
2494
if self._get_append_revisions_only():
2495
self._check_history_violation(revision_id)
2496
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2497
self._write_last_revision_info(revno, revision_id)
2498
self._clear_cached_state()
2499
self._last_revision_info_cache = revno, revision_id
2500
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2502
def _synchronize_history(self, destination, revision_id):
2503
"""Synchronize last revision and revision history between branches.
2505
:see: Branch._synchronize_history
2507
# XXX: The base Branch has a fast implementation of this method based
2508
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2509
# that uses set_revision_history. This class inherits from BzrBranch5,
2510
# but wants the fast implementation, so it calls
2511
# Branch._synchronize_history directly.
2512
Branch._synchronize_history(self, destination, revision_id)
2514
def _check_history_violation(self, revision_id):
2515
last_revision = _mod_revision.ensure_null(self.last_revision())
2516
if _mod_revision.is_null(last_revision):
1248
p.append(revision_id)
1249
self.set_pending_merges(p)
1252
def set_pending_merges(self, rev_list):
1253
from bzrlib.atomicfile import AtomicFile
2518
if last_revision not in self._lefthand_history(revision_id):
2519
raise errors.AppendRevisionsOnlyViolation(self.base)
2521
def _gen_revision_history(self):
2522
"""Generate the revision history from last revision
2524
last_revno, last_revision = self.last_revision_info()
2525
self._extend_partial_history(stop_index=last_revno-1)
2526
return list(reversed(self._partial_revision_history_cache))
2528
def _write_revision_history(self, history):
2529
"""Factored out of set_revision_history.
2531
This performs the actual writing to disk, with format-specific checks.
2532
It is intended to be called by BzrBranch5.set_revision_history.
2534
if len(history) == 0:
2535
last_revision = 'null:'
2537
if history != self._lefthand_history(history[-1]):
2538
raise errors.NotLefthandHistory(history)
2539
last_revision = history[-1]
2540
if self._get_append_revisions_only():
2541
self._check_history_violation(last_revision)
2542
self._write_last_revision_info(len(history), last_revision)
2545
def _set_parent_location(self, url):
2546
"""Set the parent branch"""
2547
self._set_config_location('parent_location', url, make_relative=True)
2550
def _get_parent_location(self):
2551
"""Set the parent branch"""
2552
return self._get_config_location('parent_location')
2555
def _set_all_reference_info(self, info_dict):
2556
"""Replace all reference info stored in a branch.
2558
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2561
writer = rio.RioWriter(s)
2562
for key, (tree_path, branch_location) in info_dict.iteritems():
2563
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2564
branch_location=branch_location)
2565
writer.write_stanza(stanza)
2566
self._transport.put_bytes('references', s.getvalue())
2567
self._reference_info = info_dict
2570
def _get_all_reference_info(self):
2571
"""Return all the reference info stored in a branch.
2573
:return: A dict of {file_id: (tree_path, branch_location)}
2575
if self._reference_info is not None:
2576
return self._reference_info
2577
rio_file = self._transport.get('references')
1256
f = AtomicFile(self.controlfilename('pending-merges'))
2579
stanzas = rio.read_stanzas(rio_file)
2580
info_dict = dict((s['file_id'], (s['tree_path'],
2581
s['branch_location'])) for s in stanzas)
1268
class ScratchBranch(Branch):
1269
"""Special test class: a branch that cleans up after itself.
1271
>>> b = ScratchBranch()
2584
self._reference_info = info_dict
2587
def set_reference_info(self, file_id, tree_path, branch_location):
2588
"""Set the branch location to use for a tree reference.
2590
:param file_id: The file-id of the tree reference.
2591
:param tree_path: The path of the tree reference in the tree.
2592
:param branch_location: The location of the branch to retrieve tree
2595
info_dict = self._get_all_reference_info()
2596
info_dict[file_id] = (tree_path, branch_location)
2597
if None in (tree_path, branch_location):
2598
if tree_path is not None:
2599
raise ValueError('tree_path must be None when branch_location'
2601
if branch_location is not None:
2602
raise ValueError('branch_location must be None when tree_path'
2604
del info_dict[file_id]
2605
self._set_all_reference_info(info_dict)
2607
def get_reference_info(self, file_id):
2608
"""Get the tree_path and branch_location for a tree reference.
2610
:return: a tuple of (tree_path, branch_location)
2612
return self._get_all_reference_info().get(file_id, (None, None))
2614
def reference_parent(self, file_id, path, possible_transports=None):
2615
"""Return the parent branch for a tree-reference file_id.
2617
:param file_id: The file_id of the tree reference
2618
:param path: The path of the file_id in the tree
2619
:return: A branch associated with the file_id
2621
branch_location = self.get_reference_info(file_id)[1]
2622
if branch_location is None:
2623
return Branch.reference_parent(self, file_id, path,
2624
possible_transports)
2625
branch_location = urlutils.join(self.base, branch_location)
2626
return Branch.open(branch_location,
2627
possible_transports=possible_transports)
2629
def set_push_location(self, location):
2630
"""See Branch.set_push_location."""
2631
self._set_config_location('push_location', location)
2633
def set_bound_location(self, location):
2634
"""See Branch.set_push_location."""
2636
config = self.get_config()
2637
if location is None:
2638
if config.get_user_option('bound') != 'True':
2641
config.set_user_option('bound', 'False', warn_masked=True)
2644
self._set_config_location('bound_location', location,
2646
config.set_user_option('bound', 'True', warn_masked=True)
2649
def _get_bound_location(self, bound):
2650
"""Return the bound location in the config file.
2652
Return None if the bound parameter does not match"""
2653
config = self.get_config()
2654
config_bound = (config.get_user_option('bound') == 'True')
2655
if config_bound != bound:
2657
return self._get_config_location('bound_location', config=config)
2659
def get_bound_location(self):
2660
"""See Branch.set_push_location."""
2661
return self._get_bound_location(True)
2663
def get_old_bound_location(self):
2664
"""See Branch.get_old_bound_location"""
2665
return self._get_bound_location(False)
2667
def get_stacked_on_url(self):
2668
# you can always ask for the URL; but you might not be able to use it
2669
# if the repo can't support stacking.
2670
## self._check_stackable_repo()
2671
stacked_url = self._get_config_location('stacked_on_location')
2672
if stacked_url is None:
2673
raise errors.NotStacked(self)
2676
def _get_append_revisions_only(self):
2677
value = self.get_config().get_user_option('append_revisions_only')
2678
return value == 'True'
2681
def generate_revision_history(self, revision_id, last_rev=None,
2683
"""See BzrBranch5.generate_revision_history"""
2684
history = self._lefthand_history(revision_id, last_rev, other_branch)
2685
revno = len(history)
2686
self.set_last_revision_info(revno, revision_id)
2689
def get_rev_id(self, revno, history=None):
2690
"""Find the revision id of the specified revno."""
2692
return _mod_revision.NULL_REVISION
2694
last_revno, last_revision_id = self.last_revision_info()
2695
if revno <= 0 or revno > last_revno:
2696
raise errors.NoSuchRevision(self, revno)
2698
if history is not None:
2699
return history[revno - 1]
2701
index = last_revno - revno
2702
if len(self._partial_revision_history_cache) <= index:
2703
self._extend_partial_history(stop_index=index)
2704
if len(self._partial_revision_history_cache) > index:
2705
return self._partial_revision_history_cache[index]
2707
raise errors.NoSuchRevision(self, revno)
2710
def revision_id_to_revno(self, revision_id):
2711
"""Given a revision id, return its revno"""
2712
if _mod_revision.is_null(revision_id):
2715
index = self._partial_revision_history_cache.index(revision_id)
2717
self._extend_partial_history(stop_revision=revision_id)
2718
index = len(self._partial_revision_history_cache) - 1
2719
if self._partial_revision_history_cache[index] != revision_id:
2720
raise errors.NoSuchRevision(self, revision_id)
2721
return self.revno() - index
2724
class BzrBranch7(BzrBranch8):
2725
"""A branch with support for a fallback repository."""
2727
def set_reference_info(self, file_id, tree_path, branch_location):
2728
Branch.set_reference_info(self, file_id, tree_path, branch_location)
2730
def get_reference_info(self, file_id):
2731
Branch.get_reference_info(self, file_id)
2733
def reference_parent(self, file_id, path, possible_transports=None):
2734
return Branch.reference_parent(self, file_id, path,
2735
possible_transports)
2738
class BzrBranch6(BzrBranch7):
2739
"""See BzrBranchFormat6 for the capabilities of this branch.
2741
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
1279
def __init__(self, files=[], dirs=[], base=None):
1280
"""Make a test branch.
1282
This creates a temporary directory and runs init-tree in it.
1284
If any files are listed, they are created in the working copy.
1286
from tempfile import mkdtemp
1291
Branch.__init__(self, base, init=init)
1293
os.mkdir(self.abspath(d))
1296
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1301
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1305
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1308
from shutil import copytree
1309
from tempfile import mkdtemp
1312
copytree(self.base, base, symlinks=True)
1313
return ScratchBranch(base=base)
1319
"""Destroy the test branch, removing the scratch directory."""
1320
from shutil import rmtree
1323
mutter("delete ScratchBranch %s" % self.base)
1326
# Work around for shutil.rmtree failing on Windows when
1327
# readonly files are encountered
1328
mutter("hit exception in destroying ScratchBranch: %s" % e)
1329
for root, dirs, files in os.walk(self.base, topdown=False):
1331
os.chmod(os.path.join(root, name), 0700)
2745
def get_stacked_on_url(self):
2746
raise errors.UnstackableBranchFormat(self._format, self.base)
1337
2749
######################################################################
1341
def is_control_file(filename):
1342
## FIXME: better check
1343
filename = os.path.normpath(filename)
1344
while filename != '':
1345
head, tail = os.path.split(filename)
1346
## mutter('check %r for control file' % ((head, tail), ))
1347
if tail == bzrlib.BZRDIR:
1349
if filename == head:
1356
def gen_file_id(name):
1357
"""Return new file id.
1359
This should probably generate proper UUIDs, but for the moment we
1360
cope with just randomness because running uuidgen every time is
1363
from binascii import hexlify
1364
from time import time
1366
# get last component
1367
idx = name.rfind('/')
1369
name = name[idx+1 : ]
1370
idx = name.rfind('\\')
1372
name = name[idx+1 : ]
1374
# make it not a hidden file
1375
name = name.lstrip('.')
1377
# remove any wierd characters; we don't escape them but rather
1378
# just pull them out
1379
name = re.sub(r'[^\w.]', '', name)
1381
s = hexlify(rand_bytes(8))
1382
return '-'.join((name, compact_date(time()), s))
1386
"""Return a new tree-root file id."""
1387
return gen_file_id('TREE_ROOT')
2750
# results of operations
2753
class _Result(object):
2755
def _show_tag_conficts(self, to_file):
2756
if not getattr(self, 'tag_conflicts', None):
2758
to_file.write('Conflicting tags:\n')
2759
for name, value1, value2 in self.tag_conflicts:
2760
to_file.write(' %s\n' % (name, ))
2763
class PullResult(_Result):
2764
"""Result of a Branch.pull operation.
2766
:ivar old_revno: Revision number before pull.
2767
:ivar new_revno: Revision number after pull.
2768
:ivar old_revid: Tip revision id before pull.
2769
:ivar new_revid: Tip revision id after pull.
2770
:ivar source_branch: Source (local) branch object. (read locked)
2771
:ivar master_branch: Master branch of the target, or the target if no
2773
:ivar local_branch: target branch if there is a Master, else None
2774
:ivar target_branch: Target/destination branch object. (write locked)
2775
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2779
# DEPRECATED: pull used to return the change in revno
2780
return self.new_revno - self.old_revno
2782
def report(self, to_file):
2784
if self.old_revid == self.new_revid:
2785
to_file.write('No revisions to pull.\n')
2787
to_file.write('Now on revision %d.\n' % self.new_revno)
2788
self._show_tag_conficts(to_file)
2791
class BranchPushResult(_Result):
2792
"""Result of a Branch.push operation.
2794
:ivar old_revno: Revision number (eg 10) of the target before push.
2795
:ivar new_revno: Revision number (eg 12) of the target after push.
2796
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
2798
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
2800
:ivar source_branch: Source branch object that the push was from. This is
2801
read locked, and generally is a local (and thus low latency) branch.
2802
:ivar master_branch: If target is a bound branch, the master branch of
2803
target, or target itself. Always write locked.
2804
:ivar target_branch: The direct Branch where data is being sent (write
2806
:ivar local_branch: If the target is a bound branch this will be the
2807
target, otherwise it will be None.
2811
# DEPRECATED: push used to return the change in revno
2812
return self.new_revno - self.old_revno
2814
def report(self, to_file):
2815
"""Write a human-readable description of the result."""
2816
if self.old_revid == self.new_revid:
2817
note('No new revisions to push.')
2819
note('Pushed up to revision %d.' % self.new_revno)
2820
self._show_tag_conficts(to_file)
2823
class BranchCheckResult(object):
2824
"""Results of checking branch consistency.
2829
def __init__(self, branch):
2830
self.branch = branch
2833
def report_results(self, verbose):
2834
"""Report the check results via trace.note.
2836
:param verbose: Requests more detailed display of what was checked,
2839
note('checked branch %s format %s', self.branch.base,
2840
self.branch._format)
2841
for error in self.errors:
2842
note('found error:%s', error)
2845
class Converter5to6(object):
2846
"""Perform an in-place upgrade of format 5 to format 6"""
2848
def convert(self, branch):
2849
# Data for 5 and 6 can peacefully coexist.
2850
format = BzrBranchFormat6()
2851
new_branch = format.open(branch.bzrdir, _found=True)
2853
# Copy source data into target
2854
new_branch._write_last_revision_info(*branch.last_revision_info())
2855
new_branch.set_parent(branch.get_parent())
2856
new_branch.set_bound_location(branch.get_bound_location())
2857
new_branch.set_push_location(branch.get_push_location())
2859
# New branch has no tags by default
2860
new_branch.tags._set_tag_dict({})
2862
# Copying done; now update target format
2863
new_branch._transport.put_bytes('format',
2864
format.get_format_string(),
2865
mode=new_branch.bzrdir._get_file_mode())
2867
# Clean up old files
2868
new_branch._transport.delete('revision-history')
2870
branch.set_parent(None)
2871
except errors.NoSuchFile:
2873
branch.set_bound_location(None)
2876
class Converter6to7(object):
2877
"""Perform an in-place upgrade of format 6 to format 7"""
2879
def convert(self, branch):
2880
format = BzrBranchFormat7()
2881
branch._set_config_location('stacked_on_location', '')
2882
# update target format
2883
branch._transport.put_bytes('format', format.get_format_string())
2886
class Converter7to8(object):
2887
"""Perform an in-place upgrade of format 6 to format 7"""
2889
def convert(self, branch):
2890
format = BzrBranchFormat8()
2891
branch._transport.put_bytes('references', '')
2892
# update target format
2893
branch._transport.put_bytes('format', format.get_format_string())
2896
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2897
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2900
_run_with_write_locked_target will attempt to release the lock it acquires.
2902
If an exception is raised by callable, then that exception *will* be
2903
propagated, even if the unlock attempt raises its own error. Thus
2904
_run_with_write_locked_target should be preferred to simply doing::
2908
return callable(*args, **kwargs)
2913
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2914
# should share code?
2917
result = callable(*args, **kwargs)
2919
exc_info = sys.exc_info()
2923
raise exc_info[0], exc_info[1], exc_info[2]
2929
class InterBranch(InterObject):
2930
"""This class represents operations taking place between two branches.
2932
Its instances have methods like pull() and push() and contain
2933
references to the source and target repositories these operations
2934
can be carried out on.
2938
"""The available optimised InterBranch types."""
2941
def _get_branch_formats_to_test():
2942
"""Return a tuple with the Branch formats to use when testing."""
2943
raise NotImplementedError(InterBranch._get_branch_formats_to_test)
2945
def pull(self, overwrite=False, stop_revision=None,
2946
possible_transports=None, local=False):
2947
"""Mirror source into target branch.
2949
The target branch is considered to be 'local', having low latency.
2951
:returns: PullResult instance
2953
raise NotImplementedError(self.pull)
2955
def update_revisions(self, stop_revision=None, overwrite=False,
2957
"""Pull in new perfect-fit revisions.
2959
:param stop_revision: Updated until the given revision
2960
:param overwrite: Always set the branch pointer, rather than checking
2961
to see if it is a proper descendant.
2962
:param graph: A Graph object that can be used to query history
2963
information. This can be None.
2966
raise NotImplementedError(self.update_revisions)
2968
def push(self, overwrite=False, stop_revision=None,
2969
_override_hook_source_branch=None):
2970
"""Mirror the source branch into the target branch.
2972
The source branch is considered to be 'local', having low latency.
2974
raise NotImplementedError(self.push)
2977
class GenericInterBranch(InterBranch):
2978
"""InterBranch implementation that uses public Branch functions.
2982
def _get_branch_formats_to_test():
2983
return BranchFormat._default_format, BranchFormat._default_format
2985
def update_revisions(self, stop_revision=None, overwrite=False,
2987
"""See InterBranch.update_revisions()."""
2988
self.source.lock_read()
2990
other_revno, other_last_revision = self.source.last_revision_info()
2991
stop_revno = None # unknown
2992
if stop_revision is None:
2993
stop_revision = other_last_revision
2994
if _mod_revision.is_null(stop_revision):
2995
# if there are no commits, we're done.
2997
stop_revno = other_revno
2999
# what's the current last revision, before we fetch [and change it
3001
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3002
# we fetch here so that we don't process data twice in the common
3003
# case of having something to pull, and so that the check for
3004
# already merged can operate on the just fetched graph, which will
3005
# be cached in memory.
3006
self.target.fetch(self.source, stop_revision)
3007
# Check to see if one is an ancestor of the other
3010
graph = self.target.repository.get_graph()
3011
if self.target._check_if_descendant_or_diverged(
3012
stop_revision, last_rev, graph, self.source):
3013
# stop_revision is a descendant of last_rev, but we aren't
3014
# overwriting, so we're done.
3016
if stop_revno is None:
3018
graph = self.target.repository.get_graph()
3019
this_revno, this_last_revision = \
3020
self.target.last_revision_info()
3021
stop_revno = graph.find_distance_to_null(stop_revision,
3022
[(other_last_revision, other_revno),
3023
(this_last_revision, this_revno)])
3024
self.target.set_last_revision_info(stop_revno, stop_revision)
3026
self.source.unlock()
3028
def pull(self, overwrite=False, stop_revision=None,
3029
possible_transports=None, _hook_master=None, run_hooks=True,
3030
_override_hook_target=None, local=False):
3033
:param _hook_master: Private parameter - set the branch to
3034
be supplied as the master to pull hooks.
3035
:param run_hooks: Private parameter - if false, this branch
3036
is being called because it's the master of the primary branch,
3037
so it should not run its hooks.
3038
:param _override_hook_target: Private parameter - set the branch to be
3039
supplied as the target_branch to pull hooks.
3040
:param local: Only update the local branch, and not the bound branch.
3042
# This type of branch can't be bound.
3044
raise errors.LocalRequiresBoundBranch()
3045
result = PullResult()
3046
result.source_branch = self.source
3047
if _override_hook_target is None:
3048
result.target_branch = self.target
3050
result.target_branch = _override_hook_target
3051
self.source.lock_read()
3053
# We assume that during 'pull' the target repository is closer than
3055
self.source.update_references(self.target)
3056
graph = self.target.repository.get_graph(self.source.repository)
3057
# TODO: Branch formats should have a flag that indicates
3058
# that revno's are expensive, and pull() should honor that flag.
3060
result.old_revno, result.old_revid = \
3061
self.target.last_revision_info()
3062
self.target.update_revisions(self.source, stop_revision,
3063
overwrite=overwrite, graph=graph)
3064
# TODO: The old revid should be specified when merging tags,
3065
# so a tags implementation that versions tags can only
3066
# pull in the most recent changes. -- JRV20090506
3067
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3069
result.new_revno, result.new_revid = self.target.last_revision_info()
3071
result.master_branch = _hook_master
3072
result.local_branch = result.target_branch
3074
result.master_branch = result.target_branch
3075
result.local_branch = None
3077
for hook in Branch.hooks['post_pull']:
3080
self.source.unlock()
3083
def push(self, overwrite=False, stop_revision=None,
3084
_override_hook_source_branch=None):
3085
"""See InterBranch.push.
3087
This is the basic concrete implementation of push()
3089
:param _override_hook_source_branch: If specified, run
3090
the hooks passing this Branch as the source, rather than self.
3091
This is for use of RemoteBranch, where push is delegated to the
3092
underlying vfs-based Branch.
3094
# TODO: Public option to disable running hooks - should be trivial but
3096
self.source.lock_read()
3098
return _run_with_write_locked_target(
3099
self.target, self._push_with_bound_branches, overwrite,
3101
_override_hook_source_branch=_override_hook_source_branch)
3103
self.source.unlock()
3105
def _push_with_bound_branches(self, overwrite, stop_revision,
3106
_override_hook_source_branch=None):
3107
"""Push from source into target, and into target's master if any.
3110
if _override_hook_source_branch:
3111
result.source_branch = _override_hook_source_branch
3112
for hook in Branch.hooks['post_push']:
3115
bound_location = self.target.get_bound_location()
3116
if bound_location and self.target.base != bound_location:
3117
# there is a master branch.
3119
# XXX: Why the second check? Is it even supported for a branch to
3120
# be bound to itself? -- mbp 20070507
3121
master_branch = self.target.get_master_branch()
3122
master_branch.lock_write()
3124
# push into the master from the source branch.
3125
self.source._basic_push(master_branch, overwrite, stop_revision)
3126
# and push into the target branch from the source. Note that we
3127
# push from the source branch again, because its considered the
3128
# highest bandwidth repository.
3129
result = self.source._basic_push(self.target, overwrite,
3131
result.master_branch = master_branch
3132
result.local_branch = self.target
3136
master_branch.unlock()
3139
result = self.source._basic_push(self.target, overwrite,
3141
# TODO: Why set master_branch and local_branch if there's no
3142
# binding? Maybe cleaner to just leave them unset? -- mbp
3144
result.master_branch = self.target
3145
result.local_branch = None
3150
def is_compatible(self, source, target):
3151
# GenericBranch uses the public API, so always compatible
3155
class InterToBranch5(GenericInterBranch):
3158
def _get_branch_formats_to_test():
3159
return BranchFormat._default_format, BzrBranchFormat5()
3161
def pull(self, overwrite=False, stop_revision=None,
3162
possible_transports=None, run_hooks=True,
3163
_override_hook_target=None, local=False):
3164
"""Pull from source into self, updating my master if any.
3166
:param run_hooks: Private parameter - if false, this branch
3167
is being called because it's the master of the primary branch,
3168
so it should not run its hooks.
3170
bound_location = self.target.get_bound_location()
3171
if local and not bound_location:
3172
raise errors.LocalRequiresBoundBranch()
3173
master_branch = None
3174
if not local and bound_location and self.source.base != bound_location:
3175
# not pulling from master, so we need to update master.
3176
master_branch = self.target.get_master_branch(possible_transports)
3177
master_branch.lock_write()
3180
# pull from source into master.
3181
master_branch.pull(self.source, overwrite, stop_revision,
3183
return super(InterToBranch5, self).pull(overwrite,
3184
stop_revision, _hook_master=master_branch,
3185
run_hooks=run_hooks,
3186
_override_hook_target=_override_hook_target)
3189
master_branch.unlock()
3192
InterBranch.register_optimiser(GenericInterBranch)
3193
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
