1
# Copyright (C) 2005 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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
20
import sys, os, os.path, random, time, sha, sets, types, re, shutil, tempfile
21
import traceback, socket, fnmatch, difflib, time
22
from binascii import hexlify
25
from inventory import Inventory
26
from trace import mutter, note
27
from tree import Tree, EmptyTree, RevisionTree, WorkingTree
28
from inventory import InventoryEntry, Inventory
29
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
30
format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
31
joinpath, sha_string, file_kind, local_time_offset, appendpath
32
from store import ImmutableStore
33
from revision import Revision
34
from errors import bailout, BzrError
35
from textui import show_status
36
from diff import diff_trees
38
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
39
## TODO: Maybe include checks for common corruption of newlines, etc?
43
def find_branch_root(f=None):
44
"""Find the branch root enclosing f, or pwd.
46
It is not necessary that f exists.
48
Basically we keep looking up until we find the control directory or
52
elif hasattr(os.path, 'realpath'):
53
f = os.path.realpath(f)
55
f = os.path.abspath(f)
60
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
62
head, tail = os.path.split(f)
64
# reached the root, whatever that may be
65
raise BzrError('%r is not in a branch' % orig_f)
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
from cStringIO import StringIO
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
from itertools import chain
27
config as _mod_config,
33
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TransportConfig
42
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack5RichRoot
43
from bzrlib.tag import (
49
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
50
from bzrlib.hooks import HookPoint, Hooks
51
from bzrlib.inter import InterObject
52
from bzrlib.lock import _RelockDebugMixin
53
from bzrlib import registry
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
61
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
62
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
63
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
66
# TODO: Maybe include checks for common corruption of newlines, etc?
68
# TODO: Some operations like log might retrieve the same revisions
69
# repeatedly to calculate deltas. We could perhaps have a weakref
70
# cache in memory to make this faster. In general anything can be
71
# cached in memory between lock and unlock operations. .. nb thats
72
# what the transaction identity map provides
70
75
######################################################################
74
79
"""Branch holding a history of revisions.
77
Base directory of the branch.
82
Base directory/url of the branch.
84
hooks: An instance of BranchHooks.
81
def __init__(self, base, init=False, find_root=True, lock_mode='w'):
82
"""Create new branch object at a particular location.
84
base -- Base directory for the branch.
86
init -- If True, create new control files in a previously
87
unversioned directory. If False, the branch must already
90
find_root -- If true and init is false, find the root of the
91
existing branch containing base.
93
In the test suite, creation of new trees is tested using the
94
`ScratchBranch` class.
97
self.base = os.path.realpath(base)
100
self.base = find_branch_root(base)
86
# this is really an instance variable - FIXME move it there
90
def __init__(self, *ignored, **ignored_too):
91
self.tags = self._format.make_tags(self)
92
self._revision_history_cache = None
93
self._revision_id_to_revno_cache = None
94
self._partial_revision_id_to_revno_cache = {}
95
self._partial_revision_history_cache = []
96
self._last_revision_info_cache = None
97
self._merge_sorted_revisions_cache = None
99
hooks = Branch.hooks['open']
103
def _open_hook(self):
104
"""Called by init to allow simpler extension of the base class."""
106
def _activate_fallback_location(self, url):
107
"""Activate the branch/repository from url as a fallback repository."""
108
repo = self._get_fallback_repository(url)
109
if repo.has_same_location(self.repository):
110
raise errors.UnstackableLocationError(self.base, url)
111
self.repository.add_fallback_repository(repo)
113
def break_lock(self):
114
"""Break a lock if one is present from another instance.
116
Uses the ui factory to ask for confirmation if the lock may be from
119
This will probe the repository for its lock as well.
121
self.control_files.break_lock()
122
self.repository.break_lock()
123
master = self.get_master_branch()
124
if master is not None:
127
def _check_stackable_repo(self):
128
if not self.repository._format.supports_external_lookups:
129
raise errors.UnstackableRepositoryFormat(self.repository._format,
130
self.repository.base)
132
def _extend_partial_history(self, stop_index=None, stop_revision=None):
133
"""Extend the partial history to include a given index
135
If a stop_index is supplied, stop when that index has been reached.
136
If a stop_revision is supplied, stop when that revision is
137
encountered. Otherwise, stop when the beginning of history is
140
:param stop_index: The index which should be present. When it is
141
present, history extension will stop.
142
:param stop_revision: The revision id which should be present. When
143
it is encountered, history extension will stop.
145
if len(self._partial_revision_history_cache) == 0:
146
self._partial_revision_history_cache = [self.last_revision()]
147
repository._iter_for_revno(
148
self.repository, self._partial_revision_history_cache,
149
stop_index=stop_index, stop_revision=stop_revision)
150
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
151
self._partial_revision_history_cache.pop()
153
def _get_check_refs(self):
154
"""Get the references needed for check().
158
revid = self.last_revision()
159
return [('revision-existence', revid), ('lefthand-distance', revid)]
162
def open(base, _unsupported=False, possible_transports=None):
163
"""Open the branch rooted at base.
165
For instance, if the branch is at URL/.bzr/branch,
166
Branch.open(URL) -> a Branch instance.
168
control = bzrdir.BzrDir.open(base, _unsupported,
169
possible_transports=possible_transports)
170
return control.open_branch(_unsupported)
173
def open_from_transport(transport, _unsupported=False):
174
"""Open the branch rooted at transport"""
175
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
176
return control.open_branch(_unsupported)
179
def open_containing(url, possible_transports=None):
180
"""Open an existing branch which contains url.
182
This probes for a branch at url, and searches upwards from there.
184
Basically we keep looking up until we find the control directory or
185
run into the root. If there isn't one, raises NotBranchError.
186
If there is one and it is either an unrecognised format or an unsupported
187
format, UnknownFormatError or UnsupportedFormatError are raised.
188
If there is one, it is returned, along with the unused portion of url.
190
control, relpath = bzrdir.BzrDir.open_containing(url,
192
return control.open_branch(), relpath
194
def _push_should_merge_tags(self):
195
"""Should _basic_push merge this branch's tags into the target?
197
The default implementation returns False if this branch has no tags,
198
and True the rest of the time. Subclasses may override this.
200
return self.supports_tags() and self.tags.get_tag_dict()
202
def get_config(self):
203
return BranchConfig(self)
205
def _get_config(self):
206
"""Get the concrete config for just the config in this branch.
208
This is not intended for client use; see Branch.get_config for the
213
:return: An object supporting get_option and set_option.
215
raise NotImplementedError(self._get_config)
217
def _get_fallback_repository(self, url):
218
"""Get the repository we fallback to at url."""
219
url = urlutils.join(self.base, url)
220
a_bzrdir = bzrdir.BzrDir.open(url,
221
possible_transports=[self.bzrdir.root_transport])
222
return a_bzrdir.open_branch().repository
224
def _get_tags_bytes(self):
225
"""Get the bytes of a serialised tags dict.
227
Note that not all branches support tags, nor do all use the same tags
228
logic: this method is specific to BasicTags. Other tag implementations
229
may use the same method name and behave differently, safely, because
230
of the double-dispatch via
231
format.make_tags->tags_instance->get_tags_dict.
233
:return: The bytes of the tags file.
234
:seealso: Branch._set_tags_bytes.
236
return self._transport.get_bytes('tags')
238
def _get_nick(self, local=False, possible_transports=None):
239
config = self.get_config()
240
# explicit overrides master, but don't look for master if local is True
241
if not local and not config.has_explicit_nickname():
243
master = self.get_master_branch(possible_transports)
244
if master is not None:
245
# return the master branch value
247
except errors.BzrError, e:
248
# Silently fall back to local implicit nick if the master is
250
mutter("Could not connect to bound branch, "
251
"falling back to local nick.\n " + str(e))
252
return config.get_nickname()
254
def _set_nick(self, nick):
255
self.get_config().set_user_option('nickname', nick, warn_masked=True)
257
nick = property(_get_nick, _set_nick)
260
raise NotImplementedError(self.is_locked)
262
def _lefthand_history(self, revision_id, last_rev=None,
264
if 'evil' in debug.debug_flags:
265
mutter_callsite(4, "_lefthand_history scales with history.")
266
# stop_revision must be a descendant of last_revision
267
graph = self.repository.get_graph()
268
if last_rev is not None:
269
if not graph.is_ancestor(last_rev, revision_id):
270
# our previous tip is not merged into stop_revision
271
raise errors.DivergedBranches(self, other_branch)
272
# make a new revision history from the graph
273
parents_map = graph.get_parent_map([revision_id])
274
if revision_id not in parents_map:
275
raise errors.NoSuchRevision(self, revision_id)
276
current_rev_id = revision_id
278
check_not_reserved_id = _mod_revision.check_not_reserved_id
279
# Do not include ghosts or graph origin in revision_history
280
while (current_rev_id in parents_map and
281
len(parents_map[current_rev_id]) > 0):
282
check_not_reserved_id(current_rev_id)
283
new_history.append(current_rev_id)
284
current_rev_id = parents_map[current_rev_id][0]
285
parents_map = graph.get_parent_map([current_rev_id])
286
new_history.reverse()
289
def lock_write(self):
290
raise NotImplementedError(self.lock_write)
293
raise NotImplementedError(self.lock_read)
296
raise NotImplementedError(self.unlock)
298
def peek_lock_mode(self):
299
"""Return lock mode for the Branch: 'r', 'w' or None"""
300
raise NotImplementedError(self.peek_lock_mode)
302
def get_physical_lock_status(self):
303
raise NotImplementedError(self.get_physical_lock_status)
306
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
307
"""Return the revision_id for a dotted revno.
309
:param revno: a tuple like (1,) or (1,1,2)
310
:param _cache_reverse: a private parameter enabling storage
311
of the reverse mapping in a top level cache. (This should
312
only be done in selective circumstances as we want to
313
avoid having the mapping cached multiple times.)
314
:return: the revision_id
315
:raises errors.NoSuchRevision: if the revno doesn't exist
317
rev_id = self._do_dotted_revno_to_revision_id(revno)
319
self._partial_revision_id_to_revno_cache[rev_id] = revno
322
def _do_dotted_revno_to_revision_id(self, revno):
323
"""Worker function for dotted_revno_to_revision_id.
325
Subclasses should override this if they wish to
326
provide a more efficient implementation.
329
return self.get_rev_id(revno[0])
330
revision_id_to_revno = self.get_revision_id_to_revno_map()
331
revision_ids = [revision_id for revision_id, this_revno
332
in revision_id_to_revno.iteritems()
333
if revno == this_revno]
334
if len(revision_ids) == 1:
335
return revision_ids[0]
102
self.base = os.path.realpath(base)
103
if not isdir(self.controlfilename('.')):
104
bailout("not a bzr branch: %s" % quotefn(base),
105
['use "bzr init" to initialize a new working tree',
106
'current bzr can only operate from top-of-tree'])
110
self.text_store = ImmutableStore(self.controlfilename('text-store'))
111
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
112
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
116
return '%s(%r)' % (self.__class__.__name__, self.base)
123
def lock(self, mode='w'):
124
"""Lock the on-disk branch, excluding other processes."""
337
revno_str = '.'.join(map(str, revno))
338
raise errors.NoSuchRevision(self, revno_str)
341
def revision_id_to_dotted_revno(self, revision_id):
342
"""Given a revision id, return its dotted revno.
344
:return: a tuple like (1,) or (400,1,3).
346
return self._do_revision_id_to_dotted_revno(revision_id)
348
def _do_revision_id_to_dotted_revno(self, revision_id):
349
"""Worker function for revision_id_to_revno."""
350
# Try the caches if they are loaded
351
result = self._partial_revision_id_to_revno_cache.get(revision_id)
352
if result is not None:
354
if self._revision_id_to_revno_cache:
355
result = self._revision_id_to_revno_cache.get(revision_id)
357
raise errors.NoSuchRevision(self, revision_id)
358
# Try the mainline as it's optimised
130
om = os.O_WRONLY | os.O_CREAT
360
revno = self.revision_id_to_revno(revision_id)
362
except errors.NoSuchRevision:
363
# We need to load and use the full revno map after all
364
result = self.get_revision_id_to_revno_map().get(revision_id)
366
raise errors.NoSuchRevision(self, revision_id)
370
def get_revision_id_to_revno_map(self):
371
"""Return the revision_id => dotted revno map.
373
This will be regenerated on demand, but will be cached.
375
:return: A dictionary mapping revision_id => dotted revno.
376
This dictionary should not be modified by the caller.
378
if self._revision_id_to_revno_cache is not None:
379
mapping = self._revision_id_to_revno_cache
381
mapping = self._gen_revno_map()
382
self._cache_revision_id_to_revno(mapping)
383
# TODO: jam 20070417 Since this is being cached, should we be returning
385
# I would rather not, and instead just declare that users should not
386
# modify the return value.
389
def _gen_revno_map(self):
390
"""Create a new mapping from revision ids to dotted revnos.
392
Dotted revnos are generated based on the current tip in the revision
394
This is the worker function for get_revision_id_to_revno_map, which
395
just caches the return value.
397
:return: A dictionary mapping revision_id => dotted revno.
399
revision_id_to_revno = dict((rev_id, revno)
400
for rev_id, depth, revno, end_of_merge
401
in self.iter_merge_sorted_revisions())
402
return revision_id_to_revno
405
def iter_merge_sorted_revisions(self, start_revision_id=None,
406
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
407
"""Walk the revisions for a branch in merge sorted order.
409
Merge sorted order is the output from a merge-aware,
410
topological sort, i.e. all parents come before their
411
children going forward; the opposite for reverse.
413
:param start_revision_id: the revision_id to begin walking from.
414
If None, the branch tip is used.
415
:param stop_revision_id: the revision_id to terminate the walk
416
after. If None, the rest of history is included.
417
:param stop_rule: if stop_revision_id is not None, the precise rule
418
to use for termination:
419
* 'exclude' - leave the stop revision out of the result (default)
420
* 'include' - the stop revision is the last item in the result
421
* 'with-merges' - include the stop revision and all of its
422
merged revisions in the result
423
:param direction: either 'reverse' or 'forward':
424
* reverse means return the start_revision_id first, i.e.
425
start at the most recent revision and go backwards in history
426
* forward returns tuples in the opposite order to reverse.
427
Note in particular that forward does *not* do any intelligent
428
ordering w.r.t. depth as some clients of this API may like.
429
(If required, that ought to be done at higher layers.)
431
:return: an iterator over (revision_id, depth, revno, end_of_merge)
434
* revision_id: the unique id of the revision
435
* depth: How many levels of merging deep this node has been
437
* revno_sequence: This field provides a sequence of
438
revision numbers for all revisions. The format is:
439
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
440
branch that the revno is on. From left to right the REVNO numbers
441
are the sequence numbers within that branch of the revision.
442
* end_of_merge: When True the next node (earlier in history) is
443
part of a different merge.
445
# Note: depth and revno values are in the context of the branch so
446
# we need the full graph to get stable numbers, regardless of the
448
if self._merge_sorted_revisions_cache is None:
449
last_revision = self.last_revision()
450
last_key = (last_revision,)
451
known_graph = self.repository.revisions.get_known_graph_ancestry(
453
self._merge_sorted_revisions_cache = known_graph.merge_sort(
455
filtered = self._filter_merge_sorted_revisions(
456
self._merge_sorted_revisions_cache, start_revision_id,
457
stop_revision_id, stop_rule)
458
if direction == 'reverse':
460
if direction == 'forward':
461
return reversed(list(filtered))
463
raise ValueError('invalid direction %r' % direction)
465
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
466
start_revision_id, stop_revision_id, stop_rule):
467
"""Iterate over an inclusive range of sorted revisions."""
468
rev_iter = iter(merge_sorted_revisions)
469
if start_revision_id is not None:
470
for node in rev_iter:
471
rev_id = node.key[-1]
472
if rev_id != start_revision_id:
475
# The decision to include the start or not
476
# depends on the stop_rule if a stop is provided
477
# so pop this node back into the iterator
478
rev_iter = chain(iter([node]), rev_iter)
480
if stop_revision_id is None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
484
yield (rev_id, node.merge_depth, node.revno,
486
elif stop_rule == 'exclude':
487
for node in rev_iter:
488
rev_id = node.key[-1]
489
if rev_id == stop_revision_id:
491
yield (rev_id, node.merge_depth, node.revno,
493
elif stop_rule == 'include':
494
for node in rev_iter:
495
rev_id = node.key[-1]
496
yield (rev_id, node.merge_depth, node.revno,
498
if rev_id == stop_revision_id:
500
elif stop_rule == 'with-merges':
501
stop_rev = self.repository.get_revision(stop_revision_id)
502
if stop_rev.parent_ids:
503
left_parent = stop_rev.parent_ids[0]
135
raise BzrError("invalid locking mode %r" % mode)
138
lockfile = os.open(self.controlfilename('branch-lock'), om)
140
if e.errno == errno.ENOENT:
141
# might not exist on branches from <0.0.4
142
self.controlfile('branch-lock', 'w').close()
143
lockfile = os.open(self.controlfilename('branch-lock'), om)
147
fcntl.lockf(lockfile, lm)
149
fcntl.lockf(lockfile, fcntl.LOCK_UN)
151
self._lockmode = None
153
self._lockmode = mode
155
warning("please write a locking method for platform %r" % sys.platform)
157
self._lockmode = None
159
self._lockmode = mode
162
def _need_readlock(self):
163
if self._lockmode not in ['r', 'w']:
164
raise BzrError('need read lock on branch, only have %r' % self._lockmode)
166
def _need_writelock(self):
167
if self._lockmode not in ['w']:
168
raise BzrError('need write lock on branch, only have %r' % self._lockmode)
171
def abspath(self, name):
172
"""Return absolute filename for something in the branch"""
173
return os.path.join(self.base, name)
176
def relpath(self, path):
177
"""Return path relative to this branch of something inside it.
179
Raises an error if path is not in this branch."""
180
rp = os.path.realpath(path)
182
if not rp.startswith(self.base):
183
bailout("path %r is not within branch %r" % (rp, self.base))
184
rp = rp[len(self.base):]
185
rp = rp.lstrip(os.sep)
189
def controlfilename(self, file_or_path):
190
"""Return location relative to branch."""
191
if isinstance(file_or_path, types.StringTypes):
192
file_or_path = [file_or_path]
193
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
196
def controlfile(self, file_or_path, mode='r'):
197
"""Open a control file for this branch.
199
There are two classes of file in the control directory: text
200
and binary. binary files are untranslated byte streams. Text
201
control files are stored with Unix newlines and in UTF-8, even
202
if the platform or locale defaults are different.
205
fn = self.controlfilename(file_or_path)
207
if mode == 'rb' or mode == 'wb':
208
return file(fn, mode)
209
elif mode == 'r' or mode == 'w':
210
# open in binary mode anyhow so there's no newline translation;
211
# codecs uses line buffering by default; don't want that.
213
return codecs.open(fn, mode + 'b', 'utf-8',
216
raise BzrError("invalid controlfile mode %r" % mode)
220
def _make_control(self):
221
os.mkdir(self.controlfilename([]))
222
self.controlfile('README', 'w').write(
223
"This is a Bazaar-NG control directory.\n"
224
"Do not change any files in this directory.")
225
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
226
for d in ('text-store', 'inventory-store', 'revision-store'):
227
os.mkdir(self.controlfilename(d))
228
for f in ('revision-history', 'merged-patches',
229
'pending-merged-patches', 'branch-name',
231
self.controlfile(f, 'w').write('')
232
mutter('created control directory in ' + self.base)
233
Inventory().write_xml(self.controlfile('inventory','w'))
236
def _check_format(self):
237
"""Check this branch format is supported.
239
The current tool only supports the current unstable format.
241
In the future, we might need different in-memory Branch
242
classes to support downlevel branches. But not yet.
244
# This ignores newlines so that we can open branches created
245
# on Windows from Linux and so on. I think it might be better
246
# to always make all internal files in unix format.
247
fmt = self.controlfile('branch-format', 'r').read()
248
fmt.replace('\r\n', '')
249
if fmt != BZR_BRANCH_FORMAT:
250
bailout('sorry, branch format %r not supported' % fmt,
251
['use a different bzr version',
252
'or remove the .bzr directory and "bzr init" again'])
255
def read_working_inventory(self):
256
"""Read the working inventory."""
257
self._need_readlock()
259
# ElementTree does its own conversion from UTF-8, so open in
261
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
262
mutter("loaded inventory of %d items in %f"
263
% (len(inv), time.time() - before))
267
def _write_inventory(self, inv):
268
"""Update the working inventory.
270
That is to say, the inventory describing changes underway, that
271
will be committed to the next revision.
273
self._need_writelock()
274
## TODO: factor out to atomicfile? is rename safe on windows?
275
## TODO: Maybe some kind of clean/dirty marker on inventory?
276
tmpfname = self.controlfilename('inventory.tmp')
277
tmpf = file(tmpfname, 'wb')
280
inv_fname = self.controlfilename('inventory')
281
if sys.platform == 'win32':
283
os.rename(tmpfname, inv_fname)
284
mutter('wrote working inventory')
287
inventory = property(read_working_inventory, _write_inventory, None,
288
"""Inventory for the working copy.""")
291
def add(self, files, verbose=False):
292
"""Make files versioned.
294
Note that the command line normally calls smart_add instead.
296
This puts the files in the Added state, so that they will be
297
recorded by the next commit.
299
TODO: Perhaps have an option to add the ids even if the files do
302
TODO: Perhaps return the ids of the files? But then again it
303
is easy to retrieve them if they're needed.
305
TODO: Option to specify file id.
307
TODO: Adding a directory should optionally recurse down and
308
add all non-ignored children. Perhaps do that in a
311
>>> b = ScratchBranch(files=['foo'])
312
>>> 'foo' in b.unknowns()
317
>>> 'foo' in b.unknowns()
319
>>> bool(b.inventory.path2id('foo'))
325
Traceback (most recent call last):
327
BzrError: ('foo is already versioned', [])
329
>>> b.add(['nothere'])
330
Traceback (most recent call last):
331
BzrError: ('cannot add: not a regular file or directory: nothere', [])
333
self._need_writelock()
335
# TODO: Re-adding a file that is removed in the working copy
336
# should probably put it back with the previous ID.
337
if isinstance(files, types.StringTypes):
340
inv = self.read_working_inventory()
342
if is_control_file(f):
343
bailout("cannot add control file %s" % quotefn(f))
348
bailout("cannot add top-level %r" % f)
350
fullpath = os.path.normpath(self.abspath(f))
353
kind = file_kind(fullpath)
355
# maybe something better?
356
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
358
if kind != 'file' and kind != 'directory':
359
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
361
file_id = gen_file_id(f)
362
inv.add_path(f, kind=kind, file_id=file_id)
365
show_status('A', kind, quotefn(f))
367
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
369
self._write_inventory(inv)
372
def print_file(self, file, revno):
505
left_parent = _mod_revision.NULL_REVISION
506
# left_parent is the actual revision we want to stop logging at,
507
# since we want to show the merged revisions after the stop_rev too
508
reached_stop_revision_id = False
509
revision_id_whitelist = []
510
for node in rev_iter:
511
rev_id = node.key[-1]
512
if rev_id == left_parent:
513
# reached the left parent after the stop_revision
515
if (not reached_stop_revision_id or
516
rev_id in revision_id_whitelist):
517
yield (rev_id, node.merge_depth, node.revno,
519
if reached_stop_revision_id or rev_id == stop_revision_id:
520
# only do the merged revs of rev_id from now on
521
rev = self.repository.get_revision(rev_id)
523
reached_stop_revision_id = True
524
revision_id_whitelist.extend(rev.parent_ids)
526
raise ValueError('invalid stop_rule %r' % stop_rule)
528
def leave_lock_in_place(self):
529
"""Tell this branch object not to release the physical lock when this
532
If lock_write doesn't return a token, then this method is not supported.
534
self.control_files.leave_in_place()
536
def dont_leave_lock_in_place(self):
537
"""Tell this branch object to release the physical lock when this
538
object is unlocked, even if it didn't originally acquire it.
540
If lock_write doesn't return a token, then this method is not supported.
542
self.control_files.dont_leave_in_place()
544
def bind(self, other):
545
"""Bind the local branch the other branch.
547
:param other: The branch to bind to
550
raise errors.UpgradeRequired(self.base)
552
def set_append_revisions_only(self, enabled):
553
if not self._format.supports_set_append_revisions_only():
554
raise errors.UpgradeRequired(self.base)
559
self.get_config().set_user_option('append_revisions_only', value,
562
def set_reference_info(self, file_id, tree_path, branch_location):
563
"""Set the branch location to use for a tree reference."""
564
raise errors.UnsupportedOperation(self.set_reference_info, self)
566
def get_reference_info(self, file_id):
567
"""Get the tree_path and branch_location for a tree reference."""
568
raise errors.UnsupportedOperation(self.get_reference_info, self)
571
def fetch(self, from_branch, last_revision=None, pb=None):
572
"""Copy revisions from from_branch into this branch.
574
:param from_branch: Where to copy from.
575
:param last_revision: What revision to stop at (None for at the end
577
:param pb: An optional progress bar to use.
580
if self.base == from_branch.base:
583
symbol_versioning.warn(
584
symbol_versioning.deprecated_in((1, 14, 0))
585
% "pb parameter to fetch()")
586
from_branch.lock_read()
588
if last_revision is None:
589
last_revision = from_branch.last_revision()
590
last_revision = _mod_revision.ensure_null(last_revision)
591
return self.repository.fetch(from_branch.repository,
592
revision_id=last_revision,
597
def get_bound_location(self):
598
"""Return the URL of the branch we are bound to.
600
Older format branches cannot bind, please be sure to use a metadir
605
def get_old_bound_location(self):
606
"""Return the URL of the branch we used to be bound to
608
raise errors.UpgradeRequired(self.base)
610
def get_commit_builder(self, parents, config=None, timestamp=None,
611
timezone=None, committer=None, revprops=None,
613
"""Obtain a CommitBuilder for this branch.
615
:param parents: Revision ids of the parents of the new revision.
616
:param config: Optional configuration to use.
617
:param timestamp: Optional timestamp recorded for commit.
618
:param timezone: Optional timezone for timestamp.
619
:param committer: Optional committer to set for commit.
620
:param revprops: Optional dictionary of revision properties.
621
:param revision_id: Optional revision id.
625
config = self.get_config()
627
return self.repository.get_commit_builder(self, parents, config,
628
timestamp, timezone, committer, revprops, revision_id)
630
def get_master_branch(self, possible_transports=None):
631
"""Return the branch we are bound to.
633
:return: Either a Branch, or None
637
def get_revision_delta(self, revno):
638
"""Return the delta for one revision.
640
The delta is relative to its mainline predecessor, or the
641
empty tree for revision 1.
643
rh = self.revision_history()
644
if not (1 <= revno <= len(rh)):
645
raise errors.InvalidRevisionNumber(revno)
646
return self.repository.get_revision_delta(rh[revno-1])
648
def get_stacked_on_url(self):
649
"""Get the URL this branch is stacked against.
651
:raises NotStacked: If the branch is not stacked.
652
:raises UnstackableBranchFormat: If the branch does not support
655
raise NotImplementedError(self.get_stacked_on_url)
657
def print_file(self, file, revision_id):
373
658
"""Print `file` to stdout."""
374
self._need_readlock()
375
tree = self.revision_tree(self.lookup_revision(revno))
376
# use inventory as it was in that revision
377
file_id = tree.inventory.path2id(file)
379
bailout("%r is not present in revision %d" % (file, revno))
380
tree.print_file(file_id)
383
def remove(self, files, verbose=False):
384
"""Mark nominated files for removal from the inventory.
386
This does not remove their text. This does not run on
388
TODO: Refuse to remove modified files unless --force is given?
390
>>> b = ScratchBranch(files=['foo'])
392
>>> b.inventory.has_filename('foo')
395
>>> b.working_tree().has_filename('foo')
397
>>> b.inventory.has_filename('foo')
400
>>> b = ScratchBranch(files=['foo'])
405
>>> b.inventory.has_filename('foo')
407
>>> b.basis_tree().has_filename('foo')
409
>>> b.working_tree().has_filename('foo')
412
TODO: Do something useful with directories.
414
TODO: Should this remove the text or not? Tough call; not
415
removing may be useful and the user can just use use rm, and
416
is the opposite of add. Removing it is consistent with most
417
other tools. Maybe an option.
419
## TODO: Normalize names
420
## TODO: Remove nested loops; better scalability
421
self._need_writelock()
423
if isinstance(files, types.StringTypes):
426
tree = self.working_tree()
429
# do this before any modifications
433
bailout("cannot remove unversioned file %s" % quotefn(f))
434
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
436
# having remove it, it must be either ignored or unknown
437
if tree.is_ignored(f):
441
show_status(new_status, inv[fid].kind, quotefn(f))
444
self._write_inventory(inv)
448
"""Return all unknown files.
450
These are files in the working directory that are not versioned or
451
control files or ignored.
453
>>> b = ScratchBranch(files=['foo', 'foo~'])
454
>>> list(b.unknowns())
457
>>> list(b.unknowns())
460
>>> list(b.unknowns())
463
return self.working_tree().unknowns()
466
def commit(self, message, timestamp=None, timezone=None,
469
"""Commit working copy as a new revision.
471
The basic approach is to add all the file texts into the
472
store, then the inventory, then make a new revision pointing
473
to that inventory and store that.
475
This is not quite safe if the working copy changes during the
476
commit; for the moment that is simply not allowed. A better
477
approach is to make a temporary copy of the files before
478
computing their hashes, and then add those hashes in turn to
479
the inventory. This should mean at least that there are no
480
broken hash pointers. There is no way we can get a snapshot
481
of the whole directory at an instant. This would also have to
482
be robust against files disappearing, moving, etc. So the
483
whole thing is a bit hard.
485
timestamp -- if not None, seconds-since-epoch for a
486
postdated/predated commit.
488
self._need_writelock()
490
## TODO: Show branch names
492
# TODO: Don't commit if there are no changes, unless forced?
494
# First walk over the working inventory; and both update that
495
# and also build a new revision inventory. The revision
496
# inventory needs to hold the text-id, sha1 and size of the
497
# actual file versions committed in the revision. (These are
498
# not present in the working inventory.) We also need to
499
# detect missing/deleted files, and remove them from the
502
work_inv = self.read_working_inventory()
504
basis = self.basis_tree()
505
basis_inv = basis.inventory
507
for path, entry in work_inv.iter_entries():
508
## TODO: Cope with files that have gone missing.
510
## TODO: Check that the file kind has not changed from the previous
511
## revision of this file (if any).
515
p = self.abspath(path)
516
file_id = entry.file_id
517
mutter('commit prep file %s, id %r ' % (p, file_id))
519
if not os.path.exists(p):
520
mutter(" file is missing, removing from inventory")
522
show_status('D', entry.kind, quotefn(path))
523
missing_ids.append(file_id)
526
# TODO: Handle files that have been deleted
528
# TODO: Maybe a special case for empty files? Seems a
529
# waste to store them many times.
533
if basis_inv.has_id(file_id):
534
old_kind = basis_inv[file_id].kind
535
if old_kind != entry.kind:
536
bailout("entry %r changed kind from %r to %r"
537
% (file_id, old_kind, entry.kind))
539
if entry.kind == 'directory':
541
bailout("%s is entered as directory but not a directory" % quotefn(p))
542
elif entry.kind == 'file':
544
bailout("%s is entered as file but is not a file" % quotefn(p))
546
content = file(p, 'rb').read()
548
entry.text_sha1 = sha_string(content)
549
entry.text_size = len(content)
551
old_ie = basis_inv.has_id(file_id) and basis_inv[file_id]
553
and (old_ie.text_size == entry.text_size)
554
and (old_ie.text_sha1 == entry.text_sha1)):
555
## assert content == basis.get_file(file_id).read()
556
entry.text_id = basis_inv[file_id].text_id
557
mutter(' unchanged from previous text_id {%s}' %
561
entry.text_id = gen_file_id(entry.name)
562
self.text_store.add(content, entry.text_id)
563
mutter(' stored with text_id {%s}' % entry.text_id)
567
elif (old_ie.name == entry.name
568
and old_ie.parent_id == entry.parent_id):
573
show_status(state, entry.kind, quotefn(path))
575
for file_id in missing_ids:
576
# have to do this later so we don't mess up the iterator.
577
# since parents may be removed before their children we
580
# FIXME: There's probably a better way to do this; perhaps
581
# the workingtree should know how to filter itself.
582
if work_inv.has_id(file_id):
583
del work_inv[file_id]
586
inv_id = rev_id = _gen_revision_id(time.time())
588
inv_tmp = tempfile.TemporaryFile()
589
inv.write_xml(inv_tmp)
591
self.inventory_store.add(inv_tmp, inv_id)
592
mutter('new inventory_id is {%s}' % inv_id)
594
self._write_inventory(work_inv)
596
if timestamp == None:
597
timestamp = time.time()
599
if committer == None:
600
committer = username()
603
timezone = local_time_offset()
605
mutter("building commit log message")
606
rev = Revision(timestamp=timestamp,
609
precursor = self.last_patch(),
614
rev_tmp = tempfile.TemporaryFile()
615
rev.write_xml(rev_tmp)
617
self.revision_store.add(rev_tmp, rev_id)
618
mutter("new revision_id is {%s}" % rev_id)
620
## XXX: Everything up to here can simply be orphaned if we abort
621
## the commit; it will leave junk files behind but that doesn't
624
## TODO: Read back the just-generated changeset, and make sure it
625
## applies and recreates the right state.
627
## TODO: Also calculate and store the inventory SHA1
628
mutter("committing patch r%d" % (self.revno() + 1))
631
self.append_revision(rev_id)
634
note("commited r%d" % self.revno())
637
def append_revision(self, revision_id):
638
mutter("add {%s} to revision-history" % revision_id)
639
rev_history = self.revision_history()
641
tmprhname = self.controlfilename('revision-history.tmp')
642
rhname = self.controlfilename('revision-history')
644
f = file(tmprhname, 'wt')
645
rev_history.append(revision_id)
646
f.write('\n'.join(rev_history))
650
if sys.platform == 'win32':
652
os.rename(tmprhname, rhname)
656
def get_revision(self, revision_id):
657
"""Return the Revision object for a named revision"""
658
self._need_readlock()
659
r = Revision.read_xml(self.revision_store[revision_id])
660
assert r.revision_id == revision_id
664
def get_inventory(self, inventory_id):
665
"""Get Inventory object by hash.
667
TODO: Perhaps for this and similar methods, take a revision
668
parameter which can be either an integer revno or a
670
self._need_readlock()
671
i = Inventory.read_xml(self.inventory_store[inventory_id])
675
def get_revision_inventory(self, revision_id):
676
"""Return inventory of a past revision."""
677
self._need_readlock()
678
if revision_id == None:
659
raise NotImplementedError(self.print_file)
661
def set_revision_history(self, rev_history):
662
raise NotImplementedError(self.set_revision_history)
665
def set_parent(self, url):
666
"""See Branch.set_parent."""
667
# TODO: Maybe delete old location files?
668
# URLs should never be unicode, even on the local fs,
669
# FIXUP this and get_parent in a future branch format bump:
670
# read and rewrite the file. RBC 20060125
672
if isinstance(url, unicode):
674
url = url.encode('ascii')
675
except UnicodeEncodeError:
676
raise errors.InvalidURL(url,
677
"Urls must be 7-bit ascii, "
678
"use bzrlib.urlutils.escape")
679
url = urlutils.relative_url(self.base, url)
680
self._set_parent_location(url)
683
def set_stacked_on_url(self, url):
684
"""Set the URL this branch is stacked against.
686
:raises UnstackableBranchFormat: If the branch does not support
688
:raises UnstackableRepositoryFormat: If the repository does not support
691
if not self._format.supports_stacking():
692
raise errors.UnstackableBranchFormat(self._format, self.base)
693
# XXX: Changing from one fallback repository to another does not check
694
# that all the data you need is present in the new fallback.
695
# Possibly it should.
696
self._check_stackable_repo()
699
old_url = self.get_stacked_on_url()
700
except (errors.NotStacked, errors.UnstackableBranchFormat,
701
errors.UnstackableRepositoryFormat):
681
return self.get_inventory(self.get_revision(revision_id).inventory_id)
705
self._activate_fallback_location(url)
706
# write this out after the repository is stacked to avoid setting a
707
# stacked config that doesn't work.
708
self._set_config_location('stacked_on_location', url)
711
"""Change a branch to be unstacked, copying data as needed.
713
Don't call this directly, use set_stacked_on_url(None).
715
pb = ui.ui_factory.nested_progress_bar()
717
pb.update("Unstacking")
718
# The basic approach here is to fetch the tip of the branch,
719
# including all available ghosts, from the existing stacked
720
# repository into a new repository object without the fallbacks.
722
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
723
# correct for CHKMap repostiories
724
old_repository = self.repository
725
if len(old_repository._fallback_repositories) != 1:
726
raise AssertionError("can't cope with fallback repositories "
727
"of %r" % (self.repository,))
728
# unlock it, including unlocking the fallback
729
old_repository.unlock()
730
old_repository.lock_read()
732
# Repositories don't offer an interface to remove fallback
733
# repositories today; take the conceptually simpler option and just
734
# reopen it. We reopen it starting from the URL so that we
735
# get a separate connection for RemoteRepositories and can
736
# stream from one of them to the other. This does mean doing
737
# separate SSH connection setup, but unstacking is not a
738
# common operation so it's tolerable.
739
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
740
new_repository = new_bzrdir.find_repository()
741
self.repository = new_repository
742
if self.repository._fallback_repositories:
743
raise AssertionError("didn't expect %r to have "
744
"fallback_repositories"
745
% (self.repository,))
746
# this is not paired with an unlock because it's just restoring
747
# the previous state; the lock's released when set_stacked_on_url
749
self.repository.lock_write()
750
# XXX: If you unstack a branch while it has a working tree
751
# with a pending merge, the pending-merged revisions will no
752
# longer be present. You can (probably) revert and remerge.
754
# XXX: This only fetches up to the tip of the repository; it
755
# doesn't bring across any tags. That's fairly consistent
756
# with how branch works, but perhaps not ideal.
757
self.repository.fetch(old_repository,
758
revision_id=self.last_revision(),
761
old_repository.unlock()
765
def _set_tags_bytes(self, bytes):
766
"""Mirror method for _get_tags_bytes.
768
:seealso: Branch._get_tags_bytes.
770
return _run_with_write_locked_target(self, self._transport.put_bytes,
773
def _cache_revision_history(self, rev_history):
774
"""Set the cached revision history to rev_history.
776
The revision_history method will use this cache to avoid regenerating
777
the revision history.
779
This API is semi-public; it only for use by subclasses, all other code
780
should consider it to be private.
782
self._revision_history_cache = rev_history
784
def _cache_revision_id_to_revno(self, revision_id_to_revno):
785
"""Set the cached revision_id => revno map to revision_id_to_revno.
787
This API is semi-public; it only for use by subclasses, all other code
788
should consider it to be private.
790
self._revision_id_to_revno_cache = revision_id_to_revno
792
def _clear_cached_state(self):
793
"""Clear any cached data on this branch, e.g. cached revision history.
795
This means the next call to revision_history will need to call
796
_gen_revision_history.
798
This API is semi-public; it only for use by subclasses, all other code
799
should consider it to be private.
801
self._revision_history_cache = None
802
self._revision_id_to_revno_cache = None
803
self._last_revision_info_cache = None
804
self._merge_sorted_revisions_cache = None
805
self._partial_revision_history_cache = []
806
self._partial_revision_id_to_revno_cache = {}
808
def _gen_revision_history(self):
809
"""Return sequence of revision hashes on to this branch.
811
Unlike revision_history, this method always regenerates or rereads the
812
revision history, i.e. it does not cache the result, so repeated calls
815
Concrete subclasses should override this instead of revision_history so
816
that subclasses do not need to deal with caching logic.
818
This API is semi-public; it only for use by subclasses, all other code
819
should consider it to be private.
821
raise NotImplementedError(self._gen_revision_history)
684
824
def revision_history(self):
685
"""Return sequence of revision hashes on to this branch.
825
"""Return sequence of revision ids on this branch.
687
>>> ScratchBranch().revision_history()
827
This method will cache the revision history for as long as it is safe to
690
self._need_readlock()
691
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
830
if 'evil' in debug.debug_flags:
831
mutter_callsite(3, "revision_history scales with history.")
832
if self._revision_history_cache is not None:
833
history = self._revision_history_cache
835
history = self._gen_revision_history()
836
self._cache_revision_history(history)
695
840
"""Return current revision number for this branch.
697
842
That is equivalent to the number of revisions committed to
700
>>> b = ScratchBranch()
703
>>> b.commit('no foo')
707
return len(self.revision_history())
710
def last_patch(self):
711
"""Return last patch hash, or None if no history.
713
>>> ScratchBranch().last_patch() == None
716
ph = self.revision_history()
723
def lookup_revision(self, revno):
724
"""Return revision hash for revision number."""
845
return self.last_revision_info()[0]
848
"""Older format branches cannot bind or unbind."""
849
raise errors.UpgradeRequired(self.base)
851
def last_revision(self):
852
"""Return last revision id, or NULL_REVISION."""
853
return self.last_revision_info()[1]
856
def last_revision_info(self):
857
"""Return information about the last revision.
859
:return: A tuple (revno, revision_id).
861
if self._last_revision_info_cache is None:
862
self._last_revision_info_cache = self._last_revision_info()
863
return self._last_revision_info_cache
865
def _last_revision_info(self):
866
rh = self.revision_history()
869
return (revno, rh[-1])
871
return (0, _mod_revision.NULL_REVISION)
873
@deprecated_method(deprecated_in((1, 6, 0)))
874
def missing_revisions(self, other, stop_revision=None):
875
"""Return a list of new revisions that would perfectly fit.
877
If self and other have not diverged, return a list of the revisions
878
present in other, but missing from self.
880
self_history = self.revision_history()
881
self_len = len(self_history)
882
other_history = other.revision_history()
883
other_len = len(other_history)
884
common_index = min(self_len, other_len) -1
885
if common_index >= 0 and \
886
self_history[common_index] != other_history[common_index]:
887
raise errors.DivergedBranches(self, other)
889
if stop_revision is None:
890
stop_revision = other_len
892
if stop_revision > other_len:
893
raise errors.NoSuchRevision(self, stop_revision)
894
return other_history[self_len:stop_revision]
897
def update_revisions(self, other, stop_revision=None, overwrite=False,
899
"""Pull in new perfect-fit revisions.
901
:param other: Another Branch to pull from
902
:param stop_revision: Updated until the given revision
903
:param overwrite: Always set the branch pointer, rather than checking
904
to see if it is a proper descendant.
905
:param graph: A Graph object that can be used to query history
906
information. This can be None.
909
return InterBranch.get(other, self).update_revisions(stop_revision,
912
def import_last_revision_info(self, source_repo, revno, revid):
913
"""Set the last revision info, importing from another repo if necessary.
915
This is used by the bound branch code to upload a revision to
916
the master branch first before updating the tip of the local branch.
918
:param source_repo: Source repository to optionally fetch from
919
:param revno: Revision number of the new tip
920
:param revid: Revision id of the new tip
922
if not self.repository.has_same_location(source_repo):
923
self.repository.fetch(source_repo, revision_id=revid)
924
self.set_last_revision_info(revno, revid)
926
def revision_id_to_revno(self, revision_id):
927
"""Given a revision id, return its revno"""
928
if _mod_revision.is_null(revision_id):
930
history = self.revision_history()
932
return history.index(revision_id) + 1
934
raise errors.NoSuchRevision(self, revision_id)
937
def get_rev_id(self, revno, history=None):
938
"""Find the revision id of the specified revno."""
729
# list is 0-based; revisions are 1-based
730
return self.revision_history()[revno-1]
732
raise BzrError("no such revision %s" % revno)
735
def revision_tree(self, revision_id):
736
"""Return Tree for a revision on this branch.
738
`revision_id` may be None for the null revision, in which case
739
an `EmptyTree` is returned."""
740
self._need_readlock()
741
if revision_id == None:
744
inv = self.get_revision_inventory(revision_id)
745
return RevisionTree(self.text_store, inv)
748
def working_tree(self):
749
"""Return a `Tree` for the working copy."""
750
return WorkingTree(self.base, self.read_working_inventory())
753
def basis_tree(self):
754
"""Return `Tree` object for last revision.
756
If there are no revisions yet, return an `EmptyTree`.
758
>>> b = ScratchBranch(files=['foo'])
759
>>> b.basis_tree().has_filename('foo')
761
>>> b.working_tree().has_filename('foo')
764
>>> b.commit('add foo')
765
>>> b.basis_tree().has_filename('foo')
768
r = self.last_patch()
772
return RevisionTree(self.text_store, self.get_revision_inventory(r))
776
def rename_one(self, from_rel, to_rel):
779
This can change the directory or the filename or both.
781
self._need_writelock()
782
tree = self.working_tree()
784
if not tree.has_filename(from_rel):
785
bailout("can't rename: old working file %r does not exist" % from_rel)
786
if tree.has_filename(to_rel):
787
bailout("can't rename: new working file %r already exists" % to_rel)
789
file_id = inv.path2id(from_rel)
791
bailout("can't rename: old name %r is not versioned" % from_rel)
793
if inv.path2id(to_rel):
794
bailout("can't rename: new name %r is already versioned" % to_rel)
796
to_dir, to_tail = os.path.split(to_rel)
797
to_dir_id = inv.path2id(to_dir)
798
if to_dir_id == None and to_dir != '':
799
bailout("can't determine destination directory id for %r" % to_dir)
801
mutter("rename_one:")
802
mutter(" file_id {%s}" % file_id)
803
mutter(" from_rel %r" % from_rel)
804
mutter(" to_rel %r" % to_rel)
805
mutter(" to_dir %r" % to_dir)
806
mutter(" to_dir_id {%s}" % to_dir_id)
808
inv.rename(file_id, to_dir_id, to_tail)
810
print "%s => %s" % (from_rel, to_rel)
812
from_abs = self.abspath(from_rel)
813
to_abs = self.abspath(to_rel)
815
os.rename(from_abs, to_abs)
817
bailout("failed to rename %r to %r: %s"
818
% (from_abs, to_abs, e[1]),
819
["rename rolled back"])
821
self._write_inventory(inv)
825
def move(self, from_paths, to_name):
828
to_name must exist as a versioned directory.
830
If to_name exists and is a directory, the files are moved into
831
it, keeping their old names. If it is a directory,
833
Note that to_name is only the last component of the new name;
834
this doesn't change the directory.
836
self._need_writelock()
837
## TODO: Option to move IDs only
838
assert not isinstance(from_paths, basestring)
839
tree = self.working_tree()
841
to_abs = self.abspath(to_name)
842
if not isdir(to_abs):
843
bailout("destination %r is not a directory" % to_abs)
844
if not tree.has_filename(to_name):
845
bailout("destination %r not in working directory" % to_abs)
846
to_dir_id = inv.path2id(to_name)
847
if to_dir_id == None and to_name != '':
848
bailout("destination %r is not a versioned directory" % to_name)
849
to_dir_ie = inv[to_dir_id]
850
if to_dir_ie.kind not in ('directory', 'root_directory'):
851
bailout("destination %r is not a directory" % to_abs)
853
to_idpath = Set(inv.get_idpath(to_dir_id))
856
if not tree.has_filename(f):
857
bailout("%r does not exist in working tree" % f)
858
f_id = inv.path2id(f)
860
bailout("%r is not versioned" % f)
861
name_tail = splitpath(f)[-1]
862
dest_path = appendpath(to_name, name_tail)
863
if tree.has_filename(dest_path):
864
bailout("destination %r already exists" % dest_path)
865
if f_id in to_idpath:
866
bailout("can't move %r to a subdirectory of itself" % f)
868
# OK, so there's a race here, it's possible that someone will
869
# create a file in this interval and then the rename might be
870
# left half-done. But we should have caught most problems.
873
name_tail = splitpath(f)[-1]
874
dest_path = appendpath(to_name, name_tail)
875
print "%s => %s" % (f, dest_path)
876
inv.rename(inv.path2id(f), to_dir_id, name_tail)
878
os.rename(self.abspath(f), self.abspath(dest_path))
880
bailout("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
881
["rename rolled back"])
883
self._write_inventory(inv)
887
def show_status(self, show_all=False):
888
"""Display single-line status for non-ignored working files.
890
The list is show sorted in order by file name.
892
>>> b = ScratchBranch(files=['foo', 'foo~'])
898
>>> b.commit("add foo")
900
>>> os.unlink(b.abspath('foo'))
904
TODO: Get state for single files.
906
self._need_readlock()
908
# We have to build everything into a list first so that it can
909
# sorted by name, incorporating all the different sources.
911
# FIXME: Rather than getting things in random order and then sorting,
912
# just step through in order.
914
# Interesting case: the old ID for a file has been removed,
915
# but a new file has been created under that name.
917
old = self.basis_tree()
918
new = self.working_tree()
920
for fs, fid, oldname, newname, kind in diff_trees(old, new):
922
show_status(fs, kind,
923
oldname + ' => ' + newname)
924
elif fs == 'A' or fs == 'M':
925
show_status(fs, kind, newname)
927
show_status(fs, kind, oldname)
930
show_status(fs, kind, newname)
933
show_status(fs, kind, newname)
935
show_status(fs, kind, newname)
940
return _mod_revision.NULL_REVISION
941
last_revno, last_revid = self.last_revision_info()
942
if revno == last_revno:
944
if revno <= 0 or revno > last_revno:
945
raise errors.NoSuchRevision(self, revno)
946
distance_from_last = last_revno - revno
947
if len(self._partial_revision_history_cache) <= distance_from_last:
948
self._extend_partial_history(distance_from_last)
949
return self._partial_revision_history_cache[distance_from_last]
952
def pull(self, source, overwrite=False, stop_revision=None,
953
possible_transports=None, *args, **kwargs):
954
"""Mirror source into this branch.
956
This branch is considered to be 'local', having low latency.
958
:returns: PullResult instance
960
return InterBranch.get(source, self).pull(overwrite=overwrite,
961
stop_revision=stop_revision,
962
possible_transports=possible_transports, *args, **kwargs)
964
def push(self, target, overwrite=False, stop_revision=None, *args,
966
"""Mirror this branch into target.
968
This branch is considered to be 'local', having low latency.
970
return InterBranch.get(self, target).push(overwrite, stop_revision,
973
def lossy_push(self, target, stop_revision=None):
974
"""Push deltas into another branch.
976
:note: This does not, like push, retain the revision ids from
977
the source branch and will, rather than adding bzr-specific
978
metadata, push only those semantics of the revision that can be
979
natively represented by this branch' VCS.
981
:param target: Target branch
982
:param stop_revision: Revision to push, defaults to last revision.
983
:return: BranchPushResult with an extra member revidmap:
984
A dictionary mapping revision ids from the target branch
985
to new revision ids in the target branch, for each
986
revision that was pushed.
988
inter = InterBranch.get(self, target)
989
lossy_push = getattr(inter, "lossy_push", None)
990
if lossy_push is None:
991
raise errors.LossyPushToSameVCS(self, target)
992
return lossy_push(stop_revision)
994
def basis_tree(self):
995
"""Return `Tree` object for last revision."""
996
return self.repository.revision_tree(self.last_revision())
998
def get_parent(self):
999
"""Return the parent location of the branch.
1001
This is the default location for pull/missing. The usual
1002
pattern is that the user can override it by specifying a
1005
parent = self._get_parent_location()
1008
# This is an old-format absolute path to a local branch
1009
# turn it into a url
1010
if parent.startswith('/'):
1011
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1013
return urlutils.join(self.base[:-1], parent)
1014
except errors.InvalidURLJoin, e:
1015
raise errors.InaccessibleParent(parent, self.base)
1017
def _get_parent_location(self):
1018
raise NotImplementedError(self._get_parent_location)
1020
def _set_config_location(self, name, url, config=None,
1021
make_relative=False):
1023
config = self.get_config()
1027
url = urlutils.relative_url(self.base, url)
1028
config.set_user_option(name, url, warn_masked=True)
1030
def _get_config_location(self, name, config=None):
1032
config = self.get_config()
1033
location = config.get_user_option(name)
1038
def get_child_submit_format(self):
1039
"""Return the preferred format of submissions to this branch."""
1040
return self.get_config().get_user_option("child_submit_format")
1042
def get_submit_branch(self):
1043
"""Return the submit location of the branch.
1045
This is the default location for bundle. The usual
1046
pattern is that the user can override it by specifying a
1049
return self.get_config().get_user_option('submit_branch')
1051
def set_submit_branch(self, location):
1052
"""Return the submit location of the branch.
1054
This is the default location for bundle. The usual
1055
pattern is that the user can override it by specifying a
1058
self.get_config().set_user_option('submit_branch', location,
1061
def get_public_branch(self):
1062
"""Return the public location of the branch.
1064
This is used by merge directives.
1066
return self._get_config_location('public_branch')
1068
def set_public_branch(self, location):
1069
"""Return the submit location of the branch.
1071
This is the default location for bundle. The usual
1072
pattern is that the user can override it by specifying a
1075
self._set_config_location('public_branch', location)
1077
def get_push_location(self):
1078
"""Return the None or the location to push this branch to."""
1079
push_loc = self.get_config().get_user_option('push_location')
1082
def set_push_location(self, location):
1083
"""Set a new push location for this branch."""
1084
raise NotImplementedError(self.set_push_location)
1086
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1087
"""Run the post_change_branch_tip hooks."""
1088
hooks = Branch.hooks['post_change_branch_tip']
1091
new_revno, new_revid = self.last_revision_info()
1092
params = ChangeBranchTipParams(
1093
self, old_revno, new_revno, old_revid, new_revid)
1097
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1098
"""Run the pre_change_branch_tip hooks."""
1099
hooks = Branch.hooks['pre_change_branch_tip']
1102
old_revno, old_revid = self.last_revision_info()
1103
params = ChangeBranchTipParams(
1104
self, old_revno, new_revno, old_revid, new_revid)
1110
"""Synchronise this branch with the master branch if any.
1112
:return: None or the last_revision pivoted out during the update.
1116
def check_revno(self, revno):
1118
Check whether a revno corresponds to any revision.
1119
Zero (the NULL revision) is considered valid.
1122
self.check_real_revno(revno)
1124
def check_real_revno(self, revno):
1126
Check whether a revno corresponds to a real revision.
1127
Zero (the NULL revision) is considered invalid
1129
if revno < 1 or revno > self.revno():
1130
raise errors.InvalidRevisionNumber(revno)
1133
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
1134
"""Clone this branch into to_bzrdir preserving all semantic values.
1136
Most API users will want 'create_clone_on_transport', which creates a
1137
new bzrdir and branch on the fly.
1139
revision_id: if not None, the revision history in the new branch will
1140
be truncated to end with revision_id.
1142
result = to_bzrdir.create_branch()
1145
if repository_policy is not None:
1146
repository_policy.configure_branch(result)
1147
self.copy_content_into(result, revision_id=revision_id)
1153
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
1154
"""Create a new line of development from the branch, into to_bzrdir.
1156
to_bzrdir controls the branch format.
1158
revision_id: if not None, the revision history in the new branch will
1159
be truncated to end with revision_id.
1161
if (repository_policy is not None and
1162
repository_policy.requires_stacking()):
1163
to_bzrdir._format.require_stacking(_skip_repo=True)
1164
result = to_bzrdir.create_branch()
1167
if repository_policy is not None:
1168
repository_policy.configure_branch(result)
1169
self.copy_content_into(result, revision_id=revision_id)
1170
result.set_parent(self.bzrdir.root_transport.base)
1175
def _synchronize_history(self, destination, revision_id):
1176
"""Synchronize last revision and revision history between branches.
1178
This version is most efficient when the destination is also a
1179
BzrBranch6, but works for BzrBranch5, as long as the destination's
1180
repository contains all the lefthand ancestors of the intended
1181
last_revision. If not, set_last_revision_info will fail.
1183
:param destination: The branch to copy the history into
1184
:param revision_id: The revision-id to truncate history at. May
1185
be None to copy complete history.
1187
source_revno, source_revision_id = self.last_revision_info()
1188
if revision_id is None:
1189
revno, revision_id = source_revno, source_revision_id
1191
graph = self.repository.get_graph()
1193
revno = graph.find_distance_to_null(revision_id,
1194
[(source_revision_id, source_revno)])
1195
except errors.GhostRevisionsHaveNoRevno:
1196
# Default to 1, if we can't find anything else
1198
destination.set_last_revision_info(revno, revision_id)
1201
def copy_content_into(self, destination, revision_id=None):
1202
"""Copy the content of self into destination.
1204
revision_id: if not None, the revision history in the new branch will
1205
be truncated to end with revision_id.
1207
self.update_references(destination)
1208
self._synchronize_history(destination, revision_id)
1210
parent = self.get_parent()
1211
except errors.InaccessibleParent, e:
1212
mutter('parent was not accessible to copy: %s', e)
1215
destination.set_parent(parent)
1216
if self._push_should_merge_tags():
1217
self.tags.merge_to(destination.tags)
1219
def update_references(self, target):
1220
if not getattr(self._format, 'supports_reference_locations', False):
1222
reference_dict = self._get_all_reference_info()
1223
if len(reference_dict) == 0:
1225
old_base = self.base
1226
new_base = target.base
1227
target_reference_dict = target._get_all_reference_info()
1228
for file_id, (tree_path, branch_location) in (
1229
reference_dict.items()):
1230
branch_location = urlutils.rebase_url(branch_location,
1232
target_reference_dict.setdefault(
1233
file_id, (tree_path, branch_location))
1234
target._set_all_reference_info(target_reference_dict)
1237
def check(self, refs):
1238
"""Check consistency of the branch.
1240
In particular this checks that revisions given in the revision-history
1241
do actually match up in the revision graph, and that they're all
1242
present in the repository.
1244
Callers will typically also want to check the repository.
1246
:param refs: Calculated refs for this branch as specified by
1247
branch._get_check_refs()
1248
:return: A BranchCheckResult.
1250
result = BranchCheckResult(self)
1251
last_revno, last_revision_id = self.last_revision_info()
1252
actual_revno = refs[('lefthand-distance', last_revision_id)]
1253
if actual_revno != last_revno:
1254
result.errors.append(errors.BzrCheckError(
1255
'revno does not match len(mainline) %s != %s' % (
1256
last_revno, actual_revno)))
1257
# TODO: We should probably also check that self.revision_history
1258
# matches the repository for older branch formats.
1259
# If looking for the code that cross-checks repository parents against
1260
# the iter_reverse_revision_history output, that is now a repository
1264
def _get_checkout_format(self):
1265
"""Return the most suitable metadir for a checkout of this branch.
1266
Weaves are used if this branch's repository uses weaves.
1268
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1269
from bzrlib.repofmt import weaverepo
1270
format = bzrdir.BzrDirMetaFormat1()
1271
format.repository_format = weaverepo.RepositoryFormat7()
1273
format = self.repository.bzrdir.checkout_metadir()
1274
format.set_branch_format(self._format)
1277
def create_clone_on_transport(self, to_transport, revision_id=None,
1278
stacked_on=None, create_prefix=False, use_existing_dir=False):
1279
"""Create a clone of this branch and its bzrdir.
1281
:param to_transport: The transport to clone onto.
1282
:param revision_id: The revision id to use as tip in the new branch.
1283
If None the tip is obtained from this branch.
1284
:param stacked_on: An optional URL to stack the clone on.
1285
:param create_prefix: Create any missing directories leading up to
1287
:param use_existing_dir: Use an existing directory if one exists.
1289
# XXX: Fix the bzrdir API to allow getting the branch back from the
1290
# clone call. Or something. 20090224 RBC/spiv.
1291
if revision_id is None:
1292
revision_id = self.last_revision()
1293
dir_to = self.bzrdir.clone_on_transport(to_transport,
1294
revision_id=revision_id, stacked_on=stacked_on,
1295
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1296
return dir_to.open_branch()
1298
def create_checkout(self, to_location, revision_id=None,
1299
lightweight=False, accelerator_tree=None,
1301
"""Create a checkout of a branch.
1303
:param to_location: The url to produce the checkout at
1304
:param revision_id: The revision to check out
1305
:param lightweight: If True, produce a lightweight checkout, otherwise,
1306
produce a bound branch (heavyweight checkout)
1307
:param accelerator_tree: A tree which can be used for retrieving file
1308
contents more quickly than the revision tree, i.e. a workingtree.
1309
The revision tree will be used for cases where accelerator_tree's
1310
content is different.
1311
:param hardlink: If true, hard-link files from accelerator_tree,
1313
:return: The tree of the created checkout
1315
t = transport.get_transport(to_location)
1318
format = self._get_checkout_format()
1319
checkout = format.initialize_on_transport(t)
1320
from_branch = BranchReferenceFormat().initialize(checkout, self)
1322
format = self._get_checkout_format()
1323
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1324
to_location, force_new_tree=False, format=format)
1325
checkout = checkout_branch.bzrdir
1326
checkout_branch.bind(self)
1327
# pull up to the specified revision_id to set the initial
1328
# branch tip correctly, and seed it with history.
1329
checkout_branch.pull(self, stop_revision=revision_id)
1331
tree = checkout.create_workingtree(revision_id,
1332
from_branch=from_branch,
1333
accelerator_tree=accelerator_tree,
1335
basis_tree = tree.basis_tree()
1336
basis_tree.lock_read()
1338
for path, file_id in basis_tree.iter_references():
1339
reference_parent = self.reference_parent(file_id, path)
1340
reference_parent.create_checkout(tree.abspath(path),
1341
basis_tree.get_reference_revision(file_id, path),
1348
def reconcile(self, thorough=True):
1349
"""Make sure the data stored in this branch is consistent."""
1350
from bzrlib.reconcile import BranchReconciler
1351
reconciler = BranchReconciler(self, thorough=thorough)
1352
reconciler.reconcile()
1355
def reference_parent(self, file_id, path, possible_transports=None):
1356
"""Return the parent branch for a tree-reference file_id
1357
:param file_id: The file_id of the tree reference
1358
:param path: The path of the file_id in the tree
1359
:return: A branch associated with the file_id
1361
# FIXME should provide multiple branches, based on config
1362
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1363
possible_transports=possible_transports)
1365
def supports_tags(self):
1366
return self._format.supports_tags()
1368
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1370
"""Ensure that revision_b is a descendant of revision_a.
1372
This is a helper function for update_revisions.
1374
:raises: DivergedBranches if revision_b has diverged from revision_a.
1375
:returns: True if revision_b is a descendant of revision_a.
1377
relation = self._revision_relations(revision_a, revision_b, graph)
1378
if relation == 'b_descends_from_a':
1380
elif relation == 'diverged':
1381
raise errors.DivergedBranches(self, other_branch)
1382
elif relation == 'a_descends_from_b':
1385
raise AssertionError("invalid relation: %r" % (relation,))
1387
def _revision_relations(self, revision_a, revision_b, graph):
1388
"""Determine the relationship between two revisions.
1390
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1392
heads = graph.heads([revision_a, revision_b])
1393
if heads == set([revision_b]):
1394
return 'b_descends_from_a'
1395
elif heads == set([revision_a, revision_b]):
1396
# These branches have diverged
1398
elif heads == set([revision_a]):
1399
return 'a_descends_from_b'
1401
raise AssertionError("invalid heads: %r" % (heads,))
1404
class BranchFormat(object):
1405
"""An encapsulation of the initialization and open routines for a format.
1407
Formats provide three things:
1408
* An initialization routine,
1412
Formats are placed in an dict by their format string for reference
1413
during branch opening. Its not required that these be instances, they
1414
can be classes themselves with class methods - it simply depends on
1415
whether state is needed for a given format or not.
1417
Once a format is deprecated, just deprecate the initialize and open
1418
methods on the format class. Do not deprecate the object, as the
1419
object will be created every time regardless.
1422
_default_format = None
1423
"""The default format used for new branches."""
1426
"""The known formats."""
1428
can_set_append_revisions_only = True
1430
def __eq__(self, other):
1431
return self.__class__ is other.__class__
1433
def __ne__(self, other):
1434
return not (self == other)
1437
def find_format(klass, a_bzrdir):
1438
"""Return the format for the branch object in a_bzrdir."""
1440
transport = a_bzrdir.get_branch_transport(None)
1441
format_string = transport.get_bytes("format")
1442
return klass._formats[format_string]
1443
except errors.NoSuchFile:
1444
raise errors.NotBranchError(path=transport.base)
1446
raise errors.UnknownFormatError(format=format_string, kind='branch')
1449
def get_default_format(klass):
1450
"""Return the current default format."""
1451
return klass._default_format
1453
def get_reference(self, a_bzrdir):
1454
"""Get the target reference of the branch in a_bzrdir.
1456
format probing must have been completed before calling
1457
this method - it is assumed that the format of the branch
1458
in a_bzrdir is correct.
1460
:param a_bzrdir: The bzrdir to get the branch data from.
1461
:return: None if the branch is not a reference branch.
1466
def set_reference(self, a_bzrdir, to_branch):
1467
"""Set the target reference of the branch in a_bzrdir.
1469
format probing must have been completed before calling
1470
this method - it is assumed that the format of the branch
1471
in a_bzrdir is correct.
1473
:param a_bzrdir: The bzrdir to set the branch reference for.
1474
:param to_branch: branch that the checkout is to reference
1476
raise NotImplementedError(self.set_reference)
1478
def get_format_string(self):
1479
"""Return the ASCII format string that identifies this format."""
1480
raise NotImplementedError(self.get_format_string)
1482
def get_format_description(self):
1483
"""Return the short format description for this format."""
1484
raise NotImplementedError(self.get_format_description)
1486
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1488
"""Initialize a branch in a bzrdir, with specified files
1490
:param a_bzrdir: The bzrdir to initialize the branch in
1491
:param utf8_files: The files to create as a list of
1492
(filename, content) tuples
1493
:param set_format: If True, set the format with
1494
self.get_format_string. (BzrBranch4 has its format set
1496
:return: a branch in this format
1498
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1499
branch_transport = a_bzrdir.get_branch_transport(self)
1501
'metadir': ('lock', lockdir.LockDir),
1502
'branch4': ('branch-lock', lockable_files.TransportLock),
1504
lock_name, lock_class = lock_map[lock_type]
1505
control_files = lockable_files.LockableFiles(branch_transport,
1506
lock_name, lock_class)
1507
control_files.create_lock()
1509
control_files.lock_write()
1510
except errors.LockContention:
1511
if lock_type != 'branch4':
1517
utf8_files += [('format', self.get_format_string())]
1519
for (filename, content) in utf8_files:
1520
branch_transport.put_bytes(
1522
mode=a_bzrdir._get_file_mode())
1525
control_files.unlock()
1526
return self.open(a_bzrdir, _found=True)
1528
def initialize(self, a_bzrdir):
1529
"""Create a branch of this format in a_bzrdir."""
1530
raise NotImplementedError(self.initialize)
1532
def is_supported(self):
1533
"""Is this format supported?
1535
Supported formats can be initialized and opened.
1536
Unsupported formats may not support initialization or committing or
1537
some other features depending on the reason for not being supported.
1541
def make_tags(self, branch):
1542
"""Create a tags object for branch.
1544
This method is on BranchFormat, because BranchFormats are reflected
1545
over the wire via network_name(), whereas full Branch instances require
1546
multiple VFS method calls to operate at all.
1548
The default implementation returns a disabled-tags instance.
1550
Note that it is normal for branch to be a RemoteBranch when using tags
1553
return DisabledTags(branch)
1555
def network_name(self):
1556
"""A simple byte string uniquely identifying this format for RPC calls.
1558
MetaDir branch formats use their disk format string to identify the
1559
repository over the wire. All in one formats such as bzr < 0.8, and
1560
foreign formats like svn/git and hg should use some marker which is
1561
unique and immutable.
1563
raise NotImplementedError(self.network_name)
1565
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1566
"""Return the branch object for a_bzrdir
1568
:param a_bzrdir: A BzrDir that contains a branch.
1569
:param _found: a private parameter, do not use it. It is used to
1570
indicate if format probing has already be done.
1571
:param ignore_fallbacks: when set, no fallback branches will be opened
1572
(if there are any). Default is to open fallbacks.
1574
raise NotImplementedError(self.open)
1577
def register_format(klass, format):
1578
"""Register a metadir format."""
1579
klass._formats[format.get_format_string()] = format
1580
# Metadir formats have a network name of their format string, and get
1581
# registered as class factories.
1582
network_format_registry.register(format.get_format_string(), format.__class__)
1585
def set_default_format(klass, format):
1586
klass._default_format = format
1588
def supports_set_append_revisions_only(self):
1589
"""True if this format supports set_append_revisions_only."""
1592
def supports_stacking(self):
1593
"""True if this format records a stacked-on branch."""
1597
def unregister_format(klass, format):
1598
del klass._formats[format.get_format_string()]
1601
return self.get_format_description().rstrip()
1603
def supports_tags(self):
1604
"""True if this format supports tags stored in the branch"""
1605
return False # by default
1608
class BranchHooks(Hooks):
1609
"""A dictionary mapping hook name to a list of callables for branch hooks.
1611
e.g. ['set_rh'] Is the list of items to be called when the
1612
set_revision_history function is invoked.
1616
"""Create the default hooks.
1618
These are all empty initially, because by default nothing should get
1621
Hooks.__init__(self)
1622
self.create_hook(HookPoint('set_rh',
1623
"Invoked whenever the revision history has been set via "
1624
"set_revision_history. The api signature is (branch, "
1625
"revision_history), and the branch will be write-locked. "
1626
"The set_rh hook can be expensive for bzr to trigger, a better "
1627
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1628
self.create_hook(HookPoint('open',
1629
"Called with the Branch object that has been opened after a "
1630
"branch is opened.", (1, 8), None))
1631
self.create_hook(HookPoint('post_push',
1632
"Called after a push operation completes. post_push is called "
1633
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1634
"bzr client.", (0, 15), None))
1635
self.create_hook(HookPoint('post_pull',
1636
"Called after a pull operation completes. post_pull is called "
1637
"with a bzrlib.branch.PullResult object and only runs in the "
1638
"bzr client.", (0, 15), None))
1639
self.create_hook(HookPoint('pre_commit',
1640
"Called after a commit is calculated but before it is is "
1641
"completed. pre_commit is called with (local, master, old_revno, "
1642
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1643
"). old_revid is NULL_REVISION for the first commit to a branch, "
1644
"tree_delta is a TreeDelta object describing changes from the "
1645
"basis revision. hooks MUST NOT modify this delta. "
1646
" future_tree is an in-memory tree obtained from "
1647
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1648
"tree.", (0,91), None))
1649
self.create_hook(HookPoint('post_commit',
1650
"Called in the bzr client after a commit has completed. "
1651
"post_commit is called with (local, master, old_revno, old_revid, "
1652
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1653
"commit to a branch.", (0, 15), None))
1654
self.create_hook(HookPoint('post_uncommit',
1655
"Called in the bzr client after an uncommit completes. "
1656
"post_uncommit is called with (local, master, old_revno, "
1657
"old_revid, new_revno, new_revid) where local is the local branch "
1658
"or None, master is the target branch, and an empty branch "
1659
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1660
self.create_hook(HookPoint('pre_change_branch_tip',
1661
"Called in bzr client and server before a change to the tip of a "
1662
"branch is made. pre_change_branch_tip is called with a "
1663
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1664
"commit, uncommit will all trigger this hook.", (1, 6), None))
1665
self.create_hook(HookPoint('post_change_branch_tip',
1666
"Called in bzr client and server after a change to the tip of a "
1667
"branch is made. post_change_branch_tip is called with a "
1668
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1669
"commit, uncommit will all trigger this hook.", (1, 4), None))
1670
self.create_hook(HookPoint('transform_fallback_location',
1671
"Called when a stacked branch is activating its fallback "
1672
"locations. transform_fallback_location is called with (branch, "
1673
"url), and should return a new url. Returning the same url "
1674
"allows it to be used as-is, returning a different one can be "
1675
"used to cause the branch to stack on a closer copy of that "
1676
"fallback_location. Note that the branch cannot have history "
1677
"accessing methods called on it during this hook because the "
1678
"fallback locations have not been activated. When there are "
1679
"multiple hooks installed for transform_fallback_location, "
1680
"all are called with the url returned from the previous hook."
1681
"The order is however undefined.", (1, 9), None))
1684
# install the default hooks into the Branch class.
1685
Branch.hooks = BranchHooks()
1688
class ChangeBranchTipParams(object):
1689
"""Object holding parameters passed to *_change_branch_tip hooks.
1691
There are 5 fields that hooks may wish to access:
1693
:ivar branch: the branch being changed
1694
:ivar old_revno: revision number before the change
1695
:ivar new_revno: revision number after the change
1696
:ivar old_revid: revision id before the change
1697
:ivar new_revid: revision id after the change
1699
The revid fields are strings. The revno fields are integers.
1702
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1703
"""Create a group of ChangeBranchTip parameters.
1705
:param branch: The branch being changed.
1706
:param old_revno: Revision number before the change.
1707
:param new_revno: Revision number after the change.
1708
:param old_revid: Tip revision id before the change.
1709
:param new_revid: Tip revision id after the change.
1711
self.branch = branch
1712
self.old_revno = old_revno
1713
self.new_revno = new_revno
1714
self.old_revid = old_revid
1715
self.new_revid = new_revid
1717
def __eq__(self, other):
1718
return self.__dict__ == other.__dict__
1721
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1722
self.__class__.__name__, self.branch,
1723
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1726
class BzrBranchFormat4(BranchFormat):
1727
"""Bzr branch format 4.
1730
- a revision-history file.
1731
- a branch-lock lock file [ to be shared with the bzrdir ]
1734
def get_format_description(self):
1735
"""See BranchFormat.get_format_description()."""
1736
return "Branch format 4"
1738
def initialize(self, a_bzrdir):
1739
"""Create a branch of this format in a_bzrdir."""
1740
utf8_files = [('revision-history', ''),
1741
('branch-name', ''),
1743
return self._initialize_helper(a_bzrdir, utf8_files,
1744
lock_type='branch4', set_format=False)
1747
super(BzrBranchFormat4, self).__init__()
1748
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1750
def network_name(self):
1751
"""The network name for this format is the control dirs disk label."""
1752
return self._matchingbzrdir.get_format_string()
1754
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1755
"""See BranchFormat.open()."""
1757
# we are being called directly and must probe.
1758
raise NotImplementedError
1759
return BzrBranch(_format=self,
1760
_control_files=a_bzrdir._control_files,
1762
_repository=a_bzrdir.open_repository())
1765
return "Bazaar-NG branch format 4"
1768
class BranchFormatMetadir(BranchFormat):
1769
"""Common logic for meta-dir based branch formats."""
1771
def _branch_class(self):
1772
"""What class to instantiate on open calls."""
1773
raise NotImplementedError(self._branch_class)
1775
def network_name(self):
1776
"""A simple byte string uniquely identifying this format for RPC calls.
1778
Metadir branch formats use their format string.
1780
return self.get_format_string()
1782
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1783
"""See BranchFormat.open()."""
1785
format = BranchFormat.find_format(a_bzrdir)
1786
if format.__class__ != self.__class__:
1787
raise AssertionError("wrong format %r found for %r" %
1790
transport = a_bzrdir.get_branch_transport(None)
1791
control_files = lockable_files.LockableFiles(transport, 'lock',
1793
return self._branch_class()(_format=self,
1794
_control_files=control_files,
1796
_repository=a_bzrdir.find_repository(),
1797
ignore_fallbacks=ignore_fallbacks)
1798
except errors.NoSuchFile:
1799
raise errors.NotBranchError(path=transport.base)
1802
super(BranchFormatMetadir, self).__init__()
1803
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1804
self._matchingbzrdir.set_branch_format(self)
1806
def supports_tags(self):
1810
class BzrBranchFormat5(BranchFormatMetadir):
1811
"""Bzr branch format 5.
1814
- a revision-history file.
1816
- a lock dir guarding the branch itself
1817
- all of this stored in a branch/ subdirectory
1818
- works with shared repositories.
1820
This format is new in bzr 0.8.
1823
def _branch_class(self):
1826
def get_format_string(self):
1827
"""See BranchFormat.get_format_string()."""
1828
return "Bazaar-NG branch format 5\n"
1830
def get_format_description(self):
1831
"""See BranchFormat.get_format_description()."""
1832
return "Branch format 5"
1834
def initialize(self, a_bzrdir):
1835
"""Create a branch of this format in a_bzrdir."""
1836
utf8_files = [('revision-history', ''),
1837
('branch-name', ''),
1839
return self._initialize_helper(a_bzrdir, utf8_files)
1841
def supports_tags(self):
1845
class BzrBranchFormat6(BranchFormatMetadir):
1846
"""Branch format with last-revision and tags.
1848
Unlike previous formats, this has no explicit revision history. Instead,
1849
this just stores the last-revision, and the left-hand history leading
1850
up to there is the history.
1852
This format was introduced in bzr 0.15
1853
and became the default in 0.91.
1856
def _branch_class(self):
1859
def get_format_string(self):
1860
"""See BranchFormat.get_format_string()."""
1861
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1863
def get_format_description(self):
1864
"""See BranchFormat.get_format_description()."""
1865
return "Branch format 6"
1867
def initialize(self, a_bzrdir):
1868
"""Create a branch of this format in a_bzrdir."""
1869
utf8_files = [('last-revision', '0 null:\n'),
1870
('branch.conf', ''),
1873
return self._initialize_helper(a_bzrdir, utf8_files)
1875
def make_tags(self, branch):
1876
"""See bzrlib.branch.BranchFormat.make_tags()."""
1877
return BasicTags(branch)
1879
def supports_set_append_revisions_only(self):
1883
class BzrBranchFormat8(BranchFormatMetadir):
1884
"""Metadir format supporting storing locations of subtree branches."""
1886
def _branch_class(self):
1889
def get_format_string(self):
1890
"""See BranchFormat.get_format_string()."""
1891
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
1893
def get_format_description(self):
1894
"""See BranchFormat.get_format_description()."""
1895
return "Branch format 8"
1897
def initialize(self, a_bzrdir):
1898
"""Create a branch of this format in a_bzrdir."""
1899
utf8_files = [('last-revision', '0 null:\n'),
1900
('branch.conf', ''),
1904
return self._initialize_helper(a_bzrdir, utf8_files)
1907
super(BzrBranchFormat8, self).__init__()
1908
self._matchingbzrdir.repository_format = \
1909
RepositoryFormatKnitPack5RichRoot()
1911
def make_tags(self, branch):
1912
"""See bzrlib.branch.BranchFormat.make_tags()."""
1913
return BasicTags(branch)
1915
def supports_set_append_revisions_only(self):
1918
def supports_stacking(self):
1921
supports_reference_locations = True
1924
class BzrBranchFormat7(BzrBranchFormat8):
1925
"""Branch format with last-revision, tags, and a stacked location pointer.
1927
The stacked location pointer is passed down to the repository and requires
1928
a repository format with supports_external_lookups = True.
1930
This format was introduced in bzr 1.6.
1933
def initialize(self, a_bzrdir):
1934
"""Create a branch of this format in a_bzrdir."""
1935
utf8_files = [('last-revision', '0 null:\n'),
1936
('branch.conf', ''),
1939
return self._initialize_helper(a_bzrdir, utf8_files)
1941
def _branch_class(self):
1944
def get_format_string(self):
1945
"""See BranchFormat.get_format_string()."""
1946
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1948
def get_format_description(self):
1949
"""See BranchFormat.get_format_description()."""
1950
return "Branch format 7"
1952
def supports_set_append_revisions_only(self):
1955
supports_reference_locations = False
1958
class BranchReferenceFormat(BranchFormat):
1959
"""Bzr branch reference format.
1961
Branch references are used in implementing checkouts, they
1962
act as an alias to the real branch which is at some other url.
1969
def get_format_string(self):
1970
"""See BranchFormat.get_format_string()."""
1971
return "Bazaar-NG Branch Reference Format 1\n"
1973
def get_format_description(self):
1974
"""See BranchFormat.get_format_description()."""
1975
return "Checkout reference format 1"
1977
def get_reference(self, a_bzrdir):
1978
"""See BranchFormat.get_reference()."""
1979
transport = a_bzrdir.get_branch_transport(None)
1980
return transport.get_bytes('location')
1982
def set_reference(self, a_bzrdir, to_branch):
1983
"""See BranchFormat.set_reference()."""
1984
transport = a_bzrdir.get_branch_transport(None)
1985
location = transport.put_bytes('location', to_branch.base)
1987
def initialize(self, a_bzrdir, target_branch=None):
1988
"""Create a branch of this format in a_bzrdir."""
1989
if target_branch is None:
1990
# this format does not implement branch itself, thus the implicit
1991
# creation contract must see it as uninitializable
1992
raise errors.UninitializableFormat(self)
1993
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1994
branch_transport = a_bzrdir.get_branch_transport(self)
1995
branch_transport.put_bytes('location',
1996
target_branch.bzrdir.root_transport.base)
1997
branch_transport.put_bytes('format', self.get_format_string())
1999
a_bzrdir, _found=True,
2000
possible_transports=[target_branch.bzrdir.root_transport])
2003
super(BranchReferenceFormat, self).__init__()
2004
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2005
self._matchingbzrdir.set_branch_format(self)
2007
def _make_reference_clone_function(format, a_branch):
2008
"""Create a clone() routine for a branch dynamically."""
2009
def clone(to_bzrdir, revision_id=None,
2010
repository_policy=None):
2011
"""See Branch.clone()."""
2012
return format.initialize(to_bzrdir, a_branch)
2013
# cannot obey revision_id limits when cloning a reference ...
2014
# FIXME RBC 20060210 either nuke revision_id for clone, or
2015
# emit some sort of warning/error to the caller ?!
2018
def open(self, a_bzrdir, _found=False, location=None,
2019
possible_transports=None, ignore_fallbacks=False):
2020
"""Return the branch that the branch reference in a_bzrdir points at.
2022
:param a_bzrdir: A BzrDir that contains a branch.
2023
:param _found: a private parameter, do not use it. It is used to
2024
indicate if format probing has already be done.
2025
:param ignore_fallbacks: when set, no fallback branches will be opened
2026
(if there are any). Default is to open fallbacks.
2027
:param location: The location of the referenced branch. If
2028
unspecified, this will be determined from the branch reference in
2030
:param possible_transports: An optional reusable transports list.
2033
format = BranchFormat.find_format(a_bzrdir)
2034
if format.__class__ != self.__class__:
2035
raise AssertionError("wrong format %r found for %r" %
2037
if location is None:
2038
location = self.get_reference(a_bzrdir)
2039
real_bzrdir = bzrdir.BzrDir.open(
2040
location, possible_transports=possible_transports)
2041
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2042
# this changes the behaviour of result.clone to create a new reference
2043
# rather than a copy of the content of the branch.
2044
# I did not use a proxy object because that needs much more extensive
2045
# testing, and we are only changing one behaviour at the moment.
2046
# If we decide to alter more behaviours - i.e. the implicit nickname
2047
# then this should be refactored to introduce a tested proxy branch
2048
# and a subclass of that for use in overriding clone() and ....
2050
result.clone = self._make_reference_clone_function(result)
2054
network_format_registry = registry.FormatRegistry()
2055
"""Registry of formats indexed by their network name.
2057
The network name for a branch format is an identifier that can be used when
2058
referring to formats with smart server operations. See
2059
BranchFormat.network_name() for more detail.
2063
# formats which have no format string are not discoverable
2064
# and not independently creatable, so are not registered.
2065
__format5 = BzrBranchFormat5()
2066
__format6 = BzrBranchFormat6()
2067
__format7 = BzrBranchFormat7()
2068
__format8 = BzrBranchFormat8()
2069
BranchFormat.register_format(__format5)
2070
BranchFormat.register_format(BranchReferenceFormat())
2071
BranchFormat.register_format(__format6)
2072
BranchFormat.register_format(__format7)
2073
BranchFormat.register_format(__format8)
2074
BranchFormat.set_default_format(__format7)
2075
_legacy_formats = [BzrBranchFormat4(),
2077
network_format_registry.register(
2078
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2081
class BzrBranch(Branch, _RelockDebugMixin):
2082
"""A branch stored in the actual filesystem.
2084
Note that it's "local" in the context of the filesystem; it doesn't
2085
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2086
it's writable, and can be accessed via the normal filesystem API.
2088
:ivar _transport: Transport for file operations on this branch's
2089
control files, typically pointing to the .bzr/branch directory.
2090
:ivar repository: Repository for this branch.
2091
:ivar base: The url of the base directory for this branch; the one
2092
containing the .bzr directory.
2095
def __init__(self, _format=None,
2096
_control_files=None, a_bzrdir=None, _repository=None,
2097
ignore_fallbacks=False):
2098
"""Create new branch object at a particular location."""
2099
if a_bzrdir is None:
2100
raise ValueError('a_bzrdir must be supplied')
2102
self.bzrdir = a_bzrdir
2103
self._base = self.bzrdir.transport.clone('..').base
2104
# XXX: We should be able to just do
2105
# self.base = self.bzrdir.root_transport.base
2106
# but this does not quite work yet -- mbp 20080522
2107
self._format = _format
2108
if _control_files is None:
2109
raise ValueError('BzrBranch _control_files is None')
2110
self.control_files = _control_files
2111
self._transport = _control_files._transport
2112
self.repository = _repository
2113
Branch.__init__(self)
2116
return '%s(%r)' % (self.__class__.__name__, self.base)
2120
def _get_base(self):
2121
"""Returns the directory containing the control directory."""
2124
base = property(_get_base, doc="The URL for the root of this branch.")
2126
def _get_config(self):
2127
return TransportConfig(self._transport, 'branch.conf')
2129
def is_locked(self):
2130
return self.control_files.is_locked()
2132
def lock_write(self, token=None):
2133
if not self.is_locked():
2134
self._note_lock('w')
2135
# All-in-one needs to always unlock/lock.
2136
repo_control = getattr(self.repository, 'control_files', None)
2137
if self.control_files == repo_control or not self.is_locked():
2138
self.repository._warn_if_deprecated(self)
2139
self.repository.lock_write()
2144
return self.control_files.lock_write(token=token)
2147
self.repository.unlock()
2150
def lock_read(self):
2151
if not self.is_locked():
2152
self._note_lock('r')
2153
# All-in-one needs to always unlock/lock.
2154
repo_control = getattr(self.repository, 'control_files', None)
2155
if self.control_files == repo_control or not self.is_locked():
2156
self.repository._warn_if_deprecated(self)
2157
self.repository.lock_read()
2162
self.control_files.lock_read()
2165
self.repository.unlock()
2168
@only_raises(errors.LockNotHeld, errors.LockBroken)
2171
self.control_files.unlock()
2173
# All-in-one needs to always unlock/lock.
2174
repo_control = getattr(self.repository, 'control_files', None)
2175
if (self.control_files == repo_control or
2176
not self.control_files.is_locked()):
2177
self.repository.unlock()
2178
if not self.control_files.is_locked():
2179
# we just released the lock
2180
self._clear_cached_state()
2182
def peek_lock_mode(self):
2183
if self.control_files._lock_count == 0:
2186
return self.control_files._lock_mode
2188
def get_physical_lock_status(self):
2189
return self.control_files.get_physical_lock_status()
2192
def print_file(self, file, revision_id):
2193
"""See Branch.print_file."""
2194
return self.repository.print_file(file, revision_id)
2196
def _write_revision_history(self, history):
2197
"""Factored out of set_revision_history.
2199
This performs the actual writing to disk.
2200
It is intended to be called by BzrBranch5.set_revision_history."""
2201
self._transport.put_bytes(
2202
'revision-history', '\n'.join(history),
2203
mode=self.bzrdir._get_file_mode())
2206
def set_revision_history(self, rev_history):
2207
"""See Branch.set_revision_history."""
2208
if 'evil' in debug.debug_flags:
2209
mutter_callsite(3, "set_revision_history scales with history.")
2210
check_not_reserved_id = _mod_revision.check_not_reserved_id
2211
for rev_id in rev_history:
2212
check_not_reserved_id(rev_id)
2213
if Branch.hooks['post_change_branch_tip']:
2214
# Don't calculate the last_revision_info() if there are no hooks
2216
old_revno, old_revid = self.last_revision_info()
2217
if len(rev_history) == 0:
2218
revid = _mod_revision.NULL_REVISION
2220
revid = rev_history[-1]
2221
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2222
self._write_revision_history(rev_history)
2223
self._clear_cached_state()
2224
self._cache_revision_history(rev_history)
2225
for hook in Branch.hooks['set_rh']:
2226
hook(self, rev_history)
2227
if Branch.hooks['post_change_branch_tip']:
2228
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230
def _synchronize_history(self, destination, revision_id):
2231
"""Synchronize last revision and revision history between branches.
2233
This version is most efficient when the destination is also a
2234
BzrBranch5, but works for BzrBranch6 as long as the revision
2235
history is the true lefthand parent history, and all of the revisions
2236
are in the destination's repository. If not, set_revision_history
2239
:param destination: The branch to copy the history into
2240
:param revision_id: The revision-id to truncate history at. May
2241
be None to copy complete history.
2243
if not isinstance(destination._format, BzrBranchFormat5):
2244
super(BzrBranch, self)._synchronize_history(
2245
destination, revision_id)
2247
if revision_id == _mod_revision.NULL_REVISION:
2250
new_history = self.revision_history()
2251
if revision_id is not None and new_history != []:
2253
new_history = new_history[:new_history.index(revision_id) + 1]
2255
rev = self.repository.get_revision(revision_id)
2256
new_history = rev.get_history(self.repository)[1:]
2257
destination.set_revision_history(new_history)
2260
def set_last_revision_info(self, revno, revision_id):
2261
"""Set the last revision of this branch.
2263
The caller is responsible for checking that the revno is correct
2264
for this revision id.
2266
It may be possible to set the branch last revision to an id not
2267
present in the repository. However, branches can also be
2268
configured to check constraints on history, in which case this may not
2271
revision_id = _mod_revision.ensure_null(revision_id)
2272
# this old format stores the full history, but this api doesn't
2273
# provide it, so we must generate, and might as well check it's
2275
history = self._lefthand_history(revision_id)
2276
if len(history) != revno:
2277
raise AssertionError('%d != %d' % (len(history), revno))
2278
self.set_revision_history(history)
2280
def _gen_revision_history(self):
2281
history = self._transport.get_bytes('revision-history').split('\n')
2282
if history[-1:] == ['']:
2283
# There shouldn't be a trailing newline, but just in case.
2288
def generate_revision_history(self, revision_id, last_rev=None,
2290
"""Create a new revision history that will finish with revision_id.
2292
:param revision_id: the new tip to use.
2293
:param last_rev: The previous last_revision. If not None, then this
2294
must be a ancestory of revision_id, or DivergedBranches is raised.
2295
:param other_branch: The other branch that DivergedBranches should
2296
raise with respect to.
2298
self.set_revision_history(self._lefthand_history(revision_id,
2299
last_rev, other_branch))
2301
def basis_tree(self):
2302
"""See Branch.basis_tree."""
2303
return self.repository.revision_tree(self.last_revision())
2305
def _get_parent_location(self):
2306
_locs = ['parent', 'pull', 'x-pull']
2309
return self._transport.get_bytes(l).strip('\n')
2310
except errors.NoSuchFile:
2314
def _basic_push(self, target, overwrite, stop_revision):
2315
"""Basic implementation of push without bound branches or hooks.
2317
Must be called with source read locked and target write locked.
2319
result = BranchPushResult()
2320
result.source_branch = self
2321
result.target_branch = target
2322
result.old_revno, result.old_revid = target.last_revision_info()
2323
self.update_references(target)
2324
if result.old_revid != self.last_revision():
2325
# We assume that during 'push' this repository is closer than
2327
graph = self.repository.get_graph(target.repository)
2328
target.update_revisions(self, stop_revision,
2329
overwrite=overwrite, graph=graph)
2330
if self._push_should_merge_tags():
2331
result.tag_conflicts = self.tags.merge_to(target.tags,
2333
result.new_revno, result.new_revid = target.last_revision_info()
2336
def get_stacked_on_url(self):
2337
raise errors.UnstackableBranchFormat(self._format, self.base)
2339
def set_push_location(self, location):
2340
"""See Branch.set_push_location."""
2341
self.get_config().set_user_option(
2342
'push_location', location,
2343
store=_mod_config.STORE_LOCATION_NORECURSE)
2345
def _set_parent_location(self, url):
2347
self._transport.delete('parent')
2349
self._transport.put_bytes('parent', url + '\n',
2350
mode=self.bzrdir._get_file_mode())
2353
class BzrBranch5(BzrBranch):
2354
"""A format 5 branch. This supports new features over plain branches.
2356
It has support for a master_branch which is the data for bound branches.
2359
def get_bound_location(self):
2361
return self._transport.get_bytes('bound')[:-1]
2362
except errors.NoSuchFile:
2366
def get_master_branch(self, possible_transports=None):
2367
"""Return the branch we are bound to.
2369
:return: Either a Branch, or None
2371
This could memoise the branch, but if thats done
2372
it must be revalidated on each new lock.
2373
So for now we just don't memoise it.
2374
# RBC 20060304 review this decision.
2376
bound_loc = self.get_bound_location()
2380
return Branch.open(bound_loc,
2381
possible_transports=possible_transports)
2382
except (errors.NotBranchError, errors.ConnectionError), e:
2383
raise errors.BoundBranchConnectionFailure(
2387
def set_bound_location(self, location):
2388
"""Set the target where this branch is bound to.
2390
:param location: URL to the target branch
2393
self._transport.put_bytes('bound', location+'\n',
2394
mode=self.bzrdir._get_file_mode())
2397
self._transport.delete('bound')
2398
except errors.NoSuchFile:
2403
def bind(self, other):
2404
"""Bind this branch to the branch other.
2406
This does not push or pull data between the branches, though it does
2407
check for divergence to raise an error when the branches are not
2408
either the same, or one a prefix of the other. That behaviour may not
2409
be useful, so that check may be removed in future.
2411
:param other: The branch to bind to
2414
# TODO: jam 20051230 Consider checking if the target is bound
2415
# It is debatable whether you should be able to bind to
2416
# a branch which is itself bound.
2417
# Committing is obviously forbidden,
2418
# but binding itself may not be.
2419
# Since we *have* to check at commit time, we don't
2420
# *need* to check here
2422
# we want to raise diverged if:
2423
# last_rev is not in the other_last_rev history, AND
2424
# other_last_rev is not in our history, and do it without pulling
2426
self.set_bound_location(other.base)
2430
"""If bound, unbind"""
2431
return self.set_bound_location(None)
2434
def update(self, possible_transports=None):
2435
"""Synchronise this branch with the master branch if any.
2437
:return: None or the last_revision that was pivoted out during the
2440
master = self.get_master_branch(possible_transports)
2441
if master is not None:
2442
old_tip = _mod_revision.ensure_null(self.last_revision())
2443
self.pull(master, overwrite=True)
2444
if self.repository.get_graph().is_ancestor(old_tip,
2445
_mod_revision.ensure_null(self.last_revision())):
2451
class BzrBranch8(BzrBranch5):
2452
"""A branch that stores tree-reference locations."""
2454
def _open_hook(self):
2455
if self._ignore_fallbacks:
2458
url = self.get_stacked_on_url()
2459
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2460
errors.UnstackableBranchFormat):
2463
for hook in Branch.hooks['transform_fallback_location']:
2464
url = hook(self, url)
2466
hook_name = Branch.hooks.get_hook_name(hook)
2467
raise AssertionError(
2468
"'transform_fallback_location' hook %s returned "
2469
"None, not a URL." % hook_name)
2470
self._activate_fallback_location(url)
2472
def __init__(self, *args, **kwargs):
2473
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2474
super(BzrBranch8, self).__init__(*args, **kwargs)
2475
self._last_revision_info_cache = None
2476
self._reference_info = None
2478
def _clear_cached_state(self):
2479
super(BzrBranch8, self)._clear_cached_state()
2480
self._last_revision_info_cache = None
2481
self._reference_info = None
2483
def _last_revision_info(self):
2484
revision_string = self._transport.get_bytes('last-revision')
2485
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2486
revision_id = cache_utf8.get_cached_utf8(revision_id)
2488
return revno, revision_id
2490
def _write_last_revision_info(self, revno, revision_id):
2491
"""Simply write out the revision id, with no checks.
2493
Use set_last_revision_info to perform this safely.
2495
Does not update the revision_history cache.
2496
Intended to be called by set_last_revision_info and
2497
_write_revision_history.
2499
revision_id = _mod_revision.ensure_null(revision_id)
2500
out_string = '%d %s\n' % (revno, revision_id)
2501
self._transport.put_bytes('last-revision', out_string,
2502
mode=self.bzrdir._get_file_mode())
2505
def set_last_revision_info(self, revno, revision_id):
2506
revision_id = _mod_revision.ensure_null(revision_id)
2507
old_revno, old_revid = self.last_revision_info()
2508
if self._get_append_revisions_only():
2509
self._check_history_violation(revision_id)
2510
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2511
self._write_last_revision_info(revno, revision_id)
2512
self._clear_cached_state()
2513
self._last_revision_info_cache = revno, revision_id
2514
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2516
def _synchronize_history(self, destination, revision_id):
2517
"""Synchronize last revision and revision history between branches.
2519
:see: Branch._synchronize_history
2521
# XXX: The base Branch has a fast implementation of this method based
2522
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2523
# that uses set_revision_history. This class inherits from BzrBranch5,
2524
# but wants the fast implementation, so it calls
2525
# Branch._synchronize_history directly.
2526
Branch._synchronize_history(self, destination, revision_id)
2528
def _check_history_violation(self, revision_id):
2529
last_revision = _mod_revision.ensure_null(self.last_revision())
2530
if _mod_revision.is_null(last_revision):
2532
if last_revision not in self._lefthand_history(revision_id):
2533
raise errors.AppendRevisionsOnlyViolation(self.base)
2535
def _gen_revision_history(self):
2536
"""Generate the revision history from last revision
2538
last_revno, last_revision = self.last_revision_info()
2539
self._extend_partial_history(stop_index=last_revno-1)
2540
return list(reversed(self._partial_revision_history_cache))
2542
def _write_revision_history(self, history):
2543
"""Factored out of set_revision_history.
2545
This performs the actual writing to disk, with format-specific checks.
2546
It is intended to be called by BzrBranch5.set_revision_history.
2548
if len(history) == 0:
2549
last_revision = 'null:'
2551
if history != self._lefthand_history(history[-1]):
2552
raise errors.NotLefthandHistory(history)
2553
last_revision = history[-1]
2554
if self._get_append_revisions_only():
2555
self._check_history_violation(last_revision)
2556
self._write_last_revision_info(len(history), last_revision)
2559
def _set_parent_location(self, url):
2560
"""Set the parent branch"""
2561
self._set_config_location('parent_location', url, make_relative=True)
2564
def _get_parent_location(self):
2565
"""Set the parent branch"""
2566
return self._get_config_location('parent_location')
2569
def _set_all_reference_info(self, info_dict):
2570
"""Replace all reference info stored in a branch.
2572
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2575
writer = rio.RioWriter(s)
2576
for key, (tree_path, branch_location) in info_dict.iteritems():
2577
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2578
branch_location=branch_location)
2579
writer.write_stanza(stanza)
2580
self._transport.put_bytes('references', s.getvalue())
2581
self._reference_info = info_dict
2584
def _get_all_reference_info(self):
2585
"""Return all the reference info stored in a branch.
2587
:return: A dict of {file_id: (tree_path, branch_location)}
2589
if self._reference_info is not None:
2590
return self._reference_info
2591
rio_file = self._transport.get('references')
2593
stanzas = rio.read_stanzas(rio_file)
2594
info_dict = dict((s['file_id'], (s['tree_path'],
2595
s['branch_location'])) for s in stanzas)
2598
self._reference_info = info_dict
2601
def set_reference_info(self, file_id, tree_path, branch_location):
2602
"""Set the branch location to use for a tree reference.
2604
:param file_id: The file-id of the tree reference.
2605
:param tree_path: The path of the tree reference in the tree.
2606
:param branch_location: The location of the branch to retrieve tree
2609
info_dict = self._get_all_reference_info()
2610
info_dict[file_id] = (tree_path, branch_location)
2611
if None in (tree_path, branch_location):
2612
if tree_path is not None:
2613
raise ValueError('tree_path must be None when branch_location'
2615
if branch_location is not None:
2616
raise ValueError('branch_location must be None when tree_path'
2618
del info_dict[file_id]
2619
self._set_all_reference_info(info_dict)
2621
def get_reference_info(self, file_id):
2622
"""Get the tree_path and branch_location for a tree reference.
2624
:return: a tuple of (tree_path, branch_location)
2626
return self._get_all_reference_info().get(file_id, (None, None))
2628
def reference_parent(self, file_id, path, possible_transports=None):
2629
"""Return the parent branch for a tree-reference file_id.
2631
:param file_id: The file_id of the tree reference
2632
:param path: The path of the file_id in the tree
2633
:return: A branch associated with the file_id
2635
branch_location = self.get_reference_info(file_id)[1]
2636
if branch_location is None:
2637
return Branch.reference_parent(self, file_id, path,
2638
possible_transports)
2639
branch_location = urlutils.join(self.base, branch_location)
2640
return Branch.open(branch_location,
2641
possible_transports=possible_transports)
2643
def set_push_location(self, location):
2644
"""See Branch.set_push_location."""
2645
self._set_config_location('push_location', location)
2647
def set_bound_location(self, location):
2648
"""See Branch.set_push_location."""
2650
config = self.get_config()
2651
if location is None:
2652
if config.get_user_option('bound') != 'True':
937
bailout("weird file state %r" % ((fs, fid),))
941
class ScratchBranch(Branch):
942
"""Special test class: a branch that cleans up after itself.
944
>>> b = ScratchBranch()
2655
config.set_user_option('bound', 'False', warn_masked=True)
2658
self._set_config_location('bound_location', location,
2660
config.set_user_option('bound', 'True', warn_masked=True)
2663
def _get_bound_location(self, bound):
2664
"""Return the bound location in the config file.
2666
Return None if the bound parameter does not match"""
2667
config = self.get_config()
2668
config_bound = (config.get_user_option('bound') == 'True')
2669
if config_bound != bound:
2671
return self._get_config_location('bound_location', config=config)
2673
def get_bound_location(self):
2674
"""See Branch.set_push_location."""
2675
return self._get_bound_location(True)
2677
def get_old_bound_location(self):
2678
"""See Branch.get_old_bound_location"""
2679
return self._get_bound_location(False)
2681
def get_stacked_on_url(self):
2682
# you can always ask for the URL; but you might not be able to use it
2683
# if the repo can't support stacking.
2684
## self._check_stackable_repo()
2685
stacked_url = self._get_config_location('stacked_on_location')
2686
if stacked_url is None:
2687
raise errors.NotStacked(self)
2690
def _get_append_revisions_only(self):
2691
value = self.get_config().get_user_option('append_revisions_only')
2692
return value == 'True'
2695
def generate_revision_history(self, revision_id, last_rev=None,
2697
"""See BzrBranch5.generate_revision_history"""
2698
history = self._lefthand_history(revision_id, last_rev, other_branch)
2699
revno = len(history)
2700
self.set_last_revision_info(revno, revision_id)
2703
def get_rev_id(self, revno, history=None):
2704
"""Find the revision id of the specified revno."""
2706
return _mod_revision.NULL_REVISION
2708
last_revno, last_revision_id = self.last_revision_info()
2709
if revno <= 0 or revno > last_revno:
2710
raise errors.NoSuchRevision(self, revno)
2712
if history is not None:
2713
return history[revno - 1]
2715
index = last_revno - revno
2716
if len(self._partial_revision_history_cache) <= index:
2717
self._extend_partial_history(stop_index=index)
2718
if len(self._partial_revision_history_cache) > index:
2719
return self._partial_revision_history_cache[index]
2721
raise errors.NoSuchRevision(self, revno)
2724
def revision_id_to_revno(self, revision_id):
2725
"""Given a revision id, return its revno"""
2726
if _mod_revision.is_null(revision_id):
2729
index = self._partial_revision_history_cache.index(revision_id)
2731
self._extend_partial_history(stop_revision=revision_id)
2732
index = len(self._partial_revision_history_cache) - 1
2733
if self._partial_revision_history_cache[index] != revision_id:
2734
raise errors.NoSuchRevision(self, revision_id)
2735
return self.revno() - index
2738
class BzrBranch7(BzrBranch8):
2739
"""A branch with support for a fallback repository."""
2741
def set_reference_info(self, file_id, tree_path, branch_location):
2742
Branch.set_reference_info(self, file_id, tree_path, branch_location)
2744
def get_reference_info(self, file_id):
2745
Branch.get_reference_info(self, file_id)
2747
def reference_parent(self, file_id, path, possible_transports=None):
2748
return Branch.reference_parent(self, file_id, path,
2749
possible_transports)
2752
class BzrBranch6(BzrBranch7):
2753
"""See BzrBranchFormat6 for the capabilities of this branch.
2755
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
952
def __init__(self, files=[], dirs=[]):
953
"""Make a test branch.
955
This creates a temporary directory and runs init-tree in it.
957
If any files are listed, they are created in the working copy.
959
Branch.__init__(self, tempfile.mkdtemp(), init=True)
961
os.mkdir(self.abspath(d))
964
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
968
"""Destroy the test branch, removing the scratch directory."""
970
shutil.rmtree(self.base)
972
# Work around for shutil.rmtree failing on Windows when
973
# readonly files are encountered
974
for root, dirs, files in os.walk(self.base, topdown=False):
976
os.chmod(os.path.join(root, name), 0700)
977
shutil.rmtree(self.base)
2759
def get_stacked_on_url(self):
2760
raise errors.UnstackableBranchFormat(self._format, self.base)
981
2763
######################################################################
985
def is_control_file(filename):
986
## FIXME: better check
987
filename = os.path.normpath(filename)
988
while filename != '':
989
head, tail = os.path.split(filename)
990
## mutter('check %r for control file' % ((head, tail), ))
991
if tail == bzrlib.BZRDIR:
1000
def _gen_revision_id(when):
1001
"""Return new revision-id."""
1002
s = '%s-%s-' % (user_email(), compact_date(when))
1003
s += hexlify(rand_bytes(8))
1007
def gen_file_id(name):
1008
"""Return new file id.
1010
This should probably generate proper UUIDs, but for the moment we
1011
cope with just randomness because running uuidgen every time is
1013
idx = name.rfind('/')
1015
name = name[idx+1 : ]
1016
idx = name.rfind('\\')
1018
name = name[idx+1 : ]
1020
name = name.lstrip('.')
1022
s = hexlify(rand_bytes(8))
1023
return '-'.join((name, compact_date(time.time()), s))
2764
# results of operations
2767
class _Result(object):
2769
def _show_tag_conficts(self, to_file):
2770
if not getattr(self, 'tag_conflicts', None):
2772
to_file.write('Conflicting tags:\n')
2773
for name, value1, value2 in self.tag_conflicts:
2774
to_file.write(' %s\n' % (name, ))
2777
class PullResult(_Result):
2778
"""Result of a Branch.pull operation.
2780
:ivar old_revno: Revision number before pull.
2781
:ivar new_revno: Revision number after pull.
2782
:ivar old_revid: Tip revision id before pull.
2783
:ivar new_revid: Tip revision id after pull.
2784
:ivar source_branch: Source (local) branch object. (read locked)
2785
:ivar master_branch: Master branch of the target, or the target if no
2787
:ivar local_branch: target branch if there is a Master, else None
2788
:ivar target_branch: Target/destination branch object. (write locked)
2789
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2793
# DEPRECATED: pull used to return the change in revno
2794
return self.new_revno - self.old_revno
2796
def report(self, to_file):
2798
if self.old_revid == self.new_revid:
2799
to_file.write('No revisions to pull.\n')
2801
to_file.write('Now on revision %d.\n' % self.new_revno)
2802
self._show_tag_conficts(to_file)
2805
class BranchPushResult(_Result):
2806
"""Result of a Branch.push operation.
2808
:ivar old_revno: Revision number (eg 10) of the target before push.
2809
:ivar new_revno: Revision number (eg 12) of the target after push.
2810
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
2812
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
2814
:ivar source_branch: Source branch object that the push was from. This is
2815
read locked, and generally is a local (and thus low latency) branch.
2816
:ivar master_branch: If target is a bound branch, the master branch of
2817
target, or target itself. Always write locked.
2818
:ivar target_branch: The direct Branch where data is being sent (write
2820
:ivar local_branch: If the target is a bound branch this will be the
2821
target, otherwise it will be None.
2825
# DEPRECATED: push used to return the change in revno
2826
return self.new_revno - self.old_revno
2828
def report(self, to_file):
2829
"""Write a human-readable description of the result."""
2830
if self.old_revid == self.new_revid:
2831
note('No new revisions to push.')
2833
note('Pushed up to revision %d.' % self.new_revno)
2834
self._show_tag_conficts(to_file)
2837
class BranchCheckResult(object):
2838
"""Results of checking branch consistency.
2843
def __init__(self, branch):
2844
self.branch = branch
2847
def report_results(self, verbose):
2848
"""Report the check results via trace.note.
2850
:param verbose: Requests more detailed display of what was checked,
2853
note('checked branch %s format %s', self.branch.base,
2854
self.branch._format)
2855
for error in self.errors:
2856
note('found error:%s', error)
2859
class Converter5to6(object):
2860
"""Perform an in-place upgrade of format 5 to format 6"""
2862
def convert(self, branch):
2863
# Data for 5 and 6 can peacefully coexist.
2864
format = BzrBranchFormat6()
2865
new_branch = format.open(branch.bzrdir, _found=True)
2867
# Copy source data into target
2868
new_branch._write_last_revision_info(*branch.last_revision_info())
2869
new_branch.set_parent(branch.get_parent())
2870
new_branch.set_bound_location(branch.get_bound_location())
2871
new_branch.set_push_location(branch.get_push_location())
2873
# New branch has no tags by default
2874
new_branch.tags._set_tag_dict({})
2876
# Copying done; now update target format
2877
new_branch._transport.put_bytes('format',
2878
format.get_format_string(),
2879
mode=new_branch.bzrdir._get_file_mode())
2881
# Clean up old files
2882
new_branch._transport.delete('revision-history')
2884
branch.set_parent(None)
2885
except errors.NoSuchFile:
2887
branch.set_bound_location(None)
2890
class Converter6to7(object):
2891
"""Perform an in-place upgrade of format 6 to format 7"""
2893
def convert(self, branch):
2894
format = BzrBranchFormat7()
2895
branch._set_config_location('stacked_on_location', '')
2896
# update target format
2897
branch._transport.put_bytes('format', format.get_format_string())
2900
class Converter7to8(object):
2901
"""Perform an in-place upgrade of format 6 to format 7"""
2903
def convert(self, branch):
2904
format = BzrBranchFormat8()
2905
branch._transport.put_bytes('references', '')
2906
# update target format
2907
branch._transport.put_bytes('format', format.get_format_string())
2910
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2911
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2914
_run_with_write_locked_target will attempt to release the lock it acquires.
2916
If an exception is raised by callable, then that exception *will* be
2917
propagated, even if the unlock attempt raises its own error. Thus
2918
_run_with_write_locked_target should be preferred to simply doing::
2922
return callable(*args, **kwargs)
2927
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2928
# should share code?
2931
result = callable(*args, **kwargs)
2933
exc_info = sys.exc_info()
2937
raise exc_info[0], exc_info[1], exc_info[2]
2943
class InterBranch(InterObject):
2944
"""This class represents operations taking place between two branches.
2946
Its instances have methods like pull() and push() and contain
2947
references to the source and target repositories these operations
2948
can be carried out on.
2952
"""The available optimised InterBranch types."""
2955
def _get_branch_formats_to_test():
2956
"""Return a tuple with the Branch formats to use when testing."""
2957
raise NotImplementedError(InterBranch._get_branch_formats_to_test)
2959
def pull(self, overwrite=False, stop_revision=None,
2960
possible_transports=None, local=False):
2961
"""Mirror source into target branch.
2963
The target branch is considered to be 'local', having low latency.
2965
:returns: PullResult instance
2967
raise NotImplementedError(self.pull)
2969
def update_revisions(self, stop_revision=None, overwrite=False,
2971
"""Pull in new perfect-fit revisions.
2973
:param stop_revision: Updated until the given revision
2974
:param overwrite: Always set the branch pointer, rather than checking
2975
to see if it is a proper descendant.
2976
:param graph: A Graph object that can be used to query history
2977
information. This can be None.
2980
raise NotImplementedError(self.update_revisions)
2982
def push(self, overwrite=False, stop_revision=None,
2983
_override_hook_source_branch=None):
2984
"""Mirror the source branch into the target branch.
2986
The source branch is considered to be 'local', having low latency.
2988
raise NotImplementedError(self.push)
2991
class GenericInterBranch(InterBranch):
2992
"""InterBranch implementation that uses public Branch functions.
2996
def _get_branch_formats_to_test():
2997
return BranchFormat._default_format, BranchFormat._default_format
2999
def update_revisions(self, stop_revision=None, overwrite=False,
3001
"""See InterBranch.update_revisions()."""
3002
self.source.lock_read()
3004
other_revno, other_last_revision = self.source.last_revision_info()
3005
stop_revno = None # unknown
3006
if stop_revision is None:
3007
stop_revision = other_last_revision
3008
if _mod_revision.is_null(stop_revision):
3009
# if there are no commits, we're done.
3011
stop_revno = other_revno
3013
# what's the current last revision, before we fetch [and change it
3015
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3016
# we fetch here so that we don't process data twice in the common
3017
# case of having something to pull, and so that the check for
3018
# already merged can operate on the just fetched graph, which will
3019
# be cached in memory.
3020
self.target.fetch(self.source, stop_revision)
3021
# Check to see if one is an ancestor of the other
3024
graph = self.target.repository.get_graph()
3025
if self.target._check_if_descendant_or_diverged(
3026
stop_revision, last_rev, graph, self.source):
3027
# stop_revision is a descendant of last_rev, but we aren't
3028
# overwriting, so we're done.
3030
if stop_revno is None:
3032
graph = self.target.repository.get_graph()
3033
this_revno, this_last_revision = \
3034
self.target.last_revision_info()
3035
stop_revno = graph.find_distance_to_null(stop_revision,
3036
[(other_last_revision, other_revno),
3037
(this_last_revision, this_revno)])
3038
self.target.set_last_revision_info(stop_revno, stop_revision)
3040
self.source.unlock()
3042
def pull(self, overwrite=False, stop_revision=None,
3043
possible_transports=None, _hook_master=None, run_hooks=True,
3044
_override_hook_target=None, local=False):
3047
:param _hook_master: Private parameter - set the branch to
3048
be supplied as the master to pull hooks.
3049
:param run_hooks: Private parameter - if false, this branch
3050
is being called because it's the master of the primary branch,
3051
so it should not run its hooks.
3052
:param _override_hook_target: Private parameter - set the branch to be
3053
supplied as the target_branch to pull hooks.
3054
:param local: Only update the local branch, and not the bound branch.
3056
# This type of branch can't be bound.
3058
raise errors.LocalRequiresBoundBranch()
3059
result = PullResult()
3060
result.source_branch = self.source
3061
if _override_hook_target is None:
3062
result.target_branch = self.target
3064
result.target_branch = _override_hook_target
3065
self.source.lock_read()
3067
# We assume that during 'pull' the target repository is closer than
3069
self.source.update_references(self.target)
3070
graph = self.target.repository.get_graph(self.source.repository)
3071
# TODO: Branch formats should have a flag that indicates
3072
# that revno's are expensive, and pull() should honor that flag.
3074
result.old_revno, result.old_revid = \
3075
self.target.last_revision_info()
3076
self.target.update_revisions(self.source, stop_revision,
3077
overwrite=overwrite, graph=graph)
3078
# TODO: The old revid should be specified when merging tags,
3079
# so a tags implementation that versions tags can only
3080
# pull in the most recent changes. -- JRV20090506
3081
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3083
result.new_revno, result.new_revid = self.target.last_revision_info()
3085
result.master_branch = _hook_master
3086
result.local_branch = result.target_branch
3088
result.master_branch = result.target_branch
3089
result.local_branch = None
3091
for hook in Branch.hooks['post_pull']:
3094
self.source.unlock()
3097
def push(self, overwrite=False, stop_revision=None,
3098
_override_hook_source_branch=None):
3099
"""See InterBranch.push.
3101
This is the basic concrete implementation of push()
3103
:param _override_hook_source_branch: If specified, run
3104
the hooks passing this Branch as the source, rather than self.
3105
This is for use of RemoteBranch, where push is delegated to the
3106
underlying vfs-based Branch.
3108
# TODO: Public option to disable running hooks - should be trivial but
3110
self.source.lock_read()
3112
return _run_with_write_locked_target(
3113
self.target, self._push_with_bound_branches, overwrite,
3115
_override_hook_source_branch=_override_hook_source_branch)
3117
self.source.unlock()
3119
def _push_with_bound_branches(self, overwrite, stop_revision,
3120
_override_hook_source_branch=None):
3121
"""Push from source into target, and into target's master if any.
3124
if _override_hook_source_branch:
3125
result.source_branch = _override_hook_source_branch
3126
for hook in Branch.hooks['post_push']:
3129
bound_location = self.target.get_bound_location()
3130
if bound_location and self.target.base != bound_location:
3131
# there is a master branch.
3133
# XXX: Why the second check? Is it even supported for a branch to
3134
# be bound to itself? -- mbp 20070507
3135
master_branch = self.target.get_master_branch()
3136
master_branch.lock_write()
3138
# push into the master from the source branch.
3139
self.source._basic_push(master_branch, overwrite, stop_revision)
3140
# and push into the target branch from the source. Note that we
3141
# push from the source branch again, because its considered the
3142
# highest bandwidth repository.
3143
result = self.source._basic_push(self.target, overwrite,
3145
result.master_branch = master_branch
3146
result.local_branch = self.target
3150
master_branch.unlock()
3153
result = self.source._basic_push(self.target, overwrite,
3155
# TODO: Why set master_branch and local_branch if there's no
3156
# binding? Maybe cleaner to just leave them unset? -- mbp
3158
result.master_branch = self.target
3159
result.local_branch = None
3164
def is_compatible(self, source, target):
3165
# GenericBranch uses the public API, so always compatible
3169
class InterToBranch5(GenericInterBranch):
3172
def _get_branch_formats_to_test():
3173
return BranchFormat._default_format, BzrBranchFormat5()
3175
def pull(self, overwrite=False, stop_revision=None,
3176
possible_transports=None, run_hooks=True,
3177
_override_hook_target=None, local=False):
3178
"""Pull from source into self, updating my master if any.
3180
:param run_hooks: Private parameter - if false, this branch
3181
is being called because it's the master of the primary branch,
3182
so it should not run its hooks.
3184
bound_location = self.target.get_bound_location()
3185
if local and not bound_location:
3186
raise errors.LocalRequiresBoundBranch()
3187
master_branch = None
3188
if not local and bound_location and self.source.base != bound_location:
3189
# not pulling from master, so we need to update master.
3190
master_branch = self.target.get_master_branch(possible_transports)
3191
master_branch.lock_write()
3194
# pull from source into master.
3195
master_branch.pull(self.source, overwrite, stop_revision,
3197
return super(InterToBranch5, self).pull(overwrite,
3198
stop_revision, _hook_master=master_branch,
3199
run_hooks=run_hooks,
3200
_override_hook_target=_override_hook_target)
3203
master_branch.unlock()
3206
InterBranch.register_optimiser(GenericInterBranch)
3207
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
