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._last_revision_info_cache = None
95
self._merge_sorted_revisions_cache = None
97
hooks = Branch.hooks['open']
101
def _open_hook(self):
102
"""Called by init to allow simpler extension of the base class."""
104
def _activate_fallback_location(self, url, lock_style):
105
"""Activate the branch/repository from url as a fallback repository."""
106
repo = self._get_fallback_repository(url)
107
if lock_style == 'write':
109
elif lock_style == 'read':
111
self.repository.add_fallback_repository(repo)
113
def break_lock(self):
114
"""Break a lock if one is present from another instance.
116
Uses the ui factory to ask for confirmation if the lock may be from
119
This will probe the repository for its lock as well.
121
self.control_files.break_lock()
122
self.repository.break_lock()
123
master = self.get_master_branch()
124
if master is not None:
127
def _check_stackable_repo(self):
128
if not self.repository._format.supports_external_lookups:
129
raise errors.UnstackableRepositoryFormat(self.repository._format,
130
self.repository.base)
133
def open(base, _unsupported=False, possible_transports=None):
134
"""Open the branch rooted at base.
136
For instance, if the branch is at URL/.bzr/branch,
137
Branch.open(URL) -> a Branch instance.
139
control = bzrdir.BzrDir.open(base, _unsupported,
140
possible_transports=possible_transports)
141
return control.open_branch(_unsupported)
144
def open_from_transport(transport, _unsupported=False):
145
"""Open the branch rooted at transport"""
146
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
147
return control.open_branch(_unsupported)
150
def open_containing(url, possible_transports=None):
151
"""Open an existing branch which contains url.
153
This probes for a branch at url, and searches upwards from there.
155
Basically we keep looking up until we find the control directory or
156
run into the root. If there isn't one, raises NotBranchError.
157
If there is one and it is either an unrecognised format or an unsupported
158
format, UnknownFormatError or UnsupportedFormatError are raised.
159
If there is one, it is returned, along with the unused portion of url.
161
control, relpath = bzrdir.BzrDir.open_containing(url,
163
return control.open_branch(), relpath
165
def _push_should_merge_tags(self):
166
"""Should _basic_push merge this branch's tags into the target?
168
The default implementation returns False if this branch has no tags,
169
and True the rest of the time. Subclasses may override this.
171
return self.supports_tags() and self.tags.get_tag_dict()
173
def get_config(self):
174
return BranchConfig(self)
176
def _get_config(self):
177
"""Get the concrete config for just the config in this branch.
179
This is not intended for client use; see Branch.get_config for the
184
:return: An object supporting get_option and set_option.
186
raise NotImplementedError(self._get_config)
188
def _get_fallback_repository(self, url):
189
"""Get the repository we fallback to at url."""
190
url = urlutils.join(self.base, url)
191
a_bzrdir = bzrdir.BzrDir.open(url,
192
possible_transports=[self.bzrdir.root_transport])
193
return a_bzrdir.open_branch().repository
195
def _get_tags_bytes(self):
196
"""Get the bytes of a serialised tags dict.
198
Note that not all branches support tags, nor do all use the same tags
199
logic: this method is specific to BasicTags. Other tag implementations
200
may use the same method name and behave differently, safely, because
201
of the double-dispatch via
202
format.make_tags->tags_instance->get_tags_dict.
204
:return: The bytes of the tags file.
205
:seealso: Branch._set_tags_bytes.
207
return self._transport.get_bytes('tags')
209
def _get_nick(self, local=False, possible_transports=None):
210
config = self.get_config()
211
# explicit overrides master, but don't look for master if local is True
212
if not local and not config.has_explicit_nickname():
214
master = self.get_master_branch(possible_transports)
215
if master is not None:
216
# return the master branch value
218
except errors.BzrError, e:
219
# Silently fall back to local implicit nick if the master is
221
mutter("Could not connect to bound branch, "
222
"falling back to local nick.\n " + str(e))
223
return config.get_nickname()
225
def _set_nick(self, nick):
226
self.get_config().set_user_option('nickname', nick, warn_masked=True)
228
nick = property(_get_nick, _set_nick)
231
raise NotImplementedError(self.is_locked)
233
def _lefthand_history(self, revision_id, last_rev=None,
235
if 'evil' in debug.debug_flags:
236
mutter_callsite(4, "_lefthand_history scales with history.")
237
# stop_revision must be a descendant of last_revision
238
graph = self.repository.get_graph()
239
if last_rev is not None:
240
if not graph.is_ancestor(last_rev, revision_id):
241
# our previous tip is not merged into stop_revision
242
raise errors.DivergedBranches(self, other_branch)
243
# make a new revision history from the graph
244
parents_map = graph.get_parent_map([revision_id])
245
if revision_id not in parents_map:
246
raise errors.NoSuchRevision(self, revision_id)
247
current_rev_id = revision_id
249
check_not_reserved_id = _mod_revision.check_not_reserved_id
250
# Do not include ghosts or graph origin in revision_history
251
while (current_rev_id in parents_map and
252
len(parents_map[current_rev_id]) > 0):
253
check_not_reserved_id(current_rev_id)
254
new_history.append(current_rev_id)
255
current_rev_id = parents_map[current_rev_id][0]
256
parents_map = graph.get_parent_map([current_rev_id])
257
new_history.reverse()
212
260
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'
261
raise NotImplementedError(self.lock_write)
228
263
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'
264
raise NotImplementedError(self.lock_read)
242
266
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
267
raise NotImplementedError(self.unlock)
269
def peek_lock_mode(self):
270
"""Return lock mode for the Branch: 'r', 'w' or None"""
271
raise NotImplementedError(self.peek_lock_mode)
273
def get_physical_lock_status(self):
274
raise NotImplementedError(self.get_physical_lock_status)
277
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
278
"""Return the revision_id for a dotted revno.
280
:param revno: a tuple like (1,) or (1,1,2)
281
:param _cache_reverse: a private parameter enabling storage
282
of the reverse mapping in a top level cache. (This should
283
only be done in selective circumstances as we want to
284
avoid having the mapping cached multiple times.)
285
:return: the revision_id
286
:raises errors.NoSuchRevision: if the revno doesn't exist
288
rev_id = self._do_dotted_revno_to_revision_id(revno)
290
self._partial_revision_id_to_revno_cache[rev_id] = revno
293
def _do_dotted_revno_to_revision_id(self, revno):
294
"""Worker function for dotted_revno_to_revision_id.
296
Subclasses should override this if they wish to
297
provide a more efficient implementation.
300
return self.get_rev_id(revno[0])
301
revision_id_to_revno = self.get_revision_id_to_revno_map()
302
revision_ids = [revision_id for revision_id, this_revno
303
in revision_id_to_revno.iteritems()
304
if revno == this_revno]
305
if len(revision_ids) == 1:
306
return revision_ids[0]
308
revno_str = '.'.join(map(str, revno))
309
raise errors.NoSuchRevision(self, revno_str)
312
def revision_id_to_dotted_revno(self, revision_id):
313
"""Given a revision id, return its dotted revno.
315
:return: a tuple like (1,) or (400,1,3).
317
return self._do_revision_id_to_dotted_revno(revision_id)
319
def _do_revision_id_to_dotted_revno(self, revision_id):
320
"""Worker function for revision_id_to_revno."""
321
# Try the caches if they are loaded
322
result = self._partial_revision_id_to_revno_cache.get(revision_id)
323
if result is not None:
325
if self._revision_id_to_revno_cache:
326
result = self._revision_id_to_revno_cache.get(revision_id)
328
raise errors.NoSuchRevision(self, revision_id)
329
# Try the mainline as it's optimised
331
revno = self.revision_id_to_revno(revision_id)
333
except errors.NoSuchRevision:
334
# We need to load and use the full revno map after all
335
result = self.get_revision_id_to_revno_map().get(revision_id)
337
raise errors.NoSuchRevision(self, revision_id)
341
def get_revision_id_to_revno_map(self):
342
"""Return the revision_id => dotted revno map.
344
This will be regenerated on demand, but will be cached.
346
:return: A dictionary mapping revision_id => dotted revno.
347
This dictionary should not be modified by the caller.
349
if self._revision_id_to_revno_cache is not None:
350
mapping = self._revision_id_to_revno_cache
352
mapping = self._gen_revno_map()
353
self._cache_revision_id_to_revno(mapping)
354
# TODO: jam 20070417 Since this is being cached, should we be returning
356
# I would rather not, and instead just declare that users should not
357
# modify the return value.
360
def _gen_revno_map(self):
361
"""Create a new mapping from revision ids to dotted revnos.
363
Dotted revnos are generated based on the current tip in the revision
365
This is the worker function for get_revision_id_to_revno_map, which
366
just caches the return value.
368
:return: A dictionary mapping revision_id => dotted revno.
370
revision_id_to_revno = dict((rev_id, revno)
371
for rev_id, depth, revno, end_of_merge
372
in self.iter_merge_sorted_revisions())
373
return revision_id_to_revno
376
def iter_merge_sorted_revisions(self, start_revision_id=None,
377
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
378
"""Walk the revisions for a branch in merge sorted order.
380
Merge sorted order is the output from a merge-aware,
381
topological sort, i.e. all parents come before their
382
children going forward; the opposite for reverse.
384
:param start_revision_id: the revision_id to begin walking from.
385
If None, the branch tip is used.
386
:param stop_revision_id: the revision_id to terminate the walk
387
after. If None, the rest of history is included.
388
:param stop_rule: if stop_revision_id is not None, the precise rule
389
to use for termination:
390
* 'exclude' - leave the stop revision out of the result (default)
391
* 'include' - the stop revision is the last item in the result
392
* 'with-merges' - include the stop revision and all of its
393
merged revisions in the result
394
:param direction: either 'reverse' or 'forward':
395
* reverse means return the start_revision_id first, i.e.
396
start at the most recent revision and go backwards in history
397
* forward returns tuples in the opposite order to reverse.
398
Note in particular that forward does *not* do any intelligent
399
ordering w.r.t. depth as some clients of this API may like.
400
(If required, that ought to be done at higher layers.)
402
:return: an iterator over (revision_id, depth, revno, end_of_merge)
405
* revision_id: the unique id of the revision
406
* depth: How many levels of merging deep this node has been
408
* revno_sequence: This field provides a sequence of
409
revision numbers for all revisions. The format is:
410
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
411
branch that the revno is on. From left to right the REVNO numbers
412
are the sequence numbers within that branch of the revision.
413
* end_of_merge: When True the next node (earlier in history) is
414
part of a different merge.
416
# Note: depth and revno values are in the context of the branch so
417
# we need the full graph to get stable numbers, regardless of the
419
if self._merge_sorted_revisions_cache is None:
420
last_revision = self.last_revision()
421
graph = self.repository.get_graph()
422
parent_map = dict(((key, value) for key, value in
423
graph.iter_ancestry([last_revision]) if value is not None))
424
revision_graph = repository._strip_NULL_ghosts(parent_map)
425
revs = tsort.merge_sort(revision_graph, last_revision, None,
427
# Drop the sequence # before caching
428
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
430
filtered = self._filter_merge_sorted_revisions(
431
self._merge_sorted_revisions_cache, start_revision_id,
432
stop_revision_id, stop_rule)
433
if direction == 'reverse':
435
if direction == 'forward':
436
return reversed(list(filtered))
438
raise ValueError('invalid direction %r' % direction)
440
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
441
start_revision_id, stop_revision_id, stop_rule):
442
"""Iterate over an inclusive range of sorted revisions."""
443
rev_iter = iter(merge_sorted_revisions)
444
if start_revision_id is not None:
445
for rev_id, depth, revno, end_of_merge in rev_iter:
446
if rev_id != start_revision_id:
449
# The decision to include the start or not
450
# depends on the stop_rule if a stop is provided
452
iter([(rev_id, depth, revno, end_of_merge)]),
455
if stop_revision_id is None:
456
for rev_id, depth, revno, end_of_merge in rev_iter:
457
yield rev_id, depth, revno, end_of_merge
458
elif stop_rule == 'exclude':
459
for rev_id, depth, revno, end_of_merge in rev_iter:
460
if rev_id == stop_revision_id:
462
yield rev_id, depth, revno, end_of_merge
463
elif stop_rule == 'include':
464
for rev_id, depth, revno, end_of_merge in rev_iter:
465
yield rev_id, depth, revno, end_of_merge
466
if rev_id == stop_revision_id:
468
elif stop_rule == 'with-merges':
469
stop_rev = self.repository.get_revision(stop_revision_id)
470
if stop_rev.parent_ids:
471
left_parent = stop_rev.parent_ids[0]
473
left_parent = _mod_revision.NULL_REVISION
474
for rev_id, depth, revno, end_of_merge in rev_iter:
475
if rev_id == left_parent:
477
yield rev_id, depth, revno, end_of_merge
479
raise ValueError('invalid stop_rule %r' % stop_rule)
481
def leave_lock_in_place(self):
482
"""Tell this branch object not to release the physical lock when this
485
If lock_write doesn't return a token, then this method is not supported.
487
self.control_files.leave_in_place()
489
def dont_leave_lock_in_place(self):
490
"""Tell this branch object to release the physical lock when this
491
object is unlocked, even if it didn't originally acquire it.
493
If lock_write doesn't return a token, then this method is not supported.
495
self.control_files.dont_leave_in_place()
497
def bind(self, other):
498
"""Bind the local branch the other branch.
500
:param other: The branch to bind to
503
raise errors.UpgradeRequired(self.base)
505
def set_reference_info(self, file_id, tree_path, branch_location):
506
"""Set the branch location to use for a tree reference."""
507
raise errors.UnsupportedOperation(self.set_reference_info, self)
509
def get_reference_info(self, file_id):
510
"""Get the tree_path and branch_location for a tree reference."""
511
raise errors.UnsupportedOperation(self.get_reference_info, self)
514
def fetch(self, from_branch, last_revision=None, pb=None):
515
"""Copy revisions from from_branch into this branch.
517
:param from_branch: Where to copy from.
518
:param last_revision: What revision to stop at (None for at the end
520
:param pb: An optional progress bar to use.
523
if self.base == from_branch.base:
526
symbol_versioning.warn(
527
symbol_versioning.deprecated_in((1, 14, 0))
528
% "pb parameter to fetch()")
529
from_branch.lock_read()
531
if last_revision is None:
532
last_revision = from_branch.last_revision()
533
last_revision = _mod_revision.ensure_null(last_revision)
534
return self.repository.fetch(from_branch.repository,
535
revision_id=last_revision,
540
def get_bound_location(self):
541
"""Return the URL of the branch we are bound to.
543
Older format branches cannot bind, please be sure to use a metadir
548
def get_old_bound_location(self):
549
"""Return the URL of the branch we used to be bound to
551
raise errors.UpgradeRequired(self.base)
553
def get_commit_builder(self, parents, config=None, timestamp=None,
554
timezone=None, committer=None, revprops=None,
556
"""Obtain a CommitBuilder for this branch.
558
:param parents: Revision ids of the parents of the new revision.
559
:param config: Optional configuration to use.
560
:param timestamp: Optional timestamp recorded for commit.
561
:param timezone: Optional timezone for timestamp.
562
:param committer: Optional committer to set for commit.
563
:param revprops: Optional dictionary of revision properties.
564
:param revision_id: Optional revision id.
568
config = self.get_config()
570
return self.repository.get_commit_builder(self, parents, config,
571
timestamp, timezone, committer, revprops, revision_id)
573
def get_master_branch(self, possible_transports=None):
574
"""Return the branch we are bound to.
576
:return: Either a Branch, or None
617
580
def get_revision_delta(self, revno):
618
581
"""Return the delta for one revision.
789
786
common_index = min(self_len, other_len) -1
790
787
if common_index >= 0 and \
791
788
self_history[common_index] != other_history[common_index]:
792
raise DivergedBranches(self, other)
789
raise errors.DivergedBranches(self, other)
794
791
if stop_revision is None:
795
792
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
794
if stop_revision > other_len:
795
raise errors.NoSuchRevision(self, stop_revision)
799
796
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)
799
def update_revisions(self, other, stop_revision=None, overwrite=False,
801
"""Pull in new perfect-fit revisions.
803
:param other: Another Branch to pull from
804
:param stop_revision: Updated until the given revision
805
:param overwrite: Always set the branch pointer, rather than checking
806
to see if it is a proper descendant.
807
:param graph: A Graph object that can be used to query history
808
information. This can be None.
811
return InterBranch.get(other, self).update_revisions(stop_revision,
814
def import_last_revision_info(self, source_repo, revno, revid):
815
"""Set the last revision info, importing from another repo if necessary.
817
This is used by the bound branch code to upload a revision to
818
the master branch first before updating the tip of the local branch.
820
:param source_repo: Source repository to optionally fetch from
821
:param revno: Revision number of the new tip
822
:param revid: Revision id of the new tip
824
if not self.repository.has_same_location(source_repo):
825
self.repository.fetch(source_repo, revision_id=revid)
826
self.set_last_revision_info(revno, revid)
828
def revision_id_to_revno(self, revision_id):
829
"""Given a revision id, return its revno"""
830
if _mod_revision.is_null(revision_id):
832
history = self.revision_history()
834
return history.index(revision_id) + 1
893
835
except ValueError:
836
raise errors.NoSuchRevision(self, revision_id)
838
def get_rev_id(self, revno, history=None):
839
"""Find the revision id of the specified revno."""
841
return _mod_revision.NULL_REVISION
843
history = self.revision_history()
844
if revno <= 0 or revno > len(history):
845
raise errors.NoSuchRevision(self, revno)
846
return history[revno - 1]
848
def pull(self, source, overwrite=False, stop_revision=None,
849
possible_transports=None, _override_hook_target=None):
850
"""Mirror source into this branch.
852
This branch is considered to be 'local', having low latency.
854
:returns: PullResult instance
856
raise NotImplementedError(self.pull)
858
def push(self, target, overwrite=False, stop_revision=None):
859
"""Mirror this branch into target.
861
This branch is considered to be 'local', having low latency.
863
raise NotImplementedError(self.push)
865
def basis_tree(self):
866
"""Return `Tree` object for last revision."""
867
return self.repository.revision_tree(self.last_revision())
869
def get_parent(self):
870
"""Return the parent location of the branch.
872
This is the default location for pull/missing. The usual
873
pattern is that the user can override it by specifying a
876
parent = self._get_parent_location()
879
# This is an old-format absolute path to a local branch
881
if parent.startswith('/'):
882
parent = urlutils.local_path_to_url(parent.decode('utf8'))
884
return urlutils.join(self.base[:-1], parent)
885
except errors.InvalidURLJoin, e:
886
raise errors.InaccessibleParent(parent, self.base)
888
def _get_parent_location(self):
889
raise NotImplementedError(self._get_parent_location)
891
def _set_config_location(self, name, url, config=None,
892
make_relative=False):
894
config = self.get_config()
898
url = urlutils.relative_url(self.base, url)
899
config.set_user_option(name, url, warn_masked=True)
901
def _get_config_location(self, name, config=None):
903
config = self.get_config()
904
location = config.get_user_option(name)
909
def get_submit_branch(self):
910
"""Return the submit location of the branch.
912
This is the default location for bundle. The usual
913
pattern is that the user can override it by specifying a
916
return self.get_config().get_user_option('submit_branch')
918
def set_submit_branch(self, location):
919
"""Return the submit location of the branch.
921
This is the default location for bundle. The usual
922
pattern is that the user can override it by specifying a
925
self.get_config().set_user_option('submit_branch', location,
928
def get_public_branch(self):
929
"""Return the public location of the branch.
931
This is used by merge directives.
933
return self._get_config_location('public_branch')
935
def set_public_branch(self, location):
936
"""Return the submit location of the branch.
938
This is the default location for bundle. The usual
939
pattern is that the user can override it by specifying a
942
self._set_config_location('public_branch', location)
944
def get_push_location(self):
945
"""Return the None or the location to push this branch to."""
946
push_loc = self.get_config().get_user_option('push_location')
949
def set_push_location(self, location):
950
"""Set a new push location for this branch."""
951
raise NotImplementedError(self.set_push_location)
953
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
954
"""Run the post_change_branch_tip hooks."""
955
hooks = Branch.hooks['post_change_branch_tip']
958
new_revno, new_revid = self.last_revision_info()
959
params = ChangeBranchTipParams(
960
self, old_revno, new_revno, old_revid, new_revid)
964
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
965
"""Run the pre_change_branch_tip hooks."""
966
hooks = Branch.hooks['pre_change_branch_tip']
969
old_revno, old_revid = self.last_revision_info()
970
params = ChangeBranchTipParams(
971
self, old_revno, new_revno, old_revid, new_revid)
975
except errors.TipChangeRejected:
978
exc_info = sys.exc_info()
979
hook_name = Branch.hooks.get_hook_name(hook)
980
raise errors.HookFailed(
981
'pre_change_branch_tip', hook_name, exc_info)
985
"""Synchronise this branch with the master branch if any.
987
:return: None or the last_revision pivoted out during the update.
991
def check_revno(self, revno):
993
Check whether a revno corresponds to any revision.
994
Zero (the NULL revision) is considered valid.
997
self.check_real_revno(revno)
999
def check_real_revno(self, revno):
1001
Check whether a revno corresponds to a real revision.
1002
Zero (the NULL revision) is considered invalid
1004
if revno < 1 or revno > self.revno():
1005
raise errors.InvalidRevisionNumber(revno)
1008
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
1009
"""Clone this branch into to_bzrdir preserving all semantic values.
1011
Most API users will want 'create_clone_on_transport', which creates a
1012
new bzrdir and branch on the fly.
1014
revision_id: if not None, the revision history in the new branch will
1015
be truncated to end with revision_id.
1017
result = to_bzrdir.create_branch()
1020
if repository_policy is not None:
1021
repository_policy.configure_branch(result)
1022
self.copy_content_into(result, revision_id=revision_id)
1028
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
1029
"""Create a new line of development from the branch, into to_bzrdir.
1031
to_bzrdir controls the branch format.
1033
revision_id: if not None, the revision history in the new branch will
1034
be truncated to end with revision_id.
1036
result = to_bzrdir.create_branch()
1039
if repository_policy is not None:
1040
repository_policy.configure_branch(result)
1041
self.copy_content_into(result, revision_id=revision_id)
1042
result.set_parent(self.bzrdir.root_transport.base)
1047
def _synchronize_history(self, destination, revision_id):
1048
"""Synchronize last revision and revision history between branches.
1050
This version is most efficient when the destination is also a
1051
BzrBranch6, but works for BzrBranch5, as long as the destination's
1052
repository contains all the lefthand ancestors of the intended
1053
last_revision. If not, set_last_revision_info will fail.
1055
:param destination: The branch to copy the history into
1056
:param revision_id: The revision-id to truncate history at. May
1057
be None to copy complete history.
1059
source_revno, source_revision_id = self.last_revision_info()
1060
if revision_id is None:
1061
revno, revision_id = source_revno, source_revision_id
1062
elif source_revision_id == revision_id:
1063
# we know the revno without needing to walk all of history
1064
revno = source_revno
1066
# To figure out the revno for a random revision, we need to build
1067
# the revision history, and count its length.
1068
# We don't care about the order, just how long it is.
1069
# Alternatively, we could start at the current location, and count
1070
# backwards. But there is no guarantee that we will find it since
1071
# it may be a merged revision.
1072
revno = len(list(self.repository.iter_reverse_revision_history(
1074
destination.set_last_revision_info(revno, revision_id)
1077
def copy_content_into(self, destination, revision_id=None):
1078
"""Copy the content of self into destination.
1080
revision_id: if not None, the revision history in the new branch will
1081
be truncated to end with revision_id.
1083
self.update_references(destination)
1084
self._synchronize_history(destination, revision_id)
1086
parent = self.get_parent()
1087
except errors.InaccessibleParent, e:
1088
mutter('parent was not accessible to copy: %s', e)
1091
destination.set_parent(parent)
1092
if self._push_should_merge_tags():
1093
self.tags.merge_to(destination.tags)
1095
def update_references(self, target):
1096
if not getattr(self._format, 'supports_reference_locations', False):
1098
reference_dict = self._get_all_reference_info()
1099
if len(reference_dict) == 0:
1101
old_base = self.base
1102
new_base = target.base
1103
target_reference_dict = target._get_all_reference_info()
1104
for file_id, (tree_path, branch_location) in (
1105
reference_dict.items()):
1106
branch_location = urlutils.rebase_url(branch_location,
1108
target_reference_dict.setdefault(
1109
file_id, (tree_path, branch_location))
1110
target._set_all_reference_info(target_reference_dict)
1114
"""Check consistency of the branch.
1116
In particular this checks that revisions given in the revision-history
1117
do actually match up in the revision graph, and that they're all
1118
present in the repository.
1120
Callers will typically also want to check the repository.
1122
:return: A BranchCheckResult.
1124
mainline_parent_id = None
1125
last_revno, last_revision_id = self.last_revision_info()
1126
real_rev_history = list(self.repository.iter_reverse_revision_history(
1128
real_rev_history.reverse()
1129
if len(real_rev_history) != last_revno:
1130
raise errors.BzrCheckError('revno does not match len(mainline)'
1131
' %s != %s' % (last_revno, len(real_rev_history)))
1132
# TODO: We should probably also check that real_rev_history actually
1133
# matches self.revision_history()
1134
for revision_id in real_rev_history:
1136
revision = self.repository.get_revision(revision_id)
1137
except errors.NoSuchRevision, e:
1138
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1140
# In general the first entry on the revision history has no parents.
1141
# But it's not illegal for it to have parents listed; this can happen
1142
# in imports from Arch when the parents weren't reachable.
1143
if mainline_parent_id is not None:
1144
if mainline_parent_id not in revision.parent_ids:
1145
raise errors.BzrCheckError("previous revision {%s} not listed among "
1147
% (mainline_parent_id, revision_id))
1148
mainline_parent_id = revision_id
1149
return BranchCheckResult(self)
1151
def _get_checkout_format(self):
1152
"""Return the most suitable metadir for a checkout of this branch.
1153
Weaves are used if this branch's repository uses weaves.
1155
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1156
from bzrlib.repofmt import weaverepo
1157
format = bzrdir.BzrDirMetaFormat1()
1158
format.repository_format = weaverepo.RepositoryFormat7()
1160
format = self.repository.bzrdir.checkout_metadir()
1161
format.set_branch_format(self._format)
1164
def create_clone_on_transport(self, to_transport, revision_id=None,
1165
stacked_on=None, create_prefix=False, use_existing_dir=False):
1166
"""Create a clone of this branch and its bzrdir.
1168
:param to_transport: The transport to clone onto.
1169
:param revision_id: The revision id to use as tip in the new branch.
1170
If None the tip is obtained from this branch.
1171
:param stacked_on: An optional URL to stack the clone on.
1172
:param create_prefix: Create any missing directories leading up to
1174
:param use_existing_dir: Use an existing directory if one exists.
1176
# XXX: Fix the bzrdir API to allow getting the branch back from the
1177
# clone call. Or something. 20090224 RBC/spiv.
1178
if revision_id is None:
1179
revision_id = self.last_revision()
1181
dir_to = self.bzrdir.clone_on_transport(to_transport,
1182
revision_id=revision_id, stacked_on=stacked_on,
1183
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1184
except errors.FileExists:
1185
if not use_existing_dir:
1187
except errors.NoSuchFile:
1188
if not create_prefix:
1190
return dir_to.open_branch()
1192
def create_checkout(self, to_location, revision_id=None,
1193
lightweight=False, accelerator_tree=None,
1195
"""Create a checkout of a branch.
1197
:param to_location: The url to produce the checkout at
1198
:param revision_id: The revision to check out
1199
:param lightweight: If True, produce a lightweight checkout, otherwise,
1200
produce a bound branch (heavyweight checkout)
1201
:param accelerator_tree: A tree which can be used for retrieving file
1202
contents more quickly than the revision tree, i.e. a workingtree.
1203
The revision tree will be used for cases where accelerator_tree's
1204
content is different.
1205
:param hardlink: If true, hard-link files from accelerator_tree,
1207
:return: The tree of the created checkout
1209
t = transport.get_transport(to_location)
1212
format = self._get_checkout_format()
1213
checkout = format.initialize_on_transport(t)
1214
from_branch = BranchReferenceFormat().initialize(checkout, self)
1216
format = self._get_checkout_format()
1217
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1218
to_location, force_new_tree=False, format=format)
1219
checkout = checkout_branch.bzrdir
1220
checkout_branch.bind(self)
1221
# pull up to the specified revision_id to set the initial
1222
# branch tip correctly, and seed it with history.
1223
checkout_branch.pull(self, stop_revision=revision_id)
1225
tree = checkout.create_workingtree(revision_id,
1226
from_branch=from_branch,
1227
accelerator_tree=accelerator_tree,
1229
basis_tree = tree.basis_tree()
1230
basis_tree.lock_read()
1232
for path, file_id in basis_tree.iter_references():
1233
reference_parent = self.reference_parent(file_id, path)
1234
reference_parent.create_checkout(tree.abspath(path),
1235
basis_tree.get_reference_revision(file_id, path),
1242
def reconcile(self, thorough=True):
1243
"""Make sure the data stored in this branch is consistent."""
1244
from bzrlib.reconcile import BranchReconciler
1245
reconciler = BranchReconciler(self, thorough=thorough)
1246
reconciler.reconcile()
1249
def reference_parent(self, file_id, path, possible_transports=None):
1250
"""Return the parent branch for a tree-reference file_id
1251
:param file_id: The file_id of the tree reference
1252
:param path: The path of the file_id in the tree
1253
:return: A branch associated with the file_id
1255
# FIXME should provide multiple branches, based on config
1256
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1257
possible_transports=possible_transports)
1259
def supports_tags(self):
1260
return self._format.supports_tags()
1262
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1264
"""Ensure that revision_b is a descendant of revision_a.
1266
This is a helper function for update_revisions.
1268
:raises: DivergedBranches if revision_b has diverged from revision_a.
1269
:returns: True if revision_b is a descendant of revision_a.
1271
relation = self._revision_relations(revision_a, revision_b, graph)
1272
if relation == 'b_descends_from_a':
1274
elif relation == 'diverged':
1275
raise errors.DivergedBranches(self, other_branch)
1276
elif relation == 'a_descends_from_b':
1279
raise AssertionError("invalid relation: %r" % (relation,))
1281
def _revision_relations(self, revision_a, revision_b, graph):
1282
"""Determine the relationship between two revisions.
1284
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1286
heads = graph.heads([revision_a, revision_b])
1287
if heads == set([revision_b]):
1288
return 'b_descends_from_a'
1289
elif heads == set([revision_a, revision_b]):
1290
# These branches have diverged
1292
elif heads == set([revision_a]):
1293
return 'a_descends_from_b'
1295
raise AssertionError("invalid heads: %r" % (heads,))
1298
class BranchFormat(object):
1299
"""An encapsulation of the initialization and open routines for a format.
1301
Formats provide three things:
1302
* An initialization routine,
1306
Formats are placed in an dict by their format string for reference
1307
during branch opening. Its not required that these be instances, they
1308
can be classes themselves with class methods - it simply depends on
1309
whether state is needed for a given format or not.
1311
Once a format is deprecated, just deprecate the initialize and open
1312
methods on the format class. Do not deprecate the object, as the
1313
object will be created every time regardless.
1316
_default_format = None
1317
"""The default format used for new branches."""
1320
"""The known formats."""
1322
def __eq__(self, other):
1323
return self.__class__ is other.__class__
1325
def __ne__(self, other):
1326
return not (self == other)
1329
def find_format(klass, a_bzrdir):
1330
"""Return the format for the branch object in a_bzrdir."""
1332
transport = a_bzrdir.get_branch_transport(None)
1333
format_string = transport.get("format").read()
1334
return klass._formats[format_string]
1335
except errors.NoSuchFile:
1336
raise errors.NotBranchError(path=transport.base)
1338
raise errors.UnknownFormatError(format=format_string, kind='branch')
1341
def get_default_format(klass):
1342
"""Return the current default format."""
1343
return klass._default_format
1345
def get_reference(self, a_bzrdir):
1346
"""Get the target reference of the branch in a_bzrdir.
1348
format probing must have been completed before calling
1349
this method - it is assumed that the format of the branch
1350
in a_bzrdir is correct.
1352
:param a_bzrdir: The bzrdir to get the branch data from.
1353
:return: None if the branch is not a reference branch.
1358
def set_reference(self, a_bzrdir, to_branch):
1359
"""Set the target reference of the branch in a_bzrdir.
1361
format probing must have been completed before calling
1362
this method - it is assumed that the format of the branch
1363
in a_bzrdir is correct.
1365
:param a_bzrdir: The bzrdir to set the branch reference for.
1366
:param to_branch: branch that the checkout is to reference
1368
raise NotImplementedError(self.set_reference)
1370
def get_format_string(self):
1371
"""Return the ASCII format string that identifies this format."""
1372
raise NotImplementedError(self.get_format_string)
1374
def get_format_description(self):
1375
"""Return the short format description for this format."""
1376
raise NotImplementedError(self.get_format_description)
1378
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1380
"""Initialize a branch in a bzrdir, with specified files
1382
:param a_bzrdir: The bzrdir to initialize the branch in
1383
:param utf8_files: The files to create as a list of
1384
(filename, content) tuples
1385
:param set_format: If True, set the format with
1386
self.get_format_string. (BzrBranch4 has its format set
1388
:return: a branch in this format
1390
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1391
branch_transport = a_bzrdir.get_branch_transport(self)
1393
'metadir': ('lock', lockdir.LockDir),
1394
'branch4': ('branch-lock', lockable_files.TransportLock),
1396
lock_name, lock_class = lock_map[lock_type]
1397
control_files = lockable_files.LockableFiles(branch_transport,
1398
lock_name, lock_class)
1399
control_files.create_lock()
1401
control_files.lock_write()
1402
except errors.LockContention:
1403
if lock_type != 'branch4':
1409
utf8_files += [('format', self.get_format_string())]
1411
for (filename, content) in utf8_files:
1412
branch_transport.put_bytes(
1414
mode=a_bzrdir._get_file_mode())
1417
control_files.unlock()
1418
return self.open(a_bzrdir, _found=True)
1420
def initialize(self, a_bzrdir):
1421
"""Create a branch of this format in a_bzrdir."""
1422
raise NotImplementedError(self.initialize)
1424
def is_supported(self):
1425
"""Is this format supported?
1427
Supported formats can be initialized and opened.
1428
Unsupported formats may not support initialization or committing or
1429
some other features depending on the reason for not being supported.
1433
def make_tags(self, branch):
1434
"""Create a tags object for branch.
1436
This method is on BranchFormat, because BranchFormats are reflected
1437
over the wire via network_name(), whereas full Branch instances require
1438
multiple VFS method calls to operate at all.
1440
The default implementation returns a disabled-tags instance.
1442
Note that it is normal for branch to be a RemoteBranch when using tags
1445
return DisabledTags(branch)
1447
def network_name(self):
1448
"""A simple byte string uniquely identifying this format for RPC calls.
1450
MetaDir branch formats use their disk format string to identify the
1451
repository over the wire. All in one formats such as bzr < 0.8, and
1452
foreign formats like svn/git and hg should use some marker which is
1453
unique and immutable.
1455
raise NotImplementedError(self.network_name)
1457
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1458
"""Return the branch object for a_bzrdir
1460
:param a_bzrdir: A BzrDir that contains a branch.
1461
:param _found: a private parameter, do not use it. It is used to
1462
indicate if format probing has already be done.
1463
:param ignore_fallbacks: when set, no fallback branches will be opened
1464
(if there are any). Default is to open fallbacks.
1466
raise NotImplementedError(self.open)
1469
def register_format(klass, format):
1470
"""Register a metadir format."""
1471
klass._formats[format.get_format_string()] = format
1472
# Metadir formats have a network name of their format string, and get
1473
# registered as class factories.
1474
network_format_registry.register(format.get_format_string(), format.__class__)
1477
def set_default_format(klass, format):
1478
klass._default_format = format
1480
def supports_stacking(self):
1481
"""True if this format records a stacked-on branch."""
1485
def unregister_format(klass, format):
1486
del klass._formats[format.get_format_string()]
1489
return self.get_format_description().rstrip()
1491
def supports_tags(self):
1492
"""True if this format supports tags stored in the branch"""
1493
return False # by default
1496
class BranchHooks(Hooks):
1497
"""A dictionary mapping hook name to a list of callables for branch hooks.
1499
e.g. ['set_rh'] Is the list of items to be called when the
1500
set_revision_history function is invoked.
1504
"""Create the default hooks.
1506
These are all empty initially, because by default nothing should get
1509
Hooks.__init__(self)
1510
self.create_hook(HookPoint('set_rh',
1511
"Invoked whenever the revision history has been set via "
1512
"set_revision_history. The api signature is (branch, "
1513
"revision_history), and the branch will be write-locked. "
1514
"The set_rh hook can be expensive for bzr to trigger, a better "
1515
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1516
self.create_hook(HookPoint('open',
1517
"Called with the Branch object that has been opened after a "
1518
"branch is opened.", (1, 8), None))
1519
self.create_hook(HookPoint('post_push',
1520
"Called after a push operation completes. post_push is called "
1521
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1522
"bzr client.", (0, 15), None))
1523
self.create_hook(HookPoint('post_pull',
1524
"Called after a pull operation completes. post_pull is called "
1525
"with a bzrlib.branch.PullResult object and only runs in the "
1526
"bzr client.", (0, 15), None))
1527
self.create_hook(HookPoint('pre_commit',
1528
"Called after a commit is calculated but before it is is "
1529
"completed. pre_commit is called with (local, master, old_revno, "
1530
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1531
"). old_revid is NULL_REVISION for the first commit to a branch, "
1532
"tree_delta is a TreeDelta object describing changes from the "
1533
"basis revision. hooks MUST NOT modify this delta. "
1534
" future_tree is an in-memory tree obtained from "
1535
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1536
"tree.", (0,91), None))
1537
self.create_hook(HookPoint('post_commit',
1538
"Called in the bzr client after a commit has completed. "
1539
"post_commit is called with (local, master, old_revno, old_revid, "
1540
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1541
"commit to a branch.", (0, 15), None))
1542
self.create_hook(HookPoint('post_uncommit',
1543
"Called in the bzr client after an uncommit completes. "
1544
"post_uncommit is called with (local, master, old_revno, "
1545
"old_revid, new_revno, new_revid) where local is the local branch "
1546
"or None, master is the target branch, and an empty branch "
1547
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1548
self.create_hook(HookPoint('pre_change_branch_tip',
1549
"Called in bzr client and server before a change to the tip of a "
1550
"branch is made. pre_change_branch_tip is called with a "
1551
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1552
"commit, uncommit will all trigger this hook.", (1, 6), None))
1553
self.create_hook(HookPoint('post_change_branch_tip',
1554
"Called in bzr client and server after a change to the tip of a "
1555
"branch is made. post_change_branch_tip is called with a "
1556
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1557
"commit, uncommit will all trigger this hook.", (1, 4), None))
1558
self.create_hook(HookPoint('transform_fallback_location',
1559
"Called when a stacked branch is activating its fallback "
1560
"locations. transform_fallback_location is called with (branch, "
1561
"url), and should return a new url. Returning the same url "
1562
"allows it to be used as-is, returning a different one can be "
1563
"used to cause the branch to stack on a closer copy of that "
1564
"fallback_location. Note that the branch cannot have history "
1565
"accessing methods called on it during this hook because the "
1566
"fallback locations have not been activated. When there are "
1567
"multiple hooks installed for transform_fallback_location, "
1568
"all are called with the url returned from the previous hook."
1569
"The order is however undefined.", (1, 9), None))
1572
# install the default hooks into the Branch class.
1573
Branch.hooks = BranchHooks()
1576
class ChangeBranchTipParams(object):
1577
"""Object holding parameters passed to *_change_branch_tip hooks.
1579
There are 5 fields that hooks may wish to access:
1581
:ivar branch: the branch being changed
1582
:ivar old_revno: revision number before the change
1583
:ivar new_revno: revision number after the change
1584
:ivar old_revid: revision id before the change
1585
:ivar new_revid: revision id after the change
1587
The revid fields are strings. The revno fields are integers.
1590
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1591
"""Create a group of ChangeBranchTip parameters.
1593
:param branch: The branch being changed.
1594
:param old_revno: Revision number before the change.
1595
:param new_revno: Revision number after the change.
1596
:param old_revid: Tip revision id before the change.
1597
:param new_revid: Tip revision id after the change.
1599
self.branch = branch
1600
self.old_revno = old_revno
1601
self.new_revno = new_revno
1602
self.old_revid = old_revid
1603
self.new_revid = new_revid
1605
def __eq__(self, other):
1606
return self.__dict__ == other.__dict__
1609
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1610
self.__class__.__name__, self.branch,
1611
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1614
class BzrBranchFormat4(BranchFormat):
1615
"""Bzr branch format 4.
1618
- a revision-history file.
1619
- a branch-lock lock file [ to be shared with the bzrdir ]
1622
def get_format_description(self):
1623
"""See BranchFormat.get_format_description()."""
1624
return "Branch format 4"
1626
def initialize(self, a_bzrdir):
1627
"""Create a branch of this format in a_bzrdir."""
1628
utf8_files = [('revision-history', ''),
1629
('branch-name', ''),
1631
return self._initialize_helper(a_bzrdir, utf8_files,
1632
lock_type='branch4', set_format=False)
1635
super(BzrBranchFormat4, self).__init__()
1636
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1638
def network_name(self):
1639
"""The network name for this format is the control dirs disk label."""
1640
return self._matchingbzrdir.get_format_string()
1642
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1643
"""See BranchFormat.open()."""
1645
# we are being called directly and must probe.
1646
raise NotImplementedError
1647
return BzrBranch(_format=self,
1648
_control_files=a_bzrdir._control_files,
1650
_repository=a_bzrdir.open_repository())
1653
return "Bazaar-NG branch format 4"
1656
class BranchFormatMetadir(BranchFormat):
1657
"""Common logic for meta-dir based branch formats."""
1659
def _branch_class(self):
1660
"""What class to instantiate on open calls."""
1661
raise NotImplementedError(self._branch_class)
1663
def network_name(self):
1664
"""A simple byte string uniquely identifying this format for RPC calls.
1666
Metadir branch formats use their format string.
1668
return self.get_format_string()
1670
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1671
"""See BranchFormat.open()."""
1673
format = BranchFormat.find_format(a_bzrdir)
1674
if format.__class__ != self.__class__:
1675
raise AssertionError("wrong format %r found for %r" %
1678
transport = a_bzrdir.get_branch_transport(None)
1679
control_files = lockable_files.LockableFiles(transport, 'lock',
1681
return self._branch_class()(_format=self,
1682
_control_files=control_files,
1684
_repository=a_bzrdir.find_repository(),
1685
ignore_fallbacks=ignore_fallbacks)
1686
except errors.NoSuchFile:
1687
raise errors.NotBranchError(path=transport.base)
1690
super(BranchFormatMetadir, self).__init__()
1691
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1692
self._matchingbzrdir.set_branch_format(self)
1694
def supports_tags(self):
1698
class BzrBranchFormat5(BranchFormatMetadir):
1699
"""Bzr branch format 5.
1702
- a revision-history file.
1704
- a lock dir guarding the branch itself
1705
- all of this stored in a branch/ subdirectory
1706
- works with shared repositories.
1708
This format is new in bzr 0.8.
1711
def _branch_class(self):
1714
def get_format_string(self):
1715
"""See BranchFormat.get_format_string()."""
1716
return "Bazaar-NG branch format 5\n"
1718
def get_format_description(self):
1719
"""See BranchFormat.get_format_description()."""
1720
return "Branch format 5"
1722
def initialize(self, a_bzrdir):
1723
"""Create a branch of this format in a_bzrdir."""
1724
utf8_files = [('revision-history', ''),
1725
('branch-name', ''),
1727
return self._initialize_helper(a_bzrdir, utf8_files)
1729
def supports_tags(self):
1733
class BzrBranchFormat6(BranchFormatMetadir):
1734
"""Branch format with last-revision and tags.
1736
Unlike previous formats, this has no explicit revision history. Instead,
1737
this just stores the last-revision, and the left-hand history leading
1738
up to there is the history.
1740
This format was introduced in bzr 0.15
1741
and became the default in 0.91.
1744
def _branch_class(self):
1747
def get_format_string(self):
1748
"""See BranchFormat.get_format_string()."""
1749
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1751
def get_format_description(self):
1752
"""See BranchFormat.get_format_description()."""
1753
return "Branch format 6"
1755
def initialize(self, a_bzrdir):
1756
"""Create a branch of this format in a_bzrdir."""
1757
utf8_files = [('last-revision', '0 null:\n'),
1758
('branch.conf', ''),
1761
return self._initialize_helper(a_bzrdir, utf8_files)
1763
def make_tags(self, branch):
1764
"""See bzrlib.branch.BranchFormat.make_tags()."""
1765
return BasicTags(branch)
1769
class BzrBranchFormat8(BranchFormatMetadir):
1770
"""Metadir format supporting storing locations of subtree branches."""
1772
def _branch_class(self):
1775
def get_format_string(self):
1776
"""See BranchFormat.get_format_string()."""
1777
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
1779
def get_format_description(self):
1780
"""See BranchFormat.get_format_description()."""
1781
return "Branch format 8"
1783
def initialize(self, a_bzrdir):
1784
"""Create a branch of this format in a_bzrdir."""
1785
utf8_files = [('last-revision', '0 null:\n'),
1786
('branch.conf', ''),
1790
return self._initialize_helper(a_bzrdir, utf8_files)
1793
super(BzrBranchFormat8, self).__init__()
1794
self._matchingbzrdir.repository_format = \
1795
RepositoryFormatKnitPack5RichRoot()
1797
def make_tags(self, branch):
1798
"""See bzrlib.branch.BranchFormat.make_tags()."""
1799
return BasicTags(branch)
1801
def supports_stacking(self):
1804
supports_reference_locations = True
1807
class BzrBranchFormat7(BzrBranchFormat8):
1808
"""Branch format with last-revision, tags, and a stacked location pointer.
1810
The stacked location pointer is passed down to the repository and requires
1811
a repository format with supports_external_lookups = True.
1813
This format was introduced in bzr 1.6.
1816
def initialize(self, a_bzrdir):
1817
"""Create a branch of this format in a_bzrdir."""
1818
utf8_files = [('last-revision', '0 null:\n'),
1819
('branch.conf', ''),
1822
return self._initialize_helper(a_bzrdir, utf8_files)
1824
def _branch_class(self):
1827
def get_format_string(self):
1828
"""See BranchFormat.get_format_string()."""
1829
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1831
def get_format_description(self):
1832
"""See BranchFormat.get_format_description()."""
1833
return "Branch format 7"
1835
supports_reference_locations = False
1838
class BranchReferenceFormat(BranchFormat):
1839
"""Bzr branch reference format.
1841
Branch references are used in implementing checkouts, they
1842
act as an alias to the real branch which is at some other url.
1849
def get_format_string(self):
1850
"""See BranchFormat.get_format_string()."""
1851
return "Bazaar-NG Branch Reference Format 1\n"
1853
def get_format_description(self):
1854
"""See BranchFormat.get_format_description()."""
1855
return "Checkout reference format 1"
1857
def get_reference(self, a_bzrdir):
1858
"""See BranchFormat.get_reference()."""
1859
transport = a_bzrdir.get_branch_transport(None)
1860
return transport.get('location').read()
1862
def set_reference(self, a_bzrdir, to_branch):
1863
"""See BranchFormat.set_reference()."""
1864
transport = a_bzrdir.get_branch_transport(None)
1865
location = transport.put_bytes('location', to_branch.base)
1867
def initialize(self, a_bzrdir, target_branch=None):
1868
"""Create a branch of this format in a_bzrdir."""
1869
if target_branch is None:
1870
# this format does not implement branch itself, thus the implicit
1871
# creation contract must see it as uninitializable
1872
raise errors.UninitializableFormat(self)
1873
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1874
branch_transport = a_bzrdir.get_branch_transport(self)
1875
branch_transport.put_bytes('location',
1876
target_branch.bzrdir.root_transport.base)
1877
branch_transport.put_bytes('format', self.get_format_string())
1879
a_bzrdir, _found=True,
1880
possible_transports=[target_branch.bzrdir.root_transport])
1883
super(BranchReferenceFormat, self).__init__()
1884
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1885
self._matchingbzrdir.set_branch_format(self)
1887
def _make_reference_clone_function(format, a_branch):
1888
"""Create a clone() routine for a branch dynamically."""
1889
def clone(to_bzrdir, revision_id=None,
1890
repository_policy=None):
1891
"""See Branch.clone()."""
1892
return format.initialize(to_bzrdir, a_branch)
1893
# cannot obey revision_id limits when cloning a reference ...
1894
# FIXME RBC 20060210 either nuke revision_id for clone, or
1895
# emit some sort of warning/error to the caller ?!
1898
def open(self, a_bzrdir, _found=False, location=None,
1899
possible_transports=None, ignore_fallbacks=False):
1900
"""Return the branch that the branch reference in a_bzrdir points at.
1902
:param a_bzrdir: A BzrDir that contains a branch.
1903
:param _found: a private parameter, do not use it. It is used to
1904
indicate if format probing has already be done.
1905
:param ignore_fallbacks: when set, no fallback branches will be opened
1906
(if there are any). Default is to open fallbacks.
1907
:param location: The location of the referenced branch. If
1908
unspecified, this will be determined from the branch reference in
1910
:param possible_transports: An optional reusable transports list.
1913
format = BranchFormat.find_format(a_bzrdir)
1914
if format.__class__ != self.__class__:
1915
raise AssertionError("wrong format %r found for %r" %
1917
if location is None:
1918
location = self.get_reference(a_bzrdir)
1919
real_bzrdir = bzrdir.BzrDir.open(
1920
location, possible_transports=possible_transports)
1921
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
1922
# this changes the behaviour of result.clone to create a new reference
1923
# rather than a copy of the content of the branch.
1924
# I did not use a proxy object because that needs much more extensive
1925
# testing, and we are only changing one behaviour at the moment.
1926
# If we decide to alter more behaviours - i.e. the implicit nickname
1927
# then this should be refactored to introduce a tested proxy branch
1928
# and a subclass of that for use in overriding clone() and ....
1930
result.clone = self._make_reference_clone_function(result)
1934
network_format_registry = registry.FormatRegistry()
1935
"""Registry of formats indexed by their network name.
1937
The network name for a branch format is an identifier that can be used when
1938
referring to formats with smart server operations. See
1939
BranchFormat.network_name() for more detail.
1943
# formats which have no format string are not discoverable
1944
# and not independently creatable, so are not registered.
1945
__format5 = BzrBranchFormat5()
1946
__format6 = BzrBranchFormat6()
1947
__format7 = BzrBranchFormat7()
1948
__format8 = BzrBranchFormat8()
1949
BranchFormat.register_format(__format5)
1950
BranchFormat.register_format(BranchReferenceFormat())
1951
BranchFormat.register_format(__format6)
1952
BranchFormat.register_format(__format7)
1953
BranchFormat.register_format(__format8)
1954
BranchFormat.set_default_format(__format6)
1955
_legacy_formats = [BzrBranchFormat4(),
1957
network_format_registry.register(
1958
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
1961
class BzrBranch(Branch):
1962
"""A branch stored in the actual filesystem.
1964
Note that it's "local" in the context of the filesystem; it doesn't
1965
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1966
it's writable, and can be accessed via the normal filesystem API.
1968
:ivar _transport: Transport for file operations on this branch's
1969
control files, typically pointing to the .bzr/branch directory.
1970
:ivar repository: Repository for this branch.
1971
:ivar base: The url of the base directory for this branch; the one
1972
containing the .bzr directory.
1975
def __init__(self, _format=None,
1976
_control_files=None, a_bzrdir=None, _repository=None,
1977
ignore_fallbacks=False):
1978
"""Create new branch object at a particular location."""
1979
if a_bzrdir is None:
1980
raise ValueError('a_bzrdir must be supplied')
1982
self.bzrdir = a_bzrdir
1983
self._base = self.bzrdir.transport.clone('..').base
1984
# XXX: We should be able to just do
1985
# self.base = self.bzrdir.root_transport.base
1986
# but this does not quite work yet -- mbp 20080522
1987
self._format = _format
1988
if _control_files is None:
1989
raise ValueError('BzrBranch _control_files is None')
1990
self.control_files = _control_files
1991
self._transport = _control_files._transport
1992
self.repository = _repository
1993
Branch.__init__(self)
1996
return '%s(%r)' % (self.__class__.__name__, self.base)
2000
def _get_base(self):
2001
"""Returns the directory containing the control directory."""
2004
base = property(_get_base, doc="The URL for the root of this branch.")
2006
def _get_config(self):
2007
return TransportConfig(self._transport, 'branch.conf')
2009
def is_locked(self):
2010
return self.control_files.is_locked()
2012
def lock_write(self, token=None):
2013
# All-in-one needs to always unlock/lock.
2014
repo_control = getattr(self.repository, 'control_files', None)
2015
if self.control_files == repo_control or not self.is_locked():
2016
self.repository.lock_write()
2021
return self.control_files.lock_write(token=token)
2024
self.repository.unlock()
2027
def lock_read(self):
2028
# All-in-one needs to always unlock/lock.
2029
repo_control = getattr(self.repository, 'control_files', None)
2030
if self.control_files == repo_control or not self.is_locked():
2031
self.repository.lock_read()
2036
self.control_files.lock_read()
2039
self.repository.unlock()
2044
self.control_files.unlock()
2046
# All-in-one needs to always unlock/lock.
2047
repo_control = getattr(self.repository, 'control_files', None)
2048
if (self.control_files == repo_control or
2049
not self.control_files.is_locked()):
2050
self.repository.unlock()
2051
if not self.control_files.is_locked():
2052
# we just released the lock
2053
self._clear_cached_state()
2055
def peek_lock_mode(self):
2056
if self.control_files._lock_count == 0:
2059
return self.control_files._lock_mode
2061
def get_physical_lock_status(self):
2062
return self.control_files.get_physical_lock_status()
2065
def print_file(self, file, revision_id):
2066
"""See Branch.print_file."""
2067
return self.repository.print_file(file, revision_id)
2069
def _write_revision_history(self, history):
2070
"""Factored out of set_revision_history.
2072
This performs the actual writing to disk.
2073
It is intended to be called by BzrBranch5.set_revision_history."""
2074
self._transport.put_bytes(
2075
'revision-history', '\n'.join(history),
2076
mode=self.bzrdir._get_file_mode())
2079
def set_revision_history(self, rev_history):
2080
"""See Branch.set_revision_history."""
2081
if 'evil' in debug.debug_flags:
2082
mutter_callsite(3, "set_revision_history scales with history.")
2083
check_not_reserved_id = _mod_revision.check_not_reserved_id
2084
for rev_id in rev_history:
2085
check_not_reserved_id(rev_id)
2086
if Branch.hooks['post_change_branch_tip']:
2087
# Don't calculate the last_revision_info() if there are no hooks
2089
old_revno, old_revid = self.last_revision_info()
2090
if len(rev_history) == 0:
2091
revid = _mod_revision.NULL_REVISION
2093
revid = rev_history[-1]
2094
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2095
self._write_revision_history(rev_history)
2096
self._clear_cached_state()
2097
self._cache_revision_history(rev_history)
2098
for hook in Branch.hooks['set_rh']:
2099
hook(self, rev_history)
2100
if Branch.hooks['post_change_branch_tip']:
2101
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2103
def _synchronize_history(self, destination, revision_id):
2104
"""Synchronize last revision and revision history between branches.
2106
This version is most efficient when the destination is also a
2107
BzrBranch5, but works for BzrBranch6 as long as the revision
2108
history is the true lefthand parent history, and all of the revisions
2109
are in the destination's repository. If not, set_revision_history
2112
:param destination: The branch to copy the history into
2113
:param revision_id: The revision-id to truncate history at. May
2114
be None to copy complete history.
2116
if not isinstance(destination._format, BzrBranchFormat5):
2117
super(BzrBranch, self)._synchronize_history(
2118
destination, revision_id)
2120
if revision_id == _mod_revision.NULL_REVISION:
2123
new_history = self.revision_history()
2124
if revision_id is not None and new_history != []:
2126
new_history = new_history[:new_history.index(revision_id) + 1]
2128
rev = self.repository.get_revision(revision_id)
2129
new_history = rev.get_history(self.repository)[1:]
2130
destination.set_revision_history(new_history)
2133
def set_last_revision_info(self, revno, revision_id):
2134
"""Set the last revision of this branch.
2136
The caller is responsible for checking that the revno is correct
2137
for this revision id.
2139
It may be possible to set the branch last revision to an id not
2140
present in the repository. However, branches can also be
2141
configured to check constraints on history, in which case this may not
2144
revision_id = _mod_revision.ensure_null(revision_id)
2145
# this old format stores the full history, but this api doesn't
2146
# provide it, so we must generate, and might as well check it's
2148
history = self._lefthand_history(revision_id)
2149
if len(history) != revno:
2150
raise AssertionError('%d != %d' % (len(history), revno))
2151
self.set_revision_history(history)
2153
def _gen_revision_history(self):
2154
history = self._transport.get_bytes('revision-history').split('\n')
2155
if history[-1:] == ['']:
2156
# There shouldn't be a trailing newline, but just in case.
2161
def generate_revision_history(self, revision_id, last_rev=None,
2163
"""Create a new revision history that will finish with revision_id.
2165
:param revision_id: the new tip to use.
2166
:param last_rev: The previous last_revision. If not None, then this
2167
must be a ancestory of revision_id, or DivergedBranches is raised.
2168
:param other_branch: The other branch that DivergedBranches should
2169
raise with respect to.
2171
self.set_revision_history(self._lefthand_history(revision_id,
2172
last_rev, other_branch))
2174
def basis_tree(self):
2175
"""See Branch.basis_tree."""
2176
return self.repository.revision_tree(self.last_revision())
2179
def pull(self, source, overwrite=False, stop_revision=None,
2180
_hook_master=None, run_hooks=True, possible_transports=None,
2181
_override_hook_target=None):
2184
:param _hook_master: Private parameter - set the branch to
2185
be supplied as the master to pull hooks.
2186
:param run_hooks: Private parameter - if false, this branch
2187
is being called because it's the master of the primary branch,
2188
so it should not run its hooks.
2189
:param _override_hook_target: Private parameter - set the branch to be
2190
supplied as the target_branch to pull hooks.
2192
result = PullResult()
2193
result.source_branch = source
2194
if _override_hook_target is None:
2195
result.target_branch = self
2197
result.target_branch = _override_hook_target
2200
# We assume that during 'pull' the local repository is closer than
2202
source.update_references(self)
2203
graph = self.repository.get_graph(source.repository)
2204
result.old_revno, result.old_revid = self.last_revision_info()
2205
self.update_revisions(source, stop_revision, overwrite=overwrite,
2207
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2208
result.new_revno, result.new_revid = self.last_revision_info()
2210
result.master_branch = _hook_master
2211
result.local_branch = result.target_branch
2213
result.master_branch = result.target_branch
2214
result.local_branch = None
2216
for hook in Branch.hooks['post_pull']:
2222
def _get_parent_location(self):
2223
_locs = ['parent', 'pull', 'x-pull']
2226
return self._transport.get_bytes(l).strip('\n')
2227
except errors.NoSuchFile:
2232
def push(self, target, overwrite=False, stop_revision=None,
2233
_override_hook_source_branch=None):
2236
This is the basic concrete implementation of push()
2238
:param _override_hook_source_branch: If specified, run
2239
the hooks passing this Branch as the source, rather than self.
2240
This is for use of RemoteBranch, where push is delegated to the
2241
underlying vfs-based Branch.
2243
# TODO: Public option to disable running hooks - should be trivial but
2245
return _run_with_write_locked_target(
2246
target, self._push_with_bound_branches, target, overwrite,
2248
_override_hook_source_branch=_override_hook_source_branch)
2250
def _push_with_bound_branches(self, target, overwrite,
2252
_override_hook_source_branch=None):
2253
"""Push from self into target, and into target's master if any.
2255
This is on the base BzrBranch class even though it doesn't support
2256
bound branches because the *target* might be bound.
2259
if _override_hook_source_branch:
2260
result.source_branch = _override_hook_source_branch
2261
for hook in Branch.hooks['post_push']:
2264
bound_location = target.get_bound_location()
2265
if bound_location and target.base != bound_location:
2266
# there is a master branch.
2268
# XXX: Why the second check? Is it even supported for a branch to
2269
# be bound to itself? -- mbp 20070507
2270
master_branch = target.get_master_branch()
2271
master_branch.lock_write()
2273
# push into the master from this branch.
2274
self._basic_push(master_branch, overwrite, stop_revision)
2275
# and push into the target branch from this. Note that we push from
2276
# this branch again, because its considered the highest bandwidth
2278
result = self._basic_push(target, overwrite, stop_revision)
2279
result.master_branch = master_branch
2280
result.local_branch = target
2284
master_branch.unlock()
2287
result = self._basic_push(target, overwrite, stop_revision)
2288
# TODO: Why set master_branch and local_branch if there's no
2289
# binding? Maybe cleaner to just leave them unset? -- mbp
2291
result.master_branch = target
2292
result.local_branch = None
2296
def _basic_push(self, target, overwrite, stop_revision):
2297
"""Basic implementation of push without bound branches or hooks.
2299
Must be called with self read locked and target write locked.
2301
result = BranchPushResult()
2302
result.source_branch = self
2303
result.target_branch = target
2304
result.old_revno, result.old_revid = target.last_revision_info()
2305
self.update_references(target)
2306
if result.old_revid != self.last_revision():
2307
# We assume that during 'push' this repository is closer than
2309
graph = self.repository.get_graph(target.repository)
2310
target.update_revisions(self, stop_revision, overwrite=overwrite,
2312
if self._push_should_merge_tags():
2313
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2314
result.new_revno, result.new_revid = target.last_revision_info()
2317
def get_stacked_on_url(self):
2318
raise errors.UnstackableBranchFormat(self._format, self.base)
2320
def set_push_location(self, location):
2321
"""See Branch.set_push_location."""
2322
self.get_config().set_user_option(
2323
'push_location', location,
2324
store=_mod_config.STORE_LOCATION_NORECURSE)
2326
def _set_parent_location(self, url):
2328
self._transport.delete('parent')
2330
self._transport.put_bytes('parent', url + '\n',
2331
mode=self.bzrdir._get_file_mode())
2334
class BzrBranch5(BzrBranch):
2335
"""A format 5 branch. This supports new features over plain branches.
2337
It has support for a master_branch which is the data for bound branches.
2341
def pull(self, source, overwrite=False, stop_revision=None,
2342
run_hooks=True, possible_transports=None,
2343
_override_hook_target=None):
2344
"""Pull from source into self, updating my master if any.
2346
:param run_hooks: Private parameter - if false, this branch
2347
is being called because it's the master of the primary branch,
2348
so it should not run its hooks.
2350
bound_location = self.get_bound_location()
2351
master_branch = None
2352
if bound_location and source.base != bound_location:
2353
# not pulling from master, so we need to update master.
2354
master_branch = self.get_master_branch(possible_transports)
2355
master_branch.lock_write()
2358
# pull from source into master.
2359
master_branch.pull(source, overwrite, stop_revision,
2361
return super(BzrBranch5, self).pull(source, overwrite,
2362
stop_revision, _hook_master=master_branch,
2363
run_hooks=run_hooks,
2364
_override_hook_target=_override_hook_target)
2367
master_branch.unlock()
2369
def get_bound_location(self):
2371
return self._transport.get_bytes('bound')[:-1]
2372
except errors.NoSuchFile:
2376
def get_master_branch(self, possible_transports=None):
2377
"""Return the branch we are bound to.
2379
:return: Either a Branch, or None
2381
This could memoise the branch, but if thats done
2382
it must be revalidated on each new lock.
2383
So for now we just don't memoise it.
2384
# RBC 20060304 review this decision.
2386
bound_loc = self.get_bound_location()
2390
return Branch.open(bound_loc,
2391
possible_transports=possible_transports)
2392
except (errors.NotBranchError, errors.ConnectionError), e:
2393
raise errors.BoundBranchConnectionFailure(
2397
def set_bound_location(self, location):
2398
"""Set the target where this branch is bound to.
2400
:param location: URL to the target branch
2403
self._transport.put_bytes('bound', location+'\n',
2404
mode=self.bzrdir._get_file_mode())
2407
self._transport.delete('bound')
2408
except errors.NoSuchFile:
2413
def bind(self, other):
2414
"""Bind this branch to the branch other.
2416
This does not push or pull data between the branches, though it does
2417
check for divergence to raise an error when the branches are not
2418
either the same, or one a prefix of the other. That behaviour may not
2419
be useful, so that check may be removed in future.
2421
:param other: The branch to bind to
2424
# TODO: jam 20051230 Consider checking if the target is bound
2425
# It is debatable whether you should be able to bind to
2426
# a branch which is itself bound.
2427
# Committing is obviously forbidden,
2428
# but binding itself may not be.
2429
# Since we *have* to check at commit time, we don't
2430
# *need* to check here
2432
# we want to raise diverged if:
2433
# last_rev is not in the other_last_rev history, AND
2434
# other_last_rev is not in our history, and do it without pulling
2436
self.set_bound_location(other.base)
2440
"""If bound, unbind"""
2441
return self.set_bound_location(None)
2444
def update(self, possible_transports=None):
2445
"""Synchronise this branch with the master branch if any.
2447
:return: None or the last_revision that was pivoted out during the
2450
master = self.get_master_branch(possible_transports)
2451
if master is not None:
2452
old_tip = _mod_revision.ensure_null(self.last_revision())
2453
self.pull(master, overwrite=True)
2454
if self.repository.get_graph().is_ancestor(old_tip,
2455
_mod_revision.ensure_null(self.last_revision())):
2461
class BzrBranch8(BzrBranch5):
2462
"""A branch that stores tree-reference locations."""
2464
def _open_hook(self):
2465
if self._ignore_fallbacks:
2468
url = self.get_stacked_on_url()
2469
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2470
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:
2473
for hook in Branch.hooks['transform_fallback_location']:
2474
url = hook(self, url)
2476
hook_name = Branch.hooks.get_hook_name(hook)
2477
raise AssertionError(
2478
"'transform_fallback_location' hook %s returned "
2479
"None, not a URL." % hook_name)
2480
self._activate_fallback_location(url, None)
2482
def __init__(self, *args, **kwargs):
2483
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2484
super(BzrBranch8, self).__init__(*args, **kwargs)
2485
self._last_revision_info_cache = None
2486
self._partial_revision_history_cache = []
2487
self._reference_info = None
2489
def _clear_cached_state(self):
2490
super(BzrBranch8, self)._clear_cached_state()
2491
self._last_revision_info_cache = None
2492
self._partial_revision_history_cache = []
2493
self._reference_info = None
2495
def _last_revision_info(self):
2496
revision_string = self._transport.get_bytes('last-revision')
2497
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2498
revision_id = cache_utf8.get_cached_utf8(revision_id)
2500
return revno, revision_id
2502
def _write_last_revision_info(self, revno, revision_id):
2503
"""Simply write out the revision id, with no checks.
2505
Use set_last_revision_info to perform this safely.
2507
Does not update the revision_history cache.
2508
Intended to be called by set_last_revision_info and
2509
_write_revision_history.
2511
revision_id = _mod_revision.ensure_null(revision_id)
2512
out_string = '%d %s\n' % (revno, revision_id)
2513
self._transport.put_bytes('last-revision', out_string,
2514
mode=self.bzrdir._get_file_mode())
2517
def set_last_revision_info(self, revno, revision_id):
2518
revision_id = _mod_revision.ensure_null(revision_id)
2519
old_revno, old_revid = self.last_revision_info()
2520
if self._get_append_revisions_only():
2521
self._check_history_violation(revision_id)
2522
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2523
self._write_last_revision_info(revno, revision_id)
2524
self._clear_cached_state()
2525
self._last_revision_info_cache = revno, revision_id
2526
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2528
def _synchronize_history(self, destination, revision_id):
2529
"""Synchronize last revision and revision history between branches.
2531
:see: Branch._synchronize_history
2533
# XXX: The base Branch has a fast implementation of this method based
2534
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2535
# that uses set_revision_history. This class inherits from BzrBranch5,
2536
# but wants the fast implementation, so it calls
2537
# Branch._synchronize_history directly.
2538
Branch._synchronize_history(self, destination, revision_id)
2540
def _check_history_violation(self, revision_id):
2541
last_revision = _mod_revision.ensure_null(self.last_revision())
2542
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
2544
if last_revision not in self._lefthand_history(revision_id):
2545
raise errors.AppendRevisionsOnlyViolation(self.base)
2547
def _gen_revision_history(self):
2548
"""Generate the revision history from last revision
2550
last_revno, last_revision = self.last_revision_info()
2551
self._extend_partial_history(stop_index=last_revno-1)
2552
return list(reversed(self._partial_revision_history_cache))
2554
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2555
"""Extend the partial history to include a given index
2557
If a stop_index is supplied, stop when that index has been reached.
2558
If a stop_revision is supplied, stop when that revision is
2559
encountered. Otherwise, stop when the beginning of history is
2562
:param stop_index: The index which should be present. When it is
2563
present, history extension will stop.
2564
:param revision_id: The revision id which should be present. When
2565
it is encountered, history extension will stop.
2567
repo = self.repository
2568
if len(self._partial_revision_history_cache) == 0:
2569
iterator = repo.iter_reverse_revision_history(self.last_revision())
2571
start_revision = self._partial_revision_history_cache[-1]
2572
iterator = repo.iter_reverse_revision_history(start_revision)
2573
#skip the last revision in the list
2574
next_revision = iterator.next()
2575
for revision_id in iterator:
2576
self._partial_revision_history_cache.append(revision_id)
2577
if (stop_index is not None and
2578
len(self._partial_revision_history_cache) > stop_index):
2580
if revision_id == stop_revision:
2583
def _write_revision_history(self, history):
2584
"""Factored out of set_revision_history.
2586
This performs the actual writing to disk, with format-specific checks.
2587
It is intended to be called by BzrBranch5.set_revision_history.
2589
if len(history) == 0:
2590
last_revision = 'null:'
2592
if history != self._lefthand_history(history[-1]):
2593
raise errors.NotLefthandHistory(history)
2594
last_revision = history[-1]
2595
if self._get_append_revisions_only():
2596
self._check_history_violation(last_revision)
2597
self._write_last_revision_info(len(history), last_revision)
2600
def _set_parent_location(self, url):
2601
"""Set the parent branch"""
2602
self._set_config_location('parent_location', url, make_relative=True)
2605
def _get_parent_location(self):
2606
"""Set the parent branch"""
2607
return self._get_config_location('parent_location')
2610
def _set_all_reference_info(self, info_dict):
2611
"""Replace all reference info stored in a branch.
2613
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2616
writer = rio.RioWriter(s)
2617
for key, (tree_path, branch_location) in info_dict.iteritems():
2618
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2619
branch_location=branch_location)
2620
writer.write_stanza(stanza)
2621
self._transport.put_bytes('references', s.getvalue())
2622
self._reference_info = info_dict
2625
def _get_all_reference_info(self):
2626
"""Return all the reference info stored in a branch.
2628
:return: A dict of {file_id: (tree_path, branch_location)}
2630
if self._reference_info is not None:
2631
return self._reference_info
2632
rio_file = self._transport.get('references')
1256
f = AtomicFile(self.controlfilename('pending-merges'))
2634
stanzas = rio.read_stanzas(rio_file)
2635
info_dict = dict((s['file_id'], (s['tree_path'],
2636
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()
2639
self._reference_info = info_dict
2642
def set_reference_info(self, file_id, tree_path, branch_location):
2643
"""Set the branch location to use for a tree reference.
2645
:param file_id: The file-id of the tree reference.
2646
:param tree_path: The path of the tree reference in the tree.
2647
:param branch_location: The location of the branch to retrieve tree
2650
info_dict = self._get_all_reference_info()
2651
info_dict[file_id] = (tree_path, branch_location)
2652
if None in (tree_path, branch_location):
2653
if tree_path is not None:
2654
raise ValueError('tree_path must be None when branch_location'
2656
if branch_location is not None:
2657
raise ValueError('branch_location must be None when tree_path'
2659
del info_dict[file_id]
2660
self._set_all_reference_info(info_dict)
2662
def get_reference_info(self, file_id):
2663
"""Get the tree_path and branch_location for a tree reference.
2665
:return: a tuple of (tree_path, branch_location)
2667
return self._get_all_reference_info().get(file_id, (None, None))
2669
def reference_parent(self, file_id, path, possible_transports=None):
2670
"""Return the parent branch for a tree-reference file_id.
2672
:param file_id: The file_id of the tree reference
2673
:param path: The path of the file_id in the tree
2674
:return: A branch associated with the file_id
2676
branch_location = self.get_reference_info(file_id)[1]
2677
if branch_location is None:
2678
return Branch.reference_parent(self, file_id, path,
2679
possible_transports)
2680
branch_location = urlutils.join(self.base, branch_location)
2681
return Branch.open(branch_location,
2682
possible_transports=possible_transports)
2684
def set_push_location(self, location):
2685
"""See Branch.set_push_location."""
2686
self._set_config_location('push_location', location)
2688
def set_bound_location(self, location):
2689
"""See Branch.set_push_location."""
2691
config = self.get_config()
2692
if location is None:
2693
if config.get_user_option('bound') != 'True':
2696
config.set_user_option('bound', 'False', warn_masked=True)
2699
self._set_config_location('bound_location', location,
2701
config.set_user_option('bound', 'True', warn_masked=True)
2704
def _get_bound_location(self, bound):
2705
"""Return the bound location in the config file.
2707
Return None if the bound parameter does not match"""
2708
config = self.get_config()
2709
config_bound = (config.get_user_option('bound') == 'True')
2710
if config_bound != bound:
2712
return self._get_config_location('bound_location', config=config)
2714
def get_bound_location(self):
2715
"""See Branch.set_push_location."""
2716
return self._get_bound_location(True)
2718
def get_old_bound_location(self):
2719
"""See Branch.get_old_bound_location"""
2720
return self._get_bound_location(False)
2722
def get_stacked_on_url(self):
2723
# you can always ask for the URL; but you might not be able to use it
2724
# if the repo can't support stacking.
2725
## self._check_stackable_repo()
2726
stacked_url = self._get_config_location('stacked_on_location')
2727
if stacked_url is None:
2728
raise errors.NotStacked(self)
2731
def set_append_revisions_only(self, enabled):
2736
self.get_config().set_user_option('append_revisions_only', value,
2739
def _get_append_revisions_only(self):
2740
value = self.get_config().get_user_option('append_revisions_only')
2741
return value == 'True'
2744
def generate_revision_history(self, revision_id, last_rev=None,
2746
"""See BzrBranch5.generate_revision_history"""
2747
history = self._lefthand_history(revision_id, last_rev, other_branch)
2748
revno = len(history)
2749
self.set_last_revision_info(revno, revision_id)
2752
def get_rev_id(self, revno, history=None):
2753
"""Find the revision id of the specified revno."""
2755
return _mod_revision.NULL_REVISION
2757
last_revno, last_revision_id = self.last_revision_info()
2758
if revno <= 0 or revno > last_revno:
2759
raise errors.NoSuchRevision(self, revno)
2761
if history is not None:
2762
return history[revno - 1]
2764
index = last_revno - revno
2765
if len(self._partial_revision_history_cache) <= index:
2766
self._extend_partial_history(stop_index=index)
2767
if len(self._partial_revision_history_cache) > index:
2768
return self._partial_revision_history_cache[index]
2770
raise errors.NoSuchRevision(self, revno)
2773
def revision_id_to_revno(self, revision_id):
2774
"""Given a revision id, return its revno"""
2775
if _mod_revision.is_null(revision_id):
2778
index = self._partial_revision_history_cache.index(revision_id)
2780
self._extend_partial_history(stop_revision=revision_id)
2781
index = len(self._partial_revision_history_cache) - 1
2782
if self._partial_revision_history_cache[index] != revision_id:
2783
raise errors.NoSuchRevision(self, revision_id)
2784
return self.revno() - index
2787
class BzrBranch7(BzrBranch8):
2788
"""A branch with support for a fallback repository."""
2790
def set_reference_info(self, file_id, tree_path, branch_location):
2791
Branch.set_reference_info(self, file_id, tree_path, branch_location)
2793
def get_reference_info(self, file_id):
2794
Branch.get_reference_info(self, file_id)
2796
def reference_parent(self, file_id, path, possible_transports=None):
2797
return Branch.reference_parent(self, file_id, path,
2798
possible_transports)
2801
class BzrBranch6(BzrBranch7):
2802
"""See BzrBranchFormat6 for the capabilities of this branch.
2804
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)
2808
def get_stacked_on_url(self):
2809
raise errors.UnstackableBranchFormat(self._format, self.base)
1337
2812
######################################################################
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')
2813
# results of operations
2816
class _Result(object):
2818
def _show_tag_conficts(self, to_file):
2819
if not getattr(self, 'tag_conflicts', None):
2821
to_file.write('Conflicting tags:\n')
2822
for name, value1, value2 in self.tag_conflicts:
2823
to_file.write(' %s\n' % (name, ))
2826
class PullResult(_Result):
2827
"""Result of a Branch.pull operation.
2829
:ivar old_revno: Revision number before pull.
2830
:ivar new_revno: Revision number after pull.
2831
:ivar old_revid: Tip revision id before pull.
2832
:ivar new_revid: Tip revision id after pull.
2833
:ivar source_branch: Source (local) branch object. (read locked)
2834
:ivar master_branch: Master branch of the target, or the target if no
2836
:ivar local_branch: target branch if there is a Master, else None
2837
:ivar target_branch: Target/destination branch object. (write locked)
2838
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2842
# DEPRECATED: pull used to return the change in revno
2843
return self.new_revno - self.old_revno
2845
def report(self, to_file):
2847
if self.old_revid == self.new_revid:
2848
to_file.write('No revisions to pull.\n')
2850
to_file.write('Now on revision %d.\n' % self.new_revno)
2851
self._show_tag_conficts(to_file)
2854
class BranchPushResult(_Result):
2855
"""Result of a Branch.push operation.
2857
:ivar old_revno: Revision number (eg 10) of the target before push.
2858
:ivar new_revno: Revision number (eg 12) of the target after push.
2859
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
2861
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
2863
:ivar source_branch: Source branch object that the push was from. This is
2864
read locked, and generally is a local (and thus low latency) branch.
2865
:ivar master_branch: If target is a bound branch, the master branch of
2866
target, or target itself. Always write locked.
2867
:ivar target_branch: The direct Branch where data is being sent (write
2869
:ivar local_branch: If the target is a bound branch this will be the
2870
target, otherwise it will be None.
2874
# DEPRECATED: push used to return the change in revno
2875
return self.new_revno - self.old_revno
2877
def report(self, to_file):
2878
"""Write a human-readable description of the result."""
2879
if self.old_revid == self.new_revid:
2880
note('No new revisions to push.')
2882
note('Pushed up to revision %d.' % self.new_revno)
2883
self._show_tag_conficts(to_file)
2886
class BranchCheckResult(object):
2887
"""Results of checking branch consistency.
2892
def __init__(self, branch):
2893
self.branch = branch
2895
def report_results(self, verbose):
2896
"""Report the check results via trace.note.
2898
:param verbose: Requests more detailed display of what was checked,
2901
note('checked branch %s format %s',
2903
self.branch._format)
2906
class Converter5to6(object):
2907
"""Perform an in-place upgrade of format 5 to format 6"""
2909
def convert(self, branch):
2910
# Data for 5 and 6 can peacefully coexist.
2911
format = BzrBranchFormat6()
2912
new_branch = format.open(branch.bzrdir, _found=True)
2914
# Copy source data into target
2915
new_branch._write_last_revision_info(*branch.last_revision_info())
2916
new_branch.set_parent(branch.get_parent())
2917
new_branch.set_bound_location(branch.get_bound_location())
2918
new_branch.set_push_location(branch.get_push_location())
2920
# New branch has no tags by default
2921
new_branch.tags._set_tag_dict({})
2923
# Copying done; now update target format
2924
new_branch._transport.put_bytes('format',
2925
format.get_format_string(),
2926
mode=new_branch.bzrdir._get_file_mode())
2928
# Clean up old files
2929
new_branch._transport.delete('revision-history')
2931
branch.set_parent(None)
2932
except errors.NoSuchFile:
2934
branch.set_bound_location(None)
2937
class Converter6to7(object):
2938
"""Perform an in-place upgrade of format 6 to format 7"""
2940
def convert(self, branch):
2941
format = BzrBranchFormat7()
2942
branch._set_config_location('stacked_on_location', '')
2943
# update target format
2944
branch._transport.put_bytes('format', format.get_format_string())
2947
class Converter7to8(object):
2948
"""Perform an in-place upgrade of format 6 to format 7"""
2950
def convert(self, branch):
2951
format = BzrBranchFormat8()
2952
branch._transport.put_bytes('references', '')
2953
# update target format
2954
branch._transport.put_bytes('format', format.get_format_string())
2957
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2958
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2961
_run_with_write_locked_target will attempt to release the lock it acquires.
2963
If an exception is raised by callable, then that exception *will* be
2964
propagated, even if the unlock attempt raises its own error. Thus
2965
_run_with_write_locked_target should be preferred to simply doing::
2969
return callable(*args, **kwargs)
2974
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2975
# should share code?
2978
result = callable(*args, **kwargs)
2980
exc_info = sys.exc_info()
2984
raise exc_info[0], exc_info[1], exc_info[2]
2990
class InterBranch(InterObject):
2991
"""This class represents operations taking place between two branches.
2993
Its instances have methods like pull() and push() and contain
2994
references to the source and target repositories these operations
2995
can be carried out on.
2999
"""The available optimised InterBranch types."""
3002
def _get_branch_formats_to_test():
3003
"""Return a tuple with the Branch formats to use when testing."""
3004
raise NotImplementedError(self._get_branch_formats_to_test)
3006
def update_revisions(self, stop_revision=None, overwrite=False,
3008
"""Pull in new perfect-fit revisions.
3010
:param stop_revision: Updated until the given revision
3011
:param overwrite: Always set the branch pointer, rather than checking
3012
to see if it is a proper descendant.
3013
:param graph: A Graph object that can be used to query history
3014
information. This can be None.
3017
raise NotImplementedError(self.update_revisions)
3020
class GenericInterBranch(InterBranch):
3021
"""InterBranch implementation that uses public Branch functions.
3025
def _get_branch_formats_to_test():
3026
return BranchFormat._default_format, BranchFormat._default_format
3028
def update_revisions(self, stop_revision=None, overwrite=False,
3030
"""See InterBranch.update_revisions()."""
3031
self.source.lock_read()
3033
other_revno, other_last_revision = self.source.last_revision_info()
3034
stop_revno = None # unknown
3035
if stop_revision is None:
3036
stop_revision = other_last_revision
3037
if _mod_revision.is_null(stop_revision):
3038
# if there are no commits, we're done.
3040
stop_revno = other_revno
3042
# what's the current last revision, before we fetch [and change it
3044
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3045
# we fetch here so that we don't process data twice in the common
3046
# case of having something to pull, and so that the check for
3047
# already merged can operate on the just fetched graph, which will
3048
# be cached in memory.
3049
self.target.fetch(self.source, stop_revision)
3050
# Check to see if one is an ancestor of the other
3053
graph = self.target.repository.get_graph()
3054
if self.target._check_if_descendant_or_diverged(
3055
stop_revision, last_rev, graph, self.source):
3056
# stop_revision is a descendant of last_rev, but we aren't
3057
# overwriting, so we're done.
3059
if stop_revno is None:
3061
graph = self.target.repository.get_graph()
3062
this_revno, this_last_revision = \
3063
self.target.last_revision_info()
3064
stop_revno = graph.find_distance_to_null(stop_revision,
3065
[(other_last_revision, other_revno),
3066
(this_last_revision, this_revno)])
3067
self.target.set_last_revision_info(stop_revno, stop_revision)
3069
self.source.unlock()
3072
def is_compatible(self, source, target):
3073
# GenericBranch uses the public API, so always compatible
3077
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
