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
18
from cStringIO import StringIO
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
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
22
from copy import deepcopy
23
from unittest import TestSuite
24
from warnings import warn
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)
30
config as _mod_config,
35
revision as _mod_revision,
42
from bzrlib.config import BranchConfig, TreeConfig
43
from bzrlib.lockable_files import LockableFiles, TransportLock
44
from bzrlib.tag import (
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
51
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
52
HistoryMissing, InvalidRevisionId,
53
InvalidRevisionNumber, LockError, NoSuchFile,
54
NoSuchRevision, NoWorkingTree, NotVersionedError,
55
NotBranchError, UninitializableFormat,
56
UnlistableStore, UnlistableBranch,
58
from bzrlib.hooks import Hooks
59
from bzrlib.symbol_versioning import (deprecated_function,
63
zero_eight, zero_nine, zero_sixteen,
65
from bzrlib.trace import mutter, note
68
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
69
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
70
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
73
# TODO: Maybe include checks for common corruption of newlines, etc?
75
# TODO: Some operations like log might retrieve the same revisions
76
# repeatedly to calculate deltas. We could perhaps have a weakref
77
# cache in memory to make this faster. In general anything can be
78
# cached in memory between lock and unlock operations. .. nb thats
79
# what the transaction identity map provides
70
82
######################################################################
74
86
"""Branch holding a history of revisions.
77
Base directory of the branch.
89
Base directory/url of the branch.
91
hooks: An instance of BranchHooks.
93
# this is really an instance variable - FIXME move it there
97
# override this to set the strategy for storing tags
99
return DisabledTags(self)
101
def __init__(self, *ignored, **ignored_too):
102
self.tags = self._make_tags()
103
self._revision_history_cache = None
104
self._revision_id_to_revno_cache = None
106
def break_lock(self):
107
"""Break a lock if one is present from another instance.
109
Uses the ui factory to ask for confirmation if the lock may be from
112
This will probe the repository for its lock as well.
114
self.control_files.break_lock()
115
self.repository.break_lock()
116
master = self.get_master_branch()
117
if master is not None:
121
@deprecated_method(zero_eight)
122
def open_downlevel(base):
123
"""Open a branch which may be of an old format."""
124
return Branch.open(base, _unsupported=True)
127
def open(base, _unsupported=False):
128
"""Open the branch rooted at base.
130
For instance, if the branch is at URL/.bzr/branch,
131
Branch.open(URL) -> a Branch instance.
133
control = bzrdir.BzrDir.open(base, _unsupported)
134
return control.open_branch(_unsupported)
137
def open_containing(url):
138
"""Open an existing branch which contains url.
140
This probes for a branch at url, and searches upwards from there.
142
Basically we keep looking up until we find the control directory or
143
run into the root. If there isn't one, raises NotBranchError.
144
If there is one and it is either an unrecognised format or an unsupported
145
format, UnknownFormatError or UnsupportedFormatError are raised.
146
If there is one, it is returned, along with the unused portion of url.
148
control, relpath = bzrdir.BzrDir.open_containing(url)
149
return control.open_branch(), relpath
152
@deprecated_function(zero_eight)
153
def initialize(base):
154
"""Create a new working tree and branch, rooted at 'base' (url)
156
NOTE: This will soon be deprecated in favour of creation
159
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
161
@deprecated_function(zero_eight)
162
def setup_caching(self, cache_root):
163
"""Subclasses that care about caching should override this, and set
164
up cached stores located under cache_root.
166
NOTE: This is unused.
170
def get_config(self):
171
return BranchConfig(self)
174
return self.get_config().get_nickname()
176
def _set_nick(self, nick):
177
self.get_config().set_user_option('nickname', nick)
179
nick = property(_get_nick, _set_nick)
182
raise NotImplementedError(self.is_locked)
184
def lock_write(self):
185
raise NotImplementedError(self.lock_write)
188
raise NotImplementedError(self.lock_read)
191
raise NotImplementedError(self.unlock)
193
def peek_lock_mode(self):
194
"""Return lock mode for the Branch: 'r', 'w' or None"""
195
raise NotImplementedError(self.peek_lock_mode)
197
def get_physical_lock_status(self):
198
raise NotImplementedError(self.get_physical_lock_status)
201
def get_revision_id_to_revno_map(self):
202
"""Return the revision_id => dotted revno map.
204
This will be regenerated on demand, but will be cached.
206
:return: A dictionary mapping revision_id => dotted revno.
207
This dictionary should not be modified by the caller.
209
if self._revision_id_to_revno_cache is not None:
210
mapping = self._revision_id_to_revno_cache
212
mapping = self._gen_revno_map()
213
self._cache_revision_id_to_revno(mapping)
214
# TODO: jam 20070417 Since this is being cached, should we be returning
216
# I would rather not, and instead just declare that users should not
217
# modify the return value.
220
def _gen_revno_map(self):
221
"""Create a new mapping from revision ids to dotted revnos.
223
Dotted revnos are generated based on the current tip in the revision
225
This is the worker function for get_revision_id_to_revno_map, which
226
just caches the return value.
228
:return: A dictionary mapping revision_id => dotted revno.
230
last_revision = self.last_revision()
231
revision_graph = self.repository.get_revision_graph(last_revision)
232
merge_sorted_revisions = tsort.merge_sort(
237
revision_id_to_revno = dict((rev_id, revno)
238
for seq_num, rev_id, depth, revno, end_of_merge
239
in merge_sorted_revisions)
240
return revision_id_to_revno
242
def leave_lock_in_place(self):
243
"""Tell this branch object not to release the physical lock when this
246
If lock_write doesn't return a token, then this method is not supported.
248
self.control_files.leave_in_place()
250
def dont_leave_lock_in_place(self):
251
"""Tell this branch object to release the physical lock when this
252
object is unlocked, even if it didn't originally acquire it.
254
If lock_write doesn't return a token, then this method is not supported.
256
self.control_files.dont_leave_in_place()
258
def abspath(self, name):
259
"""Return absolute filename for something in the branch
261
XXX: Robert Collins 20051017 what is this used for? why is it a branch
262
method and not a tree method.
264
raise NotImplementedError(self.abspath)
266
def bind(self, other):
267
"""Bind the local branch the other branch.
269
:param other: The branch to bind to
272
raise errors.UpgradeRequired(self.base)
275
def fetch(self, from_branch, last_revision=None, pb=None):
276
"""Copy revisions from from_branch into this branch.
278
:param from_branch: Where to copy from.
279
:param last_revision: What revision to stop at (None for at the end
281
:param pb: An optional progress bar to use.
283
Returns the copied revision count and the failed revisions in a tuple:
286
if self.base == from_branch.base:
289
nested_pb = ui.ui_factory.nested_progress_bar()
294
from_branch.lock_read()
296
if last_revision is None:
297
pb.update('get source history')
298
last_revision = from_branch.last_revision()
299
if last_revision is None:
300
last_revision = _mod_revision.NULL_REVISION
301
return self.repository.fetch(from_branch.repository,
302
revision_id=last_revision,
305
if nested_pb is not None:
309
def get_bound_location(self):
310
"""Return the URL of the branch we are bound to.
312
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):
317
def get_old_bound_location(self):
318
"""Return the URL of the branch we used to be bound to
320
raise errors.UpgradeRequired(self.base)
322
def get_commit_builder(self, parents, config=None, timestamp=None,
323
timezone=None, committer=None, revprops=None,
325
"""Obtain a CommitBuilder for this branch.
327
:param parents: Revision ids of the parents of the new revision.
328
:param config: Optional configuration to use.
329
:param timestamp: Optional timestamp recorded for commit.
330
:param timezone: Optional timezone for timestamp.
331
:param committer: Optional committer to set for commit.
332
:param revprops: Optional dictionary of revision properties.
333
:param revision_id: Optional revision id.
337
config = self.get_config()
339
return self.repository.get_commit_builder(self, parents, config,
340
timestamp, timezone, committer, revprops, revision_id)
342
def get_master_branch(self):
343
"""Return the branch we are bound to.
345
:return: Either a Branch, or None
349
def get_revision_delta(self, revno):
350
"""Return the delta for one revision.
352
The delta is relative to its mainline predecessor, or the
353
empty tree for revision 1.
355
assert isinstance(revno, int)
356
rh = self.revision_history()
357
if not (1 <= revno <= len(rh)):
358
raise InvalidRevisionNumber(revno)
359
return self.repository.get_revision_delta(rh[revno-1])
361
@deprecated_method(zero_sixteen)
362
def get_root_id(self):
363
"""Return the id of this branches root
365
Deprecated: branches don't have root ids-- trees do.
366
Use basis_tree().get_root_id() instead.
368
raise NotImplementedError(self.get_root_id)
370
def print_file(self, file, revision_id):
373
371
"""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)
372
raise NotImplementedError(self.print_file)
374
def append_revision(self, *revision_ids):
375
raise NotImplementedError(self.append_revision)
377
def set_revision_history(self, rev_history):
378
raise NotImplementedError(self.set_revision_history)
380
def _cache_revision_history(self, rev_history):
381
"""Set the cached revision history to rev_history.
383
The revision_history method will use this cache to avoid regenerating
384
the revision history.
386
This API is semi-public; it only for use by subclasses, all other code
387
should consider it to be private.
389
self._revision_history_cache = rev_history
391
def _cache_revision_id_to_revno(self, revision_id_to_revno):
392
"""Set the cached revision_id => revno map to revision_id_to_revno.
394
This API is semi-public; it only for use by subclasses, all other code
395
should consider it to be private.
397
self._revision_id_to_revno_cache = revision_id_to_revno
399
def _clear_cached_state(self):
400
"""Clear any cached data on this branch, e.g. cached revision history.
402
This means the next call to revision_history will need to call
403
_gen_revision_history.
405
This API is semi-public; it only for use by subclasses, all other code
406
should consider it to be private.
408
self._revision_history_cache = None
409
self._revision_id_to_revno_cache = None
411
def _gen_revision_history(self):
412
"""Return sequence of revision hashes on to this branch.
414
Unlike revision_history, this method always regenerates or rereads the
415
revision history, i.e. it does not cache the result, so repeated calls
418
Concrete subclasses should override this instead of revision_history so
419
that subclasses do not need to deal with caching logic.
421
This API is semi-public; it only for use by subclasses, all other code
422
should consider it to be private.
424
raise NotImplementedError(self._gen_revision_history)
684
427
def revision_history(self):
685
428
"""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':
430
This method will cache the revision history for as long as it is safe to
433
if self._revision_history_cache is not None:
434
history = self._revision_history_cache
713
raise BzrError('invalid history direction %r' % direction)
436
history = self._gen_revision_history()
437
self._cache_revision_history(history)
717
441
"""Return current revision number for this branch.
719
443
That is equivalent to the number of revisions committed to
722
>>> b = ScratchBranch()
725
>>> b.commit('no foo')
729
446
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
449
"""Older format branches cannot bind or unbind."""
450
raise errors.UpgradeRequired(self.base)
452
def set_append_revisions_only(self, enabled):
453
"""Older format branches are never restricted to append-only"""
454
raise errors.UpgradeRequired(self.base)
456
def last_revision(self):
457
"""Return last revision id, or None"""
738
458
ph = self.revision_history()
464
def last_revision_info(self):
465
"""Return information about the last revision.
467
:return: A tuple (revno, last_revision_id).
469
rh = self.revision_history()
472
return (revno, rh[-1])
474
return (0, _mod_revision.NULL_REVISION)
476
def missing_revisions(self, other, stop_revision=None):
477
"""Return a list of new revisions that would perfectly fit.
745
def lookup_revision(self, revno):
746
"""Return revision hash for revision number."""
479
If self and other have not diverged, return a list of the revisions
480
present in other, but missing from self.
482
self_history = self.revision_history()
483
self_len = len(self_history)
484
other_history = other.revision_history()
485
other_len = len(other_history)
486
common_index = min(self_len, other_len) -1
487
if common_index >= 0 and \
488
self_history[common_index] != other_history[common_index]:
489
raise DivergedBranches(self, other)
491
if stop_revision is None:
492
stop_revision = other_len
494
assert isinstance(stop_revision, int)
495
if stop_revision > other_len:
496
raise errors.NoSuchRevision(self, stop_revision)
497
return other_history[self_len:stop_revision]
499
def update_revisions(self, other, stop_revision=None):
500
"""Pull in new perfect-fit revisions.
502
:param other: Another Branch to pull from
503
:param stop_revision: Updated until the given revision
506
raise NotImplementedError(self.update_revisions)
508
def revision_id_to_revno(self, revision_id):
509
"""Given a revision id, return its revno"""
510
if revision_id is None:
512
revision_id = osutils.safe_revision_id(revision_id)
513
history = self.revision_history()
515
return history.index(revision_id) + 1
517
raise errors.NoSuchRevision(self, revision_id)
519
def get_rev_id(self, revno, history=None):
520
"""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())
524
history = self.revision_history()
525
if revno <= 0 or revno > len(history):
526
raise errors.NoSuchRevision(self, revno)
527
return history[revno - 1]
529
def pull(self, source, overwrite=False, stop_revision=None):
530
"""Mirror source into this branch.
532
This branch is considered to be 'local', having low latency.
534
:returns: PullResult instance
536
raise NotImplementedError(self.pull)
538
def push(self, target, overwrite=False, stop_revision=None):
539
"""Mirror this branch into target.
541
This branch is considered to be 'local', having low latency.
543
raise NotImplementedError(self.push)
775
545
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))
546
"""Return `Tree` object for last revision."""
547
return self.repository.revision_tree(self.last_revision())
798
549
def rename_one(self, from_rel, to_rel):
799
550
"""Rename one file.
801
552
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)
554
raise NotImplementedError(self.rename_one)
847
556
def move(self, from_paths, to_name):
855
564
Note that to_name is only the last component of the new name;
856
565
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))
567
This returns a list of (from_path, to_path) pairs for each
570
raise NotImplementedError(self.move)
572
def get_parent(self):
573
"""Return the parent location of the branch.
575
This is the default location for push/pull/missing. The usual
576
pattern is that the user can override it by specifying a
579
raise NotImplementedError(self.get_parent)
581
def _set_config_location(self, name, url, config=None,
582
make_relative=False):
584
config = self.get_config()
588
url = urlutils.relative_url(self.base, url)
589
config.set_user_option(name, url)
591
def _get_config_location(self, name, config=None):
593
config = self.get_config()
594
location = config.get_user_option(name)
599
def get_submit_branch(self):
600
"""Return the submit location of the branch.
602
This is the default location for bundle. The usual
603
pattern is that the user can override it by specifying a
606
return self.get_config().get_user_option('submit_branch')
608
def set_submit_branch(self, location):
609
"""Return the submit location of the branch.
611
This is the default location for bundle. The usual
612
pattern is that the user can override it by specifying a
615
self.get_config().set_user_option('submit_branch', location)
617
def get_public_branch(self):
618
"""Return the public location of the branch.
620
This is is used by merge directives.
622
return self._get_config_location('public_branch')
624
def set_public_branch(self, location):
625
"""Return the submit location of the branch.
627
This is the default location for bundle. The usual
628
pattern is that the user can override it by specifying a
631
self._set_config_location('public_branch', location)
633
def get_push_location(self):
634
"""Return the None or the location to push this branch to."""
635
push_loc = self.get_config().get_user_option('push_location')
638
def set_push_location(self, location):
639
"""Set a new push location for this branch."""
640
raise NotImplementedError(self.set_push_location)
642
def set_parent(self, url):
643
raise NotImplementedError(self.set_parent)
647
"""Synchronise this branch with the master branch if any.
649
:return: None or the last_revision pivoted out during the update.
653
def check_revno(self, revno):
655
Check whether a revno corresponds to any revision.
656
Zero (the NULL revision) is considered valid.
659
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:
661
def check_real_revno(self, revno):
663
Check whether a revno corresponds to a real revision.
664
Zero (the NULL revision) is considered invalid
666
if revno < 1 or revno > self.revno():
667
raise InvalidRevisionNumber(revno)
670
def clone(self, to_bzrdir, revision_id=None):
671
"""Clone this branch into to_bzrdir preserving all semantic values.
673
revision_id: if not None, the revision history in the new branch will
674
be truncated to end with revision_id.
676
result = self._format.initialize(to_bzrdir)
677
self.copy_content_into(result, revision_id=revision_id)
681
def sprout(self, to_bzrdir, revision_id=None):
682
"""Create a new line of development from the branch, into to_bzrdir.
684
revision_id: if not None, the revision history in the new branch will
685
be truncated to end with revision_id.
687
result = self._format.initialize(to_bzrdir)
688
self.copy_content_into(result, revision_id=revision_id)
689
result.set_parent(self.bzrdir.root_transport.base)
692
def _synchronize_history(self, destination, revision_id):
693
"""Synchronize last revision and revision history between branches.
695
This version is most efficient when the destination is also a
696
BzrBranch5, but works for BzrBranch6 as long as the revision
697
history is the true lefthand parent history, and all of the revisions
698
are in the destination's repository. If not, set_revision_history
701
:param destination: The branch to copy the history into
702
:param revision_id: The revision-id to truncate history at. May
703
be None to copy complete history.
705
new_history = self.revision_history()
706
if revision_id is not None:
707
revision_id = osutils.safe_revision_id(revision_id)
709
new_history = new_history[:new_history.index(revision_id) + 1]
711
rev = self.repository.get_revision(revision_id)
712
new_history = rev.get_history(self.repository)[1:]
713
destination.set_revision_history(new_history)
716
def copy_content_into(self, destination, revision_id=None):
717
"""Copy the content of self into destination.
719
revision_id: if not None, the revision history in the new branch will
720
be truncated to end with revision_id.
722
self._synchronize_history(destination, revision_id)
724
parent = self.get_parent()
725
except errors.InaccessibleParent, e:
726
mutter('parent was not accessible to copy: %s', e)
729
destination.set_parent(parent)
730
self.tags.merge_to(destination.tags)
734
"""Check consistency of the branch.
736
In particular this checks that revisions given in the revision-history
737
do actually match up in the revision graph, and that they're all
738
present in the repository.
740
Callers will typically also want to check the repository.
742
:return: A BranchCheckResult.
744
mainline_parent_id = None
745
for revision_id in self.revision_history():
747
revision = self.repository.get_revision(revision_id)
748
except errors.NoSuchRevision, e:
749
raise errors.BzrCheckError("mainline revision {%s} not in repository"
751
# In general the first entry on the revision history has no parents.
752
# But it's not illegal for it to have parents listed; this can happen
753
# in imports from Arch when the parents weren't reachable.
754
if mainline_parent_id is not None:
755
if mainline_parent_id not in revision.parent_ids:
756
raise errors.BzrCheckError("previous revision {%s} not listed among "
758
% (mainline_parent_id, revision_id))
759
mainline_parent_id = revision_id
760
return BranchCheckResult(self)
762
def _get_checkout_format(self):
763
"""Return the most suitable metadir for a checkout of this branch.
764
Weaves are used if this branch's repository uses weaves.
766
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
767
from bzrlib.repofmt import weaverepo
768
format = bzrdir.BzrDirMetaFormat1()
769
format.repository_format = weaverepo.RepositoryFormat7()
771
format = self.repository.bzrdir.checkout_metadir()
772
format.set_branch_format(self._format)
775
def create_checkout(self, to_location, revision_id=None,
777
"""Create a checkout of a branch.
779
:param to_location: The url to produce the checkout at
780
:param revision_id: The revision to check out
781
:param lightweight: If True, produce a lightweight checkout, otherwise,
782
produce a bound branch (heavyweight checkout)
783
:return: The tree of the created checkout
785
t = transport.get_transport(to_location)
788
except errors.FileExists:
791
format = self._get_checkout_format()
792
checkout = format.initialize_on_transport(t)
793
BranchReferenceFormat().initialize(checkout, self)
795
format = self._get_checkout_format()
796
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
797
to_location, force_new_tree=False, format=format)
798
checkout = checkout_branch.bzrdir
799
checkout_branch.bind(self)
800
# pull up to the specified revision_id to set the initial
801
# branch tip correctly, and seed it with history.
802
checkout_branch.pull(self, stop_revision=revision_id)
803
tree = checkout.create_workingtree(revision_id)
804
basis_tree = tree.basis_tree()
805
basis_tree.lock_read()
807
for path, file_id in basis_tree.iter_references():
808
reference_parent = self.reference_parent(file_id, path)
809
reference_parent.create_checkout(tree.abspath(path),
810
basis_tree.get_reference_revision(file_id, path),
816
def reference_parent(self, file_id, path):
817
"""Return the parent branch for a tree-reference file_id
818
:param file_id: The file_id of the tree reference
819
:param path: The path of the file_id in the tree
820
:return: A branch associated with the file_id
822
# FIXME should provide multiple branches, based on config
823
return Branch.open(self.bzrdir.root_transport.clone(path).base)
825
def supports_tags(self):
826
return self._format.supports_tags()
829
class BranchFormat(object):
830
"""An encapsulation of the initialization and open routines for a format.
832
Formats provide three things:
833
* An initialization routine,
837
Formats are placed in an dict by their format string for reference
838
during branch opening. Its not required that these be instances, they
839
can be classes themselves with class methods - it simply depends on
840
whether state is needed for a given format or not.
842
Once a format is deprecated, just deprecate the initialize and open
843
methods on the format class. Do not deprecate the object, as the
844
object will be created every time regardless.
847
_default_format = None
848
"""The default format used for new branches."""
851
"""The known formats."""
854
def find_format(klass, a_bzrdir):
855
"""Return the format for the branch object in a_bzrdir."""
857
transport = a_bzrdir.get_branch_transport(None)
858
format_string = transport.get("format").read()
859
return klass._formats[format_string]
861
raise NotBranchError(path=transport.base)
863
raise errors.UnknownFormatError(format=format_string)
866
def get_default_format(klass):
867
"""Return the current default format."""
868
return klass._default_format
870
def get_reference(self, a_bzrdir):
871
"""Get the target reference of the branch in a_bzrdir.
873
format probing must have been completed before calling
874
this method - it is assumed that the format of the branch
875
in a_bzrdir is correct.
877
:param a_bzrdir: The bzrdir to get the branch data from.
878
:return: None if the branch is not a reference branch.
882
def get_format_string(self):
883
"""Return the ASCII format string that identifies this format."""
884
raise NotImplementedError(self.get_format_string)
886
def get_format_description(self):
887
"""Return the short format description for this format."""
888
raise NotImplementedError(self.get_format_description)
890
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
892
"""Initialize a branch in a bzrdir, with specified files
894
:param a_bzrdir: The bzrdir to initialize the branch in
895
:param utf8_files: The files to create as a list of
896
(filename, content) tuples
897
:param set_format: If True, set the format with
898
self.get_format_string. (BzrBranch4 has its format set
900
:return: a branch in this format
902
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
903
branch_transport = a_bzrdir.get_branch_transport(self)
905
'metadir': ('lock', lockdir.LockDir),
906
'branch4': ('branch-lock', lockable_files.TransportLock),
908
lock_name, lock_class = lock_map[lock_type]
909
control_files = lockable_files.LockableFiles(branch_transport,
910
lock_name, lock_class)
911
control_files.create_lock()
912
control_files.lock_write()
914
control_files.put_utf8('format', self.get_format_string())
916
for file, content in utf8_files:
917
control_files.put_utf8(file, content)
919
control_files.unlock()
920
return self.open(a_bzrdir, _found=True)
922
def initialize(self, a_bzrdir):
923
"""Create a branch of this format in a_bzrdir."""
924
raise NotImplementedError(self.initialize)
926
def is_supported(self):
927
"""Is this format supported?
929
Supported formats can be initialized and opened.
930
Unsupported formats may not support initialization or committing or
931
some other features depending on the reason for not being supported.
935
def open(self, a_bzrdir, _found=False):
936
"""Return the branch object for a_bzrdir
938
_found is a private parameter, do not use it. It is used to indicate
939
if format probing has already be done.
941
raise NotImplementedError(self.open)
944
def register_format(klass, format):
945
klass._formats[format.get_format_string()] = format
948
def set_default_format(klass, format):
949
klass._default_format = format
952
def unregister_format(klass, format):
953
assert klass._formats[format.get_format_string()] is format
954
del klass._formats[format.get_format_string()]
957
return self.get_format_string().rstrip()
959
def supports_tags(self):
960
"""True if this format supports tags stored in the branch"""
961
return False # by default
963
# XXX: Probably doesn't really belong here -- mbp 20070212
964
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
966
branch_transport = a_bzrdir.get_branch_transport(self)
967
control_files = lockable_files.LockableFiles(branch_transport,
968
lock_filename, lock_class)
969
control_files.create_lock()
970
control_files.lock_write()
972
for filename, content in utf8_files:
973
control_files.put_utf8(filename, content)
975
control_files.unlock()
978
class BranchHooks(Hooks):
979
"""A dictionary mapping hook name to a list of callables for branch hooks.
981
e.g. ['set_rh'] Is the list of items to be called when the
982
set_revision_history function is invoked.
986
"""Create the default hooks.
988
These are all empty initially, because by default nothing should get
992
# Introduced in 0.15:
993
# invoked whenever the revision history has been set
994
# with set_revision_history. The api signature is
995
# (branch, revision_history), and the branch will
998
# invoked after a push operation completes.
999
# the api signature is
1001
# containing the members
1002
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1003
# where local is the local target branch or None, master is the target
1004
# master branch, and the rest should be self explanatory. The source
1005
# is read locked and the target branches write locked. Source will
1006
# be the local low-latency branch.
1007
self['post_push'] = []
1008
# invoked after a pull operation completes.
1009
# the api signature is
1011
# containing the members
1012
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1013
# where local is the local branch or None, master is the target
1014
# master branch, and the rest should be self explanatory. The source
1015
# is read locked and the target branches write locked. The local
1016
# branch is the low-latency branch.
1017
self['post_pull'] = []
1018
# invoked after a commit operation completes.
1019
# the api signature is
1020
# (local, master, old_revno, old_revid, new_revno, new_revid)
1021
# old_revid is NULL_REVISION for the first commit to a branch.
1022
self['post_commit'] = []
1023
# invoked after a uncommit operation completes.
1024
# the api signature is
1025
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1026
# local is the local branch or None, master is the target branch,
1027
# and an empty branch recieves new_revno of 0, new_revid of None.
1028
self['post_uncommit'] = []
1031
# install the default hooks into the Branch class.
1032
Branch.hooks = BranchHooks()
1035
class BzrBranchFormat4(BranchFormat):
1036
"""Bzr branch format 4.
1039
- a revision-history file.
1040
- a branch-lock lock file [ to be shared with the bzrdir ]
1043
def get_format_description(self):
1044
"""See BranchFormat.get_format_description()."""
1045
return "Branch format 4"
1047
def initialize(self, a_bzrdir):
1048
"""Create a branch of this format in a_bzrdir."""
1049
utf8_files = [('revision-history', ''),
1050
('branch-name', ''),
1052
return self._initialize_helper(a_bzrdir, utf8_files,
1053
lock_type='branch4', set_format=False)
1056
super(BzrBranchFormat4, self).__init__()
1057
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1059
def open(self, a_bzrdir, _found=False):
1060
"""Return the branch object for a_bzrdir
1062
_found is a private parameter, do not use it. It is used to indicate
1063
if format probing has already be done.
1066
# we are being called directly and must probe.
1067
raise NotImplementedError
1068
return BzrBranch(_format=self,
1069
_control_files=a_bzrdir._control_files,
1071
_repository=a_bzrdir.open_repository())
1074
return "Bazaar-NG branch format 4"
1077
class BzrBranchFormat5(BranchFormat):
1078
"""Bzr branch format 5.
1081
- a revision-history file.
1083
- a lock dir guarding the branch itself
1084
- all of this stored in a branch/ subdirectory
1085
- works with shared repositories.
1087
This format is new in bzr 0.8.
1090
def get_format_string(self):
1091
"""See BranchFormat.get_format_string()."""
1092
return "Bazaar-NG branch format 5\n"
1094
def get_format_description(self):
1095
"""See BranchFormat.get_format_description()."""
1096
return "Branch format 5"
1098
def initialize(self, a_bzrdir):
1099
"""Create a branch of this format in a_bzrdir."""
1100
utf8_files = [('revision-history', ''),
1101
('branch-name', ''),
1103
return self._initialize_helper(a_bzrdir, utf8_files)
1106
super(BzrBranchFormat5, self).__init__()
1107
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1109
def open(self, a_bzrdir, _found=False):
1110
"""Return the branch object for a_bzrdir
1112
_found is a private parameter, do not use it. It is used to indicate
1113
if format probing has already be done.
1116
format = BranchFormat.find_format(a_bzrdir)
1117
assert format.__class__ == self.__class__
1119
transport = a_bzrdir.get_branch_transport(None)
1120
control_files = lockable_files.LockableFiles(transport, 'lock',
1122
return BzrBranch5(_format=self,
1123
_control_files=control_files,
1125
_repository=a_bzrdir.find_repository())
1127
raise NotBranchError(path=transport.base)
1130
class BzrBranchFormat6(BzrBranchFormat5):
1131
"""Branch format with last-revision
1133
Unlike previous formats, this has no explicit revision history. Instead,
1134
this just stores the last-revision, and the left-hand history leading
1135
up to there is the history.
1137
This format was introduced in bzr 0.15
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-name', ''),
1152
('branch.conf', ''),
1155
return self._initialize_helper(a_bzrdir, utf8_files)
1157
def open(self, a_bzrdir, _found=False):
1158
"""Return the branch object for a_bzrdir
1160
_found is a private parameter, do not use it. It is used to indicate
1161
if format probing has already be done.
1164
format = BranchFormat.find_format(a_bzrdir)
1165
assert format.__class__ == self.__class__
1166
transport = a_bzrdir.get_branch_transport(None)
1167
control_files = lockable_files.LockableFiles(transport, 'lock',
1169
return BzrBranch6(_format=self,
1170
_control_files=control_files,
1172
_repository=a_bzrdir.find_repository())
1174
def supports_tags(self):
1178
class BranchReferenceFormat(BranchFormat):
1179
"""Bzr branch reference format.
1181
Branch references are used in implementing checkouts, they
1182
act as an alias to the real branch which is at some other url.
1189
def get_format_string(self):
1190
"""See BranchFormat.get_format_string()."""
1191
return "Bazaar-NG Branch Reference Format 1\n"
1193
def get_format_description(self):
1194
"""See BranchFormat.get_format_description()."""
1195
return "Checkout reference format 1"
1197
def get_reference(self, a_bzrdir):
1198
"""See BranchFormat.get_reference()."""
1199
transport = a_bzrdir.get_branch_transport(None)
1200
return transport.get('location').read()
1202
def initialize(self, a_bzrdir, target_branch=None):
1203
"""Create a branch of this format in a_bzrdir."""
1204
if target_branch is None:
1205
# this format does not implement branch itself, thus the implicit
1206
# creation contract must see it as uninitializable
1207
raise errors.UninitializableFormat(self)
1208
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1209
branch_transport = a_bzrdir.get_branch_transport(self)
1210
branch_transport.put_bytes('location',
1211
target_branch.bzrdir.root_transport.base)
1212
branch_transport.put_bytes('format', self.get_format_string())
1213
return self.open(a_bzrdir, _found=True)
1216
super(BranchReferenceFormat, self).__init__()
1217
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1219
def _make_reference_clone_function(format, a_branch):
1220
"""Create a clone() routine for a branch dynamically."""
1221
def clone(to_bzrdir, revision_id=None):
1222
"""See Branch.clone()."""
1223
return format.initialize(to_bzrdir, a_branch)
1224
# cannot obey revision_id limits when cloning a reference ...
1225
# FIXME RBC 20060210 either nuke revision_id for clone, or
1226
# emit some sort of warning/error to the caller ?!
1229
def open(self, a_bzrdir, _found=False, location=None):
1230
"""Return the branch that the branch reference in a_bzrdir points at.
1232
_found is a private parameter, do not use it. It is used to indicate
1233
if format probing has already be done.
1236
format = BranchFormat.find_format(a_bzrdir)
1237
assert format.__class__ == self.__class__
1238
if location is None:
1239
location = self.get_reference(a_bzrdir)
1240
real_bzrdir = bzrdir.BzrDir.open(location)
1241
result = real_bzrdir.open_branch()
1242
# this changes the behaviour of result.clone to create a new reference
1243
# rather than a copy of the content of the branch.
1244
# I did not use a proxy object because that needs much more extensive
1245
# testing, and we are only changing one behaviour at the moment.
1246
# If we decide to alter more behaviours - i.e. the implicit nickname
1247
# then this should be refactored to introduce a tested proxy branch
1248
# and a subclass of that for use in overriding clone() and ....
1250
result.clone = self._make_reference_clone_function(result)
1254
# formats which have no format string are not discoverable
1255
# and not independently creatable, so are not registered.
1256
__default_format = BzrBranchFormat5()
1257
BranchFormat.register_format(__default_format)
1258
BranchFormat.register_format(BranchReferenceFormat())
1259
BranchFormat.register_format(BzrBranchFormat6())
1260
BranchFormat.set_default_format(__default_format)
1261
_legacy_formats = [BzrBranchFormat4(),
1264
class BzrBranch(Branch):
1265
"""A branch stored in the actual filesystem.
1267
Note that it's "local" in the context of the filesystem; it doesn't
1268
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1269
it's writable, and can be accessed via the normal filesystem API.
1272
def __init__(self, _format=None,
1273
_control_files=None, a_bzrdir=None, _repository=None):
1274
"""Create new branch object at a particular location."""
1275
Branch.__init__(self)
1276
if a_bzrdir is None:
1277
raise ValueError('a_bzrdir must be supplied')
1279
self.bzrdir = a_bzrdir
1280
# self._transport used to point to the directory containing the
1281
# control directory, but was not used - now it's just the transport
1282
# for the branch control files. mbp 20070212
1283
self._base = self.bzrdir.transport.clone('..').base
1284
self._format = _format
1285
if _control_files is None:
1286
raise ValueError('BzrBranch _control_files is None')
1287
self.control_files = _control_files
1288
self._transport = _control_files._transport
1289
self.repository = _repository
1292
return '%s(%r)' % (self.__class__.__name__, self.base)
1296
def _get_base(self):
1297
"""Returns the directory containing the control directory."""
1300
base = property(_get_base, doc="The URL for the root of this branch.")
1302
def abspath(self, name):
1303
"""See Branch.abspath."""
1304
return self.control_files._transport.abspath(name)
1307
@deprecated_method(zero_sixteen)
1309
def get_root_id(self):
1310
"""See Branch.get_root_id."""
1311
tree = self.repository.revision_tree(self.last_revision())
1312
return tree.inventory.root.file_id
1314
def is_locked(self):
1315
return self.control_files.is_locked()
1317
def lock_write(self, token=None):
1318
repo_token = self.repository.lock_write()
1320
token = self.control_files.lock_write(token=token)
1322
self.repository.unlock()
1326
def lock_read(self):
1327
self.repository.lock_read()
1329
self.control_files.lock_read()
1331
self.repository.unlock()
1335
# TODO: test for failed two phase locks. This is known broken.
1337
self.control_files.unlock()
1339
self.repository.unlock()
1340
if not self.control_files.is_locked():
1341
# we just released the lock
1342
self._clear_cached_state()
1344
def peek_lock_mode(self):
1345
if self.control_files._lock_count == 0:
1348
return self.control_files._lock_mode
1350
def get_physical_lock_status(self):
1351
return self.control_files.get_physical_lock_status()
1354
def print_file(self, file, revision_id):
1355
"""See Branch.print_file."""
1356
return self.repository.print_file(file, revision_id)
1359
def append_revision(self, *revision_ids):
1360
"""See Branch.append_revision."""
1361
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1362
for revision_id in revision_ids:
1363
_mod_revision.check_not_reserved_id(revision_id)
1364
mutter("add {%s} to revision-history" % revision_id)
1365
rev_history = self.revision_history()
1366
rev_history.extend(revision_ids)
1367
self.set_revision_history(rev_history)
1369
def _write_revision_history(self, history):
1370
"""Factored out of set_revision_history.
1372
This performs the actual writing to disk.
1373
It is intended to be called by BzrBranch5.set_revision_history."""
1374
self.control_files.put_bytes(
1375
'revision-history', '\n'.join(history))
1378
def set_revision_history(self, rev_history):
1379
"""See Branch.set_revision_history."""
1380
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
1381
self._clear_cached_state()
1382
self._write_revision_history(rev_history)
1383
self._cache_revision_history(rev_history)
1384
for hook in Branch.hooks['set_rh']:
1385
hook(self, rev_history)
1388
def set_last_revision_info(self, revno, revision_id):
1389
revision_id = osutils.safe_revision_id(revision_id)
1390
history = self._lefthand_history(revision_id)
1391
assert len(history) == revno, '%d != %d' % (len(history), revno)
1392
self.set_revision_history(history)
1394
def _gen_revision_history(self):
1395
history = self.control_files.get('revision-history').read().split('\n')
1396
if history[-1:] == ['']:
1397
# There shouldn't be a trailing newline, but just in case.
1401
def _lefthand_history(self, revision_id, last_rev=None,
1403
# stop_revision must be a descendant of last_revision
1404
stop_graph = self.repository.get_revision_graph(revision_id)
1405
if last_rev is not None and last_rev not in stop_graph:
1406
# our previous tip is not merged into stop_revision
1407
raise errors.DivergedBranches(self, other_branch)
1408
# make a new revision history from the graph
1409
current_rev_id = revision_id
1411
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1412
new_history.append(current_rev_id)
1413
current_rev_id_parents = stop_graph[current_rev_id]
1415
current_rev_id = current_rev_id_parents[0]
1417
current_rev_id = None
1418
new_history.reverse()
1422
def generate_revision_history(self, revision_id, last_rev=None,
1424
"""Create a new revision history that will finish with revision_id.
1426
:param revision_id: the new tip to use.
1427
:param last_rev: The previous last_revision. If not None, then this
1428
must be a ancestory of revision_id, or DivergedBranches is raised.
1429
:param other_branch: The other branch that DivergedBranches should
1430
raise with respect to.
1432
revision_id = osutils.safe_revision_id(revision_id)
1433
self.set_revision_history(self._lefthand_history(revision_id,
1434
last_rev, other_branch))
1437
def update_revisions(self, other, stop_revision=None):
1438
"""See Branch.update_revisions."""
1441
if stop_revision is None:
1442
stop_revision = other.last_revision()
1443
if stop_revision is None:
1444
# if there are no commits, we're done.
1447
stop_revision = osutils.safe_revision_id(stop_revision)
1448
# whats the current last revision, before we fetch [and change it
1450
last_rev = self.last_revision()
1451
# we fetch here regardless of whether we need to so that we pickup
1453
self.fetch(other, stop_revision)
1454
my_ancestry = self.repository.get_ancestry(last_rev)
1455
if stop_revision in my_ancestry:
1456
# last_revision is a descendant of stop_revision
1458
self.generate_revision_history(stop_revision, last_rev=last_rev,
1463
def basis_tree(self):
1464
"""See Branch.basis_tree."""
1465
return self.repository.revision_tree(self.last_revision())
1467
@deprecated_method(zero_eight)
1468
def working_tree(self):
1469
"""Create a Working tree object for this branch."""
1471
from bzrlib.transport.local import LocalTransport
1472
if (self.base.find('://') != -1 or
1473
not isinstance(self._transport, LocalTransport)):
1474
raise NoWorkingTree(self.base)
1475
return self.bzrdir.open_workingtree()
1478
def pull(self, source, overwrite=False, stop_revision=None,
1479
_hook_master=None, run_hooks=True):
1482
:param _hook_master: Private parameter - set the branch to
1483
be supplied as the master to push hooks.
1484
:param run_hooks: Private parameter - if false, this branch
1485
is being called because it's the master of the primary branch,
1486
so it should not run its hooks.
1488
result = PullResult()
1489
result.source_branch = source
1490
result.target_branch = self
1493
result.old_revno, result.old_revid = self.last_revision_info()
1495
self.update_revisions(source, stop_revision)
1496
except DivergedBranches:
1500
if stop_revision is None:
1501
stop_revision = source.last_revision()
1502
self.generate_revision_history(stop_revision)
1503
result.tag_conflicts = source.tags.merge_to(self.tags)
1504
result.new_revno, result.new_revid = self.last_revision_info()
1506
result.master_branch = _hook_master
1507
result.local_branch = self
1509
result.master_branch = self
1510
result.local_branch = None
1512
for hook in Branch.hooks['post_pull']:
1518
def _get_parent_location(self):
1519
_locs = ['parent', 'pull', 'x-pull']
1522
return self.control_files.get(l).read().strip('\n')
1528
def push(self, target, overwrite=False, stop_revision=None,
1529
_override_hook_source_branch=None):
1532
This is the basic concrete implementation of push()
1534
:param _override_hook_source_branch: If specified, run
1535
the hooks passing this Branch as the source, rather than self.
1536
This is for use of RemoteBranch, where push is delegated to the
1537
underlying vfs-based Branch.
1539
# TODO: Public option to disable running hooks - should be trivial but
1543
result = self._push_with_bound_branches(target, overwrite,
1545
_override_hook_source_branch=_override_hook_source_branch)
1550
def _push_with_bound_branches(self, target, overwrite,
1552
_override_hook_source_branch=None):
1553
"""Push from self into target, and into target's master if any.
1555
This is on the base BzrBranch class even though it doesn't support
1556
bound branches because the *target* might be bound.
1559
if _override_hook_source_branch:
1560
result.source_branch = _override_hook_source_branch
1561
for hook in Branch.hooks['post_push']:
1564
bound_location = target.get_bound_location()
1565
if bound_location and target.base != bound_location:
1566
# there is a master branch.
1568
# XXX: Why the second check? Is it even supported for a branch to
1569
# be bound to itself? -- mbp 20070507
1570
master_branch = target.get_master_branch()
1571
master_branch.lock_write()
1573
# push into the master from this branch.
1574
self._basic_push(master_branch, overwrite, stop_revision)
1575
# and push into the target branch from this. Note that we push from
1576
# this branch again, because its considered the highest bandwidth
1578
result = self._basic_push(target, overwrite, stop_revision)
1579
result.master_branch = master_branch
1580
result.local_branch = target
1584
master_branch.unlock()
1587
result = self._basic_push(target, overwrite, stop_revision)
1588
# TODO: Why set master_branch and local_branch if there's no
1589
# binding? Maybe cleaner to just leave them unset? -- mbp
1591
result.master_branch = target
1592
result.local_branch = None
1596
def _basic_push(self, target, overwrite, stop_revision):
1597
"""Basic implementation of push without bound branches or hooks.
1599
Must be called with self read locked and target write locked.
1601
result = PushResult()
1602
result.source_branch = self
1603
result.target_branch = target
1604
result.old_revno, result.old_revid = target.last_revision_info()
1606
target.update_revisions(self, stop_revision)
1607
except DivergedBranches:
1611
target.set_revision_history(self.revision_history())
1612
result.tag_conflicts = self.tags.merge_to(target.tags)
1613
result.new_revno, result.new_revid = target.last_revision_info()
1616
def get_parent(self):
1617
"""See Branch.get_parent."""
1619
assert self.base[-1] == '/'
1620
parent = self._get_parent_location()
1623
# This is an old-format absolute path to a local branch
1624
# turn it into a url
1625
if parent.startswith('/'):
1626
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1628
return urlutils.join(self.base[:-1], parent)
1629
except errors.InvalidURLJoin, e:
1630
raise errors.InaccessibleParent(parent, self.base)
1632
def set_push_location(self, location):
1633
"""See Branch.set_push_location."""
1634
self.get_config().set_user_option(
1635
'push_location', location,
1636
store=_mod_config.STORE_LOCATION_NORECURSE)
1639
def set_parent(self, url):
1640
"""See Branch.set_parent."""
1641
# TODO: Maybe delete old location files?
1642
# URLs should never be unicode, even on the local fs,
1643
# FIXUP this and get_parent in a future branch format bump:
1644
# read and rewrite the file, and have the new format code read
1645
# using .get not .get_utf8. RBC 20060125
1647
if isinstance(url, unicode):
1649
url = url.encode('ascii')
1650
except UnicodeEncodeError:
1651
raise errors.InvalidURL(url,
1652
"Urls must be 7-bit ascii, "
1653
"use bzrlib.urlutils.escape")
1654
url = urlutils.relative_url(self.base, url)
1655
self._set_parent_location(url)
1657
def _set_parent_location(self, url):
1659
self.control_files._transport.delete('parent')
1661
assert isinstance(url, str)
1662
self.control_files.put_bytes('parent', url + '\n')
1664
@deprecated_function(zero_nine)
1665
def tree_config(self):
1666
"""DEPRECATED; call get_config instead.
1667
TreeConfig has become part of BranchConfig."""
1668
return TreeConfig(self)
1671
class BzrBranch5(BzrBranch):
1672
"""A format 5 branch. This supports new features over plan branches.
1674
It has support for a master_branch which is the data for bound branches.
1682
super(BzrBranch5, self).__init__(_format=_format,
1683
_control_files=_control_files,
1685
_repository=_repository)
1688
def pull(self, source, overwrite=False, stop_revision=None,
1690
"""Pull from source into self, updating my master if any.
1692
:param run_hooks: Private parameter - if false, this branch
1693
is being called because it's the master of the primary branch,
1694
so it should not run its hooks.
1696
bound_location = self.get_bound_location()
1697
master_branch = None
1698
if bound_location and source.base != bound_location:
1699
# not pulling from master, so we need to update master.
1700
master_branch = self.get_master_branch()
1701
master_branch.lock_write()
1704
# pull from source into master.
1705
master_branch.pull(source, overwrite, stop_revision,
1707
return super(BzrBranch5, self).pull(source, overwrite,
1708
stop_revision, _hook_master=master_branch,
1709
run_hooks=run_hooks)
1712
master_branch.unlock()
1714
def get_bound_location(self):
1716
return self.control_files.get_utf8('bound').read()[:-1]
1717
except errors.NoSuchFile:
1721
def get_master_branch(self):
1722
"""Return the branch we are bound to.
1724
:return: Either a Branch, or None
1726
This could memoise the branch, but if thats done
1727
it must be revalidated on each new lock.
1728
So for now we just don't memoise it.
1729
# RBC 20060304 review this decision.
1731
bound_loc = self.get_bound_location()
1735
return Branch.open(bound_loc)
1736
except (errors.NotBranchError, errors.ConnectionError), e:
1737
raise errors.BoundBranchConnectionFailure(
1741
def set_bound_location(self, location):
1742
"""Set the target where this branch is bound to.
1744
:param location: URL to the target branch
1747
self.control_files.put_utf8('bound', location+'\n')
1750
self.control_files._transport.delete('bound')
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))
1756
def bind(self, other):
1757
"""Bind this branch to the branch other.
1759
This does not push or pull data between the branches, though it does
1760
check for divergence to raise an error when the branches are not
1761
either the same, or one a prefix of the other. That behaviour may not
1762
be useful, so that check may be removed in future.
1764
:param other: The branch to bind to
1767
# TODO: jam 20051230 Consider checking if the target is bound
1768
# It is debatable whether you should be able to bind to
1769
# a branch which is itself bound.
1770
# Committing is obviously forbidden,
1771
# but binding itself may not be.
1772
# Since we *have* to check at commit time, we don't
1773
# *need* to check here
1775
# we want to raise diverged if:
1776
# last_rev is not in the other_last_rev history, AND
1777
# other_last_rev is not in our history, and do it without pulling
1779
last_rev = self.last_revision()
1780
if last_rev is not None:
1783
other_last_rev = other.last_revision()
1784
if other_last_rev is not None:
1785
# neither branch is new, we have to do some work to
1786
# ascertain diversion.
1787
remote_graph = other.repository.get_revision_graph(
1789
local_graph = self.repository.get_revision_graph(last_rev)
1790
if (last_rev not in remote_graph and
1791
other_last_rev not in local_graph):
1792
raise errors.DivergedBranches(self, other)
1795
self.set_bound_location(other.base)
1799
"""If bound, unbind"""
1800
return self.set_bound_location(None)
1804
"""Synchronise this branch with the master branch if any.
1806
:return: None or the last_revision that was pivoted out during the
1809
master = self.get_master_branch()
1810
if master is not None:
1811
old_tip = self.last_revision()
1812
self.pull(master, overwrite=True)
1813
if old_tip in self.repository.get_ancestry(self.last_revision()):
1819
class BzrBranchExperimental(BzrBranch5):
1820
"""Bzr experimental branch format
1823
- a revision-history file.
1825
- a lock dir guarding the branch itself
1826
- all of this stored in a branch/ subdirectory
1827
- works with shared repositories.
1828
- a tag dictionary in the branch
1830
This format is new in bzr 0.15, but shouldn't be used for real data,
1833
This class acts as it's own BranchFormat.
1836
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1839
def get_format_string(cls):
1840
"""See BranchFormat.get_format_string()."""
1841
return "Bazaar-NG branch format experimental\n"
1844
def get_format_description(cls):
1845
"""See BranchFormat.get_format_description()."""
1846
return "Experimental branch format"
1849
def get_reference(cls, a_bzrdir):
1850
"""Get the target reference of the branch in a_bzrdir.
1852
format probing must have been completed before calling
1853
this method - it is assumed that the format of the branch
1854
in a_bzrdir is correct.
1856
:param a_bzrdir: The bzrdir to get the branch data from.
1857
:return: None if the branch is not a reference branch.
1862
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1864
branch_transport = a_bzrdir.get_branch_transport(cls)
1865
control_files = lockable_files.LockableFiles(branch_transport,
1866
lock_filename, lock_class)
1867
control_files.create_lock()
1868
control_files.lock_write()
1870
for filename, content in utf8_files:
1871
control_files.put_utf8(filename, content)
1873
control_files.unlock()
1876
def initialize(cls, a_bzrdir):
1877
"""Create a branch of this format in a_bzrdir."""
1878
utf8_files = [('format', cls.get_format_string()),
1879
('revision-history', ''),
1880
('branch-name', ''),
1883
cls._initialize_control_files(a_bzrdir, utf8_files,
1884
'lock', lockdir.LockDir)
1885
return cls.open(a_bzrdir, _found=True)
1888
def open(cls, a_bzrdir, _found=False):
1889
"""Return the branch object for a_bzrdir
1891
_found is a private parameter, do not use it. It is used to indicate
1892
if format probing has already be done.
1895
format = BranchFormat.find_format(a_bzrdir)
1896
assert format.__class__ == cls
1897
transport = a_bzrdir.get_branch_transport(None)
1898
control_files = lockable_files.LockableFiles(transport, 'lock',
1900
return cls(_format=cls,
1901
_control_files=control_files,
1903
_repository=a_bzrdir.find_repository())
1906
def is_supported(cls):
1909
def _make_tags(self):
1910
return BasicTags(self)
1913
def supports_tags(cls):
1917
BranchFormat.register_format(BzrBranchExperimental)
1920
class BzrBranch6(BzrBranch5):
1923
def last_revision_info(self):
1924
revision_string = self.control_files.get('last-revision').read()
1925
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1926
revision_id = cache_utf8.get_cached_utf8(revision_id)
1928
return revno, revision_id
1930
def last_revision(self):
1931
"""Return last revision id, or None"""
1932
revision_id = self.last_revision_info()[1]
1933
if revision_id == _mod_revision.NULL_REVISION:
1937
def _write_last_revision_info(self, revno, revision_id):
1938
"""Simply write out the revision id, with no checks.
1940
Use set_last_revision_info to perform this safely.
1942
Does not update the revision_history cache.
1943
Intended to be called by set_last_revision_info and
1944
_write_revision_history.
1946
if revision_id is None:
1947
revision_id = 'null:'
1948
out_string = '%d %s\n' % (revno, revision_id)
1949
self.control_files.put_bytes('last-revision', out_string)
1952
def set_last_revision_info(self, revno, revision_id):
1953
revision_id = osutils.safe_revision_id(revision_id)
1954
if self._get_append_revisions_only():
1955
self._check_history_violation(revision_id)
1956
self._write_last_revision_info(revno, revision_id)
1957
self._clear_cached_state()
1959
def _check_history_violation(self, revision_id):
1960
last_revision = self.last_revision()
1961
if last_revision is None:
1963
if last_revision not in self._lefthand_history(revision_id):
1964
raise errors.AppendRevisionsOnlyViolation(self.base)
1966
def _gen_revision_history(self):
1967
"""Generate the revision history from last revision
1969
history = list(self.repository.iter_reverse_revision_history(
1970
self.last_revision()))
1974
def _write_revision_history(self, history):
1975
"""Factored out of set_revision_history.
1977
This performs the actual writing to disk, with format-specific checks.
1978
It is intended to be called by BzrBranch5.set_revision_history.
1980
if len(history) == 0:
1981
last_revision = 'null:'
1983
if history != self._lefthand_history(history[-1]):
1984
raise errors.NotLefthandHistory(history)
1985
last_revision = history[-1]
1986
if self._get_append_revisions_only():
1987
self._check_history_violation(last_revision)
1988
self._write_last_revision_info(len(history), last_revision)
1991
def append_revision(self, *revision_ids):
1992
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1993
if len(revision_ids) == 0:
1995
prev_revno, prev_revision = self.last_revision_info()
1996
for revision in self.repository.get_revisions(revision_ids):
1997
if prev_revision == _mod_revision.NULL_REVISION:
1998
if revision.parent_ids != []:
1999
raise errors.NotLeftParentDescendant(self, prev_revision,
2000
revision.revision_id)
2002
if revision.parent_ids[0] != prev_revision:
2003
raise errors.NotLeftParentDescendant(self, prev_revision,
2004
revision.revision_id)
2005
prev_revision = revision.revision_id
2006
self.set_last_revision_info(prev_revno + len(revision_ids),
2010
def _set_parent_location(self, url):
2011
"""Set the parent branch"""
2012
self._set_config_location('parent_location', url, make_relative=True)
2015
def _get_parent_location(self):
2016
"""Set the parent branch"""
2017
return self._get_config_location('parent_location')
2019
def set_push_location(self, location):
2020
"""See Branch.set_push_location."""
2021
self._set_config_location('push_location', location)
2023
def set_bound_location(self, location):
2024
"""See Branch.set_push_location."""
2026
config = self.get_config()
2027
if location is None:
2028
if config.get_user_option('bound') != 'True':
2031
config.set_user_option('bound', 'False')
2034
self._set_config_location('bound_location', location,
2036
config.set_user_option('bound', 'True')
2039
def _get_bound_location(self, bound):
2040
"""Return the bound location in the config file.
2042
Return None if the bound parameter does not match"""
2043
config = self.get_config()
2044
config_bound = (config.get_user_option('bound') == 'True')
2045
if config_bound != bound:
2047
return self._get_config_location('bound_location', config=config)
2049
def get_bound_location(self):
2050
"""See Branch.set_push_location."""
2051
return self._get_bound_location(True)
2053
def get_old_bound_location(self):
2054
"""See Branch.get_old_bound_location"""
2055
return self._get_bound_location(False)
2057
def set_append_revisions_only(self, enabled):
2062
self.get_config().set_user_option('append_revisions_only', value)
2064
def _get_append_revisions_only(self):
2065
value = self.get_config().get_user_option('append_revisions_only')
2066
return value == 'True'
2068
def _synchronize_history(self, destination, revision_id):
2069
"""Synchronize last revision and revision history between branches.
2071
This version is most efficient when the destination is also a
2072
BzrBranch6, but works for BzrBranch5, as long as the destination's
2073
repository contains all the lefthand ancestors of the intended
2074
last_revision. If not, set_last_revision_info will fail.
2076
:param destination: The branch to copy the history into
2077
:param revision_id: The revision-id to truncate history at. May
2078
be None to copy complete history.
2080
if revision_id is None:
2081
revno, revision_id = self.last_revision_info()
2083
revno = self.revision_id_to_revno(revision_id)
2084
destination.set_last_revision_info(revno, revision_id)
2086
def _make_tags(self):
2087
return BasicTags(self)
2090
class BranchTestProviderAdapter(object):
2091
"""A tool to generate a suite testing multiple branch formats at once.
2093
This is done by copying the test once for each transport and injecting
2094
the transport_server, transport_readonly_server, and branch_format
2095
classes into each copy. Each copy is also given a new id() to make it
2099
def __init__(self, transport_server, transport_readonly_server, formats,
2100
vfs_transport_factory=None):
2101
self._transport_server = transport_server
2102
self._transport_readonly_server = transport_readonly_server
2103
self._formats = formats
2105
def adapt(self, test):
2106
result = TestSuite()
2107
for branch_format, bzrdir_format in self._formats:
2108
new_test = deepcopy(test)
2109
new_test.transport_server = self._transport_server
2110
new_test.transport_readonly_server = self._transport_readonly_server
2111
new_test.bzrdir_format = bzrdir_format
2112
new_test.branch_format = branch_format
2113
def make_new_test_id():
2114
# the format can be either a class or an instance
2115
name = getattr(branch_format, '__name__',
2116
branch_format.__class__.__name__)
2117
new_id = "%s(%s)" % (new_test.id(), name)
2118
return lambda: new_id
2119
new_test.id = make_new_test_id()
2120
result.addTest(new_test)
2124
######################################################################
2125
# results of operations
2128
class _Result(object):
2130
def _show_tag_conficts(self, to_file):
2131
if not getattr(self, 'tag_conflicts', None):
2133
to_file.write('Conflicting tags:\n')
2134
for name, value1, value2 in self.tag_conflicts:
2135
to_file.write(' %s\n' % (name, ))
2138
class PullResult(_Result):
2139
"""Result of a Branch.pull operation.
2141
:ivar old_revno: Revision number before pull.
2142
:ivar new_revno: Revision number after pull.
2143
:ivar old_revid: Tip revision id before pull.
2144
:ivar new_revid: Tip revision id after pull.
2145
:ivar source_branch: Source (local) branch object.
2146
:ivar master_branch: Master branch of the target, or None.
2147
:ivar target_branch: Target/destination branch object.
2151
# DEPRECATED: pull used to return the change in revno
2152
return self.new_revno - self.old_revno
2154
def report(self, to_file):
2155
if self.old_revid == self.new_revid:
2156
to_file.write('No revisions to pull.\n')
2158
to_file.write('Now on revision %d.\n' % self.new_revno)
2159
self._show_tag_conficts(to_file)
2162
class PushResult(_Result):
2163
"""Result of a Branch.push operation.
2165
:ivar old_revno: Revision number before push.
2166
:ivar new_revno: Revision number after push.
2167
:ivar old_revid: Tip revision id before push.
2168
:ivar new_revid: Tip revision id after push.
2169
:ivar source_branch: Source branch object.
2170
:ivar master_branch: Master branch of the target, or None.
2171
:ivar target_branch: Target/destination branch object.
2175
# DEPRECATED: push used to return the change in revno
2176
return self.new_revno - self.old_revno
2178
def report(self, to_file):
2179
"""Write a human-readable description of the result."""
2180
if self.old_revid == self.new_revid:
2181
to_file.write('No new revisions to push.\n')
2183
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2184
self._show_tag_conficts(to_file)
2187
class BranchCheckResult(object):
2188
"""Results of checking branch consistency.
2193
def __init__(self, branch):
2194
self.branch = branch
2196
def report_results(self, verbose):
2197
"""Report the check results via trace.note.
2199
:param verbose: Requests more detailed display of what was checked,
2202
note('checked branch %s format %s',
2204
self.branch._format)
2207
class Converter5to6(object):
2208
"""Perform an in-place upgrade of format 5 to format 6"""
2210
def convert(self, branch):
2211
# Data for 5 and 6 can peacefully coexist.
2212
format = BzrBranchFormat6()
2213
new_branch = format.open(branch.bzrdir, _found=True)
2215
# Copy source data into target
2216
new_branch.set_last_revision_info(*branch.last_revision_info())
2217
new_branch.set_parent(branch.get_parent())
2218
new_branch.set_bound_location(branch.get_bound_location())
2219
new_branch.set_push_location(branch.get_push_location())
2221
# New branch has no tags by default
2222
new_branch.tags._set_tag_dict({})
2224
# Copying done; now update target format
2225
new_branch.control_files.put_utf8('format',
2226
format.get_format_string())
2228
# Clean up old files
2229
new_branch.control_files._transport.delete('revision-history')
2231
branch.set_parent(None)
2234
branch.set_bound_location(None)
added
removed
bzrlib/branch.py
