1
# Copyright (C) 2005 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007 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
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)
18
from bzrlib.lazy_import import lazy_import
19
lazy_import(globals(), """
23
config as _mod_config,
29
revision as _mod_revision,
35
from bzrlib.config import BranchConfig
36
from bzrlib.tag import (
42
from bzrlib.decorators import needs_read_lock, needs_write_lock
43
from bzrlib.hooks import Hooks
44
from bzrlib.symbol_versioning import (deprecated_method,
47
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
50
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
51
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
52
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
55
# TODO: Maybe include checks for common corruption of newlines, etc?
57
# TODO: Some operations like log might retrieve the same revisions
58
# repeatedly to calculate deltas. We could perhaps have a weakref
59
# cache in memory to make this faster. In general anything can be
60
# cached in memory between lock and unlock operations. .. nb thats
61
# what the transaction identity map provides
70
64
######################################################################
74
68
"""Branch holding a history of revisions.
77
Base directory of the branch.
71
Base directory/url of the branch.
73
hooks: An instance of BranchHooks.
75
# this is really an instance variable - FIXME move it there
79
# override this to set the strategy for storing tags
81
return DisabledTags(self)
83
def __init__(self, *ignored, **ignored_too):
84
self.tags = self._make_tags()
85
self._revision_history_cache = None
86
self._revision_id_to_revno_cache = None
89
"""Break a lock if one is present from another instance.
91
Uses the ui factory to ask for confirmation if the lock may be from
94
This will probe the repository for its lock as well.
96
self.control_files.break_lock()
97
self.repository.break_lock()
98
master = self.get_master_branch()
99
if master is not None:
103
def open(base, _unsupported=False, possible_transports=None):
104
"""Open the branch rooted at base.
106
For instance, if the branch is at URL/.bzr/branch,
107
Branch.open(URL) -> a Branch instance.
109
control = bzrdir.BzrDir.open(base, _unsupported,
110
possible_transports=possible_transports)
111
return control.open_branch(_unsupported)
114
def open_from_transport(transport, _unsupported=False):
115
"""Open the branch rooted at transport"""
116
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
117
return control.open_branch(_unsupported)
120
def open_containing(url, possible_transports=None):
121
"""Open an existing branch which contains url.
123
This probes for a branch at url, and searches upwards from there.
125
Basically we keep looking up until we find the control directory or
126
run into the root. If there isn't one, raises NotBranchError.
127
If there is one and it is either an unrecognised format or an unsupported
128
format, UnknownFormatError or UnsupportedFormatError are raised.
129
If there is one, it is returned, along with the unused portion of url.
131
control, relpath = bzrdir.BzrDir.open_containing(url,
133
return control.open_branch(), relpath
135
def get_config(self):
136
return BranchConfig(self)
139
return self.get_config().get_nickname()
141
def _set_nick(self, nick):
142
self.get_config().set_user_option('nickname', nick, warn_masked=True)
144
nick = property(_get_nick, _set_nick)
147
raise NotImplementedError(self.is_locked)
149
def lock_write(self):
150
raise NotImplementedError(self.lock_write)
153
raise NotImplementedError(self.lock_read)
156
raise NotImplementedError(self.unlock)
158
def peek_lock_mode(self):
159
"""Return lock mode for the Branch: 'r', 'w' or None"""
160
raise NotImplementedError(self.peek_lock_mode)
162
def get_physical_lock_status(self):
163
raise NotImplementedError(self.get_physical_lock_status)
166
def get_revision_id_to_revno_map(self):
167
"""Return the revision_id => dotted revno map.
169
This will be regenerated on demand, but will be cached.
171
:return: A dictionary mapping revision_id => dotted revno.
172
This dictionary should not be modified by the caller.
174
if self._revision_id_to_revno_cache is not None:
175
mapping = self._revision_id_to_revno_cache
177
mapping = self._gen_revno_map()
178
self._cache_revision_id_to_revno(mapping)
179
# TODO: jam 20070417 Since this is being cached, should we be returning
181
# I would rather not, and instead just declare that users should not
182
# modify the return value.
185
def _gen_revno_map(self):
186
"""Create a new mapping from revision ids to dotted revnos.
188
Dotted revnos are generated based on the current tip in the revision
190
This is the worker function for get_revision_id_to_revno_map, which
191
just caches the return value.
193
:return: A dictionary mapping revision_id => dotted revno.
195
last_revision = self.last_revision()
196
revision_graph = repository._old_get_graph(self.repository,
198
merge_sorted_revisions = tsort.merge_sort(
203
revision_id_to_revno = dict((rev_id, revno)
204
for seq_num, rev_id, depth, revno, end_of_merge
205
in merge_sorted_revisions)
206
return revision_id_to_revno
208
def leave_lock_in_place(self):
209
"""Tell this branch object not to release the physical lock when this
212
If lock_write doesn't return a token, then this method is not supported.
214
self.control_files.leave_in_place()
216
def dont_leave_lock_in_place(self):
217
"""Tell this branch object to release the physical lock when this
218
object is unlocked, even if it didn't originally acquire it.
220
If lock_write doesn't return a token, then this method is not supported.
222
self.control_files.dont_leave_in_place()
224
def abspath(self, name):
225
"""Return absolute filename for something in the branch
227
XXX: Robert Collins 20051017 what is this used for? why is it a branch
228
method and not a tree method.
230
raise NotImplementedError(self.abspath)
232
def bind(self, other):
233
"""Bind the local branch the other branch.
235
:param other: The branch to bind to
238
raise errors.UpgradeRequired(self.base)
241
def fetch(self, from_branch, last_revision=None, pb=None):
242
"""Copy revisions from from_branch into this branch.
244
:param from_branch: Where to copy from.
245
:param last_revision: What revision to stop at (None for at the end
247
:param pb: An optional progress bar to use.
249
Returns the copied revision count and the failed revisions in a tuple:
252
if self.base == from_branch.base:
255
nested_pb = ui.ui_factory.nested_progress_bar()
260
from_branch.lock_read()
262
if last_revision is None:
263
pb.update('get source history')
264
last_revision = from_branch.last_revision()
265
last_revision = _mod_revision.ensure_null(last_revision)
266
return self.repository.fetch(from_branch.repository,
267
revision_id=last_revision,
270
if nested_pb is not None:
274
def get_bound_location(self):
275
"""Return the URL of the branch we are bound to.
277
Older format branches cannot bind, please be sure to use a metadir
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)
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."""
130
om = os.O_WRONLY | os.O_CREAT
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):
282
def get_old_bound_location(self):
283
"""Return the URL of the branch we used to be bound to
285
raise errors.UpgradeRequired(self.base)
287
def get_commit_builder(self, parents, config=None, timestamp=None,
288
timezone=None, committer=None, revprops=None,
290
"""Obtain a CommitBuilder for this branch.
292
:param parents: Revision ids of the parents of the new revision.
293
:param config: Optional configuration to use.
294
:param timestamp: Optional timestamp recorded for commit.
295
:param timezone: Optional timezone for timestamp.
296
:param committer: Optional committer to set for commit.
297
:param revprops: Optional dictionary of revision properties.
298
:param revision_id: Optional revision id.
302
config = self.get_config()
304
return self.repository.get_commit_builder(self, parents, config,
305
timestamp, timezone, committer, revprops, revision_id)
307
def get_master_branch(self, possible_transports=None):
308
"""Return the branch we are bound to.
310
:return: Either a Branch, or None
314
def get_revision_delta(self, revno):
315
"""Return the delta for one revision.
317
The delta is relative to its mainline predecessor, or the
318
empty tree for revision 1.
320
assert isinstance(revno, int)
321
rh = self.revision_history()
322
if not (1 <= revno <= len(rh)):
323
raise errors.InvalidRevisionNumber(revno)
324
return self.repository.get_revision_delta(rh[revno-1])
326
@deprecated_method(zero_sixteen)
327
def get_root_id(self):
328
"""Return the id of this branches root
330
Deprecated: branches don't have root ids-- trees do.
331
Use basis_tree().get_root_id() instead.
333
raise NotImplementedError(self.get_root_id)
335
def print_file(self, file, revision_id):
373
336
"""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:
681
return self.get_inventory(self.get_revision(revision_id).inventory_id)
337
raise NotImplementedError(self.print_file)
339
def set_revision_history(self, rev_history):
340
raise NotImplementedError(self.set_revision_history)
342
def _cache_revision_history(self, rev_history):
343
"""Set the cached revision history to rev_history.
345
The revision_history method will use this cache to avoid regenerating
346
the revision history.
348
This API is semi-public; it only for use by subclasses, all other code
349
should consider it to be private.
351
self._revision_history_cache = rev_history
353
def _cache_revision_id_to_revno(self, revision_id_to_revno):
354
"""Set the cached revision_id => revno map to revision_id_to_revno.
356
This API is semi-public; it only for use by subclasses, all other code
357
should consider it to be private.
359
self._revision_id_to_revno_cache = revision_id_to_revno
361
def _clear_cached_state(self):
362
"""Clear any cached data on this branch, e.g. cached revision history.
364
This means the next call to revision_history will need to call
365
_gen_revision_history.
367
This API is semi-public; it only for use by subclasses, all other code
368
should consider it to be private.
370
self._revision_history_cache = None
371
self._revision_id_to_revno_cache = None
373
def _gen_revision_history(self):
374
"""Return sequence of revision hashes on to this branch.
376
Unlike revision_history, this method always regenerates or rereads the
377
revision history, i.e. it does not cache the result, so repeated calls
380
Concrete subclasses should override this instead of revision_history so
381
that subclasses do not need to deal with caching logic.
383
This API is semi-public; it only for use by subclasses, all other code
384
should consider it to be private.
386
raise NotImplementedError(self._gen_revision_history)
684
389
def revision_history(self):
685
"""Return sequence of revision hashes on to this branch.
687
>>> ScratchBranch().revision_history()
690
self._need_readlock()
691
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
694
def enum_history(self, direction):
695
"""Return (revno, revision_id) for history of branch.
698
'forward' is from earliest to latest
699
'reverse' is from latest to earliest
701
rh = self.revision_history()
702
if direction == 'forward':
707
elif direction == 'reverse':
390
"""Return sequence of revision ids on this branch.
392
This method will cache the revision history for as long as it is safe to
395
if 'evil' in debug.debug_flags:
396
mutter_callsite(3, "revision_history scales with history.")
397
if self._revision_history_cache is not None:
398
history = self._revision_history_cache
713
raise BzrError('invalid history direction %r' % direction)
400
history = self._gen_revision_history()
401
self._cache_revision_history(history)
717
405
"""Return current revision number for this branch.
719
407
That is equivalent to the number of revisions committed to
722
>>> b = ScratchBranch()
725
>>> b.commit('no foo')
729
return len(self.revision_history())
732
def last_patch(self):
733
"""Return last patch hash, or None if no history.
735
>>> ScratchBranch().last_patch() == None
738
ph = self.revision_history()
410
return self.last_revision_info()[0]
413
"""Older format branches cannot bind or unbind."""
414
raise errors.UpgradeRequired(self.base)
416
def set_append_revisions_only(self, enabled):
417
"""Older format branches are never restricted to append-only"""
418
raise errors.UpgradeRequired(self.base)
420
def last_revision(self):
421
"""Return last revision id, or NULL_REVISION."""
422
return self.last_revision_info()[1]
424
def last_revision_info(self):
425
"""Return information about the last revision.
427
:return: A tuple (revno, last_revision_id).
429
rh = self.revision_history()
432
return (revno, rh[-1])
434
return (0, _mod_revision.NULL_REVISION)
436
def missing_revisions(self, other, stop_revision=None):
437
"""Return a list of new revisions that would perfectly fit.
745
def lookup_revision(self, revno):
746
"""Return revision hash for revision number."""
439
If self and other have not diverged, return a list of the revisions
440
present in other, but missing from self.
442
self_history = self.revision_history()
443
self_len = len(self_history)
444
other_history = other.revision_history()
445
other_len = len(other_history)
446
common_index = min(self_len, other_len) -1
447
if common_index >= 0 and \
448
self_history[common_index] != other_history[common_index]:
449
raise errors.DivergedBranches(self, other)
451
if stop_revision is None:
452
stop_revision = other_len
454
assert isinstance(stop_revision, int)
455
if stop_revision > other_len:
456
raise errors.NoSuchRevision(self, stop_revision)
457
return other_history[self_len:stop_revision]
459
def update_revisions(self, other, stop_revision=None):
460
"""Pull in new perfect-fit revisions.
462
:param other: Another Branch to pull from
463
:param stop_revision: Updated until the given revision
466
raise NotImplementedError(self.update_revisions)
468
def revision_id_to_revno(self, revision_id):
469
"""Given a revision id, return its revno"""
470
if _mod_revision.is_null(revision_id):
472
history = self.revision_history()
474
return history.index(revision_id) + 1
476
raise errors.NoSuchRevision(self, revision_id)
478
def get_rev_id(self, revno, history=None):
479
"""Find the revision id of the specified revno."""
751
# list is 0-based; revisions are 1-based
752
return self.revision_history()[revno-1]
754
raise BzrError("no such revision %s" % revno)
757
def revision_tree(self, revision_id):
758
"""Return Tree for a revision on this branch.
760
`revision_id` may be None for the null revision, in which case
761
an `EmptyTree` is returned."""
762
self._need_readlock()
763
if revision_id == None:
766
inv = self.get_revision_inventory(revision_id)
767
return RevisionTree(self.text_store, inv)
770
def working_tree(self):
771
"""Return a `Tree` for the working copy."""
772
return WorkingTree(self.base, self.read_working_inventory())
481
return _mod_revision.NULL_REVISION
483
history = self.revision_history()
484
if revno <= 0 or revno > len(history):
485
raise errors.NoSuchRevision(self, revno)
486
return history[revno - 1]
488
def pull(self, source, overwrite=False, stop_revision=None,
489
possible_transports=None):
490
"""Mirror source into this branch.
492
This branch is considered to be 'local', having low latency.
494
:returns: PullResult instance
496
raise NotImplementedError(self.pull)
498
def push(self, target, overwrite=False, stop_revision=None):
499
"""Mirror this branch into target.
501
This branch is considered to be 'local', having low latency.
503
raise NotImplementedError(self.push)
775
505
def basis_tree(self):
776
"""Return `Tree` object for last revision.
778
If there are no revisions yet, return an `EmptyTree`.
780
>>> b = ScratchBranch(files=['foo'])
781
>>> b.basis_tree().has_filename('foo')
783
>>> b.working_tree().has_filename('foo')
786
>>> b.commit('add foo')
787
>>> b.basis_tree().has_filename('foo')
790
r = self.last_patch()
794
return RevisionTree(self.text_store, self.get_revision_inventory(r))
506
"""Return `Tree` object for last revision."""
507
return self.repository.revision_tree(self.last_revision())
798
509
def rename_one(self, from_rel, to_rel):
799
510
"""Rename one file.
801
512
This can change the directory or the filename or both.
803
self._need_writelock()
804
tree = self.working_tree()
806
if not tree.has_filename(from_rel):
807
bailout("can't rename: old working file %r does not exist" % from_rel)
808
if tree.has_filename(to_rel):
809
bailout("can't rename: new working file %r already exists" % to_rel)
811
file_id = inv.path2id(from_rel)
813
bailout("can't rename: old name %r is not versioned" % from_rel)
815
if inv.path2id(to_rel):
816
bailout("can't rename: new name %r is already versioned" % to_rel)
818
to_dir, to_tail = os.path.split(to_rel)
819
to_dir_id = inv.path2id(to_dir)
820
if to_dir_id == None and to_dir != '':
821
bailout("can't determine destination directory id for %r" % to_dir)
823
mutter("rename_one:")
824
mutter(" file_id {%s}" % file_id)
825
mutter(" from_rel %r" % from_rel)
826
mutter(" to_rel %r" % to_rel)
827
mutter(" to_dir %r" % to_dir)
828
mutter(" to_dir_id {%s}" % to_dir_id)
830
inv.rename(file_id, to_dir_id, to_tail)
832
print "%s => %s" % (from_rel, to_rel)
834
from_abs = self.abspath(from_rel)
835
to_abs = self.abspath(to_rel)
837
os.rename(from_abs, to_abs)
839
bailout("failed to rename %r to %r: %s"
840
% (from_abs, to_abs, e[1]),
841
["rename rolled back"])
843
self._write_inventory(inv)
514
raise NotImplementedError(self.rename_one)
847
516
def move(self, from_paths, to_name):
855
524
Note that to_name is only the last component of the new name;
856
525
this doesn't change the directory.
858
self._need_writelock()
859
## TODO: Option to move IDs only
860
assert not isinstance(from_paths, basestring)
861
tree = self.working_tree()
863
to_abs = self.abspath(to_name)
864
if not isdir(to_abs):
865
bailout("destination %r is not a directory" % to_abs)
866
if not tree.has_filename(to_name):
867
bailout("destination %r not in working directory" % to_abs)
868
to_dir_id = inv.path2id(to_name)
869
if to_dir_id == None and to_name != '':
870
bailout("destination %r is not a versioned directory" % to_name)
871
to_dir_ie = inv[to_dir_id]
872
if to_dir_ie.kind not in ('directory', 'root_directory'):
873
bailout("destination %r is not a directory" % to_abs)
875
to_idpath = Set(inv.get_idpath(to_dir_id))
878
if not tree.has_filename(f):
879
bailout("%r does not exist in working tree" % f)
880
f_id = inv.path2id(f)
882
bailout("%r is not versioned" % f)
883
name_tail = splitpath(f)[-1]
884
dest_path = appendpath(to_name, name_tail)
885
if tree.has_filename(dest_path):
886
bailout("destination %r already exists" % dest_path)
887
if f_id in to_idpath:
888
bailout("can't move %r to a subdirectory of itself" % f)
890
# OK, so there's a race here, it's possible that someone will
891
# create a file in this interval and then the rename might be
892
# left half-done. But we should have caught most problems.
895
name_tail = splitpath(f)[-1]
896
dest_path = appendpath(to_name, name_tail)
897
print "%s => %s" % (f, dest_path)
898
inv.rename(inv.path2id(f), to_dir_id, name_tail)
900
os.rename(self.abspath(f), self.abspath(dest_path))
902
bailout("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
903
["rename rolled back"])
905
self._write_inventory(inv)
909
def show_status(self, show_all=False, file_list=None):
910
"""Display single-line status for non-ignored working files.
912
The list is show sorted in order by file name.
914
>>> b = ScratchBranch(files=['foo', 'foo~'])
920
>>> b.commit("add foo")
922
>>> os.unlink(b.abspath('foo'))
926
self._need_readlock()
928
# We have to build everything into a list first so that it can
929
# sorted by name, incorporating all the different sources.
931
# FIXME: Rather than getting things in random order and then sorting,
932
# just step through in order.
934
# Interesting case: the old ID for a file has been removed,
935
# but a new file has been created under that name.
937
old = self.basis_tree()
938
new = self.working_tree()
940
items = diff_trees(old, new)
941
# We want to filter out only if any file was provided in the file_list.
942
if isinstance(file_list, list) and len(file_list):
943
items = [item for item in items if item[3] in file_list]
945
for fs, fid, oldname, newname, kind in items:
947
show_status(fs, kind,
948
oldname + ' => ' + newname)
949
elif fs == 'A' or fs == 'M':
950
show_status(fs, kind, newname)
952
show_status(fs, kind, oldname)
955
show_status(fs, kind, newname)
958
show_status(fs, kind, newname)
960
show_status(fs, kind, newname)
962
bailout("weird file state %r" % ((fs, fid),))
966
class ScratchBranch(Branch):
967
"""Special test class: a branch that cleans up after itself.
969
>>> b = ScratchBranch()
977
def __init__(self, files=[], dirs=[]):
978
"""Make a test branch.
980
This creates a temporary directory and runs init-tree in it.
982
If any files are listed, they are created in the working copy.
984
Branch.__init__(self, tempfile.mkdtemp(), init=True)
986
os.mkdir(self.abspath(d))
527
This returns a list of (from_path, to_path) pairs for each
530
raise NotImplementedError(self.move)
532
def get_parent(self):
533
"""Return the parent location of the branch.
535
This is the default location for push/pull/missing. The usual
536
pattern is that the user can override it by specifying a
539
raise NotImplementedError(self.get_parent)
541
def _set_config_location(self, name, url, config=None,
542
make_relative=False):
544
config = self.get_config()
548
url = urlutils.relative_url(self.base, url)
549
config.set_user_option(name, url, warn_masked=True)
551
def _get_config_location(self, name, config=None):
553
config = self.get_config()
554
location = config.get_user_option(name)
559
def get_submit_branch(self):
560
"""Return the submit location of the branch.
562
This is the default location for bundle. The usual
563
pattern is that the user can override it by specifying a
566
return self.get_config().get_user_option('submit_branch')
568
def set_submit_branch(self, location):
569
"""Return the submit location of the branch.
571
This is the default location for bundle. The usual
572
pattern is that the user can override it by specifying a
575
self.get_config().set_user_option('submit_branch', location,
578
def get_public_branch(self):
579
"""Return the public location of the branch.
581
This is is used by merge directives.
583
return self._get_config_location('public_branch')
585
def set_public_branch(self, location):
586
"""Return the submit location of the branch.
588
This is the default location for bundle. The usual
589
pattern is that the user can override it by specifying a
592
self._set_config_location('public_branch', location)
594
def get_push_location(self):
595
"""Return the None or the location to push this branch to."""
596
push_loc = self.get_config().get_user_option('push_location')
599
def set_push_location(self, location):
600
"""Set a new push location for this branch."""
601
raise NotImplementedError(self.set_push_location)
603
def set_parent(self, url):
604
raise NotImplementedError(self.set_parent)
608
"""Synchronise this branch with the master branch if any.
610
:return: None or the last_revision pivoted out during the update.
614
def check_revno(self, revno):
616
Check whether a revno corresponds to any revision.
617
Zero (the NULL revision) is considered valid.
620
self.check_real_revno(revno)
989
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
996
"""Destroy the test branch, removing the scratch directory."""
998
mutter("delete ScratchBranch %s" % self.base)
999
shutil.rmtree(self.base)
1001
# Work around for shutil.rmtree failing on Windows when
1002
# readonly files are encountered
1003
mutter("hit exception in destroying ScratchBranch: %s" % e)
1004
for root, dirs, files in os.walk(self.base, topdown=False):
1006
os.chmod(os.path.join(root, name), 0700)
1007
shutil.rmtree(self.base)
1012
######################################################################
1016
def is_control_file(filename):
1017
## FIXME: better check
1018
filename = os.path.normpath(filename)
1019
while filename != '':
1020
head, tail = os.path.split(filename)
1021
## mutter('check %r for control file' % ((head, tail), ))
1022
if tail == bzrlib.BZRDIR:
622
def check_real_revno(self, revno):
624
Check whether a revno corresponds to a real revision.
625
Zero (the NULL revision) is considered invalid
627
if revno < 1 or revno > self.revno():
628
raise errors.InvalidRevisionNumber(revno)
631
def clone(self, to_bzrdir, revision_id=None):
632
"""Clone this branch into to_bzrdir preserving all semantic values.
634
revision_id: if not None, the revision history in the new branch will
635
be truncated to end with revision_id.
637
result = self._format.initialize(to_bzrdir)
638
self.copy_content_into(result, revision_id=revision_id)
642
def sprout(self, to_bzrdir, revision_id=None):
643
"""Create a new line of development from the branch, into to_bzrdir.
645
revision_id: if not None, the revision history in the new branch will
646
be truncated to end with revision_id.
648
result = self._format.initialize(to_bzrdir)
649
self.copy_content_into(result, revision_id=revision_id)
650
result.set_parent(self.bzrdir.root_transport.base)
653
def _synchronize_history(self, destination, revision_id):
654
"""Synchronize last revision and revision history between branches.
656
This version is most efficient when the destination is also a
657
BzrBranch5, but works for BzrBranch6 as long as the revision
658
history is the true lefthand parent history, and all of the revisions
659
are in the destination's repository. If not, set_revision_history
662
:param destination: The branch to copy the history into
663
:param revision_id: The revision-id to truncate history at. May
664
be None to copy complete history.
666
if revision_id == _mod_revision.NULL_REVISION:
668
new_history = self.revision_history()
669
if revision_id is not None and new_history != []:
671
new_history = new_history[:new_history.index(revision_id) + 1]
673
rev = self.repository.get_revision(revision_id)
674
new_history = rev.get_history(self.repository)[1:]
675
destination.set_revision_history(new_history)
678
def copy_content_into(self, destination, revision_id=None):
679
"""Copy the content of self into destination.
681
revision_id: if not None, the revision history in the new branch will
682
be truncated to end with revision_id.
684
self._synchronize_history(destination, revision_id)
686
parent = self.get_parent()
687
except errors.InaccessibleParent, e:
688
mutter('parent was not accessible to copy: %s', e)
691
destination.set_parent(parent)
692
self.tags.merge_to(destination.tags)
696
"""Check consistency of the branch.
698
In particular this checks that revisions given in the revision-history
699
do actually match up in the revision graph, and that they're all
700
present in the repository.
702
Callers will typically also want to check the repository.
704
:return: A BranchCheckResult.
706
mainline_parent_id = None
707
for revision_id in self.revision_history():
709
revision = self.repository.get_revision(revision_id)
710
except errors.NoSuchRevision, e:
711
raise errors.BzrCheckError("mainline revision {%s} not in repository"
713
# In general the first entry on the revision history has no parents.
714
# But it's not illegal for it to have parents listed; this can happen
715
# in imports from Arch when the parents weren't reachable.
716
if mainline_parent_id is not None:
717
if mainline_parent_id not in revision.parent_ids:
718
raise errors.BzrCheckError("previous revision {%s} not listed among "
720
% (mainline_parent_id, revision_id))
721
mainline_parent_id = revision_id
722
return BranchCheckResult(self)
724
def _get_checkout_format(self):
725
"""Return the most suitable metadir for a checkout of this branch.
726
Weaves are used if this branch's repository uses weaves.
728
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
729
from bzrlib.repofmt import weaverepo
730
format = bzrdir.BzrDirMetaFormat1()
731
format.repository_format = weaverepo.RepositoryFormat7()
733
format = self.repository.bzrdir.checkout_metadir()
734
format.set_branch_format(self._format)
737
def create_checkout(self, to_location, revision_id=None,
738
lightweight=False, accelerator_tree=None,
740
"""Create a checkout of a branch.
742
:param to_location: The url to produce the checkout at
743
:param revision_id: The revision to check out
744
:param lightweight: If True, produce a lightweight checkout, otherwise,
745
produce a bound branch (heavyweight checkout)
746
:param accelerator_tree: A tree which can be used for retrieving file
747
contents more quickly than the revision tree, i.e. a workingtree.
748
The revision tree will be used for cases where accelerator_tree's
749
content is different.
750
:param hardlink: If true, hard-link files from accelerator_tree,
752
:return: The tree of the created checkout
754
t = transport.get_transport(to_location)
757
format = self._get_checkout_format()
758
checkout = format.initialize_on_transport(t)
759
from_branch = BranchReferenceFormat().initialize(checkout, self)
761
format = self._get_checkout_format()
762
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
763
to_location, force_new_tree=False, format=format)
764
checkout = checkout_branch.bzrdir
765
checkout_branch.bind(self)
766
# pull up to the specified revision_id to set the initial
767
# branch tip correctly, and seed it with history.
768
checkout_branch.pull(self, stop_revision=revision_id)
770
tree = checkout.create_workingtree(revision_id,
771
from_branch=from_branch,
772
accelerator_tree=accelerator_tree,
774
basis_tree = tree.basis_tree()
775
basis_tree.lock_read()
777
for path, file_id in basis_tree.iter_references():
778
reference_parent = self.reference_parent(file_id, path)
779
reference_parent.create_checkout(tree.abspath(path),
780
basis_tree.get_reference_revision(file_id, path),
786
def reference_parent(self, file_id, path):
787
"""Return the parent branch for a tree-reference file_id
788
:param file_id: The file_id of the tree reference
789
:param path: The path of the file_id in the tree
790
:return: A branch associated with the file_id
792
# FIXME should provide multiple branches, based on config
793
return Branch.open(self.bzrdir.root_transport.clone(path).base)
795
def supports_tags(self):
796
return self._format.supports_tags()
799
class BranchFormat(object):
800
"""An encapsulation of the initialization and open routines for a format.
802
Formats provide three things:
803
* An initialization routine,
807
Formats are placed in an dict by their format string for reference
808
during branch opening. Its not required that these be instances, they
809
can be classes themselves with class methods - it simply depends on
810
whether state is needed for a given format or not.
812
Once a format is deprecated, just deprecate the initialize and open
813
methods on the format class. Do not deprecate the object, as the
814
object will be created every time regardless.
817
_default_format = None
818
"""The default format used for new branches."""
821
"""The known formats."""
823
def __eq__(self, other):
824
return self.__class__ is other.__class__
826
def __ne__(self, other):
827
return not (self == other)
830
def find_format(klass, a_bzrdir):
831
"""Return the format for the branch object in a_bzrdir."""
833
transport = a_bzrdir.get_branch_transport(None)
834
format_string = transport.get("format").read()
835
return klass._formats[format_string]
836
except errors.NoSuchFile:
837
raise errors.NotBranchError(path=transport.base)
839
raise errors.UnknownFormatError(format=format_string, kind='branch')
842
def get_default_format(klass):
843
"""Return the current default format."""
844
return klass._default_format
846
def get_reference(self, a_bzrdir):
847
"""Get the target reference of the branch in a_bzrdir.
849
format probing must have been completed before calling
850
this method - it is assumed that the format of the branch
851
in a_bzrdir is correct.
853
:param a_bzrdir: The bzrdir to get the branch data from.
854
:return: None if the branch is not a reference branch.
859
def set_reference(self, a_bzrdir, to_branch):
860
"""Set the target reference of the branch in a_bzrdir.
862
format probing must have been completed before calling
863
this method - it is assumed that the format of the branch
864
in a_bzrdir is correct.
866
:param a_bzrdir: The bzrdir to set the branch reference for.
867
:param to_branch: branch that the checkout is to reference
869
raise NotImplementedError(self.set_reference)
871
def get_format_string(self):
872
"""Return the ASCII format string that identifies this format."""
873
raise NotImplementedError(self.get_format_string)
875
def get_format_description(self):
876
"""Return the short format description for this format."""
877
raise NotImplementedError(self.get_format_description)
879
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
881
"""Initialize a branch in a bzrdir, with specified files
883
:param a_bzrdir: The bzrdir to initialize the branch in
884
:param utf8_files: The files to create as a list of
885
(filename, content) tuples
886
:param set_format: If True, set the format with
887
self.get_format_string. (BzrBranch4 has its format set
889
:return: a branch in this format
891
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
892
branch_transport = a_bzrdir.get_branch_transport(self)
894
'metadir': ('lock', lockdir.LockDir),
895
'branch4': ('branch-lock', lockable_files.TransportLock),
897
lock_name, lock_class = lock_map[lock_type]
898
control_files = lockable_files.LockableFiles(branch_transport,
899
lock_name, lock_class)
900
control_files.create_lock()
901
control_files.lock_write()
903
control_files.put_utf8('format', self.get_format_string())
905
for file, content in utf8_files:
906
control_files.put_utf8(file, content)
908
control_files.unlock()
909
return self.open(a_bzrdir, _found=True)
911
def initialize(self, a_bzrdir):
912
"""Create a branch of this format in a_bzrdir."""
913
raise NotImplementedError(self.initialize)
915
def is_supported(self):
916
"""Is this format supported?
918
Supported formats can be initialized and opened.
919
Unsupported formats may not support initialization or committing or
920
some other features depending on the reason for not being supported.
924
def open(self, a_bzrdir, _found=False):
925
"""Return the branch object for a_bzrdir
927
_found is a private parameter, do not use it. It is used to indicate
928
if format probing has already be done.
930
raise NotImplementedError(self.open)
933
def register_format(klass, format):
934
klass._formats[format.get_format_string()] = format
937
def set_default_format(klass, format):
938
klass._default_format = format
941
def unregister_format(klass, format):
942
assert klass._formats[format.get_format_string()] is format
943
del klass._formats[format.get_format_string()]
946
return self.get_format_string().rstrip()
948
def supports_tags(self):
949
"""True if this format supports tags stored in the branch"""
950
return False # by default
952
# XXX: Probably doesn't really belong here -- mbp 20070212
953
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
955
branch_transport = a_bzrdir.get_branch_transport(self)
956
control_files = lockable_files.LockableFiles(branch_transport,
957
lock_filename, lock_class)
958
control_files.create_lock()
959
control_files.lock_write()
961
for filename, content in utf8_files:
962
control_files.put_utf8(filename, content)
964
control_files.unlock()
967
class BranchHooks(Hooks):
968
"""A dictionary mapping hook name to a list of callables for branch hooks.
970
e.g. ['set_rh'] Is the list of items to be called when the
971
set_revision_history function is invoked.
975
"""Create the default hooks.
977
These are all empty initially, because by default nothing should get
981
# Introduced in 0.15:
982
# invoked whenever the revision history has been set
983
# with set_revision_history. The api signature is
984
# (branch, revision_history), and the branch will
987
# invoked after a push operation completes.
988
# the api signature is
990
# containing the members
991
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
992
# where local is the local target branch or None, master is the target
993
# master branch, and the rest should be self explanatory. The source
994
# is read locked and the target branches write locked. Source will
995
# be the local low-latency branch.
996
self['post_push'] = []
997
# invoked after a pull operation completes.
998
# the api signature is
1000
# containing the members
1001
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1002
# where local is the local branch or None, master is the target
1003
# master branch, and the rest should be self explanatory. The source
1004
# is read locked and the target branches write locked. The local
1005
# branch is the low-latency branch.
1006
self['post_pull'] = []
1007
# invoked before a commit operation takes place.
1008
# the api signature is
1009
# (local, master, old_revno, old_revid, future_revno, future_revid,
1010
# tree_delta, future_tree).
1011
# old_revid is NULL_REVISION for the first commit to a branch
1012
# tree_delta is a TreeDelta object describing changes from the basis
1013
# revision, hooks MUST NOT modify this delta
1014
# future_tree is an in-memory tree obtained from
1015
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1016
self['pre_commit'] = []
1017
# invoked after a commit operation completes.
1018
# the api signature is
1019
# (local, master, old_revno, old_revid, new_revno, new_revid)
1020
# old_revid is NULL_REVISION for the first commit to a branch.
1021
self['post_commit'] = []
1022
# invoked after a uncommit operation completes.
1023
# the api signature is
1024
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1025
# local is the local branch or None, master is the target branch,
1026
# and an empty branch recieves new_revno of 0, new_revid of None.
1027
self['post_uncommit'] = []
1030
# install the default hooks into the Branch class.
1031
Branch.hooks = BranchHooks()
1034
class BzrBranchFormat4(BranchFormat):
1035
"""Bzr branch format 4.
1038
- a revision-history file.
1039
- a branch-lock lock file [ to be shared with the bzrdir ]
1042
def get_format_description(self):
1043
"""See BranchFormat.get_format_description()."""
1044
return "Branch format 4"
1046
def initialize(self, a_bzrdir):
1047
"""Create a branch of this format in a_bzrdir."""
1048
utf8_files = [('revision-history', ''),
1049
('branch-name', ''),
1051
return self._initialize_helper(a_bzrdir, utf8_files,
1052
lock_type='branch4', set_format=False)
1055
super(BzrBranchFormat4, self).__init__()
1056
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1058
def open(self, a_bzrdir, _found=False):
1059
"""Return the branch object for a_bzrdir
1061
_found is a private parameter, do not use it. It is used to indicate
1062
if format probing has already be done.
1065
# we are being called directly and must probe.
1066
raise NotImplementedError
1067
return BzrBranch(_format=self,
1068
_control_files=a_bzrdir._control_files,
1070
_repository=a_bzrdir.open_repository())
1073
return "Bazaar-NG branch format 4"
1076
class BzrBranchFormat5(BranchFormat):
1077
"""Bzr branch format 5.
1080
- a revision-history file.
1082
- a lock dir guarding the branch itself
1083
- all of this stored in a branch/ subdirectory
1084
- works with shared repositories.
1086
This format is new in bzr 0.8.
1089
def get_format_string(self):
1090
"""See BranchFormat.get_format_string()."""
1091
return "Bazaar-NG branch format 5\n"
1093
def get_format_description(self):
1094
"""See BranchFormat.get_format_description()."""
1095
return "Branch format 5"
1097
def initialize(self, a_bzrdir):
1098
"""Create a branch of this format in a_bzrdir."""
1099
utf8_files = [('revision-history', ''),
1100
('branch-name', ''),
1102
return self._initialize_helper(a_bzrdir, utf8_files)
1105
super(BzrBranchFormat5, self).__init__()
1106
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1108
def open(self, a_bzrdir, _found=False):
1109
"""Return the branch object for a_bzrdir
1111
_found is a private parameter, do not use it. It is used to indicate
1112
if format probing has already be done.
1115
format = BranchFormat.find_format(a_bzrdir)
1116
assert format.__class__ == self.__class__
1118
transport = a_bzrdir.get_branch_transport(None)
1119
control_files = lockable_files.LockableFiles(transport, 'lock',
1121
return BzrBranch5(_format=self,
1122
_control_files=control_files,
1124
_repository=a_bzrdir.find_repository())
1125
except errors.NoSuchFile:
1126
raise errors.NotBranchError(path=transport.base)
1129
class BzrBranchFormat6(BzrBranchFormat5):
1130
"""Branch format with last-revision and tags.
1132
Unlike previous formats, this has no explicit revision history. Instead,
1133
this just stores the last-revision, and the left-hand history leading
1134
up to there is the history.
1136
This format was introduced in bzr 0.15
1137
and became the default in 0.91.
1140
def get_format_string(self):
1141
"""See BranchFormat.get_format_string()."""
1142
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1144
def get_format_description(self):
1145
"""See BranchFormat.get_format_description()."""
1146
return "Branch format 6"
1148
def initialize(self, a_bzrdir):
1149
"""Create a branch of this format in a_bzrdir."""
1150
utf8_files = [('last-revision', '0 null:\n'),
1151
('branch.conf', ''),
1154
return self._initialize_helper(a_bzrdir, utf8_files)
1156
def open(self, a_bzrdir, _found=False):
1157
"""Return the branch object for a_bzrdir
1159
_found is a private parameter, do not use it. It is used to indicate
1160
if format probing has already be done.
1163
format = BranchFormat.find_format(a_bzrdir)
1164
assert format.__class__ == self.__class__
1165
transport = a_bzrdir.get_branch_transport(None)
1166
control_files = lockable_files.LockableFiles(transport, 'lock',
1168
return BzrBranch6(_format=self,
1169
_control_files=control_files,
1171
_repository=a_bzrdir.find_repository())
1173
def supports_tags(self):
1177
class BranchReferenceFormat(BranchFormat):
1178
"""Bzr branch reference format.
1180
Branch references are used in implementing checkouts, they
1181
act as an alias to the real branch which is at some other url.
1188
def get_format_string(self):
1189
"""See BranchFormat.get_format_string()."""
1190
return "Bazaar-NG Branch Reference Format 1\n"
1192
def get_format_description(self):
1193
"""See BranchFormat.get_format_description()."""
1194
return "Checkout reference format 1"
1196
def get_reference(self, a_bzrdir):
1197
"""See BranchFormat.get_reference()."""
1198
transport = a_bzrdir.get_branch_transport(None)
1199
return transport.get('location').read()
1201
def set_reference(self, a_bzrdir, to_branch):
1202
"""See BranchFormat.set_reference()."""
1203
transport = a_bzrdir.get_branch_transport(None)
1204
location = transport.put_bytes('location', to_branch.base)
1206
def initialize(self, a_bzrdir, target_branch=None):
1207
"""Create a branch of this format in a_bzrdir."""
1208
if target_branch is None:
1209
# this format does not implement branch itself, thus the implicit
1210
# creation contract must see it as uninitializable
1211
raise errors.UninitializableFormat(self)
1212
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1213
branch_transport = a_bzrdir.get_branch_transport(self)
1214
branch_transport.put_bytes('location',
1215
target_branch.bzrdir.root_transport.base)
1216
branch_transport.put_bytes('format', self.get_format_string())
1218
a_bzrdir, _found=True,
1219
possible_transports=[target_branch.bzrdir.root_transport])
1222
super(BranchReferenceFormat, self).__init__()
1223
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1225
def _make_reference_clone_function(format, a_branch):
1226
"""Create a clone() routine for a branch dynamically."""
1227
def clone(to_bzrdir, revision_id=None):
1228
"""See Branch.clone()."""
1229
return format.initialize(to_bzrdir, a_branch)
1230
# cannot obey revision_id limits when cloning a reference ...
1231
# FIXME RBC 20060210 either nuke revision_id for clone, or
1232
# emit some sort of warning/error to the caller ?!
1235
def open(self, a_bzrdir, _found=False, location=None,
1236
possible_transports=None):
1237
"""Return the branch that the branch reference in a_bzrdir points at.
1239
_found is a private parameter, do not use it. It is used to indicate
1240
if format probing has already be done.
1243
format = BranchFormat.find_format(a_bzrdir)
1244
assert format.__class__ == self.__class__
1245
if location is None:
1246
location = self.get_reference(a_bzrdir)
1247
real_bzrdir = bzrdir.BzrDir.open(
1248
location, possible_transports=possible_transports)
1249
result = real_bzrdir.open_branch()
1250
# this changes the behaviour of result.clone to create a new reference
1251
# rather than a copy of the content of the branch.
1252
# I did not use a proxy object because that needs much more extensive
1253
# testing, and we are only changing one behaviour at the moment.
1254
# If we decide to alter more behaviours - i.e. the implicit nickname
1255
# then this should be refactored to introduce a tested proxy branch
1256
# and a subclass of that for use in overriding clone() and ....
1258
result.clone = self._make_reference_clone_function(result)
1262
# formats which have no format string are not discoverable
1263
# and not independently creatable, so are not registered.
1264
__format5 = BzrBranchFormat5()
1265
__format6 = BzrBranchFormat6()
1266
BranchFormat.register_format(__format5)
1267
BranchFormat.register_format(BranchReferenceFormat())
1268
BranchFormat.register_format(__format6)
1269
BranchFormat.set_default_format(__format6)
1270
_legacy_formats = [BzrBranchFormat4(),
1273
class BzrBranch(Branch):
1274
"""A branch stored in the actual filesystem.
1276
Note that it's "local" in the context of the filesystem; it doesn't
1277
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1278
it's writable, and can be accessed via the normal filesystem API.
1281
def __init__(self, _format=None,
1282
_control_files=None, a_bzrdir=None, _repository=None):
1283
"""Create new branch object at a particular location."""
1284
Branch.__init__(self)
1285
if a_bzrdir is None:
1286
raise ValueError('a_bzrdir must be supplied')
1288
self.bzrdir = a_bzrdir
1289
# self._transport used to point to the directory containing the
1290
# control directory, but was not used - now it's just the transport
1291
# for the branch control files. mbp 20070212
1292
self._base = self.bzrdir.transport.clone('..').base
1293
self._format = _format
1294
if _control_files is None:
1295
raise ValueError('BzrBranch _control_files is None')
1296
self.control_files = _control_files
1297
self._transport = _control_files._transport
1298
self.repository = _repository
1301
return '%s(%r)' % (self.__class__.__name__, self.base)
1305
def _get_base(self):
1306
"""Returns the directory containing the control directory."""
1309
base = property(_get_base, doc="The URL for the root of this branch.")
1311
def abspath(self, name):
1312
"""See Branch.abspath."""
1313
return self.control_files._transport.abspath(name)
1316
@deprecated_method(zero_sixteen)
1318
def get_root_id(self):
1319
"""See Branch.get_root_id."""
1320
tree = self.repository.revision_tree(self.last_revision())
1321
return tree.get_root_id()
1323
def is_locked(self):
1324
return self.control_files.is_locked()
1326
def lock_write(self, token=None):
1327
repo_token = self.repository.lock_write()
1329
token = self.control_files.lock_write(token=token)
1331
self.repository.unlock()
1335
def lock_read(self):
1336
self.repository.lock_read()
1338
self.control_files.lock_read()
1340
self.repository.unlock()
1344
# TODO: test for failed two phase locks. This is known broken.
1346
self.control_files.unlock()
1348
self.repository.unlock()
1349
if not self.control_files.is_locked():
1350
# we just released the lock
1351
self._clear_cached_state()
1353
def peek_lock_mode(self):
1354
if self.control_files._lock_count == 0:
1357
return self.control_files._lock_mode
1359
def get_physical_lock_status(self):
1360
return self.control_files.get_physical_lock_status()
1363
def print_file(self, file, revision_id):
1364
"""See Branch.print_file."""
1365
return self.repository.print_file(file, revision_id)
1367
def _write_revision_history(self, history):
1368
"""Factored out of set_revision_history.
1370
This performs the actual writing to disk.
1371
It is intended to be called by BzrBranch5.set_revision_history."""
1372
self.control_files.put_bytes(
1373
'revision-history', '\n'.join(history))
1376
def set_revision_history(self, rev_history):
1377
"""See Branch.set_revision_history."""
1378
if 'evil' in debug.debug_flags:
1379
mutter_callsite(3, "set_revision_history scales with history.")
1380
self._clear_cached_state()
1381
self._write_revision_history(rev_history)
1382
self._cache_revision_history(rev_history)
1383
for hook in Branch.hooks['set_rh']:
1384
hook(self, rev_history)
1387
def set_last_revision_info(self, revno, revision_id):
1388
"""Set the last revision of this branch.
1390
The caller is responsible for checking that the revno is correct
1391
for this revision id.
1393
It may be possible to set the branch last revision to an id not
1394
present in the repository. However, branches can also be
1395
configured to check constraints on history, in which case this may not
1398
revision_id = _mod_revision.ensure_null(revision_id)
1399
history = self._lefthand_history(revision_id)
1400
assert len(history) == revno, '%d != %d' % (len(history), revno)
1401
self.set_revision_history(history)
1403
def _gen_revision_history(self):
1404
history = self.control_files.get('revision-history').read().split('\n')
1405
if history[-1:] == ['']:
1406
# There shouldn't be a trailing newline, but just in case.
1410
def _lefthand_history(self, revision_id, last_rev=None,
1412
if 'evil' in debug.debug_flags:
1413
mutter_callsite(4, "_lefthand_history scales with history.")
1414
# stop_revision must be a descendant of last_revision
1415
graph = self.repository.get_graph()
1416
if last_rev is not None:
1417
if not graph.is_ancestor(last_rev, revision_id):
1418
# our previous tip is not merged into stop_revision
1419
raise errors.DivergedBranches(self, other_branch)
1420
# make a new revision history from the graph
1421
parents_map = graph.get_parent_map([revision_id])
1422
if revision_id not in parents_map:
1423
raise errors.NoSuchRevision(self, revision_id)
1424
current_rev_id = revision_id
1426
# Do not include ghosts or graph origin in revision_history
1427
while (current_rev_id in parents_map and
1428
len(parents_map[current_rev_id]) > 0):
1429
new_history.append(current_rev_id)
1430
current_rev_id = parents_map[current_rev_id][0]
1431
parents_map = graph.get_parent_map([current_rev_id])
1432
new_history.reverse()
1436
def generate_revision_history(self, revision_id, last_rev=None,
1438
"""Create a new revision history that will finish with revision_id.
1440
:param revision_id: the new tip to use.
1441
:param last_rev: The previous last_revision. If not None, then this
1442
must be a ancestory of revision_id, or DivergedBranches is raised.
1443
:param other_branch: The other branch that DivergedBranches should
1444
raise with respect to.
1446
self.set_revision_history(self._lefthand_history(revision_id,
1447
last_rev, other_branch))
1450
def update_revisions(self, other, stop_revision=None, overwrite=False):
1451
"""See Branch.update_revisions."""
1454
other_last_revno, other_last_revision = other.last_revision_info()
1455
if stop_revision is None:
1456
stop_revision = other_last_revision
1457
if _mod_revision.is_null(stop_revision):
1458
# if there are no commits, we're done.
1460
# whats the current last revision, before we fetch [and change it
1462
last_rev = _mod_revision.ensure_null(self.last_revision())
1463
# we fetch here so that we don't process data twice in the common
1464
# case of having something to pull, and so that the check for
1465
# already merged can operate on the just fetched graph, which will
1466
# be cached in memory.
1467
self.fetch(other, stop_revision)
1468
# Check to see if one is an ancestor of the other
1470
heads = self.repository.get_graph().heads([stop_revision,
1472
if heads == set([last_rev]):
1473
# The current revision is a decendent of the target,
1476
elif heads == set([stop_revision, last_rev]):
1477
# These branches have diverged
1478
raise errors.DivergedBranches(self, other)
1479
assert heads == set([stop_revision])
1480
if other_last_revision == stop_revision:
1481
self.set_last_revision_info(other_last_revno,
1482
other_last_revision)
1484
# TODO: jam 2007-11-29 Is there a way to determine the
1485
# revno without searching all of history??
1487
self.generate_revision_history(stop_revision)
1489
self.generate_revision_history(stop_revision,
1490
last_rev=last_rev, other_branch=other)
1494
def basis_tree(self):
1495
"""See Branch.basis_tree."""
1496
return self.repository.revision_tree(self.last_revision())
1499
def pull(self, source, overwrite=False, stop_revision=None,
1500
_hook_master=None, run_hooks=True, possible_transports=None):
1503
:param _hook_master: Private parameter - set the branch to
1504
be supplied as the master to push hooks.
1505
:param run_hooks: Private parameter - if false, this branch
1506
is being called because it's the master of the primary branch,
1507
so it should not run its hooks.
1509
result = PullResult()
1510
result.source_branch = source
1511
result.target_branch = self
1514
result.old_revno, result.old_revid = self.last_revision_info()
1515
self.update_revisions(source, stop_revision, overwrite=overwrite)
1516
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
1517
result.new_revno, result.new_revid = self.last_revision_info()
1519
result.master_branch = _hook_master
1520
result.local_branch = self
1522
result.master_branch = self
1523
result.local_branch = None
1525
for hook in Branch.hooks['post_pull']:
1531
def _get_parent_location(self):
1532
_locs = ['parent', 'pull', 'x-pull']
1535
return self.control_files.get(l).read().strip('\n')
1536
except errors.NoSuchFile:
1541
def push(self, target, overwrite=False, stop_revision=None,
1542
_override_hook_source_branch=None):
1545
This is the basic concrete implementation of push()
1547
:param _override_hook_source_branch: If specified, run
1548
the hooks passing this Branch as the source, rather than self.
1549
This is for use of RemoteBranch, where push is delegated to the
1550
underlying vfs-based Branch.
1552
# TODO: Public option to disable running hooks - should be trivial but
1556
result = self._push_with_bound_branches(target, overwrite,
1558
_override_hook_source_branch=_override_hook_source_branch)
1563
def _push_with_bound_branches(self, target, overwrite,
1565
_override_hook_source_branch=None):
1566
"""Push from self into target, and into target's master if any.
1568
This is on the base BzrBranch class even though it doesn't support
1569
bound branches because the *target* might be bound.
1572
if _override_hook_source_branch:
1573
result.source_branch = _override_hook_source_branch
1574
for hook in Branch.hooks['post_push']:
1577
bound_location = target.get_bound_location()
1578
if bound_location and target.base != bound_location:
1579
# there is a master branch.
1581
# XXX: Why the second check? Is it even supported for a branch to
1582
# be bound to itself? -- mbp 20070507
1583
master_branch = target.get_master_branch()
1584
master_branch.lock_write()
1586
# push into the master from this branch.
1587
self._basic_push(master_branch, overwrite, stop_revision)
1588
# and push into the target branch from this. Note that we push from
1589
# this branch again, because its considered the highest bandwidth
1591
result = self._basic_push(target, overwrite, stop_revision)
1592
result.master_branch = master_branch
1593
result.local_branch = target
1597
master_branch.unlock()
1600
result = self._basic_push(target, overwrite, stop_revision)
1601
# TODO: Why set master_branch and local_branch if there's no
1602
# binding? Maybe cleaner to just leave them unset? -- mbp
1604
result.master_branch = target
1605
result.local_branch = None
1609
def _basic_push(self, target, overwrite, stop_revision):
1610
"""Basic implementation of push without bound branches or hooks.
1612
Must be called with self read locked and target write locked.
1614
result = PushResult()
1615
result.source_branch = self
1616
result.target_branch = target
1617
result.old_revno, result.old_revid = target.last_revision_info()
1619
target.update_revisions(self, stop_revision)
1620
except errors.DivergedBranches:
1624
target.set_revision_history(self.revision_history())
1625
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1626
result.new_revno, result.new_revid = target.last_revision_info()
1629
def get_parent(self):
1630
"""See Branch.get_parent."""
1632
assert self.base[-1] == '/'
1633
parent = self._get_parent_location()
1636
# This is an old-format absolute path to a local branch
1637
# turn it into a url
1638
if parent.startswith('/'):
1639
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1641
return urlutils.join(self.base[:-1], parent)
1642
except errors.InvalidURLJoin, e:
1643
raise errors.InaccessibleParent(parent, self.base)
1645
def set_push_location(self, location):
1646
"""See Branch.set_push_location."""
1647
self.get_config().set_user_option(
1648
'push_location', location,
1649
store=_mod_config.STORE_LOCATION_NORECURSE)
1652
def set_parent(self, url):
1653
"""See Branch.set_parent."""
1654
# TODO: Maybe delete old location files?
1655
# URLs should never be unicode, even on the local fs,
1656
# FIXUP this and get_parent in a future branch format bump:
1657
# read and rewrite the file, and have the new format code read
1658
# using .get not .get_utf8. RBC 20060125
1660
if isinstance(url, unicode):
1662
url = url.encode('ascii')
1663
except UnicodeEncodeError:
1664
raise errors.InvalidURL(url,
1665
"Urls must be 7-bit ascii, "
1666
"use bzrlib.urlutils.escape")
1667
url = urlutils.relative_url(self.base, url)
1668
self._set_parent_location(url)
1670
def _set_parent_location(self, url):
1672
self.control_files._transport.delete('parent')
1674
assert isinstance(url, str)
1675
self.control_files.put_bytes('parent', url + '\n')
1678
class BzrBranch5(BzrBranch):
1679
"""A format 5 branch. This supports new features over plain branches.
1681
It has support for a master_branch which is the data for bound branches.
1689
super(BzrBranch5, self).__init__(_format=_format,
1690
_control_files=_control_files,
1692
_repository=_repository)
1695
def pull(self, source, overwrite=False, stop_revision=None,
1696
run_hooks=True, possible_transports=None):
1697
"""Pull from source into self, updating my master if any.
1699
:param run_hooks: Private parameter - if false, this branch
1700
is being called because it's the master of the primary branch,
1701
so it should not run its hooks.
1703
bound_location = self.get_bound_location()
1704
master_branch = None
1705
if bound_location and source.base != bound_location:
1706
# not pulling from master, so we need to update master.
1707
master_branch = self.get_master_branch(possible_transports)
1708
master_branch.lock_write()
1711
# pull from source into master.
1712
master_branch.pull(source, overwrite, stop_revision,
1714
return super(BzrBranch5, self).pull(source, overwrite,
1715
stop_revision, _hook_master=master_branch,
1716
run_hooks=run_hooks)
1719
master_branch.unlock()
1721
def get_bound_location(self):
1723
return self.control_files.get_utf8('bound').read()[:-1]
1724
except errors.NoSuchFile:
1728
def get_master_branch(self, possible_transports=None):
1729
"""Return the branch we are bound to.
1731
:return: Either a Branch, or None
1733
This could memoise the branch, but if thats done
1734
it must be revalidated on each new lock.
1735
So for now we just don't memoise it.
1736
# RBC 20060304 review this decision.
1738
bound_loc = self.get_bound_location()
1742
return Branch.open(bound_loc,
1743
possible_transports=possible_transports)
1744
except (errors.NotBranchError, errors.ConnectionError), e:
1745
raise errors.BoundBranchConnectionFailure(
1749
def set_bound_location(self, location):
1750
"""Set the target where this branch is bound to.
1752
:param location: URL to the target branch
1755
self.control_files.put_utf8('bound', location+'\n')
1758
self.control_files._transport.delete('bound')
1759
except errors.NoSuchFile:
1024
if filename == head:
1031
def _gen_revision_id(when):
1032
"""Return new revision-id."""
1033
s = '%s-%s-' % (user_email(), compact_date(when))
1034
s += hexlify(rand_bytes(8))
1038
def gen_file_id(name):
1039
"""Return new file id.
1041
This should probably generate proper UUIDs, but for the moment we
1042
cope with just randomness because running uuidgen every time is
1044
idx = name.rfind('/')
1046
name = name[idx+1 : ]
1047
idx = name.rfind('\\')
1049
name = name[idx+1 : ]
1051
name = name.lstrip('.')
1053
s = hexlify(rand_bytes(8))
1054
return '-'.join((name, compact_date(time.time()), s))
1764
def bind(self, other):
1765
"""Bind this branch to the branch other.
1767
This does not push or pull data between the branches, though it does
1768
check for divergence to raise an error when the branches are not
1769
either the same, or one a prefix of the other. That behaviour may not
1770
be useful, so that check may be removed in future.
1772
:param other: The branch to bind to
1775
# TODO: jam 20051230 Consider checking if the target is bound
1776
# It is debatable whether you should be able to bind to
1777
# a branch which is itself bound.
1778
# Committing is obviously forbidden,
1779
# but binding itself may not be.
1780
# Since we *have* to check at commit time, we don't
1781
# *need* to check here
1783
# we want to raise diverged if:
1784
# last_rev is not in the other_last_rev history, AND
1785
# other_last_rev is not in our history, and do it without pulling
1787
self.set_bound_location(other.base)
1791
"""If bound, unbind"""
1792
return self.set_bound_location(None)
1795
def update(self, possible_transports=None):
1796
"""Synchronise this branch with the master branch if any.
1798
:return: None or the last_revision that was pivoted out during the
1801
master = self.get_master_branch(possible_transports)
1802
if master is not None:
1803
old_tip = _mod_revision.ensure_null(self.last_revision())
1804
self.pull(master, overwrite=True)
1805
if self.repository.get_graph().is_ancestor(old_tip,
1806
_mod_revision.ensure_null(self.last_revision())):
1812
class BzrBranch6(BzrBranch5):
1815
def last_revision_info(self):
1816
revision_string = self.control_files.get('last-revision').read()
1817
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1818
revision_id = cache_utf8.get_cached_utf8(revision_id)
1820
return revno, revision_id
1822
def _write_last_revision_info(self, revno, revision_id):
1823
"""Simply write out the revision id, with no checks.
1825
Use set_last_revision_info to perform this safely.
1827
Does not update the revision_history cache.
1828
Intended to be called by set_last_revision_info and
1829
_write_revision_history.
1831
assert revision_id is not None, "Use NULL_REVISION, not None"
1832
out_string = '%d %s\n' % (revno, revision_id)
1833
self.control_files.put_bytes('last-revision', out_string)
1836
def set_last_revision_info(self, revno, revision_id):
1837
revision_id = _mod_revision.ensure_null(revision_id)
1838
if self._get_append_revisions_only():
1839
self._check_history_violation(revision_id)
1840
self._write_last_revision_info(revno, revision_id)
1841
self._clear_cached_state()
1843
def _check_history_violation(self, revision_id):
1844
last_revision = _mod_revision.ensure_null(self.last_revision())
1845
if _mod_revision.is_null(last_revision):
1847
if last_revision not in self._lefthand_history(revision_id):
1848
raise errors.AppendRevisionsOnlyViolation(self.base)
1850
def _gen_revision_history(self):
1851
"""Generate the revision history from last revision
1853
history = list(self.repository.iter_reverse_revision_history(
1854
self.last_revision()))
1858
def _write_revision_history(self, history):
1859
"""Factored out of set_revision_history.
1861
This performs the actual writing to disk, with format-specific checks.
1862
It is intended to be called by BzrBranch5.set_revision_history.
1864
if len(history) == 0:
1865
last_revision = 'null:'
1867
if history != self._lefthand_history(history[-1]):
1868
raise errors.NotLefthandHistory(history)
1869
last_revision = history[-1]
1870
if self._get_append_revisions_only():
1871
self._check_history_violation(last_revision)
1872
self._write_last_revision_info(len(history), last_revision)
1875
def _set_parent_location(self, url):
1876
"""Set the parent branch"""
1877
self._set_config_location('parent_location', url, make_relative=True)
1880
def _get_parent_location(self):
1881
"""Set the parent branch"""
1882
return self._get_config_location('parent_location')
1884
def set_push_location(self, location):
1885
"""See Branch.set_push_location."""
1886
self._set_config_location('push_location', location)
1888
def set_bound_location(self, location):
1889
"""See Branch.set_push_location."""
1891
config = self.get_config()
1892
if location is None:
1893
if config.get_user_option('bound') != 'True':
1896
config.set_user_option('bound', 'False', warn_masked=True)
1899
self._set_config_location('bound_location', location,
1901
config.set_user_option('bound', 'True', warn_masked=True)
1904
def _get_bound_location(self, bound):
1905
"""Return the bound location in the config file.
1907
Return None if the bound parameter does not match"""
1908
config = self.get_config()
1909
config_bound = (config.get_user_option('bound') == 'True')
1910
if config_bound != bound:
1912
return self._get_config_location('bound_location', config=config)
1914
def get_bound_location(self):
1915
"""See Branch.set_push_location."""
1916
return self._get_bound_location(True)
1918
def get_old_bound_location(self):
1919
"""See Branch.get_old_bound_location"""
1920
return self._get_bound_location(False)
1922
def set_append_revisions_only(self, enabled):
1927
self.get_config().set_user_option('append_revisions_only', value,
1930
def _get_append_revisions_only(self):
1931
value = self.get_config().get_user_option('append_revisions_only')
1932
return value == 'True'
1934
def _synchronize_history(self, destination, revision_id):
1935
"""Synchronize last revision and revision history between branches.
1937
This version is most efficient when the destination is also a
1938
BzrBranch6, but works for BzrBranch5, as long as the destination's
1939
repository contains all the lefthand ancestors of the intended
1940
last_revision. If not, set_last_revision_info will fail.
1942
:param destination: The branch to copy the history into
1943
:param revision_id: The revision-id to truncate history at. May
1944
be None to copy complete history.
1946
source_revno, source_revision_id = self.last_revision_info()
1947
if revision_id is None:
1948
revno, revision_id = source_revno, source_revision_id
1949
elif source_revision_id == revision_id:
1950
# we know the revno without needing to walk all of history
1951
revno = source_revno
1953
# To figure out the revno for a random revision, we need to build
1954
# the revision history, and count its length.
1955
# We don't care about the order, just how long it is.
1956
# Alternatively, we could start at the current location, and count
1957
# backwards. But there is no guarantee that we will find it since
1958
# it may be a merged revision.
1959
revno = len(list(self.repository.iter_reverse_revision_history(
1961
destination.set_last_revision_info(revno, revision_id)
1963
def _make_tags(self):
1964
return BasicTags(self)
1967
def generate_revision_history(self, revision_id, last_rev=None,
1969
"""See BzrBranch5.generate_revision_history"""
1970
history = self._lefthand_history(revision_id, last_rev, other_branch)
1971
revno = len(history)
1972
self.set_last_revision_info(revno, revision_id)
1975
######################################################################
1976
# results of operations
1979
class _Result(object):
1981
def _show_tag_conficts(self, to_file):
1982
if not getattr(self, 'tag_conflicts', None):
1984
to_file.write('Conflicting tags:\n')
1985
for name, value1, value2 in self.tag_conflicts:
1986
to_file.write(' %s\n' % (name, ))
1989
class PullResult(_Result):
1990
"""Result of a Branch.pull operation.
1992
:ivar old_revno: Revision number before pull.
1993
:ivar new_revno: Revision number after pull.
1994
:ivar old_revid: Tip revision id before pull.
1995
:ivar new_revid: Tip revision id after pull.
1996
:ivar source_branch: Source (local) branch object.
1997
:ivar master_branch: Master branch of the target, or None.
1998
:ivar target_branch: Target/destination branch object.
2002
# DEPRECATED: pull used to return the change in revno
2003
return self.new_revno - self.old_revno
2005
def report(self, to_file):
2007
if self.old_revid == self.new_revid:
2008
to_file.write('No revisions to pull.\n')
2010
to_file.write('Now on revision %d.\n' % self.new_revno)
2011
self._show_tag_conficts(to_file)
2014
class PushResult(_Result):
2015
"""Result of a Branch.push operation.
2017
:ivar old_revno: Revision number before push.
2018
:ivar new_revno: Revision number after push.
2019
:ivar old_revid: Tip revision id before push.
2020
:ivar new_revid: Tip revision id after push.
2021
:ivar source_branch: Source branch object.
2022
:ivar master_branch: Master branch of the target, or None.
2023
:ivar target_branch: Target/destination branch object.
2027
# DEPRECATED: push used to return the change in revno
2028
return self.new_revno - self.old_revno
2030
def report(self, to_file):
2031
"""Write a human-readable description of the result."""
2032
if self.old_revid == self.new_revid:
2033
to_file.write('No new revisions to push.\n')
2035
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2036
self._show_tag_conficts(to_file)
2039
class BranchCheckResult(object):
2040
"""Results of checking branch consistency.
2045
def __init__(self, branch):
2046
self.branch = branch
2048
def report_results(self, verbose):
2049
"""Report the check results via trace.note.
2051
:param verbose: Requests more detailed display of what was checked,
2054
note('checked branch %s format %s',
2056
self.branch._format)
2059
class Converter5to6(object):
2060
"""Perform an in-place upgrade of format 5 to format 6"""
2062
def convert(self, branch):
2063
# Data for 5 and 6 can peacefully coexist.
2064
format = BzrBranchFormat6()
2065
new_branch = format.open(branch.bzrdir, _found=True)
2067
# Copy source data into target
2068
new_branch.set_last_revision_info(*branch.last_revision_info())
2069
new_branch.set_parent(branch.get_parent())
2070
new_branch.set_bound_location(branch.get_bound_location())
2071
new_branch.set_push_location(branch.get_push_location())
2073
# New branch has no tags by default
2074
new_branch.tags._set_tag_dict({})
2076
# Copying done; now update target format
2077
new_branch.control_files.put_utf8('format',
2078
format.get_format_string())
2080
# Clean up old files
2081
new_branch.control_files._transport.delete('revision-history')
2083
branch.set_parent(None)
2084
except errors.NoSuchFile:
2086
branch.set_bound_location(None)
added
removed
bzrlib/branch.py
