1
# Copyright (C) 2005 Canonical Ltd
1
# Copyright (C) 2005-2011 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
from bzrlib.trace import mutter, note
22
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, splitpath, \
23
sha_file, appendpath, file_kind
24
from bzrlib.errors import BzrError
26
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
27
## TODO: Maybe include checks for common corruption of newlines, etc?
31
def find_branch(f, **args):
32
if f and (f.startswith('http://') or f.startswith('https://')):
34
return remotebranch.RemoteBranch(f, **args)
36
return Branch(f, **args)
39
def find_cached_branch(f, cache_root, **args):
40
from remotebranch import RemoteBranch
41
br = find_branch(f, **args)
42
def cacheify(br, store_name):
43
from meta_store import CachedStore
44
cache_path = os.path.join(cache_root, store_name)
46
new_store = CachedStore(getattr(br, store_name), cache_path)
47
setattr(br, store_name, new_store)
49
if isinstance(br, RemoteBranch):
50
cacheify(br, 'inventory_store')
51
cacheify(br, 'text_store')
52
cacheify(br, 'revision_store')
56
def _relpath(base, path):
57
"""Return path relative to base, or raise exception.
59
The path may be either an absolute path or a path relative to the
60
current working directory.
62
Lifted out of Branch.relpath for ease of testing.
64
os.path.commonprefix (python2.4) has a bad bug that it works just
65
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
66
avoids that problem."""
67
rp = os.path.abspath(path)
71
while len(head) >= len(base):
74
head, tail = os.path.split(head)
78
from errors import NotBranchError
79
raise NotBranchError("path %r is not within branch %r" % (rp, base))
84
def find_branch_root(f=None):
85
"""Find the branch root enclosing f, or pwd.
87
f may be a filename or a URL.
89
It is not necessary that f exists.
91
Basically we keep looking up until we find the control directory or
95
elif hasattr(os.path, 'realpath'):
96
f = os.path.realpath(f)
98
f = os.path.abspath(f)
99
if not os.path.exists(f):
100
raise BzrError('%r does not exist' % f)
106
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
108
head, tail = os.path.split(f)
110
# reached the root, whatever that may be
111
raise BzrError('%r is not in a branch' % orig_f)
114
class DivergedBranches(Exception):
115
def __init__(self, branch1, branch2):
116
self.branch1 = branch1
117
self.branch2 = branch2
118
Exception.__init__(self, "These branches have diverged.")
121
class NoSuchRevision(BzrError):
122
def __init__(self, branch, revision):
124
self.revision = revision
125
msg = "Branch %s has no revision %d" % (branch, revision)
126
BzrError.__init__(self, msg)
129
######################################################################
132
class Branch(object):
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
from cStringIO import StringIO
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
29
config as _mod_config,
38
revision as _mod_revision,
45
from bzrlib.i18n import gettext, ngettext
51
from bzrlib.decorators import (
56
from bzrlib.hooks import Hooks
57
from bzrlib.inter import InterObject
58
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
59
from bzrlib import registry
60
from bzrlib.symbol_versioning import (
64
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
67
class Branch(controldir.ControlComponent):
133
68
"""Branch holding a history of revisions.
136
Base directory of the branch.
142
If _lock_mode is true, a positive count of the number of times the
146
Lock object from bzrlib.lock.
71
Base directory/url of the branch; using control_url and
72
control_transport is more standardized.
73
:ivar hooks: An instance of BranchHooks.
74
:ivar _master_branch_cache: cached result of get_master_branch, see
77
# this is really an instance variable - FIXME move it there
153
# Map some sort of prefix into a namespace
154
# stuff like "revno:10", "revid:", etc.
155
# This should match a prefix with a function which accepts
156
REVISION_NAMESPACES = {}
158
def __init__(self, base, init=False, find_root=True):
159
"""Create new branch object at a particular location.
161
base -- Base directory for the branch.
163
init -- If True, create new control files in a previously
164
unversioned directory. If False, the branch must already
167
find_root -- If true and init is false, find the root of the
168
existing branch containing base.
170
In the test suite, creation of new trees is tested using the
171
`ScratchBranch` class.
173
from bzrlib.store import ImmutableStore
175
self.base = os.path.realpath(base)
178
self.base = find_branch_root(base)
180
self.base = os.path.realpath(base)
181
if not isdir(self.controlfilename('.')):
182
from errors import NotBranchError
183
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
184
['use "bzr init" to initialize a new working tree',
185
'current bzr can only operate from top-of-tree'])
188
self.text_store = ImmutableStore(self.controlfilename('text-store'))
189
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
190
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
194
return '%s(%r)' % (self.__class__.__name__, self.base)
201
if self._lock_mode or self._lock:
202
from warnings import warn
203
warn("branch %r was not explicitly unlocked" % self)
208
def lock_write(self):
210
if self._lock_mode != 'w':
211
from errors import LockError
212
raise LockError("can't upgrade to a write lock from %r" %
214
self._lock_count += 1
216
from bzrlib.lock import WriteLock
218
self._lock = WriteLock(self.controlfilename('branch-lock'))
219
self._lock_mode = 'w'
82
def control_transport(self):
83
return self._transport
86
def user_transport(self):
87
return self.bzrdir.user_transport
89
def __init__(self, *ignored, **ignored_too):
90
self.tags = self._format.make_tags(self)
91
self._revision_history_cache = None
92
self._revision_id_to_revno_cache = None
93
self._partial_revision_id_to_revno_cache = {}
94
self._partial_revision_history_cache = []
95
self._tags_bytes = None
96
self._last_revision_info_cache = None
97
self._master_branch_cache = None
98
self._merge_sorted_revisions_cache = None
100
hooks = Branch.hooks['open']
104
def _open_hook(self):
105
"""Called by init to allow simpler extension of the base class."""
107
def _activate_fallback_location(self, url):
108
"""Activate the branch/repository from url as a fallback repository."""
109
for existing_fallback_repo in self.repository._fallback_repositories:
110
if existing_fallback_repo.user_url == url:
111
# This fallback is already configured. This probably only
112
# happens because ControlDir.sprout is a horrible mess. To avoid
113
# confusing _unstack we don't add this a second time.
114
mutter('duplicate activation of fallback %r on %r', url, self)
116
repo = self._get_fallback_repository(url)
117
if repo.has_same_location(self.repository):
118
raise errors.UnstackableLocationError(self.user_url, url)
119
self.repository.add_fallback_repository(repo)
121
def break_lock(self):
122
"""Break a lock if one is present from another instance.
124
Uses the ui factory to ask for confirmation if the lock may be from
127
This will probe the repository for its lock as well.
129
self.control_files.break_lock()
130
self.repository.break_lock()
131
master = self.get_master_branch()
132
if master is not None:
135
def _check_stackable_repo(self):
136
if not self.repository._format.supports_external_lookups:
137
raise errors.UnstackableRepositoryFormat(self.repository._format,
138
self.repository.base)
140
def _extend_partial_history(self, stop_index=None, stop_revision=None):
141
"""Extend the partial history to include a given index
143
If a stop_index is supplied, stop when that index has been reached.
144
If a stop_revision is supplied, stop when that revision is
145
encountered. Otherwise, stop when the beginning of history is
148
:param stop_index: The index which should be present. When it is
149
present, history extension will stop.
150
:param stop_revision: The revision id which should be present. When
151
it is encountered, history extension will stop.
153
if len(self._partial_revision_history_cache) == 0:
154
self._partial_revision_history_cache = [self.last_revision()]
155
repository._iter_for_revno(
156
self.repository, self._partial_revision_history_cache,
157
stop_index=stop_index, stop_revision=stop_revision)
158
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
159
self._partial_revision_history_cache.pop()
161
def _get_check_refs(self):
162
"""Get the references needed for check().
166
revid = self.last_revision()
167
return [('revision-existence', revid), ('lefthand-distance', revid)]
170
def open(base, _unsupported=False, possible_transports=None):
171
"""Open the branch rooted at base.
173
For instance, if the branch is at URL/.bzr/branch,
174
Branch.open(URL) -> a Branch instance.
176
control = controldir.ControlDir.open(base, _unsupported,
177
possible_transports=possible_transports)
178
return control.open_branch(unsupported=_unsupported)
181
def open_from_transport(transport, name=None, _unsupported=False):
182
"""Open the branch rooted at transport"""
183
control = controldir.ControlDir.open_from_transport(transport, _unsupported)
184
return control.open_branch(name=name, unsupported=_unsupported)
187
def open_containing(url, possible_transports=None):
188
"""Open an existing branch which contains url.
190
This probes for a branch at url, and searches upwards from there.
192
Basically we keep looking up until we find the control directory or
193
run into the root. If there isn't one, raises NotBranchError.
194
If there is one and it is either an unrecognised format or an unsupported
195
format, UnknownFormatError or UnsupportedFormatError are raised.
196
If there is one, it is returned, along with the unused portion of url.
198
control, relpath = controldir.ControlDir.open_containing(url,
200
return control.open_branch(), relpath
202
def _push_should_merge_tags(self):
203
"""Should _basic_push merge this branch's tags into the target?
205
The default implementation returns False if this branch has no tags,
206
and True the rest of the time. Subclasses may override this.
208
return self.supports_tags() and self.tags.get_tag_dict()
210
def get_config(self):
211
"""Get a bzrlib.config.BranchConfig for this Branch.
213
This can then be used to get and set configuration options for the
216
:return: A bzrlib.config.BranchConfig.
218
return _mod_config.BranchConfig(self)
220
def get_config_stack(self):
221
"""Get a bzrlib.config.BranchStack for this Branch.
223
This can then be used to get and set configuration options for the
226
:return: A bzrlib.config.BranchStack.
228
return _mod_config.BranchStack(self)
230
def _get_config(self):
231
"""Get the concrete config for just the config in this branch.
233
This is not intended for client use; see Branch.get_config for the
238
:return: An object supporting get_option and set_option.
240
raise NotImplementedError(self._get_config)
242
def _get_fallback_repository(self, url):
243
"""Get the repository we fallback to at url."""
244
url = urlutils.join(self.base, url)
245
a_branch = Branch.open(url,
246
possible_transports=[self.bzrdir.root_transport])
247
return a_branch.repository
250
def _get_tags_bytes(self):
251
"""Get the bytes of a serialised tags dict.
253
Note that not all branches support tags, nor do all use the same tags
254
logic: this method is specific to BasicTags. Other tag implementations
255
may use the same method name and behave differently, safely, because
256
of the double-dispatch via
257
format.make_tags->tags_instance->get_tags_dict.
259
:return: The bytes of the tags file.
260
:seealso: Branch._set_tags_bytes.
262
if self._tags_bytes is None:
263
self._tags_bytes = self._transport.get_bytes('tags')
264
return self._tags_bytes
266
def _get_nick(self, local=False, possible_transports=None):
267
config = self.get_config()
268
# explicit overrides master, but don't look for master if local is True
269
if not local and not config.has_explicit_nickname():
271
master = self.get_master_branch(possible_transports)
272
if master and self.user_url == master.user_url:
273
raise errors.RecursiveBind(self.user_url)
274
if master is not None:
275
# return the master branch value
277
except errors.RecursiveBind, e:
279
except errors.BzrError, e:
280
# Silently fall back to local implicit nick if the master is
282
mutter("Could not connect to bound branch, "
283
"falling back to local nick.\n " + str(e))
284
return config.get_nickname()
286
def _set_nick(self, nick):
287
self.get_config().set_user_option('nickname', nick, warn_masked=True)
289
nick = property(_get_nick, _set_nick)
292
raise NotImplementedError(self.is_locked)
294
def _lefthand_history(self, revision_id, last_rev=None,
296
if 'evil' in debug.debug_flags:
297
mutter_callsite(4, "_lefthand_history scales with history.")
298
# stop_revision must be a descendant of last_revision
299
graph = self.repository.get_graph()
300
if last_rev is not None:
301
if not graph.is_ancestor(last_rev, revision_id):
302
# our previous tip is not merged into stop_revision
303
raise errors.DivergedBranches(self, other_branch)
304
# make a new revision history from the graph
305
parents_map = graph.get_parent_map([revision_id])
306
if revision_id not in parents_map:
307
raise errors.NoSuchRevision(self, revision_id)
308
current_rev_id = revision_id
310
check_not_reserved_id = _mod_revision.check_not_reserved_id
311
# Do not include ghosts or graph origin in revision_history
312
while (current_rev_id in parents_map and
313
len(parents_map[current_rev_id]) > 0):
314
check_not_reserved_id(current_rev_id)
315
new_history.append(current_rev_id)
316
current_rev_id = parents_map[current_rev_id][0]
317
parents_map = graph.get_parent_map([current_rev_id])
318
new_history.reverse()
321
def lock_write(self, token=None):
322
"""Lock the branch for write operations.
324
:param token: A token to permit reacquiring a previously held and
326
:return: A BranchWriteLockResult.
328
raise NotImplementedError(self.lock_write)
224
330
def lock_read(self):
226
assert self._lock_mode in ('r', 'w'), \
227
"invalid lock mode %r" % self._lock_mode
228
self._lock_count += 1
230
from bzrlib.lock import ReadLock
232
self._lock = ReadLock(self.controlfilename('branch-lock'))
233
self._lock_mode = 'r'
331
"""Lock the branch for read operations.
333
:return: A bzrlib.lock.LogicalLockResult.
335
raise NotImplementedError(self.lock_read)
238
337
def unlock(self):
239
if not self._lock_mode:
240
from errors import LockError
241
raise LockError('branch %r is not locked' % (self))
243
if self._lock_count > 1:
244
self._lock_count -= 1
248
self._lock_mode = self._lock_count = None
251
def abspath(self, name):
252
"""Return absolute filename for something in the branch"""
253
return os.path.join(self.base, name)
256
def relpath(self, path):
257
"""Return path relative to this branch of something inside it.
259
Raises an error if path is not in this branch."""
260
return _relpath(self.base, path)
263
def controlfilename(self, file_or_path):
264
"""Return location relative to branch."""
265
if isinstance(file_or_path, basestring):
266
file_or_path = [file_or_path]
267
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
270
def controlfile(self, file_or_path, mode='r'):
271
"""Open a control file for this branch.
273
There are two classes of file in the control directory: text
274
and binary. binary files are untranslated byte streams. Text
275
control files are stored with Unix newlines and in UTF-8, even
276
if the platform or locale defaults are different.
278
Controlfiles should almost never be opened in write mode but
279
rather should be atomically copied and replaced using atomicfile.
282
fn = self.controlfilename(file_or_path)
284
if mode == 'rb' or mode == 'wb':
285
return file(fn, mode)
286
elif mode == 'r' or mode == 'w':
287
# open in binary mode anyhow so there's no newline translation;
288
# codecs uses line buffering by default; don't want that.
290
return codecs.open(fn, mode + 'b', 'utf-8',
293
raise BzrError("invalid controlfile mode %r" % mode)
297
def _make_control(self):
298
from bzrlib.inventory import Inventory
299
from bzrlib.xml import pack_xml
301
os.mkdir(self.controlfilename([]))
302
self.controlfile('README', 'w').write(
303
"This is a Bazaar-NG control directory.\n"
304
"Do not change any files in this directory.\n")
305
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
306
for d in ('text-store', 'inventory-store', 'revision-store'):
307
os.mkdir(self.controlfilename(d))
308
for f in ('revision-history', 'merged-patches',
309
'pending-merged-patches', 'branch-name',
312
self.controlfile(f, 'w').write('')
313
mutter('created control directory in ' + self.base)
315
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
318
def _check_format(self):
319
"""Check this branch format is supported.
321
The current tool only supports the current unstable format.
323
In the future, we might need different in-memory Branch
324
classes to support downlevel branches. But not yet.
326
# This ignores newlines so that we can open branches created
327
# on Windows from Linux and so on. I think it might be better
328
# to always make all internal files in unix format.
329
fmt = self.controlfile('branch-format', 'r').read()
330
fmt.replace('\r\n', '')
331
if fmt != BZR_BRANCH_FORMAT:
332
raise BzrError('sorry, branch format %r not supported' % fmt,
333
['use a different bzr version',
334
'or remove the .bzr directory and "bzr init" again'])
336
def get_root_id(self):
337
"""Return the id of this branches root"""
338
inv = self.read_working_inventory()
339
return inv.root.file_id
341
def set_root_id(self, file_id):
342
inv = self.read_working_inventory()
343
orig_root_id = inv.root.file_id
344
del inv._byid[inv.root.file_id]
345
inv.root.file_id = file_id
346
inv._byid[inv.root.file_id] = inv.root
349
if entry.parent_id in (None, orig_root_id):
350
entry.parent_id = inv.root.file_id
351
self._write_inventory(inv)
353
def read_working_inventory(self):
354
"""Read the working inventory."""
355
from bzrlib.inventory import Inventory
356
from bzrlib.xml import unpack_xml
357
from time import time
361
# ElementTree does its own conversion from UTF-8, so open in
363
inv = unpack_xml(Inventory,
364
self.controlfile('inventory', 'rb'))
365
mutter("loaded inventory of %d items in %f"
366
% (len(inv), time() - before))
372
def _write_inventory(self, inv):
373
"""Update the working inventory.
375
That is to say, the inventory describing changes underway, that
376
will be committed to the next revision.
378
from bzrlib.atomicfile import AtomicFile
379
from bzrlib.xml import pack_xml
383
f = AtomicFile(self.controlfilename('inventory'), 'wb')
392
mutter('wrote working inventory')
395
inventory = property(read_working_inventory, _write_inventory, None,
396
"""Inventory for the working copy.""")
399
def add(self, files, verbose=False, ids=None):
400
"""Make files versioned.
402
Note that the command line normally calls smart_add instead.
404
This puts the files in the Added state, so that they will be
405
recorded by the next commit.
408
List of paths to add, relative to the base of the tree.
411
If set, use these instead of automatically generated ids.
412
Must be the same length as the list of files, but may
413
contain None for ids that are to be autogenerated.
415
TODO: Perhaps have an option to add the ids even if the files do
418
TODO: Perhaps return the ids of the files? But then again it
419
is easy to retrieve them if they're needed.
421
TODO: Adding a directory should optionally recurse down and
422
add all non-ignored children. Perhaps do that in a
425
from bzrlib.textui import show_status
426
# TODO: Re-adding a file that is removed in the working copy
427
# should probably put it back with the previous ID.
428
if isinstance(files, basestring):
429
assert(ids is None or isinstance(ids, basestring))
435
ids = [None] * len(files)
437
assert(len(ids) == len(files))
441
inv = self.read_working_inventory()
442
for f,file_id in zip(files, ids):
443
if is_control_file(f):
444
raise BzrError("cannot add control file %s" % quotefn(f))
449
raise BzrError("cannot add top-level %r" % f)
451
fullpath = os.path.normpath(self.abspath(f))
454
kind = file_kind(fullpath)
456
# maybe something better?
457
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
459
if kind != 'file' and kind != 'directory':
460
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
463
file_id = gen_file_id(f)
464
inv.add_path(f, kind=kind, file_id=file_id)
467
print 'added', quotefn(f)
469
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
471
self._write_inventory(inv)
476
def print_file(self, file, revno):
338
raise NotImplementedError(self.unlock)
340
def peek_lock_mode(self):
341
"""Return lock mode for the Branch: 'r', 'w' or None"""
342
raise NotImplementedError(self.peek_lock_mode)
344
def get_physical_lock_status(self):
345
raise NotImplementedError(self.get_physical_lock_status)
348
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
349
"""Return the revision_id for a dotted revno.
351
:param revno: a tuple like (1,) or (1,1,2)
352
:param _cache_reverse: a private parameter enabling storage
353
of the reverse mapping in a top level cache. (This should
354
only be done in selective circumstances as we want to
355
avoid having the mapping cached multiple times.)
356
:return: the revision_id
357
:raises errors.NoSuchRevision: if the revno doesn't exist
359
rev_id = self._do_dotted_revno_to_revision_id(revno)
361
self._partial_revision_id_to_revno_cache[rev_id] = revno
364
def _do_dotted_revno_to_revision_id(self, revno):
365
"""Worker function for dotted_revno_to_revision_id.
367
Subclasses should override this if they wish to
368
provide a more efficient implementation.
371
return self.get_rev_id(revno[0])
372
revision_id_to_revno = self.get_revision_id_to_revno_map()
373
revision_ids = [revision_id for revision_id, this_revno
374
in revision_id_to_revno.iteritems()
375
if revno == this_revno]
376
if len(revision_ids) == 1:
377
return revision_ids[0]
379
revno_str = '.'.join(map(str, revno))
380
raise errors.NoSuchRevision(self, revno_str)
383
def revision_id_to_dotted_revno(self, revision_id):
384
"""Given a revision id, return its dotted revno.
386
:return: a tuple like (1,) or (400,1,3).
388
return self._do_revision_id_to_dotted_revno(revision_id)
390
def _do_revision_id_to_dotted_revno(self, revision_id):
391
"""Worker function for revision_id_to_revno."""
392
# Try the caches if they are loaded
393
result = self._partial_revision_id_to_revno_cache.get(revision_id)
394
if result is not None:
396
if self._revision_id_to_revno_cache:
397
result = self._revision_id_to_revno_cache.get(revision_id)
399
raise errors.NoSuchRevision(self, revision_id)
400
# Try the mainline as it's optimised
402
revno = self.revision_id_to_revno(revision_id)
404
except errors.NoSuchRevision:
405
# We need to load and use the full revno map after all
406
result = self.get_revision_id_to_revno_map().get(revision_id)
408
raise errors.NoSuchRevision(self, revision_id)
412
def get_revision_id_to_revno_map(self):
413
"""Return the revision_id => dotted revno map.
415
This will be regenerated on demand, but will be cached.
417
:return: A dictionary mapping revision_id => dotted revno.
418
This dictionary should not be modified by the caller.
420
if self._revision_id_to_revno_cache is not None:
421
mapping = self._revision_id_to_revno_cache
423
mapping = self._gen_revno_map()
424
self._cache_revision_id_to_revno(mapping)
425
# TODO: jam 20070417 Since this is being cached, should we be returning
427
# I would rather not, and instead just declare that users should not
428
# modify the return value.
431
def _gen_revno_map(self):
432
"""Create a new mapping from revision ids to dotted revnos.
434
Dotted revnos are generated based on the current tip in the revision
436
This is the worker function for get_revision_id_to_revno_map, which
437
just caches the return value.
439
:return: A dictionary mapping revision_id => dotted revno.
441
revision_id_to_revno = dict((rev_id, revno)
442
for rev_id, depth, revno, end_of_merge
443
in self.iter_merge_sorted_revisions())
444
return revision_id_to_revno
447
def iter_merge_sorted_revisions(self, start_revision_id=None,
448
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
449
"""Walk the revisions for a branch in merge sorted order.
451
Merge sorted order is the output from a merge-aware,
452
topological sort, i.e. all parents come before their
453
children going forward; the opposite for reverse.
455
:param start_revision_id: the revision_id to begin walking from.
456
If None, the branch tip is used.
457
:param stop_revision_id: the revision_id to terminate the walk
458
after. If None, the rest of history is included.
459
:param stop_rule: if stop_revision_id is not None, the precise rule
460
to use for termination:
462
* 'exclude' - leave the stop revision out of the result (default)
463
* 'include' - the stop revision is the last item in the result
464
* 'with-merges' - include the stop revision and all of its
465
merged revisions in the result
466
* 'with-merges-without-common-ancestry' - filter out revisions
467
that are in both ancestries
468
:param direction: either 'reverse' or 'forward':
470
* reverse means return the start_revision_id first, i.e.
471
start at the most recent revision and go backwards in history
472
* forward returns tuples in the opposite order to reverse.
473
Note in particular that forward does *not* do any intelligent
474
ordering w.r.t. depth as some clients of this API may like.
475
(If required, that ought to be done at higher layers.)
477
:return: an iterator over (revision_id, depth, revno, end_of_merge)
480
* revision_id: the unique id of the revision
481
* depth: How many levels of merging deep this node has been
483
* revno_sequence: This field provides a sequence of
484
revision numbers for all revisions. The format is:
485
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
486
branch that the revno is on. From left to right the REVNO numbers
487
are the sequence numbers within that branch of the revision.
488
* end_of_merge: When True the next node (earlier in history) is
489
part of a different merge.
491
# Note: depth and revno values are in the context of the branch so
492
# we need the full graph to get stable numbers, regardless of the
494
if self._merge_sorted_revisions_cache is None:
495
last_revision = self.last_revision()
496
known_graph = self.repository.get_known_graph_ancestry(
498
self._merge_sorted_revisions_cache = known_graph.merge_sort(
500
filtered = self._filter_merge_sorted_revisions(
501
self._merge_sorted_revisions_cache, start_revision_id,
502
stop_revision_id, stop_rule)
503
# Make sure we don't return revisions that are not part of the
504
# start_revision_id ancestry.
505
filtered = self._filter_start_non_ancestors(filtered)
506
if direction == 'reverse':
508
if direction == 'forward':
509
return reversed(list(filtered))
511
raise ValueError('invalid direction %r' % direction)
513
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
514
start_revision_id, stop_revision_id, stop_rule):
515
"""Iterate over an inclusive range of sorted revisions."""
516
rev_iter = iter(merge_sorted_revisions)
517
if start_revision_id is not None:
518
for node in rev_iter:
520
if rev_id != start_revision_id:
523
# The decision to include the start or not
524
# depends on the stop_rule if a stop is provided
525
# so pop this node back into the iterator
526
rev_iter = itertools.chain(iter([node]), rev_iter)
528
if stop_revision_id is None:
530
for node in rev_iter:
532
yield (rev_id, node.merge_depth, node.revno,
534
elif stop_rule == 'exclude':
535
for node in rev_iter:
537
if rev_id == stop_revision_id:
539
yield (rev_id, node.merge_depth, node.revno,
541
elif stop_rule == 'include':
542
for node in rev_iter:
544
yield (rev_id, node.merge_depth, node.revno,
546
if rev_id == stop_revision_id:
548
elif stop_rule == 'with-merges-without-common-ancestry':
549
# We want to exclude all revisions that are already part of the
550
# stop_revision_id ancestry.
551
graph = self.repository.get_graph()
552
ancestors = graph.find_unique_ancestors(start_revision_id,
554
for node in rev_iter:
556
if rev_id not in ancestors:
558
yield (rev_id, node.merge_depth, node.revno,
560
elif stop_rule == 'with-merges':
561
stop_rev = self.repository.get_revision(stop_revision_id)
562
if stop_rev.parent_ids:
563
left_parent = stop_rev.parent_ids[0]
565
left_parent = _mod_revision.NULL_REVISION
566
# left_parent is the actual revision we want to stop logging at,
567
# since we want to show the merged revisions after the stop_rev too
568
reached_stop_revision_id = False
569
revision_id_whitelist = []
570
for node in rev_iter:
572
if rev_id == left_parent:
573
# reached the left parent after the stop_revision
575
if (not reached_stop_revision_id or
576
rev_id in revision_id_whitelist):
577
yield (rev_id, node.merge_depth, node.revno,
579
if reached_stop_revision_id or rev_id == stop_revision_id:
580
# only do the merged revs of rev_id from now on
581
rev = self.repository.get_revision(rev_id)
583
reached_stop_revision_id = True
584
revision_id_whitelist.extend(rev.parent_ids)
586
raise ValueError('invalid stop_rule %r' % stop_rule)
588
def _filter_start_non_ancestors(self, rev_iter):
589
# If we started from a dotted revno, we want to consider it as a tip
590
# and don't want to yield revisions that are not part of its
591
# ancestry. Given the order guaranteed by the merge sort, we will see
592
# uninteresting descendants of the first parent of our tip before the
594
first = rev_iter.next()
595
(rev_id, merge_depth, revno, end_of_merge) = first
598
# We start at a mainline revision so by definition, all others
599
# revisions in rev_iter are ancestors
600
for node in rev_iter:
605
pmap = self.repository.get_parent_map([rev_id])
606
parents = pmap.get(rev_id, [])
608
whitelist.update(parents)
610
# If there is no parents, there is nothing of interest left
612
# FIXME: It's hard to test this scenario here as this code is never
613
# called in that case. -- vila 20100322
616
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
618
if rev_id in whitelist:
619
pmap = self.repository.get_parent_map([rev_id])
620
parents = pmap.get(rev_id, [])
621
whitelist.remove(rev_id)
622
whitelist.update(parents)
624
# We've reached the mainline, there is nothing left to
628
# A revision that is not part of the ancestry of our
631
yield (rev_id, merge_depth, revno, end_of_merge)
633
def leave_lock_in_place(self):
634
"""Tell this branch object not to release the physical lock when this
637
If lock_write doesn't return a token, then this method is not supported.
639
self.control_files.leave_in_place()
641
def dont_leave_lock_in_place(self):
642
"""Tell this branch object to release the physical lock when this
643
object is unlocked, even if it didn't originally acquire it.
645
If lock_write doesn't return a token, then this method is not supported.
647
self.control_files.dont_leave_in_place()
649
def bind(self, other):
650
"""Bind the local branch the other branch.
652
:param other: The branch to bind to
655
raise errors.UpgradeRequired(self.user_url)
657
def get_append_revisions_only(self):
658
"""Whether it is only possible to append revisions to the history.
660
if not self._format.supports_set_append_revisions_only():
662
return self.get_config(
663
).get_user_option_as_bool('append_revisions_only')
665
def set_append_revisions_only(self, enabled):
666
if not self._format.supports_set_append_revisions_only():
667
raise errors.UpgradeRequired(self.user_url)
672
self.get_config().set_user_option('append_revisions_only', value,
675
def set_reference_info(self, file_id, tree_path, branch_location):
676
"""Set the branch location to use for a tree reference."""
677
raise errors.UnsupportedOperation(self.set_reference_info, self)
679
def get_reference_info(self, file_id):
680
"""Get the tree_path and branch_location for a tree reference."""
681
raise errors.UnsupportedOperation(self.get_reference_info, self)
684
def fetch(self, from_branch, last_revision=None, limit=None):
685
"""Copy revisions from from_branch into this branch.
687
:param from_branch: Where to copy from.
688
:param last_revision: What revision to stop at (None for at the end
690
:param limit: Optional rough limit of revisions to fetch
693
return InterBranch.get(from_branch, self).fetch(last_revision, limit=limit)
695
def get_bound_location(self):
696
"""Return the URL of the branch we are bound to.
698
Older format branches cannot bind, please be sure to use a metadir
703
def get_old_bound_location(self):
704
"""Return the URL of the branch we used to be bound to
706
raise errors.UpgradeRequired(self.user_url)
708
def get_commit_builder(self, parents, config=None, timestamp=None,
709
timezone=None, committer=None, revprops=None,
710
revision_id=None, lossy=False):
711
"""Obtain a CommitBuilder for this branch.
713
:param parents: Revision ids of the parents of the new revision.
714
:param config: Optional configuration to use.
715
:param timestamp: Optional timestamp recorded for commit.
716
:param timezone: Optional timezone for timestamp.
717
:param committer: Optional committer to set for commit.
718
:param revprops: Optional dictionary of revision properties.
719
:param revision_id: Optional revision id.
720
:param lossy: Whether to discard data that can not be natively
721
represented, when pushing to a foreign VCS
725
config = self.get_config()
727
return self.repository.get_commit_builder(self, parents, config,
728
timestamp, timezone, committer, revprops, revision_id,
731
def get_master_branch(self, possible_transports=None):
732
"""Return the branch we are bound to.
734
:return: Either a Branch, or None
738
@deprecated_method(deprecated_in((2, 5, 0)))
739
def get_revision_delta(self, revno):
740
"""Return the delta for one revision.
742
The delta is relative to its mainline predecessor, or the
743
empty tree for revision 1.
746
revid = self.get_rev_id(revno)
747
except errors.NoSuchRevision:
748
raise errors.InvalidRevisionNumber(revno)
749
return self.repository.get_revision_delta(revid)
751
def get_stacked_on_url(self):
752
"""Get the URL this branch is stacked against.
754
:raises NotStacked: If the branch is not stacked.
755
:raises UnstackableBranchFormat: If the branch does not support
758
raise NotImplementedError(self.get_stacked_on_url)
760
def print_file(self, file, revision_id):
477
761
"""Print `file` to stdout."""
480
tree = self.revision_tree(self.lookup_revision(revno))
481
# use inventory as it was in that revision
482
file_id = tree.inventory.path2id(file)
484
raise BzrError("%r is not present in revision %s" % (file, revno))
485
tree.print_file(file_id)
490
def remove(self, files, verbose=False):
491
"""Mark nominated files for removal from the inventory.
493
This does not remove their text. This does not run on
495
TODO: Refuse to remove modified files unless --force is given?
497
TODO: Do something useful with directories.
499
TODO: Should this remove the text or not? Tough call; not
500
removing may be useful and the user can just use use rm, and
501
is the opposite of add. Removing it is consistent with most
502
other tools. Maybe an option.
504
from bzrlib.textui import show_status
505
## TODO: Normalize names
506
## TODO: Remove nested loops; better scalability
507
if isinstance(files, basestring):
513
tree = self.working_tree()
516
# do this before any modifications
520
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
521
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
523
# having remove it, it must be either ignored or unknown
524
if tree.is_ignored(f):
528
show_status(new_status, inv[fid].kind, quotefn(f))
531
self._write_inventory(inv)
536
# FIXME: this doesn't need to be a branch method
537
def set_inventory(self, new_inventory_list):
538
from bzrlib.inventory import Inventory, InventoryEntry
539
inv = Inventory(self.get_root_id())
540
for path, file_id, parent, kind in new_inventory_list:
541
name = os.path.basename(path)
544
inv.add(InventoryEntry(file_id, name, kind, parent))
545
self._write_inventory(inv)
549
"""Return all unknown files.
551
These are files in the working directory that are not versioned or
552
control files or ignored.
554
>>> b = ScratchBranch(files=['foo', 'foo~'])
555
>>> list(b.unknowns())
558
>>> list(b.unknowns())
561
>>> list(b.unknowns())
564
return self.working_tree().unknowns()
567
def append_revision(self, *revision_ids):
568
from bzrlib.atomicfile import AtomicFile
570
for revision_id in revision_ids:
571
mutter("add {%s} to revision-history" % revision_id)
573
rev_history = self.revision_history()
574
rev_history.extend(revision_ids)
576
f = AtomicFile(self.controlfilename('revision-history'))
578
for rev_id in rev_history:
585
def get_revision(self, revision_id):
586
"""Return the Revision object for a named revision"""
587
from bzrlib.revision import Revision
588
from bzrlib.xml import unpack_xml
592
if not revision_id or not isinstance(revision_id, basestring):
593
raise ValueError('invalid revision-id: %r' % revision_id)
594
r = unpack_xml(Revision, self.revision_store[revision_id])
598
assert r.revision_id == revision_id
602
def get_revision_sha1(self, revision_id):
603
"""Hash the stored value of a revision, and return it."""
604
# In the future, revision entries will be signed. At that
605
# point, it is probably best *not* to include the signature
606
# in the revision hash. Because that lets you re-sign
607
# the revision, (add signatures/remove signatures) and still
608
# have all hash pointers stay consistent.
609
# But for now, just hash the contents.
610
return sha_file(self.revision_store[revision_id])
613
def get_inventory(self, inventory_id):
614
"""Get Inventory object by hash.
616
TODO: Perhaps for this and similar methods, take a revision
617
parameter which can be either an integer revno or a
619
from bzrlib.inventory import Inventory
620
from bzrlib.xml import unpack_xml
622
return unpack_xml(Inventory, self.inventory_store[inventory_id])
625
def get_inventory_sha1(self, inventory_id):
626
"""Return the sha1 hash of the inventory entry
628
return sha_file(self.inventory_store[inventory_id])
631
def get_revision_inventory(self, revision_id):
632
"""Return inventory of a past revision."""
633
# bzr 0.0.6 imposes the constraint that the inventory_id
634
# must be the same as its revision, so this is trivial.
635
if revision_id == None:
636
from bzrlib.inventory import Inventory
637
return Inventory(self.get_root_id())
639
return self.get_inventory(revision_id)
762
raise NotImplementedError(self.print_file)
764
@deprecated_method(deprecated_in((2, 4, 0)))
765
def set_revision_history(self, rev_history):
766
"""See Branch.set_revision_history."""
767
self._set_revision_history(rev_history)
770
def _set_revision_history(self, rev_history):
771
if len(rev_history) == 0:
772
revid = _mod_revision.NULL_REVISION
774
revid = rev_history[-1]
775
if rev_history != self._lefthand_history(revid):
776
raise errors.NotLefthandHistory(rev_history)
777
self.set_last_revision_info(len(rev_history), revid)
778
self._cache_revision_history(rev_history)
779
for hook in Branch.hooks['set_rh']:
780
hook(self, rev_history)
783
def set_last_revision_info(self, revno, revision_id):
784
"""Set the last revision of this branch.
786
The caller is responsible for checking that the revno is correct
787
for this revision id.
789
It may be possible to set the branch last revision to an id not
790
present in the repository. However, branches can also be
791
configured to check constraints on history, in which case this may not
794
raise NotImplementedError(self.set_last_revision_info)
797
def generate_revision_history(self, revision_id, last_rev=None,
799
"""See Branch.generate_revision_history"""
800
graph = self.repository.get_graph()
801
(last_revno, last_revid) = self.last_revision_info()
802
known_revision_ids = [
803
(last_revid, last_revno),
804
(_mod_revision.NULL_REVISION, 0),
806
if last_rev is not None:
807
if not graph.is_ancestor(last_rev, revision_id):
808
# our previous tip is not merged into stop_revision
809
raise errors.DivergedBranches(self, other_branch)
810
revno = graph.find_distance_to_null(revision_id, known_revision_ids)
811
self.set_last_revision_info(revno, revision_id)
814
def set_parent(self, url):
815
"""See Branch.set_parent."""
816
# TODO: Maybe delete old location files?
817
# URLs should never be unicode, even on the local fs,
818
# FIXUP this and get_parent in a future branch format bump:
819
# read and rewrite the file. RBC 20060125
821
if isinstance(url, unicode):
823
url = url.encode('ascii')
824
except UnicodeEncodeError:
825
raise errors.InvalidURL(url,
826
"Urls must be 7-bit ascii, "
827
"use bzrlib.urlutils.escape")
828
url = urlutils.relative_url(self.base, url)
829
self._set_parent_location(url)
832
def set_stacked_on_url(self, url):
833
"""Set the URL this branch is stacked against.
835
:raises UnstackableBranchFormat: If the branch does not support
837
:raises UnstackableRepositoryFormat: If the repository does not support
840
if not self._format.supports_stacking():
841
raise errors.UnstackableBranchFormat(self._format, self.user_url)
842
# XXX: Changing from one fallback repository to another does not check
843
# that all the data you need is present in the new fallback.
844
# Possibly it should.
845
self._check_stackable_repo()
848
old_url = self.get_stacked_on_url()
849
except (errors.NotStacked, errors.UnstackableBranchFormat,
850
errors.UnstackableRepositoryFormat):
854
self._activate_fallback_location(url)
855
# write this out after the repository is stacked to avoid setting a
856
# stacked config that doesn't work.
857
self._set_config_location('stacked_on_location', url)
860
"""Change a branch to be unstacked, copying data as needed.
862
Don't call this directly, use set_stacked_on_url(None).
864
pb = ui.ui_factory.nested_progress_bar()
866
pb.update(gettext("Unstacking"))
867
# The basic approach here is to fetch the tip of the branch,
868
# including all available ghosts, from the existing stacked
869
# repository into a new repository object without the fallbacks.
871
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
872
# correct for CHKMap repostiories
873
old_repository = self.repository
874
if len(old_repository._fallback_repositories) != 1:
875
raise AssertionError("can't cope with fallback repositories "
876
"of %r (fallbacks: %r)" % (old_repository,
877
old_repository._fallback_repositories))
878
# Open the new repository object.
879
# Repositories don't offer an interface to remove fallback
880
# repositories today; take the conceptually simpler option and just
881
# reopen it. We reopen it starting from the URL so that we
882
# get a separate connection for RemoteRepositories and can
883
# stream from one of them to the other. This does mean doing
884
# separate SSH connection setup, but unstacking is not a
885
# common operation so it's tolerable.
886
new_bzrdir = controldir.ControlDir.open(
887
self.bzrdir.root_transport.base)
888
new_repository = new_bzrdir.find_repository()
889
if new_repository._fallback_repositories:
890
raise AssertionError("didn't expect %r to have "
891
"fallback_repositories"
892
% (self.repository,))
893
# Replace self.repository with the new repository.
894
# Do our best to transfer the lock state (i.e. lock-tokens and
895
# lock count) of self.repository to the new repository.
896
lock_token = old_repository.lock_write().repository_token
897
self.repository = new_repository
898
if isinstance(self, remote.RemoteBranch):
899
# Remote branches can have a second reference to the old
900
# repository that need to be replaced.
901
if self._real_branch is not None:
902
self._real_branch.repository = new_repository
903
self.repository.lock_write(token=lock_token)
904
if lock_token is not None:
905
old_repository.leave_lock_in_place()
906
old_repository.unlock()
907
if lock_token is not None:
908
# XXX: self.repository.leave_lock_in_place() before this
909
# function will not be preserved. Fortunately that doesn't
910
# affect the current default format (2a), and would be a
911
# corner-case anyway.
912
# - Andrew Bennetts, 2010/06/30
913
self.repository.dont_leave_lock_in_place()
917
old_repository.unlock()
918
except errors.LockNotHeld:
921
if old_lock_count == 0:
922
raise AssertionError(
923
'old_repository should have been locked at least once.')
924
for i in range(old_lock_count-1):
925
self.repository.lock_write()
926
# Fetch from the old repository into the new.
927
old_repository.lock_read()
929
# XXX: If you unstack a branch while it has a working tree
930
# with a pending merge, the pending-merged revisions will no
931
# longer be present. You can (probably) revert and remerge.
933
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
934
except errors.TagsNotSupported:
935
tags_to_fetch = set()
936
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
937
old_repository, required_ids=[self.last_revision()],
938
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
939
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
941
old_repository.unlock()
945
def _set_tags_bytes(self, bytes):
946
"""Mirror method for _get_tags_bytes.
948
:seealso: Branch._get_tags_bytes.
950
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
951
op.add_cleanup(self.lock_write().unlock)
952
return op.run_simple(bytes)
954
def _set_tags_bytes_locked(self, bytes):
955
self._tags_bytes = bytes
956
return self._transport.put_bytes('tags', bytes)
958
def _cache_revision_history(self, rev_history):
959
"""Set the cached revision history to rev_history.
961
The revision_history method will use this cache to avoid regenerating
962
the revision history.
964
This API is semi-public; it only for use by subclasses, all other code
965
should consider it to be private.
967
self._revision_history_cache = rev_history
969
def _cache_revision_id_to_revno(self, revision_id_to_revno):
970
"""Set the cached revision_id => revno map to revision_id_to_revno.
972
This API is semi-public; it only for use by subclasses, all other code
973
should consider it to be private.
975
self._revision_id_to_revno_cache = revision_id_to_revno
977
def _clear_cached_state(self):
978
"""Clear any cached data on this branch, e.g. cached revision history.
980
This means the next call to revision_history will need to call
981
_gen_revision_history.
983
This API is semi-public; it only for use by subclasses, all other code
984
should consider it to be private.
986
self._revision_history_cache = None
987
self._revision_id_to_revno_cache = None
988
self._last_revision_info_cache = None
989
self._master_branch_cache = None
990
self._merge_sorted_revisions_cache = None
991
self._partial_revision_history_cache = []
992
self._partial_revision_id_to_revno_cache = {}
993
self._tags_bytes = None
995
def _gen_revision_history(self):
996
"""Return sequence of revision hashes on to this branch.
998
Unlike revision_history, this method always regenerates or rereads the
999
revision history, i.e. it does not cache the result, so repeated calls
1002
Concrete subclasses should override this instead of revision_history so
1003
that subclasses do not need to deal with caching logic.
1005
This API is semi-public; it only for use by subclasses, all other code
1006
should consider it to be private.
1008
raise NotImplementedError(self._gen_revision_history)
1010
@deprecated_method(deprecated_in((2, 5, 0)))
642
1012
def revision_history(self):
643
"""Return sequence of revision hashes on to this branch.
645
>>> ScratchBranch().revision_history()
650
return [l.rstrip('\r\n') for l in
651
self.controlfile('revision-history', 'r').readlines()]
656
def common_ancestor(self, other, self_revno=None, other_revno=None):
659
>>> sb = ScratchBranch(files=['foo', 'foo~'])
660
>>> sb.common_ancestor(sb) == (None, None)
662
>>> commit.commit(sb, "Committing first revision", verbose=False)
663
>>> sb.common_ancestor(sb)[0]
665
>>> clone = sb.clone()
666
>>> commit.commit(sb, "Committing second revision", verbose=False)
667
>>> sb.common_ancestor(sb)[0]
669
>>> sb.common_ancestor(clone)[0]
671
>>> commit.commit(clone, "Committing divergent second revision",
673
>>> sb.common_ancestor(clone)[0]
675
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
677
>>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
679
>>> clone2 = sb.clone()
680
>>> sb.common_ancestor(clone2)[0]
682
>>> sb.common_ancestor(clone2, self_revno=1)[0]
684
>>> sb.common_ancestor(clone2, other_revno=1)[0]
687
my_history = self.revision_history()
688
other_history = other.revision_history()
689
if self_revno is None:
690
self_revno = len(my_history)
691
if other_revno is None:
692
other_revno = len(other_history)
693
indices = range(min((self_revno, other_revno)))
696
if my_history[r] == other_history[r]:
697
return r+1, my_history[r]
700
def enum_history(self, direction):
701
"""Return (revno, revision_id) for history of branch.
704
'forward' is from earliest to latest
705
'reverse' is from latest to earliest
707
rh = self.revision_history()
708
if direction == 'forward':
713
elif direction == 'reverse':
1013
"""Return sequence of revision ids on this branch.
1015
This method will cache the revision history for as long as it is safe to
1018
return self._revision_history()
1020
def _revision_history(self):
1021
if 'evil' in debug.debug_flags:
1022
mutter_callsite(3, "revision_history scales with history.")
1023
if self._revision_history_cache is not None:
1024
history = self._revision_history_cache
719
raise ValueError('invalid history direction', direction)
1026
history = self._gen_revision_history()
1027
self._cache_revision_history(history)
1028
return list(history)
722
1030
def revno(self):
723
1031
"""Return current revision number for this branch.
725
1033
That is equivalent to the number of revisions committed to
728
return len(self.revision_history())
731
def last_patch(self):
732
"""Return last patch hash, or None if no history.
734
ph = self.revision_history()
741
def missing_revisions(self, other, stop_revision=None):
743
If self and other have not diverged, return a list of the revisions
744
present in other, but missing from self.
746
>>> from bzrlib.commit import commit
747
>>> bzrlib.trace.silent = True
748
>>> br1 = ScratchBranch()
749
>>> br2 = ScratchBranch()
750
>>> br1.missing_revisions(br2)
752
>>> commit(br2, "lala!", rev_id="REVISION-ID-1")
753
>>> br1.missing_revisions(br2)
755
>>> br2.missing_revisions(br1)
757
>>> commit(br1, "lala!", rev_id="REVISION-ID-1")
758
>>> br1.missing_revisions(br2)
760
>>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
761
>>> br1.missing_revisions(br2)
763
>>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
764
>>> br1.missing_revisions(br2)
765
Traceback (most recent call last):
766
DivergedBranches: These branches have diverged.
768
self_history = self.revision_history()
769
self_len = len(self_history)
770
other_history = other.revision_history()
771
other_len = len(other_history)
772
common_index = min(self_len, other_len) -1
773
if common_index >= 0 and \
774
self_history[common_index] != other_history[common_index]:
775
raise DivergedBranches(self, other)
1036
return self.last_revision_info()[0]
1039
"""Older format branches cannot bind or unbind."""
1040
raise errors.UpgradeRequired(self.user_url)
1042
def last_revision(self):
1043
"""Return last revision id, or NULL_REVISION."""
1044
return self.last_revision_info()[1]
1047
def last_revision_info(self):
1048
"""Return information about the last revision.
1050
:return: A tuple (revno, revision_id).
1052
if self._last_revision_info_cache is None:
1053
self._last_revision_info_cache = self._read_last_revision_info()
1054
return self._last_revision_info_cache
1056
def _read_last_revision_info(self):
1057
raise NotImplementedError(self._read_last_revision_info)
1059
@deprecated_method(deprecated_in((2, 4, 0)))
1060
def import_last_revision_info(self, source_repo, revno, revid):
1061
"""Set the last revision info, importing from another repo if necessary.
1063
:param source_repo: Source repository to optionally fetch from
1064
:param revno: Revision number of the new tip
1065
:param revid: Revision id of the new tip
1067
if not self.repository.has_same_location(source_repo):
1068
self.repository.fetch(source_repo, revision_id=revid)
1069
self.set_last_revision_info(revno, revid)
1071
def import_last_revision_info_and_tags(self, source, revno, revid,
1073
"""Set the last revision info, importing from another repo if necessary.
1075
This is used by the bound branch code to upload a revision to
1076
the master branch first before updating the tip of the local branch.
1077
Revisions referenced by source's tags are also transferred.
1079
:param source: Source branch to optionally fetch from
1080
:param revno: Revision number of the new tip
1081
:param revid: Revision id of the new tip
1082
:param lossy: Whether to discard metadata that can not be
1083
natively represented
1084
:return: Tuple with the new revision number and revision id
1085
(should only be different from the arguments when lossy=True)
1087
if not self.repository.has_same_location(source.repository):
1088
self.fetch(source, revid)
1089
self.set_last_revision_info(revno, revid)
1090
return (revno, revid)
1092
def revision_id_to_revno(self, revision_id):
1093
"""Given a revision id, return its revno"""
1094
if _mod_revision.is_null(revision_id):
1096
history = self._revision_history()
1098
return history.index(revision_id) + 1
1100
raise errors.NoSuchRevision(self, revision_id)
1103
def get_rev_id(self, revno, history=None):
1104
"""Find the revision id of the specified revno."""
1106
return _mod_revision.NULL_REVISION
1107
last_revno, last_revid = self.last_revision_info()
1108
if revno == last_revno:
1110
if revno <= 0 or revno > last_revno:
1111
raise errors.NoSuchRevision(self, revno)
1112
distance_from_last = last_revno - revno
1113
if len(self._partial_revision_history_cache) <= distance_from_last:
1114
self._extend_partial_history(distance_from_last)
1115
return self._partial_revision_history_cache[distance_from_last]
1117
def pull(self, source, overwrite=False, stop_revision=None,
1118
possible_transports=None, *args, **kwargs):
1119
"""Mirror source into this branch.
1121
This branch is considered to be 'local', having low latency.
1123
:returns: PullResult instance
1125
return InterBranch.get(source, self).pull(overwrite=overwrite,
1126
stop_revision=stop_revision,
1127
possible_transports=possible_transports, *args, **kwargs)
1129
def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1131
"""Mirror this branch into target.
1133
This branch is considered to be 'local', having low latency.
1135
return InterBranch.get(self, target).push(overwrite, stop_revision,
1136
lossy, *args, **kwargs)
1138
def basis_tree(self):
1139
"""Return `Tree` object for last revision."""
1140
return self.repository.revision_tree(self.last_revision())
1142
def get_parent(self):
1143
"""Return the parent location of the branch.
1145
This is the default location for pull/missing. The usual
1146
pattern is that the user can override it by specifying a
1149
parent = self._get_parent_location()
1152
# This is an old-format absolute path to a local branch
1153
# turn it into a url
1154
if parent.startswith('/'):
1155
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1157
return urlutils.join(self.base[:-1], parent)
1158
except errors.InvalidURLJoin, e:
1159
raise errors.InaccessibleParent(parent, self.user_url)
1161
def _get_parent_location(self):
1162
raise NotImplementedError(self._get_parent_location)
1164
def _set_config_location(self, name, url, config=None,
1165
make_relative=False):
1167
config = self.get_config()
1171
url = urlutils.relative_url(self.base, url)
1172
config.set_user_option(name, url, warn_masked=True)
1174
def _get_config_location(self, name, config=None):
1176
config = self.get_config()
1177
location = config.get_user_option(name)
1182
def get_child_submit_format(self):
1183
"""Return the preferred format of submissions to this branch."""
1184
return self.get_config().get_user_option("child_submit_format")
1186
def get_submit_branch(self):
1187
"""Return the submit location of the branch.
1189
This is the default location for bundle. The usual
1190
pattern is that the user can override it by specifying a
1193
return self.get_config().get_user_option('submit_branch')
1195
def set_submit_branch(self, location):
1196
"""Return the submit location of the branch.
1198
This is the default location for bundle. The usual
1199
pattern is that the user can override it by specifying a
1202
self.get_config().set_user_option('submit_branch', location,
1205
def get_public_branch(self):
1206
"""Return the public location of the branch.
1208
This is used by merge directives.
1210
return self._get_config_location('public_branch')
1212
def set_public_branch(self, location):
1213
"""Return the submit location of the branch.
1215
This is the default location for bundle. The usual
1216
pattern is that the user can override it by specifying a
1219
self._set_config_location('public_branch', location)
1221
def get_push_location(self):
1222
"""Return the None or the location to push this branch to."""
1223
push_loc = self.get_config().get_user_option('push_location')
1226
def set_push_location(self, location):
1227
"""Set a new push location for this branch."""
1228
raise NotImplementedError(self.set_push_location)
1230
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1231
"""Run the post_change_branch_tip hooks."""
1232
hooks = Branch.hooks['post_change_branch_tip']
1235
new_revno, new_revid = self.last_revision_info()
1236
params = ChangeBranchTipParams(
1237
self, old_revno, new_revno, old_revid, new_revid)
1241
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1242
"""Run the pre_change_branch_tip hooks."""
1243
hooks = Branch.hooks['pre_change_branch_tip']
1246
old_revno, old_revid = self.last_revision_info()
1247
params = ChangeBranchTipParams(
1248
self, old_revno, new_revno, old_revid, new_revid)
1254
"""Synchronise this branch with the master branch if any.
1256
:return: None or the last_revision pivoted out during the update.
1260
def check_revno(self, revno):
1262
Check whether a revno corresponds to any revision.
1263
Zero (the NULL revision) is considered valid.
1266
self.check_real_revno(revno)
1268
def check_real_revno(self, revno):
1270
Check whether a revno corresponds to a real revision.
1271
Zero (the NULL revision) is considered invalid
1273
if revno < 1 or revno > self.revno():
1274
raise errors.InvalidRevisionNumber(revno)
1277
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
1278
"""Clone this branch into to_bzrdir preserving all semantic values.
1280
Most API users will want 'create_clone_on_transport', which creates a
1281
new bzrdir and branch on the fly.
1283
revision_id: if not None, the revision history in the new branch will
1284
be truncated to end with revision_id.
1286
result = to_bzrdir.create_branch()
1289
if repository_policy is not None:
1290
repository_policy.configure_branch(result)
1291
self.copy_content_into(result, revision_id=revision_id)
1297
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None,
1299
"""Create a new line of development from the branch, into to_bzrdir.
1301
to_bzrdir controls the branch format.
1303
revision_id: if not None, the revision history in the new branch will
1304
be truncated to end with revision_id.
1306
if (repository_policy is not None and
1307
repository_policy.requires_stacking()):
1308
to_bzrdir._format.require_stacking(_skip_repo=True)
1309
result = to_bzrdir.create_branch(repository=repository)
1312
if repository_policy is not None:
1313
repository_policy.configure_branch(result)
1314
self.copy_content_into(result, revision_id=revision_id)
1315
master_url = self.get_bound_location()
1316
if master_url is None:
1317
result.set_parent(self.bzrdir.root_transport.base)
1319
result.set_parent(master_url)
1324
def _synchronize_history(self, destination, revision_id):
1325
"""Synchronize last revision and revision history between branches.
1327
This version is most efficient when the destination is also a
1328
BzrBranch6, but works for BzrBranch5, as long as the destination's
1329
repository contains all the lefthand ancestors of the intended
1330
last_revision. If not, set_last_revision_info will fail.
1332
:param destination: The branch to copy the history into
1333
:param revision_id: The revision-id to truncate history at. May
1334
be None to copy complete history.
1336
source_revno, source_revision_id = self.last_revision_info()
1337
if revision_id is None:
1338
revno, revision_id = source_revno, source_revision_id
1340
graph = self.repository.get_graph()
1342
revno = graph.find_distance_to_null(revision_id,
1343
[(source_revision_id, source_revno)])
1344
except errors.GhostRevisionsHaveNoRevno:
1345
# Default to 1, if we can't find anything else
1347
destination.set_last_revision_info(revno, revision_id)
1349
def copy_content_into(self, destination, revision_id=None):
1350
"""Copy the content of self into destination.
1352
revision_id: if not None, the revision history in the new branch will
1353
be truncated to end with revision_id.
1355
return InterBranch.get(self, destination).copy_content_into(
1356
revision_id=revision_id)
1358
def update_references(self, target):
1359
if not getattr(self._format, 'supports_reference_locations', False):
1361
reference_dict = self._get_all_reference_info()
1362
if len(reference_dict) == 0:
1364
old_base = self.base
1365
new_base = target.base
1366
target_reference_dict = target._get_all_reference_info()
1367
for file_id, (tree_path, branch_location) in (
1368
reference_dict.items()):
1369
branch_location = urlutils.rebase_url(branch_location,
1371
target_reference_dict.setdefault(
1372
file_id, (tree_path, branch_location))
1373
target._set_all_reference_info(target_reference_dict)
1376
def check(self, refs):
1377
"""Check consistency of the branch.
1379
In particular this checks that revisions given in the revision-history
1380
do actually match up in the revision graph, and that they're all
1381
present in the repository.
1383
Callers will typically also want to check the repository.
1385
:param refs: Calculated refs for this branch as specified by
1386
branch._get_check_refs()
1387
:return: A BranchCheckResult.
1389
result = BranchCheckResult(self)
1390
last_revno, last_revision_id = self.last_revision_info()
1391
actual_revno = refs[('lefthand-distance', last_revision_id)]
1392
if actual_revno != last_revno:
1393
result.errors.append(errors.BzrCheckError(
1394
'revno does not match len(mainline) %s != %s' % (
1395
last_revno, actual_revno)))
1396
# TODO: We should probably also check that self.revision_history
1397
# matches the repository for older branch formats.
1398
# If looking for the code that cross-checks repository parents against
1399
# the Graph.iter_lefthand_ancestry output, that is now a repository
1403
def _get_checkout_format(self, lightweight=False):
1404
"""Return the most suitable metadir for a checkout of this branch.
1405
Weaves are used if this branch's repository uses weaves.
1407
format = self.repository.bzrdir.checkout_metadir()
1408
format.set_branch_format(self._format)
1411
def create_clone_on_transport(self, to_transport, revision_id=None,
1412
stacked_on=None, create_prefix=False, use_existing_dir=False,
1414
"""Create a clone of this branch and its bzrdir.
1416
:param to_transport: The transport to clone onto.
1417
:param revision_id: The revision id to use as tip in the new branch.
1418
If None the tip is obtained from this branch.
1419
:param stacked_on: An optional URL to stack the clone on.
1420
:param create_prefix: Create any missing directories leading up to
1422
:param use_existing_dir: Use an existing directory if one exists.
1424
# XXX: Fix the bzrdir API to allow getting the branch back from the
1425
# clone call. Or something. 20090224 RBC/spiv.
1426
# XXX: Should this perhaps clone colocated branches as well,
1427
# rather than just the default branch? 20100319 JRV
1428
if revision_id is None:
1429
revision_id = self.last_revision()
1430
dir_to = self.bzrdir.clone_on_transport(to_transport,
1431
revision_id=revision_id, stacked_on=stacked_on,
1432
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
1434
return dir_to.open_branch()
1436
def create_checkout(self, to_location, revision_id=None,
1437
lightweight=False, accelerator_tree=None,
1439
"""Create a checkout of a branch.
1441
:param to_location: The url to produce the checkout at
1442
:param revision_id: The revision to check out
1443
:param lightweight: If True, produce a lightweight checkout, otherwise,
1444
produce a bound branch (heavyweight checkout)
1445
:param accelerator_tree: A tree which can be used for retrieving file
1446
contents more quickly than the revision tree, i.e. a workingtree.
1447
The revision tree will be used for cases where accelerator_tree's
1448
content is different.
1449
:param hardlink: If true, hard-link files from accelerator_tree,
1451
:return: The tree of the created checkout
1453
t = transport.get_transport(to_location)
1455
format = self._get_checkout_format(lightweight=lightweight)
1457
checkout = format.initialize_on_transport(t)
1458
from_branch = BranchReferenceFormat().initialize(checkout,
1461
checkout_branch = controldir.ControlDir.create_branch_convenience(
1462
to_location, force_new_tree=False, format=format)
1463
checkout = checkout_branch.bzrdir
1464
checkout_branch.bind(self)
1465
# pull up to the specified revision_id to set the initial
1466
# branch tip correctly, and seed it with history.
1467
checkout_branch.pull(self, stop_revision=revision_id)
1469
tree = checkout.create_workingtree(revision_id,
1470
from_branch=from_branch,
1471
accelerator_tree=accelerator_tree,
1473
basis_tree = tree.basis_tree()
1474
basis_tree.lock_read()
1476
for path, file_id in basis_tree.iter_references():
1477
reference_parent = self.reference_parent(file_id, path)
1478
reference_parent.create_checkout(tree.abspath(path),
1479
basis_tree.get_reference_revision(file_id, path),
1486
def reconcile(self, thorough=True):
1487
"""Make sure the data stored in this branch is consistent."""
1488
from bzrlib.reconcile import BranchReconciler
1489
reconciler = BranchReconciler(self, thorough=thorough)
1490
reconciler.reconcile()
1493
def reference_parent(self, file_id, path, possible_transports=None):
1494
"""Return the parent branch for a tree-reference file_id
1496
:param file_id: The file_id of the tree reference
1497
:param path: The path of the file_id in the tree
1498
:return: A branch associated with the file_id
1500
# FIXME should provide multiple branches, based on config
1501
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1502
possible_transports=possible_transports)
1504
def supports_tags(self):
1505
return self._format.supports_tags()
1507
def automatic_tag_name(self, revision_id):
1508
"""Try to automatically find the tag name for a revision.
1510
:param revision_id: Revision id of the revision.
1511
:return: A tag name or None if no tag name could be determined.
1513
for hook in Branch.hooks['automatic_tag_name']:
1514
ret = hook(self, revision_id)
1519
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1521
"""Ensure that revision_b is a descendant of revision_a.
1523
This is a helper function for update_revisions.
1525
:raises: DivergedBranches if revision_b has diverged from revision_a.
1526
:returns: True if revision_b is a descendant of revision_a.
1528
relation = self._revision_relations(revision_a, revision_b, graph)
1529
if relation == 'b_descends_from_a':
1531
elif relation == 'diverged':
1532
raise errors.DivergedBranches(self, other_branch)
1533
elif relation == 'a_descends_from_b':
1536
raise AssertionError("invalid relation: %r" % (relation,))
1538
def _revision_relations(self, revision_a, revision_b, graph):
1539
"""Determine the relationship between two revisions.
1541
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1543
heads = graph.heads([revision_a, revision_b])
1544
if heads == set([revision_b]):
1545
return 'b_descends_from_a'
1546
elif heads == set([revision_a, revision_b]):
1547
# These branches have diverged
1549
elif heads == set([revision_a]):
1550
return 'a_descends_from_b'
1552
raise AssertionError("invalid heads: %r" % (heads,))
1554
def heads_to_fetch(self):
1555
"""Return the heads that must and that should be fetched to copy this
1556
branch into another repo.
1558
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
1559
set of heads that must be fetched. if_present_fetch is a set of
1560
heads that must be fetched if present, but no error is necessary if
1561
they are not present.
1563
# For bzr native formats must_fetch is just the tip, and if_present_fetch
1565
must_fetch = set([self.last_revision()])
1566
if_present_fetch = set()
1567
c = self.get_config()
1568
include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1572
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1573
except errors.TagsNotSupported:
1575
must_fetch.discard(_mod_revision.NULL_REVISION)
1576
if_present_fetch.discard(_mod_revision.NULL_REVISION)
1577
return must_fetch, if_present_fetch
1580
class BranchFormat(controldir.ControlComponentFormat):
1581
"""An encapsulation of the initialization and open routines for a format.
1583
Formats provide three things:
1584
* An initialization routine,
1588
Formats are placed in an dict by their format string for reference
1589
during branch opening. It's not required that these be instances, they
1590
can be classes themselves with class methods - it simply depends on
1591
whether state is needed for a given format or not.
1593
Once a format is deprecated, just deprecate the initialize and open
1594
methods on the format class. Do not deprecate the object, as the
1595
object will be created every time regardless.
1598
def __eq__(self, other):
1599
return self.__class__ is other.__class__
1601
def __ne__(self, other):
1602
return not (self == other)
1605
def find_format(klass, controldir, name=None):
1606
"""Return the format for the branch object in controldir."""
1608
transport = controldir.get_branch_transport(None, name=name)
1609
except errors.NoSuchFile:
1610
raise errors.NotBranchError(path=name, bzrdir=controldir)
1612
format_string = transport.get_bytes("format")
1613
return format_registry.get(format_string)
1614
except errors.NoSuchFile:
1615
raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1617
raise errors.UnknownFormatError(format=format_string, kind='branch')
1620
@deprecated_method(deprecated_in((2, 4, 0)))
1621
def get_default_format(klass):
1622
"""Return the current default format."""
1623
return format_registry.get_default()
1626
@deprecated_method(deprecated_in((2, 4, 0)))
1627
def get_formats(klass):
1628
"""Get all the known formats.
1630
Warning: This triggers a load of all lazy registered formats: do not
1631
use except when that is desireed.
1633
return format_registry._get_all()
1635
def get_reference(self, controldir, name=None):
1636
"""Get the target reference of the branch in controldir.
1638
format probing must have been completed before calling
1639
this method - it is assumed that the format of the branch
1640
in controldir is correct.
1642
:param controldir: The controldir to get the branch data from.
1643
:param name: Name of the colocated branch to fetch
1644
:return: None if the branch is not a reference branch.
1649
def set_reference(self, controldir, name, to_branch):
1650
"""Set the target reference of the branch in controldir.
1652
format probing must have been completed before calling
1653
this method - it is assumed that the format of the branch
1654
in controldir is correct.
1656
:param controldir: The controldir to set the branch reference for.
1657
:param name: Name of colocated branch to set, None for default
1658
:param to_branch: branch that the checkout is to reference
1660
raise NotImplementedError(self.set_reference)
1662
def get_format_string(self):
1663
"""Return the ASCII format string that identifies this format."""
1664
raise NotImplementedError(self.get_format_string)
1666
def get_format_description(self):
1667
"""Return the short format description for this format."""
1668
raise NotImplementedError(self.get_format_description)
1670
def _run_post_branch_init_hooks(self, controldir, name, branch):
1671
hooks = Branch.hooks['post_branch_init']
1674
params = BranchInitHookParams(self, controldir, name, branch)
1678
def initialize(self, controldir, name=None, repository=None,
1679
append_revisions_only=None):
1680
"""Create a branch of this format in controldir.
1682
:param name: Name of the colocated branch to create.
1684
raise NotImplementedError(self.initialize)
1686
def is_supported(self):
1687
"""Is this format supported?
1689
Supported formats can be initialized and opened.
1690
Unsupported formats may not support initialization or committing or
1691
some other features depending on the reason for not being supported.
1695
def make_tags(self, branch):
1696
"""Create a tags object for branch.
1698
This method is on BranchFormat, because BranchFormats are reflected
1699
over the wire via network_name(), whereas full Branch instances require
1700
multiple VFS method calls to operate at all.
1702
The default implementation returns a disabled-tags instance.
1704
Note that it is normal for branch to be a RemoteBranch when using tags
1707
return _mod_tag.DisabledTags(branch)
1709
def network_name(self):
1710
"""A simple byte string uniquely identifying this format for RPC calls.
1712
MetaDir branch formats use their disk format string to identify the
1713
repository over the wire. All in one formats such as bzr < 0.8, and
1714
foreign formats like svn/git and hg should use some marker which is
1715
unique and immutable.
1717
raise NotImplementedError(self.network_name)
1719
def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
1720
found_repository=None):
1721
"""Return the branch object for controldir.
1723
:param controldir: A ControlDir that contains a branch.
1724
:param name: Name of colocated branch to open
1725
:param _found: a private parameter, do not use it. It is used to
1726
indicate if format probing has already be done.
1727
:param ignore_fallbacks: when set, no fallback branches will be opened
1728
(if there are any). Default is to open fallbacks.
1730
raise NotImplementedError(self.open)
1733
@deprecated_method(deprecated_in((2, 4, 0)))
1734
def register_format(klass, format):
1735
"""Register a metadir format.
1737
See MetaDirBranchFormatFactory for the ability to register a format
1738
without loading the code the format needs until it is actually used.
1740
format_registry.register(format)
1743
@deprecated_method(deprecated_in((2, 4, 0)))
1744
def set_default_format(klass, format):
1745
format_registry.set_default(format)
1747
def supports_set_append_revisions_only(self):
1748
"""True if this format supports set_append_revisions_only."""
1751
def supports_stacking(self):
1752
"""True if this format records a stacked-on branch."""
1755
def supports_leaving_lock(self):
1756
"""True if this format supports leaving locks in place."""
1757
return False # by default
1760
@deprecated_method(deprecated_in((2, 4, 0)))
1761
def unregister_format(klass, format):
1762
format_registry.remove(format)
1765
return self.get_format_description().rstrip()
1767
def supports_tags(self):
1768
"""True if this format supports tags stored in the branch"""
1769
return False # by default
1771
def tags_are_versioned(self):
1772
"""Whether the tag container for this branch versions tags."""
1775
def supports_tags_referencing_ghosts(self):
1776
"""True if tags can reference ghost revisions."""
1780
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
1781
"""A factory for a BranchFormat object, permitting simple lazy registration.
1783
While none of the built in BranchFormats are lazy registered yet,
1784
bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1785
use it, and the bzr-loom plugin uses it as well (see
1786
bzrlib.plugins.loom.formats).
1789
def __init__(self, format_string, module_name, member_name):
1790
"""Create a MetaDirBranchFormatFactory.
1792
:param format_string: The format string the format has.
1793
:param module_name: Module to load the format class from.
1794
:param member_name: Attribute name within the module for the format class.
1796
registry._LazyObjectGetter.__init__(self, module_name, member_name)
1797
self._format_string = format_string
1799
def get_format_string(self):
1800
"""See BranchFormat.get_format_string."""
1801
return self._format_string
1804
"""Used for network_format_registry support."""
1805
return self.get_obj()()
1808
class BranchHooks(Hooks):
1809
"""A dictionary mapping hook name to a list of callables for branch hooks.
1811
e.g. ['set_rh'] Is the list of items to be called when the
1812
set_revision_history function is invoked.
1816
"""Create the default hooks.
1818
These are all empty initially, because by default nothing should get
1821
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1822
self.add_hook('set_rh',
1823
"Invoked whenever the revision history has been set via "
1824
"set_revision_history. The api signature is (branch, "
1825
"revision_history), and the branch will be write-locked. "
1826
"The set_rh hook can be expensive for bzr to trigger, a better "
1827
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1828
self.add_hook('open',
1829
"Called with the Branch object that has been opened after a "
1830
"branch is opened.", (1, 8))
1831
self.add_hook('post_push',
1832
"Called after a push operation completes. post_push is called "
1833
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1834
"bzr client.", (0, 15))
1835
self.add_hook('post_pull',
1836
"Called after a pull operation completes. post_pull is called "
1837
"with a bzrlib.branch.PullResult object and only runs in the "
1838
"bzr client.", (0, 15))
1839
self.add_hook('pre_commit',
1840
"Called after a commit is calculated but before it is "
1841
"completed. pre_commit is called with (local, master, old_revno, "
1842
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1843
"). old_revid is NULL_REVISION for the first commit to a branch, "
1844
"tree_delta is a TreeDelta object describing changes from the "
1845
"basis revision. hooks MUST NOT modify this delta. "
1846
" future_tree is an in-memory tree obtained from "
1847
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1849
self.add_hook('post_commit',
1850
"Called in the bzr client after a commit has completed. "
1851
"post_commit is called with (local, master, old_revno, old_revid, "
1852
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1853
"commit to a branch.", (0, 15))
1854
self.add_hook('post_uncommit',
1855
"Called in the bzr client after an uncommit completes. "
1856
"post_uncommit is called with (local, master, old_revno, "
1857
"old_revid, new_revno, new_revid) where local is the local branch "
1858
"or None, master is the target branch, and an empty branch "
1859
"receives new_revno of 0, new_revid of None.", (0, 15))
1860
self.add_hook('pre_change_branch_tip',
1861
"Called in bzr client and server before a change to the tip of a "
1862
"branch is made. pre_change_branch_tip is called with a "
1863
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1864
"commit, uncommit will all trigger this hook.", (1, 6))
1865
self.add_hook('post_change_branch_tip',
1866
"Called in bzr client and server after a change to the tip of a "
1867
"branch is made. post_change_branch_tip is called with a "
1868
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1869
"commit, uncommit will all trigger this hook.", (1, 4))
1870
self.add_hook('transform_fallback_location',
1871
"Called when a stacked branch is activating its fallback "
1872
"locations. transform_fallback_location is called with (branch, "
1873
"url), and should return a new url. Returning the same url "
1874
"allows it to be used as-is, returning a different one can be "
1875
"used to cause the branch to stack on a closer copy of that "
1876
"fallback_location. Note that the branch cannot have history "
1877
"accessing methods called on it during this hook because the "
1878
"fallback locations have not been activated. When there are "
1879
"multiple hooks installed for transform_fallback_location, "
1880
"all are called with the url returned from the previous hook."
1881
"The order is however undefined.", (1, 9))
1882
self.add_hook('automatic_tag_name',
1883
"Called to determine an automatic tag name for a revision. "
1884
"automatic_tag_name is called with (branch, revision_id) and "
1885
"should return a tag name or None if no tag name could be "
1886
"determined. The first non-None tag name returned will be used.",
1888
self.add_hook('post_branch_init',
1889
"Called after new branch initialization completes. "
1890
"post_branch_init is called with a "
1891
"bzrlib.branch.BranchInitHookParams. "
1892
"Note that init, branch and checkout (both heavyweight and "
1893
"lightweight) will all trigger this hook.", (2, 2))
1894
self.add_hook('post_switch',
1895
"Called after a checkout switches branch. "
1896
"post_switch is called with a "
1897
"bzrlib.branch.SwitchHookParams.", (2, 2))
1901
# install the default hooks into the Branch class.
1902
Branch.hooks = BranchHooks()
1905
class ChangeBranchTipParams(object):
1906
"""Object holding parameters passed to `*_change_branch_tip` hooks.
1908
There are 5 fields that hooks may wish to access:
1910
:ivar branch: the branch being changed
1911
:ivar old_revno: revision number before the change
1912
:ivar new_revno: revision number after the change
1913
:ivar old_revid: revision id before the change
1914
:ivar new_revid: revision id after the change
1916
The revid fields are strings. The revno fields are integers.
1919
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1920
"""Create a group of ChangeBranchTip parameters.
1922
:param branch: The branch being changed.
1923
:param old_revno: Revision number before the change.
1924
:param new_revno: Revision number after the change.
1925
:param old_revid: Tip revision id before the change.
1926
:param new_revid: Tip revision id after the change.
1928
self.branch = branch
1929
self.old_revno = old_revno
1930
self.new_revno = new_revno
1931
self.old_revid = old_revid
1932
self.new_revid = new_revid
1934
def __eq__(self, other):
1935
return self.__dict__ == other.__dict__
1938
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1939
self.__class__.__name__, self.branch,
1940
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1943
class BranchInitHookParams(object):
1944
"""Object holding parameters passed to `*_branch_init` hooks.
1946
There are 4 fields that hooks may wish to access:
1948
:ivar format: the branch format
1949
:ivar bzrdir: the ControlDir where the branch will be/has been initialized
1950
:ivar name: name of colocated branch, if any (or None)
1951
:ivar branch: the branch created
1953
Note that for lightweight checkouts, the bzrdir and format fields refer to
1954
the checkout, hence they are different from the corresponding fields in
1955
branch, which refer to the original branch.
1958
def __init__(self, format, controldir, name, branch):
1959
"""Create a group of BranchInitHook parameters.
1961
:param format: the branch format
1962
:param controldir: the ControlDir where the branch will be/has been
1964
:param name: name of colocated branch, if any (or None)
1965
:param branch: the branch created
1967
Note that for lightweight checkouts, the bzrdir and format fields refer
1968
to the checkout, hence they are different from the corresponding fields
1969
in branch, which refer to the original branch.
1971
self.format = format
1972
self.bzrdir = controldir
1974
self.branch = branch
1976
def __eq__(self, other):
1977
return self.__dict__ == other.__dict__
1980
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1983
class SwitchHookParams(object):
1984
"""Object holding parameters passed to `*_switch` hooks.
1986
There are 4 fields that hooks may wish to access:
1988
:ivar control_dir: ControlDir of the checkout to change
1989
:ivar to_branch: branch that the checkout is to reference
1990
:ivar force: skip the check for local commits in a heavy checkout
1991
:ivar revision_id: revision ID to switch to (or None)
1994
def __init__(self, control_dir, to_branch, force, revision_id):
1995
"""Create a group of SwitchHook parameters.
1997
:param control_dir: ControlDir of the checkout to change
1998
:param to_branch: branch that the checkout is to reference
1999
:param force: skip the check for local commits in a heavy checkout
2000
:param revision_id: revision ID to switch to (or None)
2002
self.control_dir = control_dir
2003
self.to_branch = to_branch
2005
self.revision_id = revision_id
2007
def __eq__(self, other):
2008
return self.__dict__ == other.__dict__
2011
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
2012
self.control_dir, self.to_branch,
2016
class BranchFormatMetadir(BranchFormat):
2017
"""Common logic for meta-dir based branch formats."""
2019
def _branch_class(self):
2020
"""What class to instantiate on open calls."""
2021
raise NotImplementedError(self._branch_class)
2023
def _get_initial_config(self, append_revisions_only=None):
2024
if append_revisions_only:
2025
return "append_revisions_only = True\n"
2027
# Avoid writing anything if append_revisions_only is disabled,
2028
# as that is the default.
2031
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
2033
"""Initialize a branch in a bzrdir, with specified files
2035
:param a_bzrdir: The bzrdir to initialize the branch in
2036
:param utf8_files: The files to create as a list of
2037
(filename, content) tuples
2038
:param name: Name of colocated branch to create, if any
2039
:return: a branch in this format
2041
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2042
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2043
control_files = lockable_files.LockableFiles(branch_transport,
2044
'lock', lockdir.LockDir)
2045
control_files.create_lock()
2046
control_files.lock_write()
2048
utf8_files += [('format', self.get_format_string())]
2049
for (filename, content) in utf8_files:
2050
branch_transport.put_bytes(
2052
mode=a_bzrdir._get_file_mode())
2054
control_files.unlock()
2055
branch = self.open(a_bzrdir, name, _found=True,
2056
found_repository=repository)
2057
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2060
def network_name(self):
2061
"""A simple byte string uniquely identifying this format for RPC calls.
2063
Metadir branch formats use their format string.
2065
return self.get_format_string()
2067
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2068
found_repository=None):
2069
"""See BranchFormat.open()."""
2071
format = BranchFormat.find_format(a_bzrdir, name=name)
2072
if format.__class__ != self.__class__:
2073
raise AssertionError("wrong format %r found for %r" %
2075
transport = a_bzrdir.get_branch_transport(None, name=name)
2077
control_files = lockable_files.LockableFiles(transport, 'lock',
2079
if found_repository is None:
2080
found_repository = a_bzrdir.find_repository()
2081
return self._branch_class()(_format=self,
2082
_control_files=control_files,
2085
_repository=found_repository,
2086
ignore_fallbacks=ignore_fallbacks)
2087
except errors.NoSuchFile:
2088
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
2091
def _matchingbzrdir(self):
2092
ret = bzrdir.BzrDirMetaFormat1()
2093
ret.set_branch_format(self)
2096
def supports_tags(self):
2099
def supports_leaving_lock(self):
2103
class BzrBranchFormat5(BranchFormatMetadir):
2104
"""Bzr branch format 5.
2107
- a revision-history file.
2109
- a lock dir guarding the branch itself
2110
- all of this stored in a branch/ subdirectory
2111
- works with shared repositories.
2113
This format is new in bzr 0.8.
2116
def _branch_class(self):
2119
def get_format_string(self):
2120
"""See BranchFormat.get_format_string()."""
2121
return "Bazaar-NG branch format 5\n"
2123
def get_format_description(self):
2124
"""See BranchFormat.get_format_description()."""
2125
return "Branch format 5"
2127
def initialize(self, a_bzrdir, name=None, repository=None,
2128
append_revisions_only=None):
2129
"""Create a branch of this format in a_bzrdir."""
2130
if append_revisions_only:
2131
raise errors.UpgradeRequired(a_bzrdir.user_url)
2132
utf8_files = [('revision-history', ''),
2133
('branch-name', ''),
2135
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2137
def supports_tags(self):
2141
class BzrBranchFormat6(BranchFormatMetadir):
2142
"""Branch format with last-revision and tags.
2144
Unlike previous formats, this has no explicit revision history. Instead,
2145
this just stores the last-revision, and the left-hand history leading
2146
up to there is the history.
2148
This format was introduced in bzr 0.15
2149
and became the default in 0.91.
2152
def _branch_class(self):
2155
def get_format_string(self):
2156
"""See BranchFormat.get_format_string()."""
2157
return "Bazaar Branch Format 6 (bzr 0.15)\n"
2159
def get_format_description(self):
2160
"""See BranchFormat.get_format_description()."""
2161
return "Branch format 6"
2163
def initialize(self, a_bzrdir, name=None, repository=None,
2164
append_revisions_only=None):
2165
"""Create a branch of this format in a_bzrdir."""
2166
utf8_files = [('last-revision', '0 null:\n'),
2168
self._get_initial_config(append_revisions_only)),
2171
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2173
def make_tags(self, branch):
2174
"""See bzrlib.branch.BranchFormat.make_tags()."""
2175
return _mod_tag.BasicTags(branch)
2177
def supports_set_append_revisions_only(self):
2181
class BzrBranchFormat8(BranchFormatMetadir):
2182
"""Metadir format supporting storing locations of subtree branches."""
2184
def _branch_class(self):
2187
def get_format_string(self):
2188
"""See BranchFormat.get_format_string()."""
2189
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2191
def get_format_description(self):
2192
"""See BranchFormat.get_format_description()."""
2193
return "Branch format 8"
2195
def initialize(self, a_bzrdir, name=None, repository=None,
2196
append_revisions_only=None):
2197
"""Create a branch of this format in a_bzrdir."""
2198
utf8_files = [('last-revision', '0 null:\n'),
2200
self._get_initial_config(append_revisions_only)),
2204
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2206
def make_tags(self, branch):
2207
"""See bzrlib.branch.BranchFormat.make_tags()."""
2208
return _mod_tag.BasicTags(branch)
2210
def supports_set_append_revisions_only(self):
2213
def supports_stacking(self):
2216
supports_reference_locations = True
2219
class BzrBranchFormat7(BranchFormatMetadir):
2220
"""Branch format with last-revision, tags, and a stacked location pointer.
2222
The stacked location pointer is passed down to the repository and requires
2223
a repository format with supports_external_lookups = True.
2225
This format was introduced in bzr 1.6.
2228
def initialize(self, a_bzrdir, name=None, repository=None,
2229
append_revisions_only=None):
2230
"""Create a branch of this format in a_bzrdir."""
2231
utf8_files = [('last-revision', '0 null:\n'),
2233
self._get_initial_config(append_revisions_only)),
2236
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2238
def _branch_class(self):
2241
def get_format_string(self):
2242
"""See BranchFormat.get_format_string()."""
2243
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
2245
def get_format_description(self):
2246
"""See BranchFormat.get_format_description()."""
2247
return "Branch format 7"
2249
def supports_set_append_revisions_only(self):
2252
def supports_stacking(self):
2255
def make_tags(self, branch):
2256
"""See bzrlib.branch.BranchFormat.make_tags()."""
2257
return _mod_tag.BasicTags(branch)
2259
supports_reference_locations = False
2262
class BranchReferenceFormat(BranchFormatMetadir):
2263
"""Bzr branch reference format.
2265
Branch references are used in implementing checkouts, they
2266
act as an alias to the real branch which is at some other url.
2273
def get_format_string(self):
2274
"""See BranchFormat.get_format_string()."""
2275
return "Bazaar-NG Branch Reference Format 1\n"
2277
def get_format_description(self):
2278
"""See BranchFormat.get_format_description()."""
2279
return "Checkout reference format 1"
2281
def get_reference(self, a_bzrdir, name=None):
2282
"""See BranchFormat.get_reference()."""
2283
transport = a_bzrdir.get_branch_transport(None, name=name)
2284
return transport.get_bytes('location')
2286
def set_reference(self, a_bzrdir, name, to_branch):
2287
"""See BranchFormat.set_reference()."""
2288
transport = a_bzrdir.get_branch_transport(None, name=name)
2289
location = transport.put_bytes('location', to_branch.base)
2291
def initialize(self, a_bzrdir, name=None, target_branch=None,
2292
repository=None, append_revisions_only=None):
2293
"""Create a branch of this format in a_bzrdir."""
2294
if target_branch is None:
2295
# this format does not implement branch itself, thus the implicit
2296
# creation contract must see it as uninitializable
2297
raise errors.UninitializableFormat(self)
2298
mutter('creating branch reference in %s', a_bzrdir.user_url)
2299
if a_bzrdir._format.fixed_components:
2300
raise errors.IncompatibleFormat(self, a_bzrdir._format)
2301
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2302
branch_transport.put_bytes('location',
2303
target_branch.bzrdir.user_url)
2304
branch_transport.put_bytes('format', self.get_format_string())
2306
a_bzrdir, name, _found=True,
2307
possible_transports=[target_branch.bzrdir.root_transport])
2308
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2311
def _make_reference_clone_function(format, a_branch):
2312
"""Create a clone() routine for a branch dynamically."""
2313
def clone(to_bzrdir, revision_id=None,
2314
repository_policy=None):
2315
"""See Branch.clone()."""
2316
return format.initialize(to_bzrdir, target_branch=a_branch)
2317
# cannot obey revision_id limits when cloning a reference ...
2318
# FIXME RBC 20060210 either nuke revision_id for clone, or
2319
# emit some sort of warning/error to the caller ?!
2322
def open(self, a_bzrdir, name=None, _found=False, location=None,
2323
possible_transports=None, ignore_fallbacks=False,
2324
found_repository=None):
2325
"""Return the branch that the branch reference in a_bzrdir points at.
2327
:param a_bzrdir: A BzrDir that contains a branch.
2328
:param name: Name of colocated branch to open, if any
2329
:param _found: a private parameter, do not use it. It is used to
2330
indicate if format probing has already be done.
2331
:param ignore_fallbacks: when set, no fallback branches will be opened
2332
(if there are any). Default is to open fallbacks.
2333
:param location: The location of the referenced branch. If
2334
unspecified, this will be determined from the branch reference in
2336
:param possible_transports: An optional reusable transports list.
2339
format = BranchFormat.find_format(a_bzrdir, name=name)
2340
if format.__class__ != self.__class__:
2341
raise AssertionError("wrong format %r found for %r" %
2343
if location is None:
2344
location = self.get_reference(a_bzrdir, name)
2345
real_bzrdir = controldir.ControlDir.open(
2346
location, possible_transports=possible_transports)
2347
result = real_bzrdir.open_branch(name=name,
2348
ignore_fallbacks=ignore_fallbacks)
2349
# this changes the behaviour of result.clone to create a new reference
2350
# rather than a copy of the content of the branch.
2351
# I did not use a proxy object because that needs much more extensive
2352
# testing, and we are only changing one behaviour at the moment.
2353
# If we decide to alter more behaviours - i.e. the implicit nickname
2354
# then this should be refactored to introduce a tested proxy branch
2355
# and a subclass of that for use in overriding clone() and ....
2357
result.clone = self._make_reference_clone_function(result)
2361
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
2362
"""Branch format registry."""
2364
def __init__(self, other_registry=None):
2365
super(BranchFormatRegistry, self).__init__(other_registry)
2366
self._default_format = None
2368
def set_default(self, format):
2369
self._default_format = format
2371
def get_default(self):
2372
return self._default_format
2375
network_format_registry = registry.FormatRegistry()
2376
"""Registry of formats indexed by their network name.
2378
The network name for a branch format is an identifier that can be used when
2379
referring to formats with smart server operations. See
2380
BranchFormat.network_name() for more detail.
2383
format_registry = BranchFormatRegistry(network_format_registry)
2386
# formats which have no format string are not discoverable
2387
# and not independently creatable, so are not registered.
2388
__format5 = BzrBranchFormat5()
2389
__format6 = BzrBranchFormat6()
2390
__format7 = BzrBranchFormat7()
2391
__format8 = BzrBranchFormat8()
2392
format_registry.register(__format5)
2393
format_registry.register(BranchReferenceFormat())
2394
format_registry.register(__format6)
2395
format_registry.register(__format7)
2396
format_registry.register(__format8)
2397
format_registry.set_default(__format7)
2400
class BranchWriteLockResult(LogicalLockResult):
2401
"""The result of write locking a branch.
2403
:ivar branch_token: The token obtained from the underlying branch lock, or
2405
:ivar unlock: A callable which will unlock the lock.
2408
def __init__(self, unlock, branch_token):
2409
LogicalLockResult.__init__(self, unlock)
2410
self.branch_token = branch_token
2413
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2417
class BzrBranch(Branch, _RelockDebugMixin):
2418
"""A branch stored in the actual filesystem.
2420
Note that it's "local" in the context of the filesystem; it doesn't
2421
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2422
it's writable, and can be accessed via the normal filesystem API.
2424
:ivar _transport: Transport for file operations on this branch's
2425
control files, typically pointing to the .bzr/branch directory.
2426
:ivar repository: Repository for this branch.
2427
:ivar base: The url of the base directory for this branch; the one
2428
containing the .bzr directory.
2429
:ivar name: Optional colocated branch name as it exists in the control
2433
def __init__(self, _format=None,
2434
_control_files=None, a_bzrdir=None, name=None,
2435
_repository=None, ignore_fallbacks=False):
2436
"""Create new branch object at a particular location."""
2437
if a_bzrdir is None:
2438
raise ValueError('a_bzrdir must be supplied')
2440
self.bzrdir = a_bzrdir
2441
self._base = self.bzrdir.transport.clone('..').base
2443
# XXX: We should be able to just do
2444
# self.base = self.bzrdir.root_transport.base
2445
# but this does not quite work yet -- mbp 20080522
2446
self._format = _format
2447
if _control_files is None:
2448
raise ValueError('BzrBranch _control_files is None')
2449
self.control_files = _control_files
2450
self._transport = _control_files._transport
2451
self.repository = _repository
2452
Branch.__init__(self)
2455
if self.name is None:
2456
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2458
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2463
def _get_base(self):
2464
"""Returns the directory containing the control directory."""
2467
base = property(_get_base, doc="The URL for the root of this branch.")
2469
def _get_config(self):
2470
return _mod_config.TransportConfig(self._transport, 'branch.conf')
2472
def is_locked(self):
2473
return self.control_files.is_locked()
2475
def lock_write(self, token=None):
2476
"""Lock the branch for write operations.
2478
:param token: A token to permit reacquiring a previously held and
2480
:return: A BranchWriteLockResult.
2482
if not self.is_locked():
2483
self._note_lock('w')
2484
# All-in-one needs to always unlock/lock.
2485
repo_control = getattr(self.repository, 'control_files', None)
2486
if self.control_files == repo_control or not self.is_locked():
2487
self.repository._warn_if_deprecated(self)
2488
self.repository.lock_write()
2493
return BranchWriteLockResult(self.unlock,
2494
self.control_files.lock_write(token=token))
2497
self.repository.unlock()
2500
def lock_read(self):
2501
"""Lock the branch for read operations.
2503
:return: A bzrlib.lock.LogicalLockResult.
2505
if not self.is_locked():
2506
self._note_lock('r')
2507
# All-in-one needs to always unlock/lock.
2508
repo_control = getattr(self.repository, 'control_files', None)
2509
if self.control_files == repo_control or not self.is_locked():
2510
self.repository._warn_if_deprecated(self)
2511
self.repository.lock_read()
2516
self.control_files.lock_read()
2517
return LogicalLockResult(self.unlock)
2520
self.repository.unlock()
2523
@only_raises(errors.LockNotHeld, errors.LockBroken)
2526
self.control_files.unlock()
2528
# All-in-one needs to always unlock/lock.
2529
repo_control = getattr(self.repository, 'control_files', None)
2530
if (self.control_files == repo_control or
2531
not self.control_files.is_locked()):
2532
self.repository.unlock()
2533
if not self.control_files.is_locked():
2534
# we just released the lock
2535
self._clear_cached_state()
2537
def peek_lock_mode(self):
2538
if self.control_files._lock_count == 0:
2541
return self.control_files._lock_mode
2543
def get_physical_lock_status(self):
2544
return self.control_files.get_physical_lock_status()
2547
def print_file(self, file, revision_id):
2548
"""See Branch.print_file."""
2549
return self.repository.print_file(file, revision_id)
2552
def set_last_revision_info(self, revno, revision_id):
2553
if not revision_id or not isinstance(revision_id, basestring):
2554
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2555
revision_id = _mod_revision.ensure_null(revision_id)
2556
old_revno, old_revid = self.last_revision_info()
2557
if self.get_append_revisions_only():
2558
self._check_history_violation(revision_id)
2559
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2560
self._write_last_revision_info(revno, revision_id)
2561
self._clear_cached_state()
2562
self._last_revision_info_cache = revno, revision_id
2563
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2565
def basis_tree(self):
2566
"""See Branch.basis_tree."""
2567
return self.repository.revision_tree(self.last_revision())
2569
def _get_parent_location(self):
2570
_locs = ['parent', 'pull', 'x-pull']
2573
return self._transport.get_bytes(l).strip('\n')
2574
except errors.NoSuchFile:
2578
def get_stacked_on_url(self):
2579
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2581
def set_push_location(self, location):
2582
"""See Branch.set_push_location."""
2583
self.get_config().set_user_option(
2584
'push_location', location,
2585
store=_mod_config.STORE_LOCATION_NORECURSE)
2587
def _set_parent_location(self, url):
2589
self._transport.delete('parent')
2591
self._transport.put_bytes('parent', url + '\n',
2592
mode=self.bzrdir._get_file_mode())
2596
"""If bound, unbind"""
2597
return self.set_bound_location(None)
2600
def bind(self, other):
2601
"""Bind this branch to the branch other.
2603
This does not push or pull data between the branches, though it does
2604
check for divergence to raise an error when the branches are not
2605
either the same, or one a prefix of the other. That behaviour may not
2606
be useful, so that check may be removed in future.
2608
:param other: The branch to bind to
2611
# TODO: jam 20051230 Consider checking if the target is bound
2612
# It is debatable whether you should be able to bind to
2613
# a branch which is itself bound.
2614
# Committing is obviously forbidden,
2615
# but binding itself may not be.
2616
# Since we *have* to check at commit time, we don't
2617
# *need* to check here
2619
# we want to raise diverged if:
2620
# last_rev is not in the other_last_rev history, AND
2621
# other_last_rev is not in our history, and do it without pulling
2623
self.set_bound_location(other.base)
2625
def get_bound_location(self):
2627
return self._transport.get_bytes('bound')[:-1]
2628
except errors.NoSuchFile:
2632
def get_master_branch(self, possible_transports=None):
2633
"""Return the branch we are bound to.
2635
:return: Either a Branch, or None
2637
if self._master_branch_cache is None:
2638
self._master_branch_cache = self._get_master_branch(
2639
possible_transports)
2640
return self._master_branch_cache
2642
def _get_master_branch(self, possible_transports):
2643
bound_loc = self.get_bound_location()
2647
return Branch.open(bound_loc,
2648
possible_transports=possible_transports)
2649
except (errors.NotBranchError, errors.ConnectionError), e:
2650
raise errors.BoundBranchConnectionFailure(
2654
def set_bound_location(self, location):
2655
"""Set the target where this branch is bound to.
2657
:param location: URL to the target branch
2659
self._master_branch_cache = None
2661
self._transport.put_bytes('bound', location+'\n',
2662
mode=self.bzrdir._get_file_mode())
2665
self._transport.delete('bound')
2666
except errors.NoSuchFile:
2671
def update(self, possible_transports=None):
2672
"""Synchronise this branch with the master branch if any.
2674
:return: None or the last_revision that was pivoted out during the
2677
master = self.get_master_branch(possible_transports)
2678
if master is not None:
2679
old_tip = _mod_revision.ensure_null(self.last_revision())
2680
self.pull(master, overwrite=True)
2681
if self.repository.get_graph().is_ancestor(old_tip,
2682
_mod_revision.ensure_null(self.last_revision())):
2687
def _read_last_revision_info(self):
2688
revision_string = self._transport.get_bytes('last-revision')
2689
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2690
revision_id = cache_utf8.get_cached_utf8(revision_id)
2692
return revno, revision_id
2694
def _write_last_revision_info(self, revno, revision_id):
2695
"""Simply write out the revision id, with no checks.
2697
Use set_last_revision_info to perform this safely.
2699
Does not update the revision_history cache.
2701
revision_id = _mod_revision.ensure_null(revision_id)
2702
out_string = '%d %s\n' % (revno, revision_id)
2703
self._transport.put_bytes('last-revision', out_string,
2704
mode=self.bzrdir._get_file_mode())
2707
class FullHistoryBzrBranch(BzrBranch):
2708
"""Bzr branch which contains the full revision history."""
2711
def set_last_revision_info(self, revno, revision_id):
2712
if not revision_id or not isinstance(revision_id, basestring):
2713
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2714
revision_id = _mod_revision.ensure_null(revision_id)
2715
# this old format stores the full history, but this api doesn't
2716
# provide it, so we must generate, and might as well check it's
2718
history = self._lefthand_history(revision_id)
2719
if len(history) != revno:
2720
raise AssertionError('%d != %d' % (len(history), revno))
2721
self._set_revision_history(history)
2723
def _read_last_revision_info(self):
2724
rh = self._revision_history()
2727
return (revno, rh[-1])
2729
return (0, _mod_revision.NULL_REVISION)
2731
@deprecated_method(deprecated_in((2, 4, 0)))
2733
def set_revision_history(self, rev_history):
2734
"""See Branch.set_revision_history."""
2735
self._set_revision_history(rev_history)
2737
def _set_revision_history(self, rev_history):
2738
if 'evil' in debug.debug_flags:
2739
mutter_callsite(3, "set_revision_history scales with history.")
2740
check_not_reserved_id = _mod_revision.check_not_reserved_id
2741
for rev_id in rev_history:
2742
check_not_reserved_id(rev_id)
2743
if Branch.hooks['post_change_branch_tip']:
2744
# Don't calculate the last_revision_info() if there are no hooks
2746
old_revno, old_revid = self.last_revision_info()
2747
if len(rev_history) == 0:
2748
revid = _mod_revision.NULL_REVISION
2750
revid = rev_history[-1]
2751
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2752
self._write_revision_history(rev_history)
2753
self._clear_cached_state()
2754
self._cache_revision_history(rev_history)
2755
for hook in Branch.hooks['set_rh']:
2756
hook(self, rev_history)
2757
if Branch.hooks['post_change_branch_tip']:
2758
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2760
def _write_revision_history(self, history):
2761
"""Factored out of set_revision_history.
2763
This performs the actual writing to disk.
2764
It is intended to be called by set_revision_history."""
2765
self._transport.put_bytes(
2766
'revision-history', '\n'.join(history),
2767
mode=self.bzrdir._get_file_mode())
2769
def _gen_revision_history(self):
2770
history = self._transport.get_bytes('revision-history').split('\n')
2771
if history[-1:] == ['']:
2772
# There shouldn't be a trailing newline, but just in case.
2776
def _synchronize_history(self, destination, revision_id):
2777
if not isinstance(destination, FullHistoryBzrBranch):
2778
super(BzrBranch, self)._synchronize_history(
2779
destination, revision_id)
2781
if revision_id == _mod_revision.NULL_REVISION:
2784
new_history = self._revision_history()
2785
if revision_id is not None and new_history != []:
2787
new_history = new_history[:new_history.index(revision_id) + 1]
2789
rev = self.repository.get_revision(revision_id)
2790
new_history = rev.get_history(self.repository)[1:]
2791
destination._set_revision_history(new_history)
2794
def generate_revision_history(self, revision_id, last_rev=None,
2796
"""Create a new revision history that will finish with revision_id.
2798
:param revision_id: the new tip to use.
2799
:param last_rev: The previous last_revision. If not None, then this
2800
must be a ancestory of revision_id, or DivergedBranches is raised.
2801
:param other_branch: The other branch that DivergedBranches should
2802
raise with respect to.
2804
self._set_revision_history(self._lefthand_history(revision_id,
2805
last_rev, other_branch))
2808
class BzrBranch5(FullHistoryBzrBranch):
2809
"""A format 5 branch. This supports new features over plain branches.
2811
It has support for a master_branch which is the data for bound branches.
2815
class BzrBranch8(BzrBranch):
2816
"""A branch that stores tree-reference locations."""
2818
def _open_hook(self):
2819
if self._ignore_fallbacks:
2822
url = self.get_stacked_on_url()
2823
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2824
errors.UnstackableBranchFormat):
2827
for hook in Branch.hooks['transform_fallback_location']:
2828
url = hook(self, url)
2830
hook_name = Branch.hooks.get_hook_name(hook)
2831
raise AssertionError(
2832
"'transform_fallback_location' hook %s returned "
2833
"None, not a URL." % hook_name)
2834
self._activate_fallback_location(url)
2836
def __init__(self, *args, **kwargs):
2837
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2838
super(BzrBranch8, self).__init__(*args, **kwargs)
2839
self._last_revision_info_cache = None
2840
self._reference_info = None
2842
def _clear_cached_state(self):
2843
super(BzrBranch8, self)._clear_cached_state()
2844
self._last_revision_info_cache = None
2845
self._reference_info = None
2847
def _check_history_violation(self, revision_id):
2848
current_revid = self.last_revision()
2849
last_revision = _mod_revision.ensure_null(current_revid)
2850
if _mod_revision.is_null(last_revision):
2852
graph = self.repository.get_graph()
2853
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2854
if lh_ancestor == current_revid:
2856
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2858
def _gen_revision_history(self):
2859
"""Generate the revision history from last revision
2861
last_revno, last_revision = self.last_revision_info()
2862
self._extend_partial_history(stop_index=last_revno-1)
2863
return list(reversed(self._partial_revision_history_cache))
2866
def _set_parent_location(self, url):
2867
"""Set the parent branch"""
2868
self._set_config_location('parent_location', url, make_relative=True)
2871
def _get_parent_location(self):
2872
"""Set the parent branch"""
2873
return self._get_config_location('parent_location')
2876
def _set_all_reference_info(self, info_dict):
2877
"""Replace all reference info stored in a branch.
2879
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2882
writer = rio.RioWriter(s)
2883
for key, (tree_path, branch_location) in info_dict.iteritems():
2884
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2885
branch_location=branch_location)
2886
writer.write_stanza(stanza)
2887
self._transport.put_bytes('references', s.getvalue())
2888
self._reference_info = info_dict
2891
def _get_all_reference_info(self):
2892
"""Return all the reference info stored in a branch.
2894
:return: A dict of {file_id: (tree_path, branch_location)}
2896
if self._reference_info is not None:
2897
return self._reference_info
2898
rio_file = self._transport.get('references')
2900
stanzas = rio.read_stanzas(rio_file)
2901
info_dict = dict((s['file_id'], (s['tree_path'],
2902
s['branch_location'])) for s in stanzas)
2905
self._reference_info = info_dict
2908
def set_reference_info(self, file_id, tree_path, branch_location):
2909
"""Set the branch location to use for a tree reference.
2911
:param file_id: The file-id of the tree reference.
2912
:param tree_path: The path of the tree reference in the tree.
2913
:param branch_location: The location of the branch to retrieve tree
2916
info_dict = self._get_all_reference_info()
2917
info_dict[file_id] = (tree_path, branch_location)
2918
if None in (tree_path, branch_location):
2919
if tree_path is not None:
2920
raise ValueError('tree_path must be None when branch_location'
2922
if branch_location is not None:
2923
raise ValueError('branch_location must be None when tree_path'
2925
del info_dict[file_id]
2926
self._set_all_reference_info(info_dict)
2928
def get_reference_info(self, file_id):
2929
"""Get the tree_path and branch_location for a tree reference.
2931
:return: a tuple of (tree_path, branch_location)
2933
return self._get_all_reference_info().get(file_id, (None, None))
2935
def reference_parent(self, file_id, path, possible_transports=None):
2936
"""Return the parent branch for a tree-reference file_id.
2938
:param file_id: The file_id of the tree reference
2939
:param path: The path of the file_id in the tree
2940
:return: A branch associated with the file_id
2942
branch_location = self.get_reference_info(file_id)[1]
2943
if branch_location is None:
2944
return Branch.reference_parent(self, file_id, path,
2945
possible_transports)
2946
branch_location = urlutils.join(self.user_url, branch_location)
2947
return Branch.open(branch_location,
2948
possible_transports=possible_transports)
2950
def set_push_location(self, location):
2951
"""See Branch.set_push_location."""
2952
self._set_config_location('push_location', location)
2954
def set_bound_location(self, location):
2955
"""See Branch.set_push_location."""
2956
self._master_branch_cache = None
2958
config = self.get_config()
2959
if location is None:
2960
if config.get_user_option('bound') != 'True':
2963
config.set_user_option('bound', 'False', warn_masked=True)
2966
self._set_config_location('bound_location', location,
2968
config.set_user_option('bound', 'True', warn_masked=True)
2971
def _get_bound_location(self, bound):
2972
"""Return the bound location in the config file.
2974
Return None if the bound parameter does not match"""
2975
config = self.get_config()
2976
config_bound = (config.get_user_option('bound') == 'True')
2977
if config_bound != bound:
2979
return self._get_config_location('bound_location', config=config)
2981
def get_bound_location(self):
2982
"""See Branch.set_push_location."""
2983
return self._get_bound_location(True)
2985
def get_old_bound_location(self):
2986
"""See Branch.get_old_bound_location"""
2987
return self._get_bound_location(False)
2989
def get_stacked_on_url(self):
2990
# you can always ask for the URL; but you might not be able to use it
2991
# if the repo can't support stacking.
2992
## self._check_stackable_repo()
2993
# stacked_on_location is only ever defined in branch.conf, so don't
2994
# waste effort reading the whole stack of config files.
2995
config = self.get_config()._get_branch_data_config()
2996
stacked_url = self._get_config_location('stacked_on_location',
2998
if stacked_url is None:
2999
raise errors.NotStacked(self)
3003
def get_rev_id(self, revno, history=None):
3004
"""Find the revision id of the specified revno."""
3006
return _mod_revision.NULL_REVISION
3008
last_revno, last_revision_id = self.last_revision_info()
3009
if revno <= 0 or revno > last_revno:
3010
raise errors.NoSuchRevision(self, revno)
3012
if history is not None:
3013
return history[revno - 1]
3015
index = last_revno - revno
3016
if len(self._partial_revision_history_cache) <= index:
3017
self._extend_partial_history(stop_index=index)
3018
if len(self._partial_revision_history_cache) > index:
3019
return self._partial_revision_history_cache[index]
3021
raise errors.NoSuchRevision(self, revno)
3024
def revision_id_to_revno(self, revision_id):
3025
"""Given a revision id, return its revno"""
3026
if _mod_revision.is_null(revision_id):
3029
index = self._partial_revision_history_cache.index(revision_id)
3032
self._extend_partial_history(stop_revision=revision_id)
3033
except errors.RevisionNotPresent, e:
3034
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3035
index = len(self._partial_revision_history_cache) - 1
3037
raise errors.NoSuchRevision(self, revision_id)
3038
if self._partial_revision_history_cache[index] != revision_id:
3039
raise errors.NoSuchRevision(self, revision_id)
3040
return self.revno() - index
3043
class BzrBranch7(BzrBranch8):
3044
"""A branch with support for a fallback repository."""
3046
def set_reference_info(self, file_id, tree_path, branch_location):
3047
Branch.set_reference_info(self, file_id, tree_path, branch_location)
3049
def get_reference_info(self, file_id):
3050
Branch.get_reference_info(self, file_id)
3052
def reference_parent(self, file_id, path, possible_transports=None):
3053
return Branch.reference_parent(self, file_id, path,
3054
possible_transports)
3057
class BzrBranch6(BzrBranch7):
3058
"""See BzrBranchFormat6 for the capabilities of this branch.
3060
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3064
def get_stacked_on_url(self):
3065
raise errors.UnstackableBranchFormat(self._format, self.user_url)
3068
######################################################################
3069
# results of operations
3072
class _Result(object):
3074
def _show_tag_conficts(self, to_file):
3075
if not getattr(self, 'tag_conflicts', None):
3077
to_file.write('Conflicting tags:\n')
3078
for name, value1, value2 in self.tag_conflicts:
3079
to_file.write(' %s\n' % (name, ))
3082
class PullResult(_Result):
3083
"""Result of a Branch.pull operation.
3085
:ivar old_revno: Revision number before pull.
3086
:ivar new_revno: Revision number after pull.
3087
:ivar old_revid: Tip revision id before pull.
3088
:ivar new_revid: Tip revision id after pull.
3089
:ivar source_branch: Source (local) branch object. (read locked)
3090
:ivar master_branch: Master branch of the target, or the target if no
3092
:ivar local_branch: target branch if there is a Master, else None
3093
:ivar target_branch: Target/destination branch object. (write locked)
3094
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3095
:ivar tag_updates: A dict with new tags, see BasicTags.merge_to
3098
@deprecated_method(deprecated_in((2, 3, 0)))
3100
"""Return the relative change in revno.
3102
:deprecated: Use `new_revno` and `old_revno` instead.
3104
return self.new_revno - self.old_revno
3106
def report(self, to_file):
3107
tag_conflicts = getattr(self, "tag_conflicts", None)
3108
tag_updates = getattr(self, "tag_updates", None)
3110
if self.old_revid != self.new_revid:
3111
to_file.write('Now on revision %d.\n' % self.new_revno)
3113
to_file.write('%d tag(s) updated.\n' % len(tag_updates))
3114
if self.old_revid == self.new_revid and not tag_updates:
3115
if not tag_conflicts:
3116
to_file.write('No revisions or tags to pull.\n')
3118
to_file.write('No revisions to pull.\n')
3119
self._show_tag_conficts(to_file)
3122
class BranchPushResult(_Result):
3123
"""Result of a Branch.push operation.
3125
:ivar old_revno: Revision number (eg 10) of the target before push.
3126
:ivar new_revno: Revision number (eg 12) of the target after push.
3127
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3129
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3131
:ivar source_branch: Source branch object that the push was from. This is
3132
read locked, and generally is a local (and thus low latency) branch.
3133
:ivar master_branch: If target is a bound branch, the master branch of
3134
target, or target itself. Always write locked.
3135
:ivar target_branch: The direct Branch where data is being sent (write
3137
:ivar local_branch: If the target is a bound branch this will be the
3138
target, otherwise it will be None.
3141
@deprecated_method(deprecated_in((2, 3, 0)))
3143
"""Return the relative change in revno.
3145
:deprecated: Use `new_revno` and `old_revno` instead.
3147
return self.new_revno - self.old_revno
3149
def report(self, to_file):
3150
# TODO: This function gets passed a to_file, but then
3151
# ignores it and calls note() instead. This is also
3152
# inconsistent with PullResult(), which writes to stdout.
3153
# -- JRV20110901, bug #838853
3154
tag_conflicts = getattr(self, "tag_conflicts", None)
3155
tag_updates = getattr(self, "tag_updates", None)
3157
if self.old_revid != self.new_revid:
3158
note(gettext('Pushed up to revision %d.') % self.new_revno)
3160
note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
3161
if self.old_revid == self.new_revid and not tag_updates:
3162
if not tag_conflicts:
3163
note(gettext('No new revisions or tags to push.'))
3165
note(gettext('No new revisions to push.'))
3166
self._show_tag_conficts(to_file)
3169
class BranchCheckResult(object):
3170
"""Results of checking branch consistency.
3175
def __init__(self, branch):
3176
self.branch = branch
3179
def report_results(self, verbose):
3180
"""Report the check results via trace.note.
3182
:param verbose: Requests more detailed display of what was checked,
3185
note(gettext('checked branch {0} format {1}').format(
3186
self.branch.user_url, self.branch._format))
3187
for error in self.errors:
3188
note(gettext('found error:%s'), error)
3191
class Converter5to6(object):
3192
"""Perform an in-place upgrade of format 5 to format 6"""
3194
def convert(self, branch):
3195
# Data for 5 and 6 can peacefully coexist.
3196
format = BzrBranchFormat6()
3197
new_branch = format.open(branch.bzrdir, _found=True)
3199
# Copy source data into target
3200
new_branch._write_last_revision_info(*branch.last_revision_info())
3201
new_branch.set_parent(branch.get_parent())
3202
new_branch.set_bound_location(branch.get_bound_location())
3203
new_branch.set_push_location(branch.get_push_location())
3205
# New branch has no tags by default
3206
new_branch.tags._set_tag_dict({})
3208
# Copying done; now update target format
3209
new_branch._transport.put_bytes('format',
3210
format.get_format_string(),
3211
mode=new_branch.bzrdir._get_file_mode())
3213
# Clean up old files
3214
new_branch._transport.delete('revision-history')
3216
branch.set_parent(None)
3217
except errors.NoSuchFile:
3219
branch.set_bound_location(None)
3222
class Converter6to7(object):
3223
"""Perform an in-place upgrade of format 6 to format 7"""
3225
def convert(self, branch):
3226
format = BzrBranchFormat7()
3227
branch._set_config_location('stacked_on_location', '')
3228
# update target format
3229
branch._transport.put_bytes('format', format.get_format_string())
3232
class Converter7to8(object):
3233
"""Perform an in-place upgrade of format 7 to format 8"""
3235
def convert(self, branch):
3236
format = BzrBranchFormat8()
3237
branch._transport.put_bytes('references', '')
3238
# update target format
3239
branch._transport.put_bytes('format', format.get_format_string())
3242
class InterBranch(InterObject):
3243
"""This class represents operations taking place between two branches.
3245
Its instances have methods like pull() and push() and contain
3246
references to the source and target repositories these operations
3247
can be carried out on.
3251
"""The available optimised InterBranch types."""
3254
def _get_branch_formats_to_test(klass):
3255
"""Return an iterable of format tuples for testing.
3257
:return: An iterable of (from_format, to_format) to use when testing
3258
this InterBranch class. Each InterBranch class should define this
3261
raise NotImplementedError(klass._get_branch_formats_to_test)
3264
def pull(self, overwrite=False, stop_revision=None,
3265
possible_transports=None, local=False):
3266
"""Mirror source into target branch.
3268
The target branch is considered to be 'local', having low latency.
3270
:returns: PullResult instance
3272
raise NotImplementedError(self.pull)
3275
def push(self, overwrite=False, stop_revision=None, lossy=False,
3276
_override_hook_source_branch=None):
3277
"""Mirror the source branch into the target branch.
3279
The source branch is considered to be 'local', having low latency.
3281
raise NotImplementedError(self.push)
3284
def copy_content_into(self, revision_id=None):
3285
"""Copy the content of source into target
3287
revision_id: if not None, the revision history in the new branch will
3288
be truncated to end with revision_id.
3290
raise NotImplementedError(self.copy_content_into)
3293
def fetch(self, stop_revision=None, limit=None):
3296
:param stop_revision: Last revision to fetch
3297
:param limit: Optional rough limit of revisions to fetch
3299
raise NotImplementedError(self.fetch)
3302
class GenericInterBranch(InterBranch):
3303
"""InterBranch implementation that uses public Branch functions."""
3306
def is_compatible(klass, source, target):
3307
# GenericBranch uses the public API, so always compatible
3311
def _get_branch_formats_to_test(klass):
3312
return [(format_registry.get_default(), format_registry.get_default())]
3315
def unwrap_format(klass, format):
3316
if isinstance(format, remote.RemoteBranchFormat):
3317
format._ensure_real()
3318
return format._custom_format
3322
def copy_content_into(self, revision_id=None):
3323
"""Copy the content of source into target
3325
revision_id: if not None, the revision history in the new branch will
3326
be truncated to end with revision_id.
3328
self.source.update_references(self.target)
3329
self.source._synchronize_history(self.target, revision_id)
3331
parent = self.source.get_parent()
3332
except errors.InaccessibleParent, e:
3333
mutter('parent was not accessible to copy: %s', e)
3336
self.target.set_parent(parent)
3337
if self.source._push_should_merge_tags():
3338
self.source.tags.merge_to(self.target.tags)
3341
def fetch(self, stop_revision=None, limit=None):
3342
if self.target.base == self.source.base:
3344
self.source.lock_read()
3346
fetch_spec_factory = fetch.FetchSpecFactory()
3347
fetch_spec_factory.source_branch = self.source
3348
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3349
fetch_spec_factory.source_repo = self.source.repository
3350
fetch_spec_factory.target_repo = self.target.repository
3351
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3352
fetch_spec_factory.limit = limit
3353
fetch_spec = fetch_spec_factory.make_fetch_spec()
3354
return self.target.repository.fetch(self.source.repository,
3355
fetch_spec=fetch_spec)
3357
self.source.unlock()
3360
def _update_revisions(self, stop_revision=None, overwrite=False,
3362
other_revno, other_last_revision = self.source.last_revision_info()
3363
stop_revno = None # unknown
777
3364
if stop_revision is None:
778
stop_revision = other_len
779
elif stop_revision > other_len:
780
raise NoSuchRevision(self, stop_revision)
782
return other_history[self_len:stop_revision]
785
def update_revisions(self, other, stop_revision=None):
786
"""Pull in all new revisions from other branch.
788
>>> from bzrlib.commit import commit
789
>>> bzrlib.trace.silent = True
790
>>> br1 = ScratchBranch(files=['foo', 'bar'])
793
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
794
>>> br2 = ScratchBranch()
795
>>> br2.update_revisions(br1)
799
>>> br2.revision_history()
801
>>> br2.update_revisions(br1)
805
>>> br1.text_store.total_size() == br2.text_store.total_size()
808
from bzrlib.progress import ProgressBar
812
pb.update('comparing histories')
813
revision_ids = self.missing_revisions(other, stop_revision)
815
if hasattr(other.revision_store, "prefetch"):
816
other.revision_store.prefetch(revision_ids)
817
if hasattr(other.inventory_store, "prefetch"):
818
inventory_ids = [other.get_revision(r).inventory_id
819
for r in revision_ids]
820
other.inventory_store.prefetch(inventory_ids)
825
for rev_id in revision_ids:
827
pb.update('fetching revision', i, len(revision_ids))
828
rev = other.get_revision(rev_id)
829
revisions.append(rev)
830
inv = other.get_inventory(str(rev.inventory_id))
831
for key, entry in inv.iter_entries():
832
if entry.text_id is None:
834
if entry.text_id not in self.text_store:
835
needed_texts.add(entry.text_id)
839
count = self.text_store.copy_multi(other.text_store, needed_texts)
840
print "Added %d texts." % count
841
inventory_ids = [ f.inventory_id for f in revisions ]
842
count = self.inventory_store.copy_multi(other.inventory_store,
844
print "Added %d inventories." % count
845
revision_ids = [ f.revision_id for f in revisions]
846
count = self.revision_store.copy_multi(other.revision_store,
848
for revision_id in revision_ids:
849
self.append_revision(revision_id)
850
print "Added %d revisions." % count
853
def commit(self, *args, **kw):
854
from bzrlib.commit import commit
855
commit(self, *args, **kw)
858
def lookup_revision(self, revision):
859
"""Return the revision identifier for a given revision information."""
860
revno, info = self.get_revision_info(revision)
863
def get_revision_info(self, revision):
864
"""Return (revno, revision id) for revision identifier.
866
revision can be an integer, in which case it is assumed to be revno (though
867
this will translate negative values into positive ones)
868
revision can also be a string, in which case it is parsed for something like
869
'date:' or 'revid:' etc.
874
try:# Convert to int if possible
875
revision = int(revision)
878
revs = self.revision_history()
879
if isinstance(revision, int):
882
# Mabye we should do this first, but we don't need it if revision == 0
884
revno = len(revs) + revision + 1
887
elif isinstance(revision, basestring):
888
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
889
if revision.startswith(prefix):
890
revno = func(self, revs, revision)
893
raise BzrError('No namespace registered for string: %r' % revision)
895
if revno is None or revno <= 0 or revno > len(revs):
896
raise BzrError("no such revision %s" % revision)
897
return revno, revs[revno-1]
899
def _namespace_revno(self, revs, revision):
900
"""Lookup a revision by revision number"""
901
assert revision.startswith('revno:')
903
return int(revision[6:])
906
REVISION_NAMESPACES['revno:'] = _namespace_revno
908
def _namespace_revid(self, revs, revision):
909
assert revision.startswith('revid:')
911
return revs.index(revision[6:]) + 1
914
REVISION_NAMESPACES['revid:'] = _namespace_revid
916
def _namespace_last(self, revs, revision):
917
assert revision.startswith('last:')
919
offset = int(revision[5:])
924
raise BzrError('You must supply a positive value for --revision last:XXX')
925
return len(revs) - offset + 1
926
REVISION_NAMESPACES['last:'] = _namespace_last
928
def _namespace_tag(self, revs, revision):
929
assert revision.startswith('tag:')
930
raise BzrError('tag: namespace registered, but not implemented.')
931
REVISION_NAMESPACES['tag:'] = _namespace_tag
933
def _namespace_date(self, revs, revision):
934
assert revision.startswith('date:')
936
# Spec for date revisions:
938
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
939
# it can also start with a '+/-/='. '+' says match the first
940
# entry after the given date. '-' is match the first entry before the date
941
# '=' is match the first entry after, but still on the given date.
943
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
944
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
945
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
946
# May 13th, 2005 at 0:00
948
# So the proper way of saying 'give me all entries for today' is:
949
# -r {date:+today}:{date:-tomorrow}
950
# The default is '=' when not supplied
953
if val[:1] in ('+', '-', '='):
954
match_style = val[:1]
957
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
958
if val.lower() == 'yesterday':
959
dt = today - datetime.timedelta(days=1)
960
elif val.lower() == 'today':
962
elif val.lower() == 'tomorrow':
963
dt = today + datetime.timedelta(days=1)
966
# This should be done outside the function to avoid recompiling it.
967
_date_re = re.compile(
968
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
970
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
972
m = _date_re.match(val)
973
if not m or (not m.group('date') and not m.group('time')):
974
raise BzrError('Invalid revision date %r' % revision)
977
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
979
year, month, day = today.year, today.month, today.day
981
hour = int(m.group('hour'))
982
minute = int(m.group('minute'))
983
if m.group('second'):
984
second = int(m.group('second'))
988
hour, minute, second = 0,0,0
990
dt = datetime.datetime(year=year, month=month, day=day,
991
hour=hour, minute=minute, second=second)
995
if match_style == '-':
997
elif match_style == '=':
998
last = dt + datetime.timedelta(days=1)
1001
for i in range(len(revs)-1, -1, -1):
1002
r = self.get_revision(revs[i])
1003
# TODO: Handle timezone.
1004
dt = datetime.datetime.fromtimestamp(r.timestamp)
1005
if first >= dt and (last is None or dt >= last):
1008
for i in range(len(revs)):
1009
r = self.get_revision(revs[i])
1010
# TODO: Handle timezone.
1011
dt = datetime.datetime.fromtimestamp(r.timestamp)
1012
if first <= dt and (last is None or dt <= last):
1014
REVISION_NAMESPACES['date:'] = _namespace_date
1016
def revision_tree(self, revision_id):
1017
"""Return Tree for a revision on this branch.
1019
`revision_id` may be None for the null revision, in which case
1020
an `EmptyTree` is returned."""
1021
from bzrlib.tree import EmptyTree, RevisionTree
1022
# TODO: refactor this to use an existing revision object
1023
# so we don't need to read it in twice.
1024
if revision_id == None:
1025
return EmptyTree(self.get_root_id())
1027
inv = self.get_revision_inventory(revision_id)
1028
return RevisionTree(self.text_store, inv)
1031
def working_tree(self):
1032
"""Return a `Tree` for the working copy."""
1033
from workingtree import WorkingTree
1034
return WorkingTree(self.base, self.read_working_inventory())
1037
def basis_tree(self):
1038
"""Return `Tree` object for last revision.
1040
If there are no revisions yet, return an `EmptyTree`.
1042
from bzrlib.tree import EmptyTree, RevisionTree
1043
r = self.last_patch()
1045
return EmptyTree(self.get_root_id())
1047
return RevisionTree(self.text_store, self.get_revision_inventory(r))
1051
def rename_one(self, from_rel, to_rel):
1054
This can change the directory or the filename or both.
1058
tree = self.working_tree()
1059
inv = tree.inventory
1060
if not tree.has_filename(from_rel):
1061
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1062
if tree.has_filename(to_rel):
1063
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1065
file_id = inv.path2id(from_rel)
1067
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1069
if inv.path2id(to_rel):
1070
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1072
to_dir, to_tail = os.path.split(to_rel)
1073
to_dir_id = inv.path2id(to_dir)
1074
if to_dir_id == None and to_dir != '':
1075
raise BzrError("can't determine destination directory id for %r" % to_dir)
1077
mutter("rename_one:")
1078
mutter(" file_id {%s}" % file_id)
1079
mutter(" from_rel %r" % from_rel)
1080
mutter(" to_rel %r" % to_rel)
1081
mutter(" to_dir %r" % to_dir)
1082
mutter(" to_dir_id {%s}" % to_dir_id)
1084
inv.rename(file_id, to_dir_id, to_tail)
1086
print "%s => %s" % (from_rel, to_rel)
1088
from_abs = self.abspath(from_rel)
1089
to_abs = self.abspath(to_rel)
1091
os.rename(from_abs, to_abs)
1093
raise BzrError("failed to rename %r to %r: %s"
1094
% (from_abs, to_abs, e[1]),
1095
["rename rolled back"])
1097
self._write_inventory(inv)
1102
def move(self, from_paths, to_name):
1105
to_name must exist as a versioned directory.
1107
If to_name exists and is a directory, the files are moved into
1108
it, keeping their old names. If it is a directory,
1110
Note that to_name is only the last component of the new name;
1111
this doesn't change the directory.
1115
## TODO: Option to move IDs only
1116
assert not isinstance(from_paths, basestring)
1117
tree = self.working_tree()
1118
inv = tree.inventory
1119
to_abs = self.abspath(to_name)
1120
if not isdir(to_abs):
1121
raise BzrError("destination %r is not a directory" % to_abs)
1122
if not tree.has_filename(to_name):
1123
raise BzrError("destination %r not in working directory" % to_abs)
1124
to_dir_id = inv.path2id(to_name)
1125
if to_dir_id == None and to_name != '':
1126
raise BzrError("destination %r is not a versioned directory" % to_name)
1127
to_dir_ie = inv[to_dir_id]
1128
if to_dir_ie.kind not in ('directory', 'root_directory'):
1129
raise BzrError("destination %r is not a directory" % to_abs)
1131
to_idpath = inv.get_idpath(to_dir_id)
1133
for f in from_paths:
1134
if not tree.has_filename(f):
1135
raise BzrError("%r does not exist in working tree" % f)
1136
f_id = inv.path2id(f)
1138
raise BzrError("%r is not versioned" % f)
1139
name_tail = splitpath(f)[-1]
1140
dest_path = appendpath(to_name, name_tail)
1141
if tree.has_filename(dest_path):
1142
raise BzrError("destination %r already exists" % dest_path)
1143
if f_id in to_idpath:
1144
raise BzrError("can't move %r to a subdirectory of itself" % f)
1146
# OK, so there's a race here, it's possible that someone will
1147
# create a file in this interval and then the rename might be
1148
# left half-done. But we should have caught most problems.
1150
for f in from_paths:
1151
name_tail = splitpath(f)[-1]
1152
dest_path = appendpath(to_name, name_tail)
1153
print "%s => %s" % (f, dest_path)
1154
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1156
os.rename(self.abspath(f), self.abspath(dest_path))
1158
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1159
["rename rolled back"])
1161
self._write_inventory(inv)
1166
def revert(self, filenames, old_tree=None, backups=True):
1167
"""Restore selected files to the versions from a previous tree.
1170
If true (default) backups are made of files before
1173
from bzrlib.errors import NotVersionedError, BzrError
1174
from bzrlib.atomicfile import AtomicFile
1175
from bzrlib.osutils import backup_file
1177
inv = self.read_working_inventory()
1178
if old_tree is None:
1179
old_tree = self.basis_tree()
1180
old_inv = old_tree.inventory
1183
for fn in filenames:
1184
file_id = inv.path2id(fn)
1186
raise NotVersionedError("not a versioned file", fn)
1187
if not old_inv.has_id(file_id):
1188
raise BzrError("file not present in old tree", fn, file_id)
1189
nids.append((fn, file_id))
1191
# TODO: Rename back if it was previously at a different location
1193
# TODO: If given a directory, restore the entire contents from
1194
# the previous version.
1196
# TODO: Make a backup to a temporary file.
1198
# TODO: If the file previously didn't exist, delete it?
1199
for fn, file_id in nids:
1202
f = AtomicFile(fn, 'wb')
1204
f.write(old_tree.get_file(file_id).read())
1210
def pending_merges(self):
1211
"""Return a list of pending merges.
1213
These are revisions that have been merged into the working
1214
directory but not yet committed.
1216
cfn = self.controlfilename('pending-merges')
1217
if not os.path.exists(cfn):
1220
for l in self.controlfile('pending-merges', 'r').readlines():
1221
p.append(l.rstrip('\n'))
1225
def add_pending_merge(self, revision_id):
1226
from bzrlib.revision import validate_revision_id
1228
validate_revision_id(revision_id)
1230
p = self.pending_merges()
1231
if revision_id in p:
1233
p.append(revision_id)
1234
self.set_pending_merges(p)
1237
def set_pending_merges(self, rev_list):
1238
from bzrlib.atomicfile import AtomicFile
1241
f = AtomicFile(self.controlfilename('pending-merges'))
1253
class ScratchBranch(Branch):
1254
"""Special test class: a branch that cleans up after itself.
1256
>>> b = ScratchBranch()
1264
def __init__(self, files=[], dirs=[], base=None):
1265
"""Make a test branch.
1267
This creates a temporary directory and runs init-tree in it.
1269
If any files are listed, they are created in the working copy.
1271
from tempfile import mkdtemp
1276
Branch.__init__(self, base, init=init)
1278
os.mkdir(self.abspath(d))
1281
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1286
>>> orig = ScratchBranch(files=["file1", "file2"])
1287
>>> clone = orig.clone()
1288
>>> os.path.samefile(orig.base, clone.base)
1290
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1293
from shutil import copytree
1294
from tempfile import mkdtemp
1297
copytree(self.base, base, symlinks=True)
1298
return ScratchBranch(base=base)
1304
"""Destroy the test branch, removing the scratch directory."""
1305
from shutil import rmtree
1308
mutter("delete ScratchBranch %s" % self.base)
1311
# Work around for shutil.rmtree failing on Windows when
1312
# readonly files are encountered
1313
mutter("hit exception in destroying ScratchBranch: %s" % e)
1314
for root, dirs, files in os.walk(self.base, topdown=False):
1316
os.chmod(os.path.join(root, name), 0700)
1322
######################################################################
1326
def is_control_file(filename):
1327
## FIXME: better check
1328
filename = os.path.normpath(filename)
1329
while filename != '':
1330
head, tail = os.path.split(filename)
1331
## mutter('check %r for control file' % ((head, tail), ))
1332
if tail == bzrlib.BZRDIR:
1334
if filename == head:
1341
def gen_file_id(name):
1342
"""Return new file id.
1344
This should probably generate proper UUIDs, but for the moment we
1345
cope with just randomness because running uuidgen every time is
1348
from binascii import hexlify
1349
from time import time
1351
# get last component
1352
idx = name.rfind('/')
1354
name = name[idx+1 : ]
1355
idx = name.rfind('\\')
1357
name = name[idx+1 : ]
1359
# make it not a hidden file
1360
name = name.lstrip('.')
1362
# remove any wierd characters; we don't escape them but rather
1363
# just pull them out
1364
name = re.sub(r'[^\w.]', '', name)
1366
s = hexlify(rand_bytes(8))
1367
return '-'.join((name, compact_date(time()), s))
1371
"""Return a new tree-root file id."""
1372
return gen_file_id('TREE_ROOT')
3365
stop_revision = other_last_revision
3366
if _mod_revision.is_null(stop_revision):
3367
# if there are no commits, we're done.
3369
stop_revno = other_revno
3371
# what's the current last revision, before we fetch [and change it
3373
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3374
# we fetch here so that we don't process data twice in the common
3375
# case of having something to pull, and so that the check for
3376
# already merged can operate on the just fetched graph, which will
3377
# be cached in memory.
3378
self.fetch(stop_revision=stop_revision)
3379
# Check to see if one is an ancestor of the other
3382
graph = self.target.repository.get_graph()
3383
if self.target._check_if_descendant_or_diverged(
3384
stop_revision, last_rev, graph, self.source):
3385
# stop_revision is a descendant of last_rev, but we aren't
3386
# overwriting, so we're done.
3388
if stop_revno is None:
3390
graph = self.target.repository.get_graph()
3391
this_revno, this_last_revision = \
3392
self.target.last_revision_info()
3393
stop_revno = graph.find_distance_to_null(stop_revision,
3394
[(other_last_revision, other_revno),
3395
(this_last_revision, this_revno)])
3396
self.target.set_last_revision_info(stop_revno, stop_revision)
3399
def pull(self, overwrite=False, stop_revision=None,
3400
possible_transports=None, run_hooks=True,
3401
_override_hook_target=None, local=False):
3402
"""Pull from source into self, updating my master if any.
3404
:param run_hooks: Private parameter - if false, this branch
3405
is being called because it's the master of the primary branch,
3406
so it should not run its hooks.
3408
bound_location = self.target.get_bound_location()
3409
if local and not bound_location:
3410
raise errors.LocalRequiresBoundBranch()
3411
master_branch = None
3412
source_is_master = False
3414
# bound_location comes from a config file, some care has to be
3415
# taken to relate it to source.user_url
3416
normalized = urlutils.normalize_url(bound_location)
3418
relpath = self.source.user_transport.relpath(normalized)
3419
source_is_master = (relpath == '')
3420
except (errors.PathNotChild, errors.InvalidURL):
3421
source_is_master = False
3422
if not local and bound_location and not source_is_master:
3423
# not pulling from master, so we need to update master.
3424
master_branch = self.target.get_master_branch(possible_transports)
3425
master_branch.lock_write()
3428
# pull from source into master.
3429
master_branch.pull(self.source, overwrite, stop_revision,
3431
return self._pull(overwrite,
3432
stop_revision, _hook_master=master_branch,
3433
run_hooks=run_hooks,
3434
_override_hook_target=_override_hook_target,
3435
merge_tags_to_master=not source_is_master)
3438
master_branch.unlock()
3440
def push(self, overwrite=False, stop_revision=None, lossy=False,
3441
_override_hook_source_branch=None):
3442
"""See InterBranch.push.
3444
This is the basic concrete implementation of push()
3446
:param _override_hook_source_branch: If specified, run the hooks
3447
passing this Branch as the source, rather than self. This is for
3448
use of RemoteBranch, where push is delegated to the underlying
3452
raise errors.LossyPushToSameVCS(self.source, self.target)
3453
# TODO: Public option to disable running hooks - should be trivial but
3456
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3457
op.add_cleanup(self.source.lock_read().unlock)
3458
op.add_cleanup(self.target.lock_write().unlock)
3459
return op.run(overwrite, stop_revision,
3460
_override_hook_source_branch=_override_hook_source_branch)
3462
def _basic_push(self, overwrite, stop_revision):
3463
"""Basic implementation of push without bound branches or hooks.
3465
Must be called with source read locked and target write locked.
3467
result = BranchPushResult()
3468
result.source_branch = self.source
3469
result.target_branch = self.target
3470
result.old_revno, result.old_revid = self.target.last_revision_info()
3471
self.source.update_references(self.target)
3472
if result.old_revid != stop_revision:
3473
# We assume that during 'push' this repository is closer than
3475
graph = self.source.repository.get_graph(self.target.repository)
3476
self._update_revisions(stop_revision, overwrite=overwrite,
3478
if self.source._push_should_merge_tags():
3479
result.tag_updates, result.tag_conflicts = (
3480
self.source.tags.merge_to(self.target.tags, overwrite))
3481
result.new_revno, result.new_revid = self.target.last_revision_info()
3484
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3485
_override_hook_source_branch=None):
3486
"""Push from source into target, and into target's master if any.
3489
if _override_hook_source_branch:
3490
result.source_branch = _override_hook_source_branch
3491
for hook in Branch.hooks['post_push']:
3494
bound_location = self.target.get_bound_location()
3495
if bound_location and self.target.base != bound_location:
3496
# there is a master branch.
3498
# XXX: Why the second check? Is it even supported for a branch to
3499
# be bound to itself? -- mbp 20070507
3500
master_branch = self.target.get_master_branch()
3501
master_branch.lock_write()
3502
operation.add_cleanup(master_branch.unlock)
3503
# push into the master from the source branch.
3504
master_inter = InterBranch.get(self.source, master_branch)
3505
master_inter._basic_push(overwrite, stop_revision)
3506
# and push into the target branch from the source. Note that
3507
# we push from the source branch again, because it's considered
3508
# the highest bandwidth repository.
3509
result = self._basic_push(overwrite, stop_revision)
3510
result.master_branch = master_branch
3511
result.local_branch = self.target
3513
master_branch = None
3515
result = self._basic_push(overwrite, stop_revision)
3516
# TODO: Why set master_branch and local_branch if there's no
3517
# binding? Maybe cleaner to just leave them unset? -- mbp
3519
result.master_branch = self.target
3520
result.local_branch = None
3524
def _pull(self, overwrite=False, stop_revision=None,
3525
possible_transports=None, _hook_master=None, run_hooks=True,
3526
_override_hook_target=None, local=False,
3527
merge_tags_to_master=True):
3530
This function is the core worker, used by GenericInterBranch.pull to
3531
avoid duplication when pulling source->master and source->local.
3533
:param _hook_master: Private parameter - set the branch to
3534
be supplied as the master to pull hooks.
3535
:param run_hooks: Private parameter - if false, this branch
3536
is being called because it's the master of the primary branch,
3537
so it should not run its hooks.
3538
is being called because it's the master of the primary branch,
3539
so it should not run its hooks.
3540
:param _override_hook_target: Private parameter - set the branch to be
3541
supplied as the target_branch to pull hooks.
3542
:param local: Only update the local branch, and not the bound branch.
3544
# This type of branch can't be bound.
3546
raise errors.LocalRequiresBoundBranch()
3547
result = PullResult()
3548
result.source_branch = self.source
3549
if _override_hook_target is None:
3550
result.target_branch = self.target
3552
result.target_branch = _override_hook_target
3553
self.source.lock_read()
3555
# We assume that during 'pull' the target repository is closer than
3557
self.source.update_references(self.target)
3558
graph = self.target.repository.get_graph(self.source.repository)
3559
# TODO: Branch formats should have a flag that indicates
3560
# that revno's are expensive, and pull() should honor that flag.
3562
result.old_revno, result.old_revid = \
3563
self.target.last_revision_info()
3564
self._update_revisions(stop_revision, overwrite=overwrite,
3566
# TODO: The old revid should be specified when merging tags,
3567
# so a tags implementation that versions tags can only
3568
# pull in the most recent changes. -- JRV20090506
3569
result.tag_updates, result.tag_conflicts = (
3570
self.source.tags.merge_to(self.target.tags, overwrite,
3571
ignore_master=not merge_tags_to_master))
3572
result.new_revno, result.new_revid = self.target.last_revision_info()
3574
result.master_branch = _hook_master
3575
result.local_branch = result.target_branch
3577
result.master_branch = result.target_branch
3578
result.local_branch = None
3580
for hook in Branch.hooks['post_pull']:
3583
self.source.unlock()
3587
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
