1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1
# Copyright (C) 2005 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from cStringIO import StringIO
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
22
from warnings import warn
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
28
config as _mod_config,
33
revision as _mod_revision,
40
from bzrlib.config import BranchConfig, TreeConfig
41
from bzrlib.lockable_files import LockableFiles, TransportLock
42
from bzrlib.tag import (
48
from bzrlib.decorators import needs_read_lock, needs_write_lock
49
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
50
HistoryMissing, InvalidRevisionId,
51
InvalidRevisionNumber, LockError, NoSuchFile,
52
NoSuchRevision, NotVersionedError,
53
NotBranchError, UninitializableFormat,
54
UnlistableStore, UnlistableBranch,
56
from bzrlib.hooks import Hooks
57
from bzrlib.symbol_versioning import (deprecated_function,
61
zero_eight, zero_nine, zero_sixteen,
64
from bzrlib.trace import mutter, note
67
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
68
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
69
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
72
# TODO: Maybe include checks for common corruption of newlines, etc?
74
# TODO: Some operations like log might retrieve the same revisions
75
# repeatedly to calculate deltas. We could perhaps have a weakref
76
# cache in memory to make this faster. In general anything can be
77
# cached in memory between lock and unlock operations. .. nb thats
78
# what the transaction identity map provides
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, chomp, \
30
format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
31
joinpath, sha_string, file_kind, local_time_offset
32
from store import ImmutableStore
33
from revision import Revision
34
from errors import bailout
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)
61
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
63
head, tail = os.path.split(f)
65
# reached the root, whatever that may be
66
bailout('%r is not in a branch' % orig_f)
81
71
######################################################################
85
75
"""Branch holding a history of revisions.
88
Base directory/url of the branch.
90
hooks: An instance of BranchHooks.
77
:todo: Perhaps use different stores for different classes of object,
78
so that we can keep track of how much space each one uses,
79
or garbage-collect them.
81
:todo: Add a RemoteBranch subclass. For the basic case of read-only
82
HTTP access this should be very easy by,
83
just redirecting controlfile access into HTTP requests.
84
We would need a RemoteStore working similarly.
86
:todo: Keep the on-disk branch locked while the object exists.
88
:todo: mkdir() method.
92
# this is really an instance variable - FIXME move it there
96
# override this to set the strategy for storing tags
98
return DisabledTags(self)
100
def __init__(self, *ignored, **ignored_too):
101
self.tags = self._make_tags()
102
self._revision_history_cache = None
103
self._revision_id_to_revno_cache = None
105
def break_lock(self):
106
"""Break a lock if one is present from another instance.
108
Uses the ui factory to ask for confirmation if the lock may be from
111
This will probe the repository for its lock as well.
113
self.control_files.break_lock()
114
self.repository.break_lock()
115
master = self.get_master_branch()
116
if master is not None:
120
def open(base, _unsupported=False):
121
"""Open the branch rooted at base.
123
For instance, if the branch is at URL/.bzr/branch,
124
Branch.open(URL) -> a Branch instance.
126
control = bzrdir.BzrDir.open(base, _unsupported)
127
return control.open_branch(_unsupported)
130
def open_from_transport(transport, _unsupported=False):
131
"""Open the branch rooted at transport"""
132
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
133
return control.open_branch(_unsupported)
136
def open_containing(url, possible_transports=None):
137
"""Open an existing branch which contains url.
90
def __init__(self, base, init=False, find_root=True):
91
"""Create new branch object at a particular location.
93
:param base: Base directory for the branch.
139
This probes for a branch at url, and searches upwards from there.
141
Basically we keep looking up until we find the control directory or
142
run into the root. If there isn't one, raises NotBranchError.
143
If there is one and it is either an unrecognised format or an unsupported
144
format, UnknownFormatError or UnsupportedFormatError are raised.
145
If there is one, it is returned, along with the unused portion of url.
147
control, relpath = bzrdir.BzrDir.open_containing(url,
149
return control.open_branch(), relpath
151
def get_config(self):
152
return BranchConfig(self)
155
return self.get_config().get_nickname()
157
def _set_nick(self, nick):
158
self.get_config().set_user_option('nickname', nick, warn_masked=True)
160
nick = property(_get_nick, _set_nick)
163
raise NotImplementedError(self.is_locked)
165
def lock_write(self):
166
raise NotImplementedError(self.lock_write)
169
raise NotImplementedError(self.lock_read)
172
raise NotImplementedError(self.unlock)
174
def peek_lock_mode(self):
175
"""Return lock mode for the Branch: 'r', 'w' or None"""
176
raise NotImplementedError(self.peek_lock_mode)
178
def get_physical_lock_status(self):
179
raise NotImplementedError(self.get_physical_lock_status)
182
def get_revision_id_to_revno_map(self):
183
"""Return the revision_id => dotted revno map.
185
This will be regenerated on demand, but will be cached.
187
:return: A dictionary mapping revision_id => dotted revno.
188
This dictionary should not be modified by the caller.
190
if self._revision_id_to_revno_cache is not None:
191
mapping = self._revision_id_to_revno_cache
95
:param init: If True, create new control files in a previously
96
unversioned directory. If False, the branch must already
99
:param find_root: If true and init is false, find the root of the
100
existing branch containing base.
102
In the test suite, creation of new trees is tested using the
103
`ScratchBranch` class.
106
self.base = os.path.realpath(base)
109
self.base = find_branch_root(base)
193
mapping = self._gen_revno_map()
194
self._cache_revision_id_to_revno(mapping)
195
# TODO: jam 20070417 Since this is being cached, should we be returning
197
# I would rather not, and instead just declare that users should not
198
# modify the return value.
201
def _gen_revno_map(self):
202
"""Create a new mapping from revision ids to dotted revnos.
204
Dotted revnos are generated based on the current tip in the revision
206
This is the worker function for get_revision_id_to_revno_map, which
207
just caches the return value.
209
:return: A dictionary mapping revision_id => dotted revno.
211
last_revision = self.last_revision()
212
revision_graph = self.repository.get_revision_graph(last_revision)
213
merge_sorted_revisions = tsort.merge_sort(
218
revision_id_to_revno = dict((rev_id, revno)
219
for seq_num, rev_id, depth, revno, end_of_merge
220
in merge_sorted_revisions)
221
return revision_id_to_revno
223
def leave_lock_in_place(self):
224
"""Tell this branch object not to release the physical lock when this
227
If lock_write doesn't return a token, then this method is not supported.
229
self.control_files.leave_in_place()
231
def dont_leave_lock_in_place(self):
232
"""Tell this branch object to release the physical lock when this
233
object is unlocked, even if it didn't originally acquire it.
235
If lock_write doesn't return a token, then this method is not supported.
237
self.control_files.dont_leave_in_place()
111
self.base = os.path.realpath(base)
112
if not isdir(self.controlfilename('.')):
113
bailout("not a bzr branch: %s" % quotefn(base),
114
['use "bzr init" to initialize a new working tree',
115
'current bzr can only operate from top-of-tree'])
118
self.text_store = ImmutableStore(self.controlfilename('text-store'))
119
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
120
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
124
return '%s(%r)' % (self.__class__.__name__, self.base)
239
130
def abspath(self, name):
240
"""Return absolute filename for something in the branch
242
XXX: Robert Collins 20051017 what is this used for? why is it a branch
243
method and not a tree method.
245
raise NotImplementedError(self.abspath)
247
def bind(self, other):
248
"""Bind the local branch the other branch.
250
:param other: The branch to bind to
253
raise errors.UpgradeRequired(self.base)
256
def fetch(self, from_branch, last_revision=None, pb=None):
257
"""Copy revisions from from_branch into this branch.
259
:param from_branch: Where to copy from.
260
:param last_revision: What revision to stop at (None for at the end
262
:param pb: An optional progress bar to use.
264
Returns the copied revision count and the failed revisions in a tuple:
267
if self.base == from_branch.base:
270
nested_pb = ui.ui_factory.nested_progress_bar()
131
"""Return absolute filename for something in the branch"""
132
return os.path.join(self.base, name)
135
def relpath(self, path):
136
"""Return path relative to this branch of something inside it.
138
Raises an error if path is not in this branch."""
139
rp = os.path.realpath(path)
141
if not rp.startswith(self.base):
142
bailout("path %r is not within branch %r" % (rp, self.base))
143
rp = rp[len(self.base):]
144
rp = rp.lstrip(os.sep)
148
def controlfilename(self, file_or_path):
149
"""Return location relative to branch."""
150
if isinstance(file_or_path, types.StringTypes):
151
file_or_path = [file_or_path]
152
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
155
def controlfile(self, file_or_path, mode='r'):
156
"""Open a control file for this branch"""
157
return file(self.controlfilename(file_or_path), mode)
160
def _make_control(self):
161
os.mkdir(self.controlfilename([]))
162
self.controlfile('README', 'w').write(
163
"This is a Bazaar-NG control directory.\n"
164
"Do not change any files in this directory.")
165
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
166
for d in ('text-store', 'inventory-store', 'revision-store'):
167
os.mkdir(self.controlfilename(d))
168
for f in ('revision-history', 'merged-patches',
169
'pending-merged-patches', 'branch-name'):
170
self.controlfile(f, 'w').write('')
171
mutter('created control directory in ' + self.base)
172
Inventory().write_xml(self.controlfile('inventory','w'))
175
def _check_format(self):
176
"""Check this branch format is supported.
178
The current tool only supports the current unstable format.
180
In the future, we might need different in-memory Branch
181
classes to support downlevel branches. But not yet.
183
# read in binary mode to detect newline wierdness.
184
fmt = self.controlfile('branch-format', 'rb').read()
185
if fmt != BZR_BRANCH_FORMAT:
186
bailout('sorry, branch format %r not supported' % fmt,
187
['use a different bzr version',
188
'or remove the .bzr directory and "bzr init" again'])
191
def read_working_inventory(self):
192
"""Read the working inventory."""
194
inv = Inventory.read_xml(self.controlfile('inventory', 'r'))
195
mutter("loaded inventory of %d items in %f"
196
% (len(inv), time.time() - before))
200
def _write_inventory(self, inv):
201
"""Update the working inventory.
203
That is to say, the inventory describing changes underway, that
204
will be committed to the next revision.
206
## TODO: factor out to atomicfile? is rename safe on windows?
207
## TODO: Maybe some kind of clean/dirty marker on inventory?
208
tmpfname = self.controlfilename('inventory.tmp')
209
tmpf = file(tmpfname, 'w')
212
os.rename(tmpfname, self.controlfilename('inventory'))
213
mutter('wrote working inventory')
216
inventory = property(read_working_inventory, _write_inventory, None,
217
"""Inventory for the working copy.""")
220
def add(self, files, verbose=False):
221
"""Make files versioned.
223
This puts the files in the Added state, so that they will be
224
recorded by the next commit.
226
:todo: Perhaps have an option to add the ids even if the files do
229
:todo: Perhaps return the ids of the files? But then again it
230
is easy to retrieve them if they're needed.
232
:todo: Option to specify file id.
234
:todo: Adding a directory should optionally recurse down and
235
add all non-ignored children. Perhaps do that in a
238
>>> b = ScratchBranch(files=['foo'])
239
>>> 'foo' in b.unknowns()
244
>>> 'foo' in b.unknowns()
246
>>> bool(b.inventory.path2id('foo'))
252
Traceback (most recent call last):
254
BzrError: ('foo is already versioned', [])
256
>>> b.add(['nothere'])
257
Traceback (most recent call last):
258
BzrError: ('cannot add: not a regular file or directory: nothere', [])
261
# TODO: Re-adding a file that is removed in the working copy
262
# should probably put it back with the previous ID.
263
if isinstance(files, types.StringTypes):
266
inv = self.read_working_inventory()
268
if is_control_file(f):
269
bailout("cannot add control file %s" % quotefn(f))
274
bailout("cannot add top-level %r" % f)
276
fullpath = os.path.normpath(self.abspath(f))
279
kind = file_kind(fullpath)
281
# maybe something better?
282
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
284
if kind != 'file' and kind != 'directory':
285
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
287
file_id = gen_file_id(f)
288
inv.add_path(f, kind=kind, file_id=file_id)
291
show_status('A', kind, quotefn(f))
293
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
295
self._write_inventory(inv)
299
def remove(self, files, verbose=False):
300
"""Mark nominated files for removal from the inventory.
302
This does not remove their text. This does not run on
304
:todo: Refuse to remove modified files unless --force is given?
306
>>> b = ScratchBranch(files=['foo'])
308
>>> b.inventory.has_filename('foo')
311
>>> b.working_tree().has_filename('foo')
313
>>> b.inventory.has_filename('foo')
316
>>> b = ScratchBranch(files=['foo'])
321
>>> b.inventory.has_filename('foo')
323
>>> b.basis_tree().has_filename('foo')
325
>>> b.working_tree().has_filename('foo')
328
:todo: Do something useful with directories.
330
:todo: Should this remove the text or not? Tough call; not
331
removing may be useful and the user can just use use rm, and
332
is the opposite of add. Removing it is consistent with most
333
other tools. Maybe an option.
335
## TODO: Normalize names
336
## TODO: Remove nested loops; better scalability
338
if isinstance(files, types.StringTypes):
341
tree = self.working_tree()
344
# do this before any modifications
348
bailout("cannot remove unversioned file %s" % quotefn(f))
349
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
351
# having remove it, it must be either ignored or unknown
352
if tree.is_ignored(f):
356
show_status(new_status, inv[fid].kind, quotefn(f))
359
self._write_inventory(inv)
363
"""Return all unknown files.
365
These are files in the working directory that are not versioned or
366
control files or ignored.
368
>>> b = ScratchBranch(files=['foo', 'foo~'])
369
>>> list(b.unknowns())
372
>>> list(b.unknowns())
375
>>> list(b.unknowns())
378
return self.working_tree().unknowns()
381
def commit(self, message, timestamp=None, timezone=None,
384
"""Commit working copy as a new revision.
386
The basic approach is to add all the file texts into the
387
store, then the inventory, then make a new revision pointing
388
to that inventory and store that.
390
This is not quite safe if the working copy changes during the
391
commit; for the moment that is simply not allowed. A better
392
approach is to make a temporary copy of the files before
393
computing their hashes, and then add those hashes in turn to
394
the inventory. This should mean at least that there are no
395
broken hash pointers. There is no way we can get a snapshot
396
of the whole directory at an instant. This would also have to
397
be robust against files disappearing, moving, etc. So the
398
whole thing is a bit hard.
400
:param timestamp: if not None, seconds-since-epoch for a
401
postdated/predated commit.
404
## TODO: Show branch names
406
# TODO: Don't commit if there are no changes, unless forced?
408
# First walk over the working inventory; and both update that
409
# and also build a new revision inventory. The revision
410
# inventory needs to hold the text-id, sha1 and size of the
411
# actual file versions committed in the revision. (These are
412
# not present in the working inventory.) We also need to
413
# detect missing/deleted files, and remove them from the
416
work_inv = self.read_working_inventory()
418
basis = self.basis_tree()
419
basis_inv = basis.inventory
421
for path, entry in work_inv.iter_entries():
422
## TODO: Cope with files that have gone missing.
424
## TODO: Check that the file kind has not changed from the previous
425
## revision of this file (if any).
429
p = self.abspath(path)
430
file_id = entry.file_id
431
mutter('commit prep file %s, id %r ' % (p, file_id))
433
if not os.path.exists(p):
434
mutter(" file is missing, removing from inventory")
436
show_status('D', entry.kind, quotefn(path))
437
missing_ids.append(file_id)
440
# TODO: Handle files that have been deleted
442
# TODO: Maybe a special case for empty files? Seems a
443
# waste to store them many times.
447
if basis_inv.has_id(file_id):
448
old_kind = basis_inv[file_id].kind
449
if old_kind != entry.kind:
450
bailout("entry %r changed kind from %r to %r"
451
% (file_id, old_kind, entry.kind))
453
if entry.kind == 'directory':
455
bailout("%s is entered as directory but not a directory" % quotefn(p))
456
elif entry.kind == 'file':
458
bailout("%s is entered as file but is not a file" % quotefn(p))
460
content = file(p, 'rb').read()
462
entry.text_sha1 = sha_string(content)
463
entry.text_size = len(content)
465
old_ie = basis_inv.has_id(file_id) and basis_inv[file_id]
467
and (old_ie.text_size == entry.text_size)
468
and (old_ie.text_sha1 == entry.text_sha1)):
469
## assert content == basis.get_file(file_id).read()
470
entry.text_id = basis_inv[file_id].text_id
471
mutter(' unchanged from previous text_id {%s}' %
475
entry.text_id = gen_file_id(entry.name)
476
self.text_store.add(content, entry.text_id)
477
mutter(' stored with text_id {%s}' % entry.text_id)
481
elif (old_ie.name == entry.name
482
and old_ie.parent_id == entry.parent_id):
487
show_status(state, entry.kind, quotefn(path))
489
for file_id in missing_ids:
490
# have to do this later so we don't mess up the iterator.
491
# since parents may be removed before their children we
494
# FIXME: There's probably a better way to do this; perhaps
495
# the workingtree should know how to filter itself.
496
if work_inv.has_id(file_id):
497
del work_inv[file_id]
500
inv_id = rev_id = _gen_revision_id(time.time())
502
inv_tmp = tempfile.TemporaryFile()
503
inv.write_xml(inv_tmp)
505
self.inventory_store.add(inv_tmp, inv_id)
506
mutter('new inventory_id is {%s}' % inv_id)
508
self._write_inventory(work_inv)
510
if timestamp == None:
511
timestamp = time.time()
513
if committer == None:
514
committer = username()
517
timezone = local_time_offset()
519
mutter("building commit log message")
520
rev = Revision(timestamp=timestamp,
523
precursor = self.last_patch(),
528
rev_tmp = tempfile.TemporaryFile()
529
rev.write_xml(rev_tmp)
531
self.revision_store.add(rev_tmp, rev_id)
532
mutter("new revision_id is {%s}" % rev_id)
534
## XXX: Everything up to here can simply be orphaned if we abort
535
## the commit; it will leave junk files behind but that doesn't
538
## TODO: Read back the just-generated changeset, and make sure it
539
## applies and recreates the right state.
541
## TODO: Also calculate and store the inventory SHA1
542
mutter("committing patch r%d" % (self.revno() + 1))
544
mutter("append to revision-history")
545
self.controlfile('revision-history', 'at').write(rev_id + '\n')
550
def get_revision(self, revision_id):
551
"""Return the Revision object for a named revision"""
552
r = Revision.read_xml(self.revision_store[revision_id])
553
assert r.revision_id == revision_id
557
def get_inventory(self, inventory_id):
558
"""Get Inventory object by hash.
560
:todo: Perhaps for this and similar methods, take a revision
561
parameter which can be either an integer revno or a
563
i = Inventory.read_xml(self.inventory_store[inventory_id])
567
def get_revision_inventory(self, revision_id):
568
"""Return inventory of a past revision."""
569
if revision_id == None:
275
from_branch.lock_read()
277
if last_revision is None:
278
pb.update('get source history')
279
last_revision = from_branch.last_revision()
280
if last_revision is None:
281
last_revision = _mod_revision.NULL_REVISION
282
return self.repository.fetch(from_branch.repository,
283
revision_id=last_revision,
286
if nested_pb is not None:
290
def get_bound_location(self):
291
"""Return the URL of the branch we are bound to.
293
Older format branches cannot bind, please be sure to use a metadir
298
def get_old_bound_location(self):
299
"""Return the URL of the branch we used to be bound to
301
raise errors.UpgradeRequired(self.base)
303
def get_commit_builder(self, parents, config=None, timestamp=None,
304
timezone=None, committer=None, revprops=None,
306
"""Obtain a CommitBuilder for this branch.
308
:param parents: Revision ids of the parents of the new revision.
309
:param config: Optional configuration to use.
310
:param timestamp: Optional timestamp recorded for commit.
311
:param timezone: Optional timezone for timestamp.
312
:param committer: Optional committer to set for commit.
313
:param revprops: Optional dictionary of revision properties.
314
:param revision_id: Optional revision id.
318
config = self.get_config()
320
return self.repository.get_commit_builder(self, parents, config,
321
timestamp, timezone, committer, revprops, revision_id)
323
def get_master_branch(self):
324
"""Return the branch we are bound to.
326
:return: Either a Branch, or None
330
def get_revision_delta(self, revno):
331
"""Return the delta for one revision.
333
The delta is relative to its mainline predecessor, or the
334
empty tree for revision 1.
336
assert isinstance(revno, int)
337
rh = self.revision_history()
338
if not (1 <= revno <= len(rh)):
339
raise InvalidRevisionNumber(revno)
340
return self.repository.get_revision_delta(rh[revno-1])
342
@deprecated_method(zero_sixteen)
343
def get_root_id(self):
344
"""Return the id of this branches root
346
Deprecated: branches don't have root ids-- trees do.
347
Use basis_tree().get_root_id() instead.
349
raise NotImplementedError(self.get_root_id)
351
def print_file(self, file, revision_id):
352
"""Print `file` to stdout."""
353
raise NotImplementedError(self.print_file)
355
def set_revision_history(self, rev_history):
356
raise NotImplementedError(self.set_revision_history)
358
def _cache_revision_history(self, rev_history):
359
"""Set the cached revision history to rev_history.
361
The revision_history method will use this cache to avoid regenerating
362
the revision history.
364
This API is semi-public; it only for use by subclasses, all other code
365
should consider it to be private.
367
self._revision_history_cache = rev_history
369
def _cache_revision_id_to_revno(self, revision_id_to_revno):
370
"""Set the cached revision_id => revno map to revision_id_to_revno.
372
This API is semi-public; it only for use by subclasses, all other code
373
should consider it to be private.
375
self._revision_id_to_revno_cache = revision_id_to_revno
377
def _clear_cached_state(self):
378
"""Clear any cached data on this branch, e.g. cached revision history.
380
This means the next call to revision_history will need to call
381
_gen_revision_history.
383
This API is semi-public; it only for use by subclasses, all other code
384
should consider it to be private.
386
self._revision_history_cache = None
387
self._revision_id_to_revno_cache = None
389
def _gen_revision_history(self):
390
"""Return sequence of revision hashes on to this branch.
392
Unlike revision_history, this method always regenerates or rereads the
393
revision history, i.e. it does not cache the result, so repeated calls
396
Concrete subclasses should override this instead of revision_history so
397
that subclasses do not need to deal with caching logic.
399
This API is semi-public; it only for use by subclasses, all other code
400
should consider it to be private.
402
raise NotImplementedError(self._gen_revision_history)
572
return self.get_inventory(self.get_revision(revision_id).inventory_id)
405
575
def revision_history(self):
406
576
"""Return sequence of revision hashes on to this branch.
408
This method will cache the revision history for as long as it is safe to
578
>>> ScratchBranch().revision_history()
411
if self._revision_history_cache is not None:
412
history = self._revision_history_cache
414
history = self._gen_revision_history()
415
self._cache_revision_history(history)
581
return [chomp(l) for l in self.controlfile('revision-history').readlines()]
419
585
"""Return current revision number for this branch.
421
587
That is equivalent to the number of revisions committed to
590
>>> b = ScratchBranch()
593
>>> b.commit('no foo')
424
597
return len(self.revision_history())
427
"""Older format branches cannot bind or unbind."""
428
raise errors.UpgradeRequired(self.base)
430
def set_append_revisions_only(self, enabled):
431
"""Older format branches are never restricted to append-only"""
432
raise errors.UpgradeRequired(self.base)
434
def last_revision(self):
435
"""Return last revision id, or None"""
600
def last_patch(self):
601
"""Return last patch hash, or None if no history.
603
>>> ScratchBranch().last_patch() == None
436
606
ph = self.revision_history()
442
def last_revision_info(self):
443
"""Return information about the last revision.
445
:return: A tuple (revno, last_revision_id).
447
rh = self.revision_history()
450
return (revno, rh[-1])
452
return (0, _mod_revision.NULL_REVISION)
454
def missing_revisions(self, other, stop_revision=None):
455
"""Return a list of new revisions that would perfectly fit.
457
If self and other have not diverged, return a list of the revisions
458
present in other, but missing from self.
460
self_history = self.revision_history()
461
self_len = len(self_history)
462
other_history = other.revision_history()
463
other_len = len(other_history)
464
common_index = min(self_len, other_len) -1
465
if common_index >= 0 and \
466
self_history[common_index] != other_history[common_index]:
467
raise DivergedBranches(self, other)
469
if stop_revision is None:
470
stop_revision = other_len
472
assert isinstance(stop_revision, int)
473
if stop_revision > other_len:
474
raise errors.NoSuchRevision(self, stop_revision)
475
return other_history[self_len:stop_revision]
477
def update_revisions(self, other, stop_revision=None):
478
"""Pull in new perfect-fit revisions.
480
:param other: Another Branch to pull from
481
:param stop_revision: Updated until the given revision
484
raise NotImplementedError(self.update_revisions)
486
def revision_id_to_revno(self, revision_id):
487
"""Given a revision id, return its revno"""
488
if _mod_revision.is_null(revision_id):
490
revision_id = osutils.safe_revision_id(revision_id)
491
history = self.revision_history()
493
return history.index(revision_id) + 1
495
raise errors.NoSuchRevision(self, revision_id)
497
def get_rev_id(self, revno, history=None):
498
"""Find the revision id of the specified revno."""
611
def lookup_revision(self, revno):
612
"""Return revision hash for revision number."""
502
history = self.revision_history()
503
if revno <= 0 or revno > len(history):
504
raise errors.NoSuchRevision(self, revno)
505
return history[revno - 1]
507
def pull(self, source, overwrite=False, stop_revision=None):
508
"""Mirror source into this branch.
510
This branch is considered to be 'local', having low latency.
512
:returns: PullResult instance
514
raise NotImplementedError(self.pull)
516
def push(self, target, overwrite=False, stop_revision=None):
517
"""Mirror this branch into target.
519
This branch is considered to be 'local', having low latency.
521
raise NotImplementedError(self.push)
523
def basis_tree(self):
524
"""Return `Tree` object for last revision."""
525
return self.repository.revision_tree(self.last_revision())
527
def rename_one(self, from_rel, to_rel):
530
This can change the directory or the filename or both.
532
raise NotImplementedError(self.rename_one)
534
def move(self, from_paths, to_name):
537
to_name must exist as a versioned directory.
539
If to_name exists and is a directory, the files are moved into
540
it, keeping their old names. If it is a directory,
542
Note that to_name is only the last component of the new name;
543
this doesn't change the directory.
545
This returns a list of (from_path, to_path) pairs for each
548
raise NotImplementedError(self.move)
550
def get_parent(self):
551
"""Return the parent location of the branch.
553
This is the default location for push/pull/missing. The usual
554
pattern is that the user can override it by specifying a
557
raise NotImplementedError(self.get_parent)
559
def _set_config_location(self, name, url, config=None,
560
make_relative=False):
562
config = self.get_config()
566
url = urlutils.relative_url(self.base, url)
567
config.set_user_option(name, url, warn_masked=True)
569
def _get_config_location(self, name, config=None):
571
config = self.get_config()
572
location = config.get_user_option(name)
577
def get_submit_branch(self):
578
"""Return the submit location of the branch.
580
This is the default location for bundle. The usual
581
pattern is that the user can override it by specifying a
584
return self.get_config().get_user_option('submit_branch')
586
def set_submit_branch(self, location):
587
"""Return the submit location of the branch.
589
This is the default location for bundle. The usual
590
pattern is that the user can override it by specifying a
593
self.get_config().set_user_option('submit_branch', location,
596
def get_public_branch(self):
597
"""Return the public location of the branch.
599
This is is used by merge directives.
601
return self._get_config_location('public_branch')
603
def set_public_branch(self, location):
604
"""Return the submit location of the branch.
606
This is the default location for bundle. The usual
607
pattern is that the user can override it by specifying a
610
self._set_config_location('public_branch', location)
612
def get_push_location(self):
613
"""Return the None or the location to push this branch to."""
614
push_loc = self.get_config().get_user_option('push_location')
617
def set_push_location(self, location):
618
"""Set a new push location for this branch."""
619
raise NotImplementedError(self.set_push_location)
621
def set_parent(self, url):
622
raise NotImplementedError(self.set_parent)
626
"""Synchronise this branch with the master branch if any.
628
:return: None or the last_revision pivoted out during the update.
632
def check_revno(self, revno):
634
Check whether a revno corresponds to any revision.
635
Zero (the NULL revision) is considered valid.
638
self.check_real_revno(revno)
640
def check_real_revno(self, revno):
642
Check whether a revno corresponds to a real revision.
643
Zero (the NULL revision) is considered invalid
645
if revno < 1 or revno > self.revno():
646
raise InvalidRevisionNumber(revno)
649
def clone(self, to_bzrdir, revision_id=None):
650
"""Clone this branch into to_bzrdir preserving all semantic values.
652
revision_id: if not None, the revision history in the new branch will
653
be truncated to end with revision_id.
655
result = self._format.initialize(to_bzrdir)
656
self.copy_content_into(result, revision_id=revision_id)
660
def sprout(self, to_bzrdir, revision_id=None):
661
"""Create a new line of development from the branch, into to_bzrdir.
663
revision_id: if not None, the revision history in the new branch will
664
be truncated to end with revision_id.
666
result = self._format.initialize(to_bzrdir)
667
self.copy_content_into(result, revision_id=revision_id)
668
result.set_parent(self.bzrdir.root_transport.base)
671
def _synchronize_history(self, destination, revision_id):
672
"""Synchronize last revision and revision history between branches.
674
This version is most efficient when the destination is also a
675
BzrBranch5, but works for BzrBranch6 as long as the revision
676
history is the true lefthand parent history, and all of the revisions
677
are in the destination's repository. If not, set_revision_history
680
:param destination: The branch to copy the history into
681
:param revision_id: The revision-id to truncate history at. May
682
be None to copy complete history.
684
if revision_id == _mod_revision.NULL_REVISION:
686
new_history = self.revision_history()
687
if revision_id is not None and new_history != []:
688
revision_id = osutils.safe_revision_id(revision_id)
690
new_history = new_history[:new_history.index(revision_id) + 1]
692
rev = self.repository.get_revision(revision_id)
693
new_history = rev.get_history(self.repository)[1:]
694
destination.set_revision_history(new_history)
697
def copy_content_into(self, destination, revision_id=None):
698
"""Copy the content of self into destination.
700
revision_id: if not None, the revision history in the new branch will
701
be truncated to end with revision_id.
703
self._synchronize_history(destination, revision_id)
705
parent = self.get_parent()
706
except errors.InaccessibleParent, e:
707
mutter('parent was not accessible to copy: %s', e)
710
destination.set_parent(parent)
711
self.tags.merge_to(destination.tags)
715
"""Check consistency of the branch.
717
In particular this checks that revisions given in the revision-history
718
do actually match up in the revision graph, and that they're all
719
present in the repository.
721
Callers will typically also want to check the repository.
723
:return: A BranchCheckResult.
725
mainline_parent_id = None
726
for revision_id in self.revision_history():
728
revision = self.repository.get_revision(revision_id)
729
except errors.NoSuchRevision, e:
730
raise errors.BzrCheckError("mainline revision {%s} not in repository"
732
# In general the first entry on the revision history has no parents.
733
# But it's not illegal for it to have parents listed; this can happen
734
# in imports from Arch when the parents weren't reachable.
735
if mainline_parent_id is not None:
736
if mainline_parent_id not in revision.parent_ids:
737
raise errors.BzrCheckError("previous revision {%s} not listed among "
739
% (mainline_parent_id, revision_id))
740
mainline_parent_id = revision_id
741
return BranchCheckResult(self)
743
def _get_checkout_format(self):
744
"""Return the most suitable metadir for a checkout of this branch.
745
Weaves are used if this branch's repository uses weaves.
747
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
748
from bzrlib.repofmt import weaverepo
749
format = bzrdir.BzrDirMetaFormat1()
750
format.repository_format = weaverepo.RepositoryFormat7()
752
format = self.repository.bzrdir.checkout_metadir()
753
format.set_branch_format(self._format)
756
def create_checkout(self, to_location, revision_id=None,
758
"""Create a checkout of a branch.
760
:param to_location: The url to produce the checkout at
761
:param revision_id: The revision to check out
762
:param lightweight: If True, produce a lightweight checkout, otherwise,
763
produce a bound branch (heavyweight checkout)
764
:return: The tree of the created checkout
766
t = transport.get_transport(to_location)
769
format = self._get_checkout_format()
770
checkout = format.initialize_on_transport(t)
771
BranchReferenceFormat().initialize(checkout, self)
773
format = self._get_checkout_format()
774
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
775
to_location, force_new_tree=False, format=format)
776
checkout = checkout_branch.bzrdir
777
checkout_branch.bind(self)
778
# pull up to the specified revision_id to set the initial
779
# branch tip correctly, and seed it with history.
780
checkout_branch.pull(self, stop_revision=revision_id)
781
tree = checkout.create_workingtree(revision_id)
782
basis_tree = tree.basis_tree()
783
basis_tree.lock_read()
785
for path, file_id in basis_tree.iter_references():
786
reference_parent = self.reference_parent(file_id, path)
787
reference_parent.create_checkout(tree.abspath(path),
788
basis_tree.get_reference_revision(file_id, path),
794
def reference_parent(self, file_id, path):
795
"""Return the parent branch for a tree-reference file_id
796
:param file_id: The file_id of the tree reference
797
:param path: The path of the file_id in the tree
798
:return: A branch associated with the file_id
800
# FIXME should provide multiple branches, based on config
801
return Branch.open(self.bzrdir.root_transport.clone(path).base)
803
def supports_tags(self):
804
return self._format.supports_tags()
807
class BranchFormat(object):
808
"""An encapsulation of the initialization and open routines for a format.
810
Formats provide three things:
811
* An initialization routine,
815
Formats are placed in an dict by their format string for reference
816
during branch opening. Its not required that these be instances, they
817
can be classes themselves with class methods - it simply depends on
818
whether state is needed for a given format or not.
820
Once a format is deprecated, just deprecate the initialize and open
821
methods on the format class. Do not deprecate the object, as the
822
object will be created every time regardless.
825
_default_format = None
826
"""The default format used for new branches."""
829
"""The known formats."""
831
def __eq__(self, other):
832
return self.__class__ is other.__class__
834
def __ne__(self, other):
835
return not (self == other)
838
def find_format(klass, a_bzrdir):
839
"""Return the format for the branch object in a_bzrdir."""
841
transport = a_bzrdir.get_branch_transport(None)
842
format_string = transport.get("format").read()
843
return klass._formats[format_string]
845
raise NotBranchError(path=transport.base)
847
raise errors.UnknownFormatError(format=format_string)
850
def get_default_format(klass):
851
"""Return the current default format."""
852
return klass._default_format
854
def get_reference(self, a_bzrdir):
855
"""Get the target reference of the branch in a_bzrdir.
857
format probing must have been completed before calling
858
this method - it is assumed that the format of the branch
859
in a_bzrdir is correct.
861
:param a_bzrdir: The bzrdir to get the branch data from.
862
:return: None if the branch is not a reference branch.
866
def get_format_string(self):
867
"""Return the ASCII format string that identifies this format."""
868
raise NotImplementedError(self.get_format_string)
870
def get_format_description(self):
871
"""Return the short format description for this format."""
872
raise NotImplementedError(self.get_format_description)
874
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
876
"""Initialize a branch in a bzrdir, with specified files
878
:param a_bzrdir: The bzrdir to initialize the branch in
879
:param utf8_files: The files to create as a list of
880
(filename, content) tuples
881
:param set_format: If True, set the format with
882
self.get_format_string. (BzrBranch4 has its format set
884
:return: a branch in this format
886
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
887
branch_transport = a_bzrdir.get_branch_transport(self)
889
'metadir': ('lock', lockdir.LockDir),
890
'branch4': ('branch-lock', lockable_files.TransportLock),
892
lock_name, lock_class = lock_map[lock_type]
893
control_files = lockable_files.LockableFiles(branch_transport,
894
lock_name, lock_class)
895
control_files.create_lock()
896
control_files.lock_write()
898
control_files.put_utf8('format', self.get_format_string())
900
for file, content in utf8_files:
901
control_files.put_utf8(file, content)
903
control_files.unlock()
904
return self.open(a_bzrdir, _found=True)
906
def initialize(self, a_bzrdir):
907
"""Create a branch of this format in a_bzrdir."""
908
raise NotImplementedError(self.initialize)
910
def is_supported(self):
911
"""Is this format supported?
913
Supported formats can be initialized and opened.
914
Unsupported formats may not support initialization or committing or
915
some other features depending on the reason for not being supported.
919
def open(self, a_bzrdir, _found=False):
920
"""Return the branch object for a_bzrdir
922
_found is a private parameter, do not use it. It is used to indicate
923
if format probing has already be done.
925
raise NotImplementedError(self.open)
928
def register_format(klass, format):
929
klass._formats[format.get_format_string()] = format
932
def set_default_format(klass, format):
933
klass._default_format = format
936
def unregister_format(klass, format):
937
assert klass._formats[format.get_format_string()] is format
938
del klass._formats[format.get_format_string()]
941
return self.get_format_string().rstrip()
943
def supports_tags(self):
944
"""True if this format supports tags stored in the branch"""
945
return False # by default
947
# XXX: Probably doesn't really belong here -- mbp 20070212
948
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
950
branch_transport = a_bzrdir.get_branch_transport(self)
951
control_files = lockable_files.LockableFiles(branch_transport,
952
lock_filename, lock_class)
953
control_files.create_lock()
954
control_files.lock_write()
956
for filename, content in utf8_files:
957
control_files.put_utf8(filename, content)
959
control_files.unlock()
962
class BranchHooks(Hooks):
963
"""A dictionary mapping hook name to a list of callables for branch hooks.
965
e.g. ['set_rh'] Is the list of items to be called when the
966
set_revision_history function is invoked.
970
"""Create the default hooks.
972
These are all empty initially, because by default nothing should get
976
# Introduced in 0.15:
977
# invoked whenever the revision history has been set
978
# with set_revision_history. The api signature is
979
# (branch, revision_history), and the branch will
982
# invoked after a push operation completes.
983
# the api signature is
985
# containing the members
986
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
987
# where local is the local target branch or None, master is the target
988
# master branch, and the rest should be self explanatory. The source
989
# is read locked and the target branches write locked. Source will
990
# be the local low-latency branch.
991
self['post_push'] = []
992
# invoked after a pull operation completes.
993
# the api signature is
995
# containing the members
996
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
997
# where local is the local branch or None, master is the target
998
# master branch, and the rest should be self explanatory. The source
999
# is read locked and the target branches write locked. The local
1000
# branch is the low-latency branch.
1001
self['post_pull'] = []
1002
# invoked after a commit operation completes.
1003
# the api signature is
1004
# (local, master, old_revno, old_revid, new_revno, new_revid)
1005
# old_revid is NULL_REVISION for the first commit to a branch.
1006
self['post_commit'] = []
1007
# invoked after a uncommit operation completes.
1008
# the api signature is
1009
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1010
# local is the local branch or None, master is the target branch,
1011
# and an empty branch recieves new_revno of 0, new_revid of None.
1012
self['post_uncommit'] = []
1015
# install the default hooks into the Branch class.
1016
Branch.hooks = BranchHooks()
1019
class BzrBranchFormat4(BranchFormat):
1020
"""Bzr branch format 4.
1023
- a revision-history file.
1024
- a branch-lock lock file [ to be shared with the bzrdir ]
1027
def get_format_description(self):
1028
"""See BranchFormat.get_format_description()."""
1029
return "Branch format 4"
1031
def initialize(self, a_bzrdir):
1032
"""Create a branch of this format in a_bzrdir."""
1033
utf8_files = [('revision-history', ''),
1034
('branch-name', ''),
1036
return self._initialize_helper(a_bzrdir, utf8_files,
1037
lock_type='branch4', set_format=False)
1040
super(BzrBranchFormat4, self).__init__()
1041
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1043
def open(self, a_bzrdir, _found=False):
1044
"""Return the branch object for a_bzrdir
1046
_found is a private parameter, do not use it. It is used to indicate
1047
if format probing has already be done.
1050
# we are being called directly and must probe.
1051
raise NotImplementedError
1052
return BzrBranch(_format=self,
1053
_control_files=a_bzrdir._control_files,
1055
_repository=a_bzrdir.open_repository())
1058
return "Bazaar-NG branch format 4"
1061
class BzrBranchFormat5(BranchFormat):
1062
"""Bzr branch format 5.
1065
- a revision-history file.
1067
- a lock dir guarding the branch itself
1068
- all of this stored in a branch/ subdirectory
1069
- works with shared repositories.
1071
This format is new in bzr 0.8.
1074
def get_format_string(self):
1075
"""See BranchFormat.get_format_string()."""
1076
return "Bazaar-NG branch format 5\n"
1078
def get_format_description(self):
1079
"""See BranchFormat.get_format_description()."""
1080
return "Branch format 5"
1082
def initialize(self, a_bzrdir):
1083
"""Create a branch of this format in a_bzrdir."""
1084
utf8_files = [('revision-history', ''),
1085
('branch-name', ''),
1087
return self._initialize_helper(a_bzrdir, utf8_files)
1090
super(BzrBranchFormat5, self).__init__()
1091
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1093
def open(self, a_bzrdir, _found=False):
1094
"""Return the branch object for a_bzrdir
1096
_found is a private parameter, do not use it. It is used to indicate
1097
if format probing has already be done.
1100
format = BranchFormat.find_format(a_bzrdir)
1101
assert format.__class__ == self.__class__
1103
transport = a_bzrdir.get_branch_transport(None)
1104
control_files = lockable_files.LockableFiles(transport, 'lock',
1106
return BzrBranch5(_format=self,
1107
_control_files=control_files,
1109
_repository=a_bzrdir.find_repository())
1111
raise NotBranchError(path=transport.base)
1114
class BzrBranchFormat6(BzrBranchFormat5):
1115
"""Branch format with last-revision and tags.
1117
Unlike previous formats, this has no explicit revision history. Instead,
1118
this just stores the last-revision, and the left-hand history leading
1119
up to there is the history.
1121
This format was introduced in bzr 0.15
1122
and became the default in 0.91.
1125
def get_format_string(self):
1126
"""See BranchFormat.get_format_string()."""
1127
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1129
def get_format_description(self):
1130
"""See BranchFormat.get_format_description()."""
1131
return "Branch format 6"
1133
def initialize(self, a_bzrdir):
1134
"""Create a branch of this format in a_bzrdir."""
1135
utf8_files = [('last-revision', '0 null:\n'),
1136
('branch-name', ''),
1137
('branch.conf', ''),
1140
return self._initialize_helper(a_bzrdir, utf8_files)
1142
def open(self, a_bzrdir, _found=False):
1143
"""Return the branch object for a_bzrdir
1145
_found is a private parameter, do not use it. It is used to indicate
1146
if format probing has already be done.
1149
format = BranchFormat.find_format(a_bzrdir)
1150
assert format.__class__ == self.__class__
1151
transport = a_bzrdir.get_branch_transport(None)
1152
control_files = lockable_files.LockableFiles(transport, 'lock',
1154
return BzrBranch6(_format=self,
1155
_control_files=control_files,
1157
_repository=a_bzrdir.find_repository())
1159
def supports_tags(self):
1163
class BranchReferenceFormat(BranchFormat):
1164
"""Bzr branch reference format.
1166
Branch references are used in implementing checkouts, they
1167
act as an alias to the real branch which is at some other url.
1174
def get_format_string(self):
1175
"""See BranchFormat.get_format_string()."""
1176
return "Bazaar-NG Branch Reference Format 1\n"
1178
def get_format_description(self):
1179
"""See BranchFormat.get_format_description()."""
1180
return "Checkout reference format 1"
1182
def get_reference(self, a_bzrdir):
1183
"""See BranchFormat.get_reference()."""
1184
transport = a_bzrdir.get_branch_transport(None)
1185
return transport.get('location').read()
1187
def initialize(self, a_bzrdir, target_branch=None):
1188
"""Create a branch of this format in a_bzrdir."""
1189
if target_branch is None:
1190
# this format does not implement branch itself, thus the implicit
1191
# creation contract must see it as uninitializable
1192
raise errors.UninitializableFormat(self)
1193
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1194
branch_transport = a_bzrdir.get_branch_transport(self)
1195
branch_transport.put_bytes('location',
1196
target_branch.bzrdir.root_transport.base)
1197
branch_transport.put_bytes('format', self.get_format_string())
1198
return self.open(a_bzrdir, _found=True)
1201
super(BranchReferenceFormat, self).__init__()
1202
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1204
def _make_reference_clone_function(format, a_branch):
1205
"""Create a clone() routine for a branch dynamically."""
1206
def clone(to_bzrdir, revision_id=None):
1207
"""See Branch.clone()."""
1208
return format.initialize(to_bzrdir, a_branch)
1209
# cannot obey revision_id limits when cloning a reference ...
1210
# FIXME RBC 20060210 either nuke revision_id for clone, or
1211
# emit some sort of warning/error to the caller ?!
1214
def open(self, a_bzrdir, _found=False, location=None):
1215
"""Return the branch that the branch reference in a_bzrdir points at.
1217
_found is a private parameter, do not use it. It is used to indicate
1218
if format probing has already be done.
1221
format = BranchFormat.find_format(a_bzrdir)
1222
assert format.__class__ == self.__class__
1223
if location is None:
1224
location = self.get_reference(a_bzrdir)
1225
real_bzrdir = bzrdir.BzrDir.open(location)
1226
result = real_bzrdir.open_branch()
1227
# this changes the behaviour of result.clone to create a new reference
1228
# rather than a copy of the content of the branch.
1229
# I did not use a proxy object because that needs much more extensive
1230
# testing, and we are only changing one behaviour at the moment.
1231
# If we decide to alter more behaviours - i.e. the implicit nickname
1232
# then this should be refactored to introduce a tested proxy branch
1233
# and a subclass of that for use in overriding clone() and ....
1235
result.clone = self._make_reference_clone_function(result)
1239
# formats which have no format string are not discoverable
1240
# and not independently creatable, so are not registered.
1241
__format5 = BzrBranchFormat5()
1242
__format6 = BzrBranchFormat6()
1243
BranchFormat.register_format(__format5)
1244
BranchFormat.register_format(BranchReferenceFormat())
1245
BranchFormat.register_format(__format6)
1246
BranchFormat.set_default_format(__format6)
1247
_legacy_formats = [BzrBranchFormat4(),
1250
class BzrBranch(Branch):
1251
"""A branch stored in the actual filesystem.
1253
Note that it's "local" in the context of the filesystem; it doesn't
1254
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1255
it's writable, and can be accessed via the normal filesystem API.
1258
def __init__(self, _format=None,
1259
_control_files=None, a_bzrdir=None, _repository=None):
1260
"""Create new branch object at a particular location."""
1261
Branch.__init__(self)
1262
if a_bzrdir is None:
1263
raise ValueError('a_bzrdir must be supplied')
1265
self.bzrdir = a_bzrdir
1266
# self._transport used to point to the directory containing the
1267
# control directory, but was not used - now it's just the transport
1268
# for the branch control files. mbp 20070212
1269
self._base = self.bzrdir.transport.clone('..').base
1270
self._format = _format
1271
if _control_files is None:
1272
raise ValueError('BzrBranch _control_files is None')
1273
self.control_files = _control_files
1274
self._transport = _control_files._transport
1275
self.repository = _repository
1278
return '%s(%r)' % (self.__class__.__name__, self.base)
1282
def _get_base(self):
1283
"""Returns the directory containing the control directory."""
1286
base = property(_get_base, doc="The URL for the root of this branch.")
1288
def abspath(self, name):
1289
"""See Branch.abspath."""
1290
return self.control_files._transport.abspath(name)
1293
@deprecated_method(zero_sixteen)
1295
def get_root_id(self):
1296
"""See Branch.get_root_id."""
1297
tree = self.repository.revision_tree(self.last_revision())
1298
return tree.inventory.root.file_id
1300
def is_locked(self):
1301
return self.control_files.is_locked()
1303
def lock_write(self, token=None):
1304
repo_token = self.repository.lock_write()
1306
token = self.control_files.lock_write(token=token)
1308
self.repository.unlock()
1312
def lock_read(self):
1313
self.repository.lock_read()
1315
self.control_files.lock_read()
1317
self.repository.unlock()
1321
# TODO: test for failed two phase locks. This is known broken.
1323
self.control_files.unlock()
1325
self.repository.unlock()
1326
if not self.control_files.is_locked():
1327
# we just released the lock
1328
self._clear_cached_state()
1330
def peek_lock_mode(self):
1331
if self.control_files._lock_count == 0:
1334
return self.control_files._lock_mode
1336
def get_physical_lock_status(self):
1337
return self.control_files.get_physical_lock_status()
1340
def print_file(self, file, revision_id):
1341
"""See Branch.print_file."""
1342
return self.repository.print_file(file, revision_id)
1344
def _write_revision_history(self, history):
1345
"""Factored out of set_revision_history.
1347
This performs the actual writing to disk.
1348
It is intended to be called by BzrBranch5.set_revision_history."""
1349
self.control_files.put_bytes(
1350
'revision-history', '\n'.join(history))
1353
def set_revision_history(self, rev_history):
1354
"""See Branch.set_revision_history."""
1355
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
1356
self._clear_cached_state()
1357
self._write_revision_history(rev_history)
1358
self._cache_revision_history(rev_history)
1359
for hook in Branch.hooks['set_rh']:
1360
hook(self, rev_history)
1363
def set_last_revision_info(self, revno, revision_id):
1364
"""Set the last revision of this branch.
1366
The caller is responsible for checking that the revno is correct
1367
for this revision id.
1369
It may be possible to set the branch last revision to an id not
1370
present in the repository. However, branches can also be
1371
configured to check constraints on history, in which case this may not
1374
revision_id = osutils.safe_revision_id(revision_id)
1375
history = self._lefthand_history(revision_id)
1376
assert len(history) == revno, '%d != %d' % (len(history), revno)
1377
self.set_revision_history(history)
1379
def _gen_revision_history(self):
1380
history = self.control_files.get('revision-history').read().split('\n')
1381
if history[-1:] == ['']:
1382
# There shouldn't be a trailing newline, but just in case.
1386
def _lefthand_history(self, revision_id, last_rev=None,
1388
# stop_revision must be a descendant of last_revision
1389
stop_graph = self.repository.get_revision_graph(revision_id)
1390
if (last_rev is not None and last_rev != _mod_revision.NULL_REVISION
1391
and last_rev not in stop_graph):
1392
# our previous tip is not merged into stop_revision
1393
raise errors.DivergedBranches(self, other_branch)
1394
# make a new revision history from the graph
1395
current_rev_id = revision_id
1397
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1398
new_history.append(current_rev_id)
1399
current_rev_id_parents = stop_graph[current_rev_id]
1401
current_rev_id = current_rev_id_parents[0]
1403
current_rev_id = None
1404
new_history.reverse()
1408
def generate_revision_history(self, revision_id, last_rev=None,
1410
"""Create a new revision history that will finish with revision_id.
1412
:param revision_id: the new tip to use.
1413
:param last_rev: The previous last_revision. If not None, then this
1414
must be a ancestory of revision_id, or DivergedBranches is raised.
1415
:param other_branch: The other branch that DivergedBranches should
1416
raise with respect to.
1418
revision_id = osutils.safe_revision_id(revision_id)
1419
self.set_revision_history(self._lefthand_history(revision_id,
1420
last_rev, other_branch))
1423
def update_revisions(self, other, stop_revision=None):
1424
"""See Branch.update_revisions."""
1427
if stop_revision is None:
1428
stop_revision = other.last_revision()
1429
if stop_revision is None:
1430
# if there are no commits, we're done.
1433
stop_revision = osutils.safe_revision_id(stop_revision)
1434
# whats the current last revision, before we fetch [and change it
1436
last_rev = _mod_revision.ensure_null(self.last_revision())
1437
# we fetch here regardless of whether we need to so that we pickup
1439
self.fetch(other, stop_revision)
1440
if self.repository.get_graph().is_ancestor(stop_revision,
1443
self.generate_revision_history(stop_revision, last_rev=last_rev,
1448
def basis_tree(self):
1449
"""See Branch.basis_tree."""
1450
return self.repository.revision_tree(self.last_revision())
1453
def pull(self, source, overwrite=False, stop_revision=None,
1454
_hook_master=None, run_hooks=True):
1457
:param _hook_master: Private parameter - set the branch to
1458
be supplied as the master to push hooks.
1459
:param run_hooks: Private parameter - if false, this branch
1460
is being called because it's the master of the primary branch,
1461
so it should not run its hooks.
1463
result = PullResult()
1464
result.source_branch = source
1465
result.target_branch = self
1468
result.old_revno, result.old_revid = self.last_revision_info()
1470
self.update_revisions(source, stop_revision)
1471
except DivergedBranches:
1475
if stop_revision is None:
1476
stop_revision = source.last_revision()
1477
self.generate_revision_history(stop_revision)
1478
result.tag_conflicts = source.tags.merge_to(self.tags)
1479
result.new_revno, result.new_revid = self.last_revision_info()
1481
result.master_branch = _hook_master
1482
result.local_branch = self
1484
result.master_branch = self
1485
result.local_branch = None
1487
for hook in Branch.hooks['post_pull']:
1493
def _get_parent_location(self):
1494
_locs = ['parent', 'pull', 'x-pull']
1497
return self.control_files.get(l).read().strip('\n')
1503
def push(self, target, overwrite=False, stop_revision=None,
1504
_override_hook_source_branch=None):
1507
This is the basic concrete implementation of push()
1509
:param _override_hook_source_branch: If specified, run
1510
the hooks passing this Branch as the source, rather than self.
1511
This is for use of RemoteBranch, where push is delegated to the
1512
underlying vfs-based Branch.
1514
# TODO: Public option to disable running hooks - should be trivial but
1518
result = self._push_with_bound_branches(target, overwrite,
1520
_override_hook_source_branch=_override_hook_source_branch)
1525
def _push_with_bound_branches(self, target, overwrite,
1527
_override_hook_source_branch=None):
1528
"""Push from self into target, and into target's master if any.
1530
This is on the base BzrBranch class even though it doesn't support
1531
bound branches because the *target* might be bound.
1534
if _override_hook_source_branch:
1535
result.source_branch = _override_hook_source_branch
1536
for hook in Branch.hooks['post_push']:
1539
bound_location = target.get_bound_location()
1540
if bound_location and target.base != bound_location:
1541
# there is a master branch.
1543
# XXX: Why the second check? Is it even supported for a branch to
1544
# be bound to itself? -- mbp 20070507
1545
master_branch = target.get_master_branch()
1546
master_branch.lock_write()
1548
# push into the master from this branch.
1549
self._basic_push(master_branch, overwrite, stop_revision)
1550
# and push into the target branch from this. Note that we push from
1551
# this branch again, because its considered the highest bandwidth
1553
result = self._basic_push(target, overwrite, stop_revision)
1554
result.master_branch = master_branch
1555
result.local_branch = target
1559
master_branch.unlock()
1562
result = self._basic_push(target, overwrite, stop_revision)
1563
# TODO: Why set master_branch and local_branch if there's no
1564
# binding? Maybe cleaner to just leave them unset? -- mbp
1566
result.master_branch = target
1567
result.local_branch = None
1571
def _basic_push(self, target, overwrite, stop_revision):
1572
"""Basic implementation of push without bound branches or hooks.
1574
Must be called with self read locked and target write locked.
1576
result = PushResult()
1577
result.source_branch = self
1578
result.target_branch = target
1579
result.old_revno, result.old_revid = target.last_revision_info()
1581
target.update_revisions(self, stop_revision)
1582
except DivergedBranches:
1586
target.set_revision_history(self.revision_history())
1587
result.tag_conflicts = self.tags.merge_to(target.tags)
1588
result.new_revno, result.new_revid = target.last_revision_info()
1591
def get_parent(self):
1592
"""See Branch.get_parent."""
1594
assert self.base[-1] == '/'
1595
parent = self._get_parent_location()
1598
# This is an old-format absolute path to a local branch
1599
# turn it into a url
1600
if parent.startswith('/'):
1601
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1603
return urlutils.join(self.base[:-1], parent)
1604
except errors.InvalidURLJoin, e:
1605
raise errors.InaccessibleParent(parent, self.base)
1607
def set_push_location(self, location):
1608
"""See Branch.set_push_location."""
1609
self.get_config().set_user_option(
1610
'push_location', location,
1611
store=_mod_config.STORE_LOCATION_NORECURSE)
1614
def set_parent(self, url):
1615
"""See Branch.set_parent."""
1616
# TODO: Maybe delete old location files?
1617
# URLs should never be unicode, even on the local fs,
1618
# FIXUP this and get_parent in a future branch format bump:
1619
# read and rewrite the file, and have the new format code read
1620
# using .get not .get_utf8. RBC 20060125
1622
if isinstance(url, unicode):
1624
url = url.encode('ascii')
1625
except UnicodeEncodeError:
1626
raise errors.InvalidURL(url,
1627
"Urls must be 7-bit ascii, "
1628
"use bzrlib.urlutils.escape")
1629
url = urlutils.relative_url(self.base, url)
1630
self._set_parent_location(url)
1632
def _set_parent_location(self, url):
1634
self.control_files._transport.delete('parent')
1636
assert isinstance(url, str)
1637
self.control_files.put_bytes('parent', url + '\n')
1640
class BzrBranch5(BzrBranch):
1641
"""A format 5 branch. This supports new features over plan branches.
1643
It has support for a master_branch which is the data for bound branches.
1651
super(BzrBranch5, self).__init__(_format=_format,
1652
_control_files=_control_files,
1654
_repository=_repository)
1657
def pull(self, source, overwrite=False, stop_revision=None,
1659
"""Pull from source into self, updating my master if any.
1661
:param run_hooks: Private parameter - if false, this branch
1662
is being called because it's the master of the primary branch,
1663
so it should not run its hooks.
1665
bound_location = self.get_bound_location()
1666
master_branch = None
1667
if bound_location and source.base != bound_location:
1668
# not pulling from master, so we need to update master.
1669
master_branch = self.get_master_branch()
1670
master_branch.lock_write()
1673
# pull from source into master.
1674
master_branch.pull(source, overwrite, stop_revision,
1676
return super(BzrBranch5, self).pull(source, overwrite,
1677
stop_revision, _hook_master=master_branch,
1678
run_hooks=run_hooks)
1681
master_branch.unlock()
1683
def get_bound_location(self):
1685
return self.control_files.get_utf8('bound').read()[:-1]
1686
except errors.NoSuchFile:
1690
def get_master_branch(self):
1691
"""Return the branch we are bound to.
1693
:return: Either a Branch, or None
1695
This could memoise the branch, but if thats done
1696
it must be revalidated on each new lock.
1697
So for now we just don't memoise it.
1698
# RBC 20060304 review this decision.
1700
bound_loc = self.get_bound_location()
1704
return Branch.open(bound_loc)
1705
except (errors.NotBranchError, errors.ConnectionError), e:
1706
raise errors.BoundBranchConnectionFailure(
1710
def set_bound_location(self, location):
1711
"""Set the target where this branch is bound to.
1713
:param location: URL to the target branch
1716
self.control_files.put_utf8('bound', location+'\n')
1719
self.control_files._transport.delete('bound')
617
# list is 0-based; revisions are 1-based
618
return self.revision_history()[revno-1]
620
bailout("no such revision %s" % revno)
623
def revision_tree(self, revision_id):
624
"""Return Tree for a revision on this branch.
626
`revision_id` may be None for the null revision, in which case
627
an `EmptyTree` is returned."""
629
if revision_id == None:
632
inv = self.get_revision_inventory(revision_id)
633
return RevisionTree(self.text_store, inv)
636
def working_tree(self):
637
"""Return a `Tree` for the working copy."""
638
return WorkingTree(self.base, self.read_working_inventory())
641
def basis_tree(self):
642
"""Return `Tree` object for last revision.
644
If there are no revisions yet, return an `EmptyTree`.
646
>>> b = ScratchBranch(files=['foo'])
647
>>> b.basis_tree().has_filename('foo')
649
>>> b.working_tree().has_filename('foo')
652
>>> b.commit('add foo')
653
>>> b.basis_tree().has_filename('foo')
656
r = self.last_patch()
660
return RevisionTree(self.text_store, self.get_revision_inventory(r))
664
def write_log(self, show_timezone='original'):
665
"""Write out human-readable log of commits to this branch
667
:param utc: If true, show dates in universal time, not local time."""
668
## TODO: Option to choose either original, utc or local timezone
671
for p in self.revision_history():
673
print 'revno:', revno
674
## TODO: Show hash if --id is given.
675
##print 'revision-hash:', p
676
rev = self.get_revision(p)
677
print 'committer:', rev.committer
678
print 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,
681
## opportunistic consistency check, same as check_patch_chaining
682
if rev.precursor != precursor:
683
bailout("mismatched precursor!")
687
print ' (no message)'
689
for l in rev.message.split('\n'):
697
def show_status(branch, show_all=False):
698
"""Display single-line status for non-ignored working files.
700
The list is show sorted in order by file name.
702
>>> b = ScratchBranch(files=['foo', 'foo~'])
708
>>> b.commit("add foo")
710
>>> os.unlink(b.abspath('foo'))
715
:todo: Get state for single files.
717
:todo: Perhaps show a slash at the end of directory names.
721
# We have to build everything into a list first so that it can
722
# sorted by name, incorporating all the different sources.
724
# FIXME: Rather than getting things in random order and then sorting,
725
# just step through in order.
727
# Interesting case: the old ID for a file has been removed,
728
# but a new file has been created under that name.
730
old = branch.basis_tree()
731
old_inv = old.inventory
732
new = branch.working_tree()
733
new_inv = new.inventory
735
for fs, fid, oldname, newname, kind in diff_trees(old, new):
737
show_status(fs, kind,
738
oldname + ' => ' + newname)
739
elif fs == 'A' or fs == 'M':
740
show_status(fs, kind, newname)
742
show_status(fs, kind, oldname)
745
show_status(fs, kind, newname)
748
show_status(fs, kind, newname)
750
show_status(fs, kind, newname)
752
bailout("wierd file state %r" % ((fs, fid),))
756
class ScratchBranch(Branch):
757
"""Special test class: a branch that cleans up after itself.
759
>>> b = ScratchBranch()
767
def __init__(self, files = []):
768
"""Make a test branch.
770
This creates a temporary directory and runs init-tree in it.
772
If any files are listed, they are created in the working copy.
774
Branch.__init__(self, tempfile.mkdtemp(), init=True)
776
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
780
"""Destroy the test branch, removing the scratch directory."""
781
shutil.rmtree(self.base)
785
######################################################################
789
def is_control_file(filename):
790
## FIXME: better check
791
filename = os.path.normpath(filename)
792
while filename != '':
793
head, tail = os.path.split(filename)
794
## mutter('check %r for control file' % ((head, tail), ))
795
if tail == bzrlib.BZRDIR:
1725
def bind(self, other):
1726
"""Bind this branch to the branch other.
1728
This does not push or pull data between the branches, though it does
1729
check for divergence to raise an error when the branches are not
1730
either the same, or one a prefix of the other. That behaviour may not
1731
be useful, so that check may be removed in future.
1733
:param other: The branch to bind to
1736
# TODO: jam 20051230 Consider checking if the target is bound
1737
# It is debatable whether you should be able to bind to
1738
# a branch which is itself bound.
1739
# Committing is obviously forbidden,
1740
# but binding itself may not be.
1741
# Since we *have* to check at commit time, we don't
1742
# *need* to check here
1744
# we want to raise diverged if:
1745
# last_rev is not in the other_last_rev history, AND
1746
# other_last_rev is not in our history, and do it without pulling
1748
last_rev = _mod_revision.ensure_null(self.last_revision())
1749
if last_rev != _mod_revision.NULL_REVISION:
1752
other_last_rev = other.last_revision()
1753
if not _mod_revision.is_null(other_last_rev):
1754
# neither branch is new, we have to do some work to
1755
# ascertain diversion.
1756
remote_graph = other.repository.get_revision_graph(
1758
local_graph = self.repository.get_revision_graph(last_rev)
1759
if (last_rev not in remote_graph and
1760
other_last_rev not in local_graph):
1761
raise errors.DivergedBranches(self, other)
1764
self.set_bound_location(other.base)
1768
"""If bound, unbind"""
1769
return self.set_bound_location(None)
1773
"""Synchronise this branch with the master branch if any.
1775
:return: None or the last_revision that was pivoted out during the
1778
master = self.get_master_branch()
1779
if master is not None:
1780
old_tip = _mod_revision.ensure_null(self.last_revision())
1781
self.pull(master, overwrite=True)
1782
if self.repository.get_graph().is_ancestor(old_tip,
1783
_mod_revision.ensure_null(self.last_revision())):
1789
class BzrBranchExperimental(BzrBranch5):
1790
"""Bzr experimental branch format
1793
- a revision-history file.
1795
- a lock dir guarding the branch itself
1796
- all of this stored in a branch/ subdirectory
1797
- works with shared repositories.
1798
- a tag dictionary in the branch
1800
This format is new in bzr 0.15, but shouldn't be used for real data,
1803
This class acts as it's own BranchFormat.
1806
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1809
def get_format_string(cls):
1810
"""See BranchFormat.get_format_string()."""
1811
return "Bazaar-NG branch format experimental\n"
1814
def get_format_description(cls):
1815
"""See BranchFormat.get_format_description()."""
1816
return "Experimental branch format"
1819
def get_reference(cls, a_bzrdir):
1820
"""Get the target reference of the branch in a_bzrdir.
1822
format probing must have been completed before calling
1823
this method - it is assumed that the format of the branch
1824
in a_bzrdir is correct.
1826
:param a_bzrdir: The bzrdir to get the branch data from.
1827
:return: None if the branch is not a reference branch.
1832
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1834
branch_transport = a_bzrdir.get_branch_transport(cls)
1835
control_files = lockable_files.LockableFiles(branch_transport,
1836
lock_filename, lock_class)
1837
control_files.create_lock()
1838
control_files.lock_write()
1840
for filename, content in utf8_files:
1841
control_files.put_utf8(filename, content)
1843
control_files.unlock()
1846
def initialize(cls, a_bzrdir):
1847
"""Create a branch of this format in a_bzrdir."""
1848
utf8_files = [('format', cls.get_format_string()),
1849
('revision-history', ''),
1850
('branch-name', ''),
1853
cls._initialize_control_files(a_bzrdir, utf8_files,
1854
'lock', lockdir.LockDir)
1855
return cls.open(a_bzrdir, _found=True)
1858
def open(cls, a_bzrdir, _found=False):
1859
"""Return the branch object for a_bzrdir
1861
_found is a private parameter, do not use it. It is used to indicate
1862
if format probing has already be done.
1865
format = BranchFormat.find_format(a_bzrdir)
1866
assert format.__class__ == cls
1867
transport = a_bzrdir.get_branch_transport(None)
1868
control_files = lockable_files.LockableFiles(transport, 'lock',
1870
return cls(_format=cls,
1871
_control_files=control_files,
1873
_repository=a_bzrdir.find_repository())
1876
def is_supported(cls):
1879
def _make_tags(self):
1880
return BasicTags(self)
1883
def supports_tags(cls):
1887
BranchFormat.register_format(BzrBranchExperimental)
1890
class BzrBranch6(BzrBranch5):
1893
def last_revision_info(self):
1894
revision_string = self.control_files.get('last-revision').read()
1895
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1896
revision_id = cache_utf8.get_cached_utf8(revision_id)
1898
return revno, revision_id
1900
def last_revision(self):
1901
"""Return last revision id, or None"""
1902
revision_id = self.last_revision_info()[1]
1903
if revision_id == _mod_revision.NULL_REVISION:
1907
def _write_last_revision_info(self, revno, revision_id):
1908
"""Simply write out the revision id, with no checks.
1910
Use set_last_revision_info to perform this safely.
1912
Does not update the revision_history cache.
1913
Intended to be called by set_last_revision_info and
1914
_write_revision_history.
1916
if revision_id is None:
1917
revision_id = 'null:'
1918
out_string = '%d %s\n' % (revno, revision_id)
1919
self.control_files.put_bytes('last-revision', out_string)
1922
def set_last_revision_info(self, revno, revision_id):
1923
revision_id = osutils.safe_revision_id(revision_id)
1924
if self._get_append_revisions_only():
1925
self._check_history_violation(revision_id)
1926
self._write_last_revision_info(revno, revision_id)
1927
self._clear_cached_state()
1929
def _check_history_violation(self, revision_id):
1930
last_revision = _mod_revision.ensure_null(self.last_revision())
1931
if _mod_revision.is_null(last_revision):
1933
if last_revision not in self._lefthand_history(revision_id):
1934
raise errors.AppendRevisionsOnlyViolation(self.base)
1936
def _gen_revision_history(self):
1937
"""Generate the revision history from last revision
1939
history = list(self.repository.iter_reverse_revision_history(
1940
self.last_revision()))
1944
def _write_revision_history(self, history):
1945
"""Factored out of set_revision_history.
1947
This performs the actual writing to disk, with format-specific checks.
1948
It is intended to be called by BzrBranch5.set_revision_history.
1950
if len(history) == 0:
1951
last_revision = 'null:'
1953
if history != self._lefthand_history(history[-1]):
1954
raise errors.NotLefthandHistory(history)
1955
last_revision = history[-1]
1956
if self._get_append_revisions_only():
1957
self._check_history_violation(last_revision)
1958
self._write_last_revision_info(len(history), last_revision)
1961
def _set_parent_location(self, url):
1962
"""Set the parent branch"""
1963
self._set_config_location('parent_location', url, make_relative=True)
1966
def _get_parent_location(self):
1967
"""Set the parent branch"""
1968
return self._get_config_location('parent_location')
1970
def set_push_location(self, location):
1971
"""See Branch.set_push_location."""
1972
self._set_config_location('push_location', location)
1974
def set_bound_location(self, location):
1975
"""See Branch.set_push_location."""
1977
config = self.get_config()
1978
if location is None:
1979
if config.get_user_option('bound') != 'True':
1982
config.set_user_option('bound', 'False', warn_masked=True)
1985
self._set_config_location('bound_location', location,
1987
config.set_user_option('bound', 'True', warn_masked=True)
1990
def _get_bound_location(self, bound):
1991
"""Return the bound location in the config file.
1993
Return None if the bound parameter does not match"""
1994
config = self.get_config()
1995
config_bound = (config.get_user_option('bound') == 'True')
1996
if config_bound != bound:
1998
return self._get_config_location('bound_location', config=config)
2000
def get_bound_location(self):
2001
"""See Branch.set_push_location."""
2002
return self._get_bound_location(True)
2004
def get_old_bound_location(self):
2005
"""See Branch.get_old_bound_location"""
2006
return self._get_bound_location(False)
2008
def set_append_revisions_only(self, enabled):
2013
self.get_config().set_user_option('append_revisions_only', value,
2016
def _get_append_revisions_only(self):
2017
value = self.get_config().get_user_option('append_revisions_only')
2018
return value == 'True'
2020
def _synchronize_history(self, destination, revision_id):
2021
"""Synchronize last revision and revision history between branches.
2023
This version is most efficient when the destination is also a
2024
BzrBranch6, but works for BzrBranch5, as long as the destination's
2025
repository contains all the lefthand ancestors of the intended
2026
last_revision. If not, set_last_revision_info will fail.
2028
:param destination: The branch to copy the history into
2029
:param revision_id: The revision-id to truncate history at. May
2030
be None to copy complete history.
2032
source_revno, source_revision_id = self.last_revision_info()
2033
if revision_id is None:
2034
revno, revision_id = source_revno, source_revision_id
2035
elif source_revision_id == revision_id:
2036
# we know the revno without needing to walk all of history
2037
revno = source_revno
2039
# To figure out the revno for a random revision, we need to build
2040
# the revision history, and count its length.
2041
# We don't care about the order, just how long it is.
2042
# Alternatively, we could start at the current location, and count
2043
# backwards. But there is no guarantee that we will find it since
2044
# it may be a merged revision.
2045
revno = len(list(self.repository.iter_reverse_revision_history(
2047
destination.set_last_revision_info(revno, revision_id)
2049
def _make_tags(self):
2050
return BasicTags(self)
2053
######################################################################
2054
# results of operations
2057
class _Result(object):
2059
def _show_tag_conficts(self, to_file):
2060
if not getattr(self, 'tag_conflicts', None):
2062
to_file.write('Conflicting tags:\n')
2063
for name, value1, value2 in self.tag_conflicts:
2064
to_file.write(' %s\n' % (name, ))
2067
class PullResult(_Result):
2068
"""Result of a Branch.pull operation.
2070
:ivar old_revno: Revision number before pull.
2071
:ivar new_revno: Revision number after pull.
2072
:ivar old_revid: Tip revision id before pull.
2073
:ivar new_revid: Tip revision id after pull.
2074
:ivar source_branch: Source (local) branch object.
2075
:ivar master_branch: Master branch of the target, or None.
2076
:ivar target_branch: Target/destination branch object.
2080
# DEPRECATED: pull used to return the change in revno
2081
return self.new_revno - self.old_revno
2083
def report(self, to_file):
2084
if self.old_revid == self.new_revid:
2085
to_file.write('No revisions to pull.\n')
2087
to_file.write('Now on revision %d.\n' % self.new_revno)
2088
self._show_tag_conficts(to_file)
2091
class PushResult(_Result):
2092
"""Result of a Branch.push operation.
2094
:ivar old_revno: Revision number before push.
2095
:ivar new_revno: Revision number after push.
2096
:ivar old_revid: Tip revision id before push.
2097
:ivar new_revid: Tip revision id after push.
2098
:ivar source_branch: Source branch object.
2099
:ivar master_branch: Master branch of the target, or None.
2100
:ivar target_branch: Target/destination branch object.
2104
# DEPRECATED: push used to return the change in revno
2105
return self.new_revno - self.old_revno
2107
def report(self, to_file):
2108
"""Write a human-readable description of the result."""
2109
if self.old_revid == self.new_revid:
2110
to_file.write('No new revisions to push.\n')
2112
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2113
self._show_tag_conficts(to_file)
2116
class BranchCheckResult(object):
2117
"""Results of checking branch consistency.
2122
def __init__(self, branch):
2123
self.branch = branch
2125
def report_results(self, verbose):
2126
"""Report the check results via trace.note.
2128
:param verbose: Requests more detailed display of what was checked,
2131
note('checked branch %s format %s',
2133
self.branch._format)
2136
class Converter5to6(object):
2137
"""Perform an in-place upgrade of format 5 to format 6"""
2139
def convert(self, branch):
2140
# Data for 5 and 6 can peacefully coexist.
2141
format = BzrBranchFormat6()
2142
new_branch = format.open(branch.bzrdir, _found=True)
2144
# Copy source data into target
2145
new_branch.set_last_revision_info(*branch.last_revision_info())
2146
new_branch.set_parent(branch.get_parent())
2147
new_branch.set_bound_location(branch.get_bound_location())
2148
new_branch.set_push_location(branch.get_push_location())
2150
# New branch has no tags by default
2151
new_branch.tags._set_tag_dict({})
2153
# Copying done; now update target format
2154
new_branch.control_files.put_utf8('format',
2155
format.get_format_string())
2157
# Clean up old files
2158
new_branch.control_files._transport.delete('revision-history')
2160
branch.set_parent(None)
2163
branch.set_bound_location(None)
804
def _gen_revision_id(when):
805
"""Return new revision-id."""
806
s = '%s-%s-' % (user_email(), compact_date(when))
807
s += hexlify(rand_bytes(8))
811
def gen_file_id(name):
812
"""Return new file id.
814
This should probably generate proper UUIDs, but for the moment we
815
cope with just randomness because running uuidgen every time is
817
idx = name.rfind('/')
819
name = name[idx+1 : ]
821
name = name.lstrip('.')
823
s = hexlify(rand_bytes(8))
824
return '-'.join((name, compact_date(time.time()), s))
added
removed
bzrlib/branch.py
