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 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)
28
config as _mod_config,
34
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
43
from bzrlib.tag import (
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
50
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
51
HistoryMissing, InvalidRevisionId,
52
InvalidRevisionNumber, LockError, NoSuchFile,
53
NoSuchRevision, NotVersionedError,
54
NotBranchError, UninitializableFormat,
55
UnlistableStore, UnlistableBranch,
57
from bzrlib.hooks import Hooks
58
from bzrlib.symbol_versioning import (deprecated_function,
62
zero_eight, zero_nine, zero_sixteen,
65
from bzrlib.trace import mutter, mutter_callsite, 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.
76
TODO: Perhaps use different stores for different classes of object,
77
so that we can keep track of how much space each one uses,
78
or garbage-collect them.
80
TODO: Add a RemoteBranch subclass. For the basic case of read-only
81
HTTP access this should be very easy by,
82
just redirecting controlfile access into HTTP requests.
83
We would need a RemoteStore working similarly.
85
TODO: Keep the on-disk branch locked while the object exists.
89
Base directory/url of the branch.
91
hooks: An instance of BranchHooks.
89
def __init__(self, base, init=False, find_root=True):
90
"""Create new branch object at a particular location.
92
base -- Base directory for the branch.
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
def open(base, _unsupported=False, possible_transports=None):
122
"""Open the branch rooted at base.
124
For instance, if the branch is at URL/.bzr/branch,
125
Branch.open(URL) -> a Branch instance.
127
control = bzrdir.BzrDir.open(base, _unsupported,
128
possible_transports=possible_transports)
129
return control.open_branch(_unsupported)
132
def open_from_transport(transport, _unsupported=False):
133
"""Open the branch rooted at transport"""
134
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
135
return control.open_branch(_unsupported)
138
def open_containing(url, possible_transports=None):
139
"""Open an existing branch which contains url.
94
init -- If True, create new control files in a previously
95
unversioned directory. If False, the branch must already
98
find_root -- If true and init is false, find the root of the
99
existing branch containing base.
101
In the test suite, creation of new trees is tested using the
102
`ScratchBranch` class.
105
self.base = os.path.realpath(base)
108
self.base = find_branch_root(base)
141
This probes for a branch at url, and searches upwards from there.
143
Basically we keep looking up until we find the control directory or
144
run into the root. If there isn't one, raises NotBranchError.
145
If there is one and it is either an unrecognised format or an unsupported
146
format, UnknownFormatError or UnsupportedFormatError are raised.
147
If there is one, it is returned, along with the unused portion of url.
149
control, relpath = bzrdir.BzrDir.open_containing(url,
151
return control.open_branch(), relpath
153
def get_config(self):
154
return BranchConfig(self)
157
return self.get_config().get_nickname()
159
def _set_nick(self, nick):
160
self.get_config().set_user_option('nickname', nick, warn_masked=True)
162
nick = property(_get_nick, _set_nick)
165
raise NotImplementedError(self.is_locked)
167
def lock_write(self):
168
raise NotImplementedError(self.lock_write)
171
raise NotImplementedError(self.lock_read)
174
raise NotImplementedError(self.unlock)
176
def peek_lock_mode(self):
177
"""Return lock mode for the Branch: 'r', 'w' or None"""
178
raise NotImplementedError(self.peek_lock_mode)
180
def get_physical_lock_status(self):
181
raise NotImplementedError(self.get_physical_lock_status)
184
def get_revision_id_to_revno_map(self):
185
"""Return the revision_id => dotted revno map.
187
This will be regenerated on demand, but will be cached.
189
:return: A dictionary mapping revision_id => dotted revno.
190
This dictionary should not be modified by the caller.
192
if self._revision_id_to_revno_cache is not None:
193
mapping = self._revision_id_to_revno_cache
110
self.base = os.path.realpath(base)
111
if not isdir(self.controlfilename('.')):
112
bailout("not a bzr branch: %s" % quotefn(base),
113
['use "bzr init" to initialize a new working tree',
114
'current bzr can only operate from top-of-tree'])
117
self.text_store = ImmutableStore(self.controlfilename('text-store'))
118
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
119
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
123
return '%s(%r)' % (self.__class__.__name__, self.base)
195
mapping = self._gen_revno_map()
196
self._cache_revision_id_to_revno(mapping)
197
# TODO: jam 20070417 Since this is being cached, should we be returning
199
# I would rather not, and instead just declare that users should not
200
# modify the return value.
203
def _gen_revno_map(self):
204
"""Create a new mapping from revision ids to dotted revnos.
206
Dotted revnos are generated based on the current tip in the revision
208
This is the worker function for get_revision_id_to_revno_map, which
209
just caches the return value.
211
:return: A dictionary mapping revision_id => dotted revno.
213
last_revision = self.last_revision()
214
revision_graph = self.repository.get_revision_graph(last_revision)
215
merge_sorted_revisions = tsort.merge_sort(
220
revision_id_to_revno = dict((rev_id, revno)
221
for seq_num, rev_id, depth, revno, end_of_merge
222
in merge_sorted_revisions)
223
return revision_id_to_revno
225
def leave_lock_in_place(self):
226
"""Tell this branch object not to release the physical lock when this
229
If lock_write doesn't return a token, then this method is not supported.
231
self.control_files.leave_in_place()
233
def dont_leave_lock_in_place(self):
234
"""Tell this branch object to release the physical lock when this
235
object is unlocked, even if it didn't originally acquire it.
237
If lock_write doesn't return a token, then this method is not supported.
239
self.control_files.dont_leave_in_place()
129
241
def abspath(self, name):
130
"""Return absolute filename for something in the branch"""
131
return os.path.join(self.base, name)
134
def relpath(self, path):
135
"""Return path relative to this branch of something inside it.
137
Raises an error if path is not in this branch."""
138
rp = os.path.realpath(path)
140
if not rp.startswith(self.base):
141
bailout("path %r is not within branch %r" % (rp, self.base))
142
rp = rp[len(self.base):]
143
rp = rp.lstrip(os.sep)
147
def controlfilename(self, file_or_path):
148
"""Return location relative to branch."""
149
if isinstance(file_or_path, types.StringTypes):
150
file_or_path = [file_or_path]
151
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
154
def controlfile(self, file_or_path, mode='r'):
155
"""Open a control file for this branch.
157
There are two classes of file in the control directory: text
158
and binary. binary files are untranslated byte streams. Text
159
control files are stored with Unix newlines and in UTF-8, even
160
if the platform or locale defaults are different.
163
fn = self.controlfilename(file_or_path)
165
if mode == 'rb' or mode == 'wb':
166
return file(fn, mode)
167
elif mode == 'r' or mode == 'w':
168
# open in binary mode anyhow so there's no newline translation;
169
# codecs uses line buffering by default; don't want that.
171
return codecs.open(fn, mode + 'b', 'utf-8',
242
"""Return absolute filename for something in the branch
244
XXX: Robert Collins 20051017 what is this used for? why is it a branch
245
method and not a tree method.
247
raise NotImplementedError(self.abspath)
249
def bind(self, other):
250
"""Bind the local branch the other branch.
252
:param other: The branch to bind to
255
raise errors.UpgradeRequired(self.base)
258
def fetch(self, from_branch, last_revision=None, pb=None):
259
"""Copy revisions from from_branch into this branch.
261
:param from_branch: Where to copy from.
262
:param last_revision: What revision to stop at (None for at the end
264
:param pb: An optional progress bar to use.
266
Returns the copied revision count and the failed revisions in a tuple:
269
if self.base == from_branch.base:
272
nested_pb = ui.ui_factory.nested_progress_bar()
174
raise BzrError("invalid controlfile mode %r" % mode)
178
def _make_control(self):
179
os.mkdir(self.controlfilename([]))
180
self.controlfile('README', 'w').write(
181
"This is a Bazaar-NG control directory.\n"
182
"Do not change any files in this directory.")
183
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
184
for d in ('text-store', 'inventory-store', 'revision-store'):
185
os.mkdir(self.controlfilename(d))
186
for f in ('revision-history', 'merged-patches',
187
'pending-merged-patches', 'branch-name'):
188
self.controlfile(f, 'w').write('')
189
mutter('created control directory in ' + self.base)
190
Inventory().write_xml(self.controlfile('inventory','w'))
193
def _check_format(self):
194
"""Check this branch format is supported.
196
The current tool only supports the current unstable format.
198
In the future, we might need different in-memory Branch
199
classes to support downlevel branches. But not yet.
201
# This ignores newlines so that we can open branches created
202
# on Windows from Linux and so on. I think it might be better
203
# to always make all internal files in unix format.
204
fmt = self.controlfile('branch-format', 'r').read()
205
fmt.replace('\r\n', '')
206
if fmt != BZR_BRANCH_FORMAT:
207
bailout('sorry, branch format %r not supported' % fmt,
208
['use a different bzr version',
209
'or remove the .bzr directory and "bzr init" again'])
212
def read_working_inventory(self):
213
"""Read the working inventory."""
215
# ElementTree does its own conversion from UTF-8, so open in
217
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
218
mutter("loaded inventory of %d items in %f"
219
% (len(inv), time.time() - before))
223
def _write_inventory(self, inv):
224
"""Update the working inventory.
226
That is to say, the inventory describing changes underway, that
227
will be committed to the next revision.
229
## TODO: factor out to atomicfile? is rename safe on windows?
230
## TODO: Maybe some kind of clean/dirty marker on inventory?
231
tmpfname = self.controlfilename('inventory.tmp')
232
tmpf = file(tmpfname, 'wb')
235
inv_fname = self.controlfilename('inventory')
236
if sys.platform == 'win32':
238
os.rename(tmpfname, inv_fname)
239
mutter('wrote working inventory')
242
inventory = property(read_working_inventory, _write_inventory, None,
243
"""Inventory for the working copy.""")
246
def add(self, files, verbose=False):
247
"""Make files versioned.
249
Note that the command line normally calls smart_add instead.
251
This puts the files in the Added state, so that they will be
252
recorded by the next commit.
254
TODO: Perhaps have an option to add the ids even if the files do
257
TODO: Perhaps return the ids of the files? But then again it
258
is easy to retrieve them if they're needed.
260
TODO: Option to specify file id.
262
TODO: Adding a directory should optionally recurse down and
263
add all non-ignored children. Perhaps do that in a
266
>>> b = ScratchBranch(files=['foo'])
267
>>> 'foo' in b.unknowns()
272
>>> 'foo' in b.unknowns()
274
>>> bool(b.inventory.path2id('foo'))
280
Traceback (most recent call last):
282
BzrError: ('foo is already versioned', [])
284
>>> b.add(['nothere'])
285
Traceback (most recent call last):
286
BzrError: ('cannot add: not a regular file or directory: nothere', [])
289
# TODO: Re-adding a file that is removed in the working copy
290
# should probably put it back with the previous ID.
291
if isinstance(files, types.StringTypes):
294
inv = self.read_working_inventory()
296
if is_control_file(f):
297
bailout("cannot add control file %s" % quotefn(f))
302
bailout("cannot add top-level %r" % f)
304
fullpath = os.path.normpath(self.abspath(f))
307
kind = file_kind(fullpath)
309
# maybe something better?
310
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
312
if kind != 'file' and kind != 'directory':
313
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
315
file_id = gen_file_id(f)
316
inv.add_path(f, kind=kind, file_id=file_id)
319
show_status('A', kind, quotefn(f))
321
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
323
self._write_inventory(inv)
326
def print_file(self, file, revno):
277
from_branch.lock_read()
279
if last_revision is None:
280
pb.update('get source history')
281
last_revision = from_branch.last_revision()
282
if last_revision is None:
283
last_revision = _mod_revision.NULL_REVISION
284
return self.repository.fetch(from_branch.repository,
285
revision_id=last_revision,
288
if nested_pb is not None:
292
def get_bound_location(self):
293
"""Return the URL of the branch we are bound to.
295
Older format branches cannot bind, please be sure to use a metadir
300
def get_old_bound_location(self):
301
"""Return the URL of the branch we used to be bound to
303
raise errors.UpgradeRequired(self.base)
305
def get_commit_builder(self, parents, config=None, timestamp=None,
306
timezone=None, committer=None, revprops=None,
308
"""Obtain a CommitBuilder for this branch.
310
:param parents: Revision ids of the parents of the new revision.
311
:param config: Optional configuration to use.
312
:param timestamp: Optional timestamp recorded for commit.
313
:param timezone: Optional timezone for timestamp.
314
:param committer: Optional committer to set for commit.
315
:param revprops: Optional dictionary of revision properties.
316
:param revision_id: Optional revision id.
320
config = self.get_config()
322
return self.repository.get_commit_builder(self, parents, config,
323
timestamp, timezone, committer, revprops, revision_id)
325
def get_master_branch(self, possible_transports=None):
326
"""Return the branch we are bound to.
328
:return: Either a Branch, or None
332
def get_revision_delta(self, revno):
333
"""Return the delta for one revision.
335
The delta is relative to its mainline predecessor, or the
336
empty tree for revision 1.
338
assert isinstance(revno, int)
339
rh = self.revision_history()
340
if not (1 <= revno <= len(rh)):
341
raise InvalidRevisionNumber(revno)
342
return self.repository.get_revision_delta(rh[revno-1])
344
@deprecated_method(zero_sixteen)
345
def get_root_id(self):
346
"""Return the id of this branches root
348
Deprecated: branches don't have root ids-- trees do.
349
Use basis_tree().get_root_id() instead.
351
raise NotImplementedError(self.get_root_id)
353
def print_file(self, file, revision_id):
327
354
"""Print `file` to stdout."""
328
tree = self.revision_tree(self.lookup_revision(revno))
329
# use inventory as it was in that revision
330
file_id = tree.inventory.path2id(file)
332
bailout("%r is not present in revision %d" % (file, revno))
333
tree.print_file(file_id)
336
def remove(self, files, verbose=False):
337
"""Mark nominated files for removal from the inventory.
339
This does not remove their text. This does not run on
341
TODO: Refuse to remove modified files unless --force is given?
343
>>> b = ScratchBranch(files=['foo'])
345
>>> b.inventory.has_filename('foo')
348
>>> b.working_tree().has_filename('foo')
350
>>> b.inventory.has_filename('foo')
353
>>> b = ScratchBranch(files=['foo'])
358
>>> b.inventory.has_filename('foo')
360
>>> b.basis_tree().has_filename('foo')
362
>>> b.working_tree().has_filename('foo')
365
TODO: Do something useful with directories.
367
TODO: Should this remove the text or not? Tough call; not
368
removing may be useful and the user can just use use rm, and
369
is the opposite of add. Removing it is consistent with most
370
other tools. Maybe an option.
372
## TODO: Normalize names
373
## TODO: Remove nested loops; better scalability
375
if isinstance(files, types.StringTypes):
378
tree = self.working_tree()
381
# do this before any modifications
385
bailout("cannot remove unversioned file %s" % quotefn(f))
386
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
388
# having remove it, it must be either ignored or unknown
389
if tree.is_ignored(f):
393
show_status(new_status, inv[fid].kind, quotefn(f))
396
self._write_inventory(inv)
400
"""Return all unknown files.
402
These are files in the working directory that are not versioned or
403
control files or ignored.
405
>>> b = ScratchBranch(files=['foo', 'foo~'])
406
>>> list(b.unknowns())
409
>>> list(b.unknowns())
412
>>> list(b.unknowns())
415
return self.working_tree().unknowns()
418
def commit(self, message, timestamp=None, timezone=None,
421
"""Commit working copy as a new revision.
423
The basic approach is to add all the file texts into the
424
store, then the inventory, then make a new revision pointing
425
to that inventory and store that.
427
This is not quite safe if the working copy changes during the
428
commit; for the moment that is simply not allowed. A better
429
approach is to make a temporary copy of the files before
430
computing their hashes, and then add those hashes in turn to
431
the inventory. This should mean at least that there are no
432
broken hash pointers. There is no way we can get a snapshot
433
of the whole directory at an instant. This would also have to
434
be robust against files disappearing, moving, etc. So the
435
whole thing is a bit hard.
437
timestamp -- if not None, seconds-since-epoch for a
438
postdated/predated commit.
441
## TODO: Show branch names
443
# TODO: Don't commit if there are no changes, unless forced?
445
# First walk over the working inventory; and both update that
446
# and also build a new revision inventory. The revision
447
# inventory needs to hold the text-id, sha1 and size of the
448
# actual file versions committed in the revision. (These are
449
# not present in the working inventory.) We also need to
450
# detect missing/deleted files, and remove them from the
453
work_inv = self.read_working_inventory()
455
basis = self.basis_tree()
456
basis_inv = basis.inventory
458
for path, entry in work_inv.iter_entries():
459
## TODO: Cope with files that have gone missing.
461
## TODO: Check that the file kind has not changed from the previous
462
## revision of this file (if any).
466
p = self.abspath(path)
467
file_id = entry.file_id
468
mutter('commit prep file %s, id %r ' % (p, file_id))
470
if not os.path.exists(p):
471
mutter(" file is missing, removing from inventory")
473
show_status('D', entry.kind, quotefn(path))
474
missing_ids.append(file_id)
477
# TODO: Handle files that have been deleted
479
# TODO: Maybe a special case for empty files? Seems a
480
# waste to store them many times.
484
if basis_inv.has_id(file_id):
485
old_kind = basis_inv[file_id].kind
486
if old_kind != entry.kind:
487
bailout("entry %r changed kind from %r to %r"
488
% (file_id, old_kind, entry.kind))
490
if entry.kind == 'directory':
492
bailout("%s is entered as directory but not a directory" % quotefn(p))
493
elif entry.kind == 'file':
495
bailout("%s is entered as file but is not a file" % quotefn(p))
497
content = file(p, 'rb').read()
499
entry.text_sha1 = sha_string(content)
500
entry.text_size = len(content)
502
old_ie = basis_inv.has_id(file_id) and basis_inv[file_id]
504
and (old_ie.text_size == entry.text_size)
505
and (old_ie.text_sha1 == entry.text_sha1)):
506
## assert content == basis.get_file(file_id).read()
507
entry.text_id = basis_inv[file_id].text_id
508
mutter(' unchanged from previous text_id {%s}' %
512
entry.text_id = gen_file_id(entry.name)
513
self.text_store.add(content, entry.text_id)
514
mutter(' stored with text_id {%s}' % entry.text_id)
518
elif (old_ie.name == entry.name
519
and old_ie.parent_id == entry.parent_id):
524
show_status(state, entry.kind, quotefn(path))
526
for file_id in missing_ids:
527
# have to do this later so we don't mess up the iterator.
528
# since parents may be removed before their children we
531
# FIXME: There's probably a better way to do this; perhaps
532
# the workingtree should know how to filter itself.
533
if work_inv.has_id(file_id):
534
del work_inv[file_id]
537
inv_id = rev_id = _gen_revision_id(time.time())
539
inv_tmp = tempfile.TemporaryFile()
540
inv.write_xml(inv_tmp)
542
self.inventory_store.add(inv_tmp, inv_id)
543
mutter('new inventory_id is {%s}' % inv_id)
545
self._write_inventory(work_inv)
547
if timestamp == None:
548
timestamp = time.time()
550
if committer == None:
551
committer = username()
554
timezone = local_time_offset()
556
mutter("building commit log message")
557
rev = Revision(timestamp=timestamp,
560
precursor = self.last_patch(),
565
rev_tmp = tempfile.TemporaryFile()
566
rev.write_xml(rev_tmp)
568
self.revision_store.add(rev_tmp, rev_id)
569
mutter("new revision_id is {%s}" % rev_id)
571
## XXX: Everything up to here can simply be orphaned if we abort
572
## the commit; it will leave junk files behind but that doesn't
575
## TODO: Read back the just-generated changeset, and make sure it
576
## applies and recreates the right state.
578
## TODO: Also calculate and store the inventory SHA1
579
mutter("committing patch r%d" % (self.revno() + 1))
582
self.append_revision(rev_id)
585
note("commited r%d" % self.revno())
588
def append_revision(self, revision_id):
589
mutter("add {%s} to revision-history" % revision_id)
590
rev_history = self.revision_history()
592
tmprhname = self.controlfilename('revision-history.tmp')
593
rhname = self.controlfilename('revision-history')
595
f = file(tmprhname, 'wt')
596
rev_history.append(revision_id)
597
f.write('\n'.join(rev_history))
601
if sys.platform == 'win32':
603
os.rename(tmprhname, rhname)
607
def get_revision(self, revision_id):
608
"""Return the Revision object for a named revision"""
609
r = Revision.read_xml(self.revision_store[revision_id])
610
assert r.revision_id == revision_id
614
def get_inventory(self, inventory_id):
615
"""Get Inventory object by hash.
617
TODO: Perhaps for this and similar methods, take a revision
618
parameter which can be either an integer revno or a
620
i = Inventory.read_xml(self.inventory_store[inventory_id])
624
def get_revision_inventory(self, revision_id):
625
"""Return inventory of a past revision."""
626
if revision_id == None:
629
return self.get_inventory(self.get_revision(revision_id).inventory_id)
355
raise NotImplementedError(self.print_file)
357
def set_revision_history(self, rev_history):
358
raise NotImplementedError(self.set_revision_history)
360
def _cache_revision_history(self, rev_history):
361
"""Set the cached revision history to rev_history.
363
The revision_history method will use this cache to avoid regenerating
364
the revision history.
366
This API is semi-public; it only for use by subclasses, all other code
367
should consider it to be private.
369
self._revision_history_cache = rev_history
371
def _cache_revision_id_to_revno(self, revision_id_to_revno):
372
"""Set the cached revision_id => revno map to revision_id_to_revno.
374
This API is semi-public; it only for use by subclasses, all other code
375
should consider it to be private.
377
self._revision_id_to_revno_cache = revision_id_to_revno
379
def _clear_cached_state(self):
380
"""Clear any cached data on this branch, e.g. cached revision history.
382
This means the next call to revision_history will need to call
383
_gen_revision_history.
385
This API is semi-public; it only for use by subclasses, all other code
386
should consider it to be private.
388
self._revision_history_cache = None
389
self._revision_id_to_revno_cache = None
391
def _gen_revision_history(self):
392
"""Return sequence of revision hashes on to this branch.
394
Unlike revision_history, this method always regenerates or rereads the
395
revision history, i.e. it does not cache the result, so repeated calls
398
Concrete subclasses should override this instead of revision_history so
399
that subclasses do not need to deal with caching logic.
401
This API is semi-public; it only for use by subclasses, all other code
402
should consider it to be private.
404
raise NotImplementedError(self._gen_revision_history)
632
407
def revision_history(self):
633
"""Return sequence of revision hashes on to this branch.
635
>>> ScratchBranch().revision_history()
408
"""Return sequence of revision ids on this branch.
410
This method will cache the revision history for as long as it is safe to
638
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
413
if 'evil' in debug.debug_flags:
414
mutter_callsite(3, "revision_history scales with history.")
415
if self._revision_history_cache is not None:
416
history = self._revision_history_cache
418
history = self._gen_revision_history()
419
self._cache_revision_history(history)
642
423
"""Return current revision number for this branch.
644
425
That is equivalent to the number of revisions committed to
647
>>> b = ScratchBranch()
650
>>> b.commit('no foo')
654
428
return len(self.revision_history())
657
def last_patch(self):
658
"""Return last patch hash, or None if no history.
660
>>> ScratchBranch().last_patch() == None
431
"""Older format branches cannot bind or unbind."""
432
raise errors.UpgradeRequired(self.base)
434
def set_append_revisions_only(self, enabled):
435
"""Older format branches are never restricted to append-only"""
436
raise errors.UpgradeRequired(self.base)
438
def last_revision(self):
439
"""Return last revision id, or None"""
663
440
ph = self.revision_history()
444
return _mod_revision.NULL_REVISION
446
def last_revision_info(self):
447
"""Return information about the last revision.
449
:return: A tuple (revno, last_revision_id).
451
rh = self.revision_history()
454
return (revno, rh[-1])
456
return (0, _mod_revision.NULL_REVISION)
458
def missing_revisions(self, other, stop_revision=None):
459
"""Return a list of new revisions that would perfectly fit.
670
def lookup_revision(self, revno):
671
"""Return revision hash for revision number."""
461
If self and other have not diverged, return a list of the revisions
462
present in other, but missing from self.
464
self_history = self.revision_history()
465
self_len = len(self_history)
466
other_history = other.revision_history()
467
other_len = len(other_history)
468
common_index = min(self_len, other_len) -1
469
if common_index >= 0 and \
470
self_history[common_index] != other_history[common_index]:
471
raise DivergedBranches(self, other)
473
if stop_revision is None:
474
stop_revision = other_len
476
assert isinstance(stop_revision, int)
477
if stop_revision > other_len:
478
raise errors.NoSuchRevision(self, stop_revision)
479
return other_history[self_len:stop_revision]
481
def update_revisions(self, other, stop_revision=None):
482
"""Pull in new perfect-fit revisions.
484
:param other: Another Branch to pull from
485
:param stop_revision: Updated until the given revision
488
raise NotImplementedError(self.update_revisions)
490
def revision_id_to_revno(self, revision_id):
491
"""Given a revision id, return its revno"""
492
if _mod_revision.is_null(revision_id):
494
history = self.revision_history()
496
return history.index(revision_id) + 1
498
raise errors.NoSuchRevision(self, revision_id)
500
def get_rev_id(self, revno, history=None):
501
"""Find the revision id of the specified revno."""
676
# list is 0-based; revisions are 1-based
677
return self.revision_history()[revno-1]
679
raise BzrError("no such revision %s" % revno)
682
def revision_tree(self, revision_id):
683
"""Return Tree for a revision on this branch.
685
`revision_id` may be None for the null revision, in which case
686
an `EmptyTree` is returned."""
688
if revision_id == None:
691
inv = self.get_revision_inventory(revision_id)
692
return RevisionTree(self.text_store, inv)
695
def working_tree(self):
696
"""Return a `Tree` for the working copy."""
697
return WorkingTree(self.base, self.read_working_inventory())
503
return _mod_revision.NULL_REVISION
505
history = self.revision_history()
506
if revno <= 0 or revno > len(history):
507
raise errors.NoSuchRevision(self, revno)
508
return history[revno - 1]
510
def pull(self, source, overwrite=False, stop_revision=None,
511
possible_transports=None):
512
"""Mirror source into this branch.
514
This branch is considered to be 'local', having low latency.
516
:returns: PullResult instance
518
raise NotImplementedError(self.pull)
520
def push(self, target, overwrite=False, stop_revision=None):
521
"""Mirror this branch into target.
523
This branch is considered to be 'local', having low latency.
525
raise NotImplementedError(self.push)
700
527
def basis_tree(self):
701
"""Return `Tree` object for last revision.
703
If there are no revisions yet, return an `EmptyTree`.
705
>>> b = ScratchBranch(files=['foo'])
706
>>> b.basis_tree().has_filename('foo')
708
>>> b.working_tree().has_filename('foo')
711
>>> b.commit('add foo')
712
>>> b.basis_tree().has_filename('foo')
715
r = self.last_patch()
719
return RevisionTree(self.text_store, self.get_revision_inventory(r))
723
def write_log(self, show_timezone='original', verbose=False):
724
"""Write out human-readable log of commits to this branch
726
utc -- If true, show dates in universal time, not local time."""
727
## TODO: Option to choose either original, utc or local timezone
730
for p in self.revision_history():
732
print 'revno:', revno
733
## TODO: Show hash if --id is given.
734
##print 'revision-hash:', p
735
rev = self.get_revision(p)
736
print 'committer:', rev.committer
737
print 'timestamp: %s' % (format_date(rev.timestamp, rev.timezone or 0,
740
## opportunistic consistency check, same as check_patch_chaining
741
if rev.precursor != precursor:
742
bailout("mismatched precursor!")
746
print ' (no message)'
748
for l in rev.message.split('\n'):
751
if verbose == True and precursor != None:
752
print 'changed files:'
753
tree = self.revision_tree(p)
754
prevtree = self.revision_tree(precursor)
756
for file_state, fid, old_name, new_name, kind in \
757
diff_trees(prevtree, tree, ):
758
if file_state == 'A' or file_state == 'M':
759
show_status(file_state, kind, new_name)
760
elif file_state == 'D':
761
show_status(file_state, kind, old_name)
762
elif file_state == 'R':
763
show_status(file_state, kind,
764
old_name + ' => ' + new_name)
528
"""Return `Tree` object for last revision."""
529
return self.repository.revision_tree(self.last_revision())
770
531
def rename_one(self, from_rel, to_rel):
771
532
"""Rename one file.
773
534
This can change the directory or the filename or both.
775
tree = self.working_tree()
777
if not tree.has_filename(from_rel):
778
bailout("can't rename: old working file %r does not exist" % from_rel)
779
if tree.has_filename(to_rel):
780
bailout("can't rename: new working file %r already exists" % to_rel)
782
file_id = inv.path2id(from_rel)
784
bailout("can't rename: old name %r is not versioned" % from_rel)
786
if inv.path2id(to_rel):
787
bailout("can't rename: new name %r is already versioned" % to_rel)
789
to_dir, to_tail = os.path.split(to_rel)
790
to_dir_id = inv.path2id(to_dir)
791
if to_dir_id == None and to_dir != '':
792
bailout("can't determine destination directory id for %r" % to_dir)
794
mutter("rename_one:")
795
mutter(" file_id {%s}" % file_id)
796
mutter(" from_rel %r" % from_rel)
797
mutter(" to_rel %r" % to_rel)
798
mutter(" to_dir %r" % to_dir)
799
mutter(" to_dir_id {%s}" % to_dir_id)
801
inv.rename(file_id, to_dir_id, to_tail)
803
print "%s => %s" % (from_rel, to_rel)
805
from_abs = self.abspath(from_rel)
806
to_abs = self.abspath(to_rel)
808
os.rename(from_abs, to_abs)
810
bailout("failed to rename %r to %r: %s"
811
% (from_abs, to_abs, e[1]),
812
["rename rolled back"])
814
self._write_inventory(inv)
536
raise NotImplementedError(self.rename_one)
818
538
def move(self, from_paths, to_name):
826
546
Note that to_name is only the last component of the new name;
827
547
this doesn't change the directory.
829
## TODO: Option to move IDs only
830
assert not isinstance(from_paths, basestring)
831
tree = self.working_tree()
833
to_abs = self.abspath(to_name)
834
if not isdir(to_abs):
835
bailout("destination %r is not a directory" % to_abs)
836
if not tree.has_filename(to_name):
837
bailout("destination %r not in working directory" % to_abs)
838
to_dir_id = inv.path2id(to_name)
839
if to_dir_id == None and to_name != '':
840
bailout("destination %r is not a versioned directory" % to_name)
841
to_dir_ie = inv[to_dir_id]
842
if to_dir_ie.kind not in ('directory', 'root_directory'):
843
bailout("destination %r is not a directory" % to_abs)
845
to_idpath = Set(inv.get_idpath(to_dir_id))
848
if not tree.has_filename(f):
849
bailout("%r does not exist in working tree" % f)
850
f_id = inv.path2id(f)
852
bailout("%r is not versioned" % f)
853
name_tail = splitpath(f)[-1]
854
dest_path = appendpath(to_name, name_tail)
855
if tree.has_filename(dest_path):
856
bailout("destination %r already exists" % dest_path)
857
if f_id in to_idpath:
858
bailout("can't move %r to a subdirectory of itself" % f)
860
# OK, so there's a race here, it's possible that someone will
861
# create a file in this interval and then the rename might be
862
# left half-done. But we should have caught most problems.
865
name_tail = splitpath(f)[-1]
866
dest_path = appendpath(to_name, name_tail)
867
print "%s => %s" % (f, dest_path)
868
inv.rename(inv.path2id(f), to_dir_id, name_tail)
870
os.rename(self.abspath(f), self.abspath(dest_path))
872
bailout("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
873
["rename rolled back"])
875
self._write_inventory(inv)
879
def show_status(self, show_all=False):
880
"""Display single-line status for non-ignored working files.
882
The list is show sorted in order by file name.
884
>>> b = ScratchBranch(files=['foo', 'foo~'])
890
>>> b.commit("add foo")
892
>>> os.unlink(b.abspath('foo'))
896
TODO: Get state for single files.
899
# We have to build everything into a list first so that it can
900
# sorted by name, incorporating all the different sources.
902
# FIXME: Rather than getting things in random order and then sorting,
903
# just step through in order.
905
# Interesting case: the old ID for a file has been removed,
906
# but a new file has been created under that name.
908
old = self.basis_tree()
909
new = self.working_tree()
911
for fs, fid, oldname, newname, kind in diff_trees(old, new):
913
show_status(fs, kind,
914
oldname + ' => ' + newname)
915
elif fs == 'A' or fs == 'M':
916
show_status(fs, kind, newname)
918
show_status(fs, kind, oldname)
921
show_status(fs, kind, newname)
924
show_status(fs, kind, newname)
926
show_status(fs, kind, newname)
549
This returns a list of (from_path, to_path) pairs for each
552
raise NotImplementedError(self.move)
554
def get_parent(self):
555
"""Return the parent location of the branch.
557
This is the default location for push/pull/missing. The usual
558
pattern is that the user can override it by specifying a
561
raise NotImplementedError(self.get_parent)
563
def _set_config_location(self, name, url, config=None,
564
make_relative=False):
566
config = self.get_config()
570
url = urlutils.relative_url(self.base, url)
571
config.set_user_option(name, url, warn_masked=True)
573
def _get_config_location(self, name, config=None):
575
config = self.get_config()
576
location = config.get_user_option(name)
581
def get_submit_branch(self):
582
"""Return the submit location of the branch.
584
This is the default location for bundle. The usual
585
pattern is that the user can override it by specifying a
588
return self.get_config().get_user_option('submit_branch')
590
def set_submit_branch(self, location):
591
"""Return the submit location of the branch.
593
This is the default location for bundle. The usual
594
pattern is that the user can override it by specifying a
597
self.get_config().set_user_option('submit_branch', location,
600
def get_public_branch(self):
601
"""Return the public location of the branch.
603
This is is used by merge directives.
605
return self._get_config_location('public_branch')
607
def set_public_branch(self, location):
608
"""Return the submit location of the branch.
610
This is the default location for bundle. The usual
611
pattern is that the user can override it by specifying a
614
self._set_config_location('public_branch', location)
616
def get_push_location(self):
617
"""Return the None or the location to push this branch to."""
618
push_loc = self.get_config().get_user_option('push_location')
621
def set_push_location(self, location):
622
"""Set a new push location for this branch."""
623
raise NotImplementedError(self.set_push_location)
625
def set_parent(self, url):
626
raise NotImplementedError(self.set_parent)
630
"""Synchronise this branch with the master branch if any.
632
:return: None or the last_revision pivoted out during the update.
636
def check_revno(self, revno):
638
Check whether a revno corresponds to any revision.
639
Zero (the NULL revision) is considered valid.
642
self.check_real_revno(revno)
644
def check_real_revno(self, revno):
646
Check whether a revno corresponds to a real revision.
647
Zero (the NULL revision) is considered invalid
649
if revno < 1 or revno > self.revno():
650
raise InvalidRevisionNumber(revno)
653
def clone(self, to_bzrdir, revision_id=None):
654
"""Clone this branch into to_bzrdir preserving all semantic values.
656
revision_id: if not None, the revision history in the new branch will
657
be truncated to end with revision_id.
659
result = self._format.initialize(to_bzrdir)
660
self.copy_content_into(result, revision_id=revision_id)
664
def sprout(self, to_bzrdir, revision_id=None):
665
"""Create a new line of development from the branch, into to_bzrdir.
667
revision_id: if not None, the revision history in the new branch will
668
be truncated to end with revision_id.
670
result = self._format.initialize(to_bzrdir)
671
self.copy_content_into(result, revision_id=revision_id)
672
result.set_parent(self.bzrdir.root_transport.base)
675
def _synchronize_history(self, destination, revision_id):
676
"""Synchronize last revision and revision history between branches.
678
This version is most efficient when the destination is also a
679
BzrBranch5, but works for BzrBranch6 as long as the revision
680
history is the true lefthand parent history, and all of the revisions
681
are in the destination's repository. If not, set_revision_history
684
:param destination: The branch to copy the history into
685
:param revision_id: The revision-id to truncate history at. May
686
be None to copy complete history.
688
if revision_id == _mod_revision.NULL_REVISION:
690
new_history = self.revision_history()
691
if revision_id is not None and new_history != []:
693
new_history = new_history[:new_history.index(revision_id) + 1]
695
rev = self.repository.get_revision(revision_id)
696
new_history = rev.get_history(self.repository)[1:]
697
destination.set_revision_history(new_history)
700
def copy_content_into(self, destination, revision_id=None):
701
"""Copy the content of self into destination.
703
revision_id: if not None, the revision history in the new branch will
704
be truncated to end with revision_id.
706
self._synchronize_history(destination, revision_id)
708
parent = self.get_parent()
709
except errors.InaccessibleParent, e:
710
mutter('parent was not accessible to copy: %s', e)
713
destination.set_parent(parent)
714
self.tags.merge_to(destination.tags)
718
"""Check consistency of the branch.
720
In particular this checks that revisions given in the revision-history
721
do actually match up in the revision graph, and that they're all
722
present in the repository.
724
Callers will typically also want to check the repository.
726
:return: A BranchCheckResult.
728
mainline_parent_id = None
729
for revision_id in self.revision_history():
731
revision = self.repository.get_revision(revision_id)
732
except errors.NoSuchRevision, e:
733
raise errors.BzrCheckError("mainline revision {%s} not in repository"
735
# In general the first entry on the revision history has no parents.
736
# But it's not illegal for it to have parents listed; this can happen
737
# in imports from Arch when the parents weren't reachable.
738
if mainline_parent_id is not None:
739
if mainline_parent_id not in revision.parent_ids:
740
raise errors.BzrCheckError("previous revision {%s} not listed among "
742
% (mainline_parent_id, revision_id))
743
mainline_parent_id = revision_id
744
return BranchCheckResult(self)
746
def _get_checkout_format(self):
747
"""Return the most suitable metadir for a checkout of this branch.
748
Weaves are used if this branch's repository uses weaves.
750
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
751
from bzrlib.repofmt import weaverepo
752
format = bzrdir.BzrDirMetaFormat1()
753
format.repository_format = weaverepo.RepositoryFormat7()
755
format = self.repository.bzrdir.checkout_metadir()
756
format.set_branch_format(self._format)
759
def create_checkout(self, to_location, revision_id=None,
761
"""Create a checkout of a branch.
763
:param to_location: The url to produce the checkout at
764
:param revision_id: The revision to check out
765
:param lightweight: If True, produce a lightweight checkout, otherwise,
766
produce a bound branch (heavyweight checkout)
767
:return: The tree of the created checkout
769
t = transport.get_transport(to_location)
772
format = self._get_checkout_format()
773
checkout = format.initialize_on_transport(t)
774
from_branch = BranchReferenceFormat().initialize(checkout, self)
776
format = self._get_checkout_format()
777
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
778
to_location, force_new_tree=False, format=format)
779
checkout = checkout_branch.bzrdir
780
checkout_branch.bind(self)
781
# pull up to the specified revision_id to set the initial
782
# branch tip correctly, and seed it with history.
783
checkout_branch.pull(self, stop_revision=revision_id)
785
tree = checkout.create_workingtree(revision_id,
786
from_branch=from_branch)
787
basis_tree = tree.basis_tree()
788
basis_tree.lock_read()
790
for path, file_id in basis_tree.iter_references():
791
reference_parent = self.reference_parent(file_id, path)
792
reference_parent.create_checkout(tree.abspath(path),
793
basis_tree.get_reference_revision(file_id, path),
799
def reference_parent(self, file_id, path):
800
"""Return the parent branch for a tree-reference file_id
801
:param file_id: The file_id of the tree reference
802
:param path: The path of the file_id in the tree
803
:return: A branch associated with the file_id
805
# FIXME should provide multiple branches, based on config
806
return Branch.open(self.bzrdir.root_transport.clone(path).base)
808
def supports_tags(self):
809
return self._format.supports_tags()
812
class BranchFormat(object):
813
"""An encapsulation of the initialization and open routines for a format.
815
Formats provide three things:
816
* An initialization routine,
820
Formats are placed in an dict by their format string for reference
821
during branch opening. Its not required that these be instances, they
822
can be classes themselves with class methods - it simply depends on
823
whether state is needed for a given format or not.
825
Once a format is deprecated, just deprecate the initialize and open
826
methods on the format class. Do not deprecate the object, as the
827
object will be created every time regardless.
830
_default_format = None
831
"""The default format used for new branches."""
834
"""The known formats."""
836
def __eq__(self, other):
837
return self.__class__ is other.__class__
839
def __ne__(self, other):
840
return not (self == other)
843
def find_format(klass, a_bzrdir):
844
"""Return the format for the branch object in a_bzrdir."""
846
transport = a_bzrdir.get_branch_transport(None)
847
format_string = transport.get("format").read()
848
return klass._formats[format_string]
850
raise NotBranchError(path=transport.base)
852
raise errors.UnknownFormatError(format=format_string)
855
def get_default_format(klass):
856
"""Return the current default format."""
857
return klass._default_format
859
def get_reference(self, a_bzrdir):
860
"""Get 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 get the branch data from.
867
:return: None if the branch is not a reference branch.
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())
1126
raise 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-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())
1214
a_bzrdir, _found=True,
1215
possible_transports=[target_branch.bzrdir.root_transport])
1218
super(BranchReferenceFormat, self).__init__()
1219
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1221
def _make_reference_clone_function(format, a_branch):
1222
"""Create a clone() routine for a branch dynamically."""
1223
def clone(to_bzrdir, revision_id=None):
1224
"""See Branch.clone()."""
1225
return format.initialize(to_bzrdir, a_branch)
1226
# cannot obey revision_id limits when cloning a reference ...
1227
# FIXME RBC 20060210 either nuke revision_id for clone, or
1228
# emit some sort of warning/error to the caller ?!
1231
def open(self, a_bzrdir, _found=False, location=None,
1232
possible_transports=None):
1233
"""Return the branch that the branch reference in a_bzrdir points at.
1235
_found is a private parameter, do not use it. It is used to indicate
1236
if format probing has already be done.
1239
format = BranchFormat.find_format(a_bzrdir)
1240
assert format.__class__ == self.__class__
1241
if location is None:
1242
location = self.get_reference(a_bzrdir)
1243
real_bzrdir = bzrdir.BzrDir.open(
1244
location, possible_transports=possible_transports)
1245
result = real_bzrdir.open_branch()
1246
# this changes the behaviour of result.clone to create a new reference
1247
# rather than a copy of the content of the branch.
1248
# I did not use a proxy object because that needs much more extensive
1249
# testing, and we are only changing one behaviour at the moment.
1250
# If we decide to alter more behaviours - i.e. the implicit nickname
1251
# then this should be refactored to introduce a tested proxy branch
1252
# and a subclass of that for use in overriding clone() and ....
1254
result.clone = self._make_reference_clone_function(result)
1258
# formats which have no format string are not discoverable
1259
# and not independently creatable, so are not registered.
1260
__format5 = BzrBranchFormat5()
1261
__format6 = BzrBranchFormat6()
1262
BranchFormat.register_format(__format5)
1263
BranchFormat.register_format(BranchReferenceFormat())
1264
BranchFormat.register_format(__format6)
1265
BranchFormat.set_default_format(__format6)
1266
_legacy_formats = [BzrBranchFormat4(),
1269
class BzrBranch(Branch):
1270
"""A branch stored in the actual filesystem.
1272
Note that it's "local" in the context of the filesystem; it doesn't
1273
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1274
it's writable, and can be accessed via the normal filesystem API.
1277
def __init__(self, _format=None,
1278
_control_files=None, a_bzrdir=None, _repository=None):
1279
"""Create new branch object at a particular location."""
1280
Branch.__init__(self)
1281
if a_bzrdir is None:
1282
raise ValueError('a_bzrdir must be supplied')
1284
self.bzrdir = a_bzrdir
1285
# self._transport used to point to the directory containing the
1286
# control directory, but was not used - now it's just the transport
1287
# for the branch control files. mbp 20070212
1288
self._base = self.bzrdir.transport.clone('..').base
1289
self._format = _format
1290
if _control_files is None:
1291
raise ValueError('BzrBranch _control_files is None')
1292
self.control_files = _control_files
1293
self._transport = _control_files._transport
1294
self.repository = _repository
1297
return '%s(%r)' % (self.__class__.__name__, self.base)
1301
def _get_base(self):
1302
"""Returns the directory containing the control directory."""
1305
base = property(_get_base, doc="The URL for the root of this branch.")
1307
def abspath(self, name):
1308
"""See Branch.abspath."""
1309
return self.control_files._transport.abspath(name)
1312
@deprecated_method(zero_sixteen)
1314
def get_root_id(self):
1315
"""See Branch.get_root_id."""
1316
tree = self.repository.revision_tree(self.last_revision())
1317
return tree.get_root_id()
1319
def is_locked(self):
1320
return self.control_files.is_locked()
1322
def lock_write(self, token=None):
1323
repo_token = self.repository.lock_write()
1325
token = self.control_files.lock_write(token=token)
1327
self.repository.unlock()
1331
def lock_read(self):
1332
self.repository.lock_read()
1334
self.control_files.lock_read()
1336
self.repository.unlock()
1340
# TODO: test for failed two phase locks. This is known broken.
1342
self.control_files.unlock()
1344
self.repository.unlock()
1345
if not self.control_files.is_locked():
1346
# we just released the lock
1347
self._clear_cached_state()
1349
def peek_lock_mode(self):
1350
if self.control_files._lock_count == 0:
1353
return self.control_files._lock_mode
1355
def get_physical_lock_status(self):
1356
return self.control_files.get_physical_lock_status()
1359
def print_file(self, file, revision_id):
1360
"""See Branch.print_file."""
1361
return self.repository.print_file(file, revision_id)
1363
def _write_revision_history(self, history):
1364
"""Factored out of set_revision_history.
1366
This performs the actual writing to disk.
1367
It is intended to be called by BzrBranch5.set_revision_history."""
1368
self.control_files.put_bytes(
1369
'revision-history', '\n'.join(history))
1372
def set_revision_history(self, rev_history):
1373
"""See Branch.set_revision_history."""
1374
if 'evil' in debug.debug_flags:
1375
mutter_callsite(3, "set_revision_history scales with history.")
1376
self._clear_cached_state()
1377
self._write_revision_history(rev_history)
1378
self._cache_revision_history(rev_history)
1379
for hook in Branch.hooks['set_rh']:
1380
hook(self, rev_history)
1383
def set_last_revision_info(self, revno, revision_id):
1384
"""Set the last revision of this branch.
1386
The caller is responsible for checking that the revno is correct
1387
for this revision id.
1389
It may be possible to set the branch last revision to an id not
1390
present in the repository. However, branches can also be
1391
configured to check constraints on history, in which case this may not
1394
history = self._lefthand_history(revision_id)
1395
assert len(history) == revno, '%d != %d' % (len(history), revno)
1396
self.set_revision_history(history)
1398
def _gen_revision_history(self):
1399
history = self.control_files.get('revision-history').read().split('\n')
1400
if history[-1:] == ['']:
1401
# There shouldn't be a trailing newline, but just in case.
1405
def _lefthand_history(self, revision_id, last_rev=None,
1407
if 'evil' in debug.debug_flags:
1408
mutter_callsite(4, "_lefthand_history scales with history.")
1409
# stop_revision must be a descendant of last_revision
1410
stop_graph = self.repository.get_revision_graph(revision_id)
1411
if (last_rev is not None and last_rev != _mod_revision.NULL_REVISION
1412
and last_rev not in stop_graph):
1413
# our previous tip is not merged into stop_revision
1414
raise errors.DivergedBranches(self, other_branch)
1415
# make a new revision history from the graph
1416
current_rev_id = revision_id
1418
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1419
new_history.append(current_rev_id)
1420
current_rev_id_parents = stop_graph[current_rev_id]
1422
current_rev_id = current_rev_id_parents[0]
1424
current_rev_id = None
1425
new_history.reverse()
1429
def generate_revision_history(self, revision_id, last_rev=None,
1431
"""Create a new revision history that will finish with revision_id.
1433
:param revision_id: the new tip to use.
1434
:param last_rev: The previous last_revision. If not None, then this
1435
must be a ancestory of revision_id, or DivergedBranches is raised.
1436
:param other_branch: The other branch that DivergedBranches should
1437
raise with respect to.
1439
self.set_revision_history(self._lefthand_history(revision_id,
1440
last_rev, other_branch))
1443
def update_revisions(self, other, stop_revision=None):
1444
"""See Branch.update_revisions."""
1447
if stop_revision is None:
1448
stop_revision = other.last_revision()
1449
if stop_revision is None:
1450
# if there are no commits, we're done.
1452
# whats the current last revision, before we fetch [and change it
1454
last_rev = _mod_revision.ensure_null(self.last_revision())
1455
# we fetch here so that we don't process data twice in the common
1456
# case of having something to pull, and so that the check for
1457
# already merged can operate on the just fetched graph, which will
1458
# be cached in memory.
1459
self.fetch(other, stop_revision)
1460
if self.repository.get_graph().is_ancestor(stop_revision,
1463
self.generate_revision_history(stop_revision, last_rev=last_rev,
1468
def basis_tree(self):
1469
"""See Branch.basis_tree."""
1470
return self.repository.revision_tree(self.last_revision())
1473
def pull(self, source, overwrite=False, stop_revision=None,
1474
_hook_master=None, run_hooks=True, possible_transports=None):
1477
:param _hook_master: Private parameter - set the branch to
1478
be supplied as the master to push hooks.
1479
:param run_hooks: Private parameter - if false, this branch
1480
is being called because it's the master of the primary branch,
1481
so it should not run its hooks.
1483
result = PullResult()
1484
result.source_branch = source
1485
result.target_branch = self
1488
result.old_revno, result.old_revid = self.last_revision_info()
1490
self.update_revisions(source, stop_revision)
1491
except DivergedBranches:
1495
if stop_revision is None:
1496
stop_revision = source.last_revision()
1497
self.generate_revision_history(stop_revision)
1498
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
1499
result.new_revno, result.new_revid = self.last_revision_info()
1501
result.master_branch = _hook_master
1502
result.local_branch = self
928
bailout("weird file state %r" % ((fs, fid),))
932
class ScratchBranch(Branch):
933
"""Special test class: a branch that cleans up after itself.
935
>>> b = ScratchBranch()
1504
result.master_branch = self
1505
result.local_branch = None
1507
for hook in Branch.hooks['post_pull']:
1513
def _get_parent_location(self):
1514
_locs = ['parent', 'pull', 'x-pull']
1517
return self.control_files.get(l).read().strip('\n')
1523
def push(self, target, overwrite=False, stop_revision=None,
1524
_override_hook_source_branch=None):
1527
This is the basic concrete implementation of push()
1529
:param _override_hook_source_branch: If specified, run
1530
the hooks passing this Branch as the source, rather than self.
1531
This is for use of RemoteBranch, where push is delegated to the
1532
underlying vfs-based Branch.
1534
# TODO: Public option to disable running hooks - should be trivial but
1538
result = self._push_with_bound_branches(target, overwrite,
1540
_override_hook_source_branch=_override_hook_source_branch)
1545
def _push_with_bound_branches(self, target, overwrite,
1547
_override_hook_source_branch=None):
1548
"""Push from self into target, and into target's master if any.
1550
This is on the base BzrBranch class even though it doesn't support
1551
bound branches because the *target* might be bound.
1554
if _override_hook_source_branch:
1555
result.source_branch = _override_hook_source_branch
1556
for hook in Branch.hooks['post_push']:
1559
bound_location = target.get_bound_location()
1560
if bound_location and target.base != bound_location:
1561
# there is a master branch.
1563
# XXX: Why the second check? Is it even supported for a branch to
1564
# be bound to itself? -- mbp 20070507
1565
master_branch = target.get_master_branch()
1566
master_branch.lock_write()
1568
# push into the master from this branch.
1569
self._basic_push(master_branch, overwrite, stop_revision)
1570
# and push into the target branch from this. Note that we push from
1571
# this branch again, because its considered the highest bandwidth
1573
result = self._basic_push(target, overwrite, stop_revision)
1574
result.master_branch = master_branch
1575
result.local_branch = target
1579
master_branch.unlock()
1582
result = self._basic_push(target, overwrite, stop_revision)
1583
# TODO: Why set master_branch and local_branch if there's no
1584
# binding? Maybe cleaner to just leave them unset? -- mbp
1586
result.master_branch = target
1587
result.local_branch = None
1591
def _basic_push(self, target, overwrite, stop_revision):
1592
"""Basic implementation of push without bound branches or hooks.
1594
Must be called with self read locked and target write locked.
1596
result = PushResult()
1597
result.source_branch = self
1598
result.target_branch = target
1599
result.old_revno, result.old_revid = target.last_revision_info()
1601
target.update_revisions(self, stop_revision)
1602
except DivergedBranches:
1606
target.set_revision_history(self.revision_history())
1607
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1608
result.new_revno, result.new_revid = target.last_revision_info()
1611
def get_parent(self):
1612
"""See Branch.get_parent."""
1614
assert self.base[-1] == '/'
1615
parent = self._get_parent_location()
1618
# This is an old-format absolute path to a local branch
1619
# turn it into a url
1620
if parent.startswith('/'):
1621
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1623
return urlutils.join(self.base[:-1], parent)
1624
except errors.InvalidURLJoin, e:
1625
raise errors.InaccessibleParent(parent, self.base)
1627
def set_push_location(self, location):
1628
"""See Branch.set_push_location."""
1629
self.get_config().set_user_option(
1630
'push_location', location,
1631
store=_mod_config.STORE_LOCATION_NORECURSE)
1634
def set_parent(self, url):
1635
"""See Branch.set_parent."""
1636
# TODO: Maybe delete old location files?
1637
# URLs should never be unicode, even on the local fs,
1638
# FIXUP this and get_parent in a future branch format bump:
1639
# read and rewrite the file, and have the new format code read
1640
# using .get not .get_utf8. RBC 20060125
1642
if isinstance(url, unicode):
1644
url = url.encode('ascii')
1645
except UnicodeEncodeError:
1646
raise errors.InvalidURL(url,
1647
"Urls must be 7-bit ascii, "
1648
"use bzrlib.urlutils.escape")
1649
url = urlutils.relative_url(self.base, url)
1650
self._set_parent_location(url)
1652
def _set_parent_location(self, url):
1654
self.control_files._transport.delete('parent')
1656
assert isinstance(url, str)
1657
self.control_files.put_bytes('parent', url + '\n')
1660
class BzrBranch5(BzrBranch):
1661
"""A format 5 branch. This supports new features over plain branches.
1663
It has support for a master_branch which is the data for bound branches.
943
def __init__(self, files=[], dirs=[]):
944
"""Make a test branch.
946
This creates a temporary directory and runs init-tree in it.
948
If any files are listed, they are created in the working copy.
950
Branch.__init__(self, tempfile.mkdtemp(), init=True)
952
os.mkdir(self.abspath(d))
955
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
959
"""Destroy the test branch, removing the scratch directory."""
961
shutil.rmtree(self.base)
963
# Work around for shutil.rmtree failing on Windows when
964
# readonly files are encountered
965
for root, dirs, files in os.walk(self.base, topdown=False):
967
os.chmod(os.path.join(root, name), 0700)
968
shutil.rmtree(self.base)
972
######################################################################
976
def is_control_file(filename):
977
## FIXME: better check
978
filename = os.path.normpath(filename)
979
while filename != '':
980
head, tail = os.path.split(filename)
981
## mutter('check %r for control file' % ((head, tail), ))
982
if tail == bzrlib.BZRDIR:
1671
super(BzrBranch5, self).__init__(_format=_format,
1672
_control_files=_control_files,
1674
_repository=_repository)
1677
def pull(self, source, overwrite=False, stop_revision=None,
1678
run_hooks=True, possible_transports=None):
1679
"""Pull from source into self, updating my master if any.
1681
:param run_hooks: Private parameter - if false, this branch
1682
is being called because it's the master of the primary branch,
1683
so it should not run its hooks.
1685
bound_location = self.get_bound_location()
1686
master_branch = None
1687
if bound_location and source.base != bound_location:
1688
# not pulling from master, so we need to update master.
1689
master_branch = self.get_master_branch(possible_transports)
1690
master_branch.lock_write()
1693
# pull from source into master.
1694
master_branch.pull(source, overwrite, stop_revision,
1696
return super(BzrBranch5, self).pull(source, overwrite,
1697
stop_revision, _hook_master=master_branch,
1698
run_hooks=run_hooks)
1701
master_branch.unlock()
1703
def get_bound_location(self):
1705
return self.control_files.get_utf8('bound').read()[:-1]
1706
except errors.NoSuchFile:
1710
def get_master_branch(self, possible_transports=None):
1711
"""Return the branch we are bound to.
1713
:return: Either a Branch, or None
1715
This could memoise the branch, but if thats done
1716
it must be revalidated on each new lock.
1717
So for now we just don't memoise it.
1718
# RBC 20060304 review this decision.
1720
bound_loc = self.get_bound_location()
1724
return Branch.open(bound_loc,
1725
possible_transports=possible_transports)
1726
except (errors.NotBranchError, errors.ConnectionError), e:
1727
raise errors.BoundBranchConnectionFailure(
1731
def set_bound_location(self, location):
1732
"""Set the target where this branch is bound to.
1734
:param location: URL to the target branch
1737
self.control_files.put_utf8('bound', location+'\n')
1740
self.control_files._transport.delete('bound')
991
def _gen_revision_id(when):
992
"""Return new revision-id."""
993
s = '%s-%s-' % (user_email(), compact_date(when))
994
s += hexlify(rand_bytes(8))
998
def gen_file_id(name):
999
"""Return new file id.
1001
This should probably generate proper UUIDs, but for the moment we
1002
cope with just randomness because running uuidgen every time is
1004
idx = name.rfind('/')
1006
name = name[idx+1 : ]
1007
idx = name.rfind('\\')
1009
name = name[idx+1 : ]
1011
name = name.lstrip('.')
1013
s = hexlify(rand_bytes(8))
1014
return '-'.join((name, compact_date(time.time()), s))
1746
def bind(self, other):
1747
"""Bind this branch to the branch other.
1749
This does not push or pull data between the branches, though it does
1750
check for divergence to raise an error when the branches are not
1751
either the same, or one a prefix of the other. That behaviour may not
1752
be useful, so that check may be removed in future.
1754
:param other: The branch to bind to
1757
# TODO: jam 20051230 Consider checking if the target is bound
1758
# It is debatable whether you should be able to bind to
1759
# a branch which is itself bound.
1760
# Committing is obviously forbidden,
1761
# but binding itself may not be.
1762
# Since we *have* to check at commit time, we don't
1763
# *need* to check here
1765
# we want to raise diverged if:
1766
# last_rev is not in the other_last_rev history, AND
1767
# other_last_rev is not in our history, and do it without pulling
1769
last_rev = _mod_revision.ensure_null(self.last_revision())
1770
if last_rev != _mod_revision.NULL_REVISION:
1773
other_last_rev = other.last_revision()
1774
if not _mod_revision.is_null(other_last_rev):
1775
# neither branch is new, we have to do some work to
1776
# ascertain diversion.
1777
remote_graph = other.repository.get_revision_graph(
1779
local_graph = self.repository.get_revision_graph(last_rev)
1780
if (last_rev not in remote_graph and
1781
other_last_rev not in local_graph):
1782
raise errors.DivergedBranches(self, other)
1785
self.set_bound_location(other.base)
1789
"""If bound, unbind"""
1790
return self.set_bound_location(None)
1793
def update(self, possible_transports=None):
1794
"""Synchronise this branch with the master branch if any.
1796
:return: None or the last_revision that was pivoted out during the
1799
master = self.get_master_branch(possible_transports)
1800
if master is not None:
1801
old_tip = _mod_revision.ensure_null(self.last_revision())
1802
self.pull(master, overwrite=True)
1803
if self.repository.get_graph().is_ancestor(old_tip,
1804
_mod_revision.ensure_null(self.last_revision())):
1810
class BzrBranchExperimental(BzrBranch5):
1811
"""Bzr experimental branch format
1814
- a revision-history file.
1816
- a lock dir guarding the branch itself
1817
- all of this stored in a branch/ subdirectory
1818
- works with shared repositories.
1819
- a tag dictionary in the branch
1821
This format is new in bzr 0.15, but shouldn't be used for real data,
1824
This class acts as it's own BranchFormat.
1827
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1830
def get_format_string(cls):
1831
"""See BranchFormat.get_format_string()."""
1832
return "Bazaar-NG branch format experimental\n"
1835
def get_format_description(cls):
1836
"""See BranchFormat.get_format_description()."""
1837
return "Experimental branch format"
1840
def get_reference(cls, a_bzrdir):
1841
"""Get the target reference of the branch in a_bzrdir.
1843
format probing must have been completed before calling
1844
this method - it is assumed that the format of the branch
1845
in a_bzrdir is correct.
1847
:param a_bzrdir: The bzrdir to get the branch data from.
1848
:return: None if the branch is not a reference branch.
1853
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1855
branch_transport = a_bzrdir.get_branch_transport(cls)
1856
control_files = lockable_files.LockableFiles(branch_transport,
1857
lock_filename, lock_class)
1858
control_files.create_lock()
1859
control_files.lock_write()
1861
for filename, content in utf8_files:
1862
control_files.put_utf8(filename, content)
1864
control_files.unlock()
1867
def initialize(cls, a_bzrdir):
1868
"""Create a branch of this format in a_bzrdir."""
1869
utf8_files = [('format', cls.get_format_string()),
1870
('revision-history', ''),
1871
('branch-name', ''),
1874
cls._initialize_control_files(a_bzrdir, utf8_files,
1875
'lock', lockdir.LockDir)
1876
return cls.open(a_bzrdir, _found=True)
1879
def open(cls, a_bzrdir, _found=False):
1880
"""Return the branch object for a_bzrdir
1882
_found is a private parameter, do not use it. It is used to indicate
1883
if format probing has already be done.
1886
format = BranchFormat.find_format(a_bzrdir)
1887
assert format.__class__ == cls
1888
transport = a_bzrdir.get_branch_transport(None)
1889
control_files = lockable_files.LockableFiles(transport, 'lock',
1891
return cls(_format=cls,
1892
_control_files=control_files,
1894
_repository=a_bzrdir.find_repository())
1897
def is_supported(cls):
1900
def _make_tags(self):
1901
return BasicTags(self)
1904
def supports_tags(cls):
1908
BranchFormat.register_format(BzrBranchExperimental)
1911
class BzrBranch6(BzrBranch5):
1914
def last_revision_info(self):
1915
revision_string = self.control_files.get('last-revision').read()
1916
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1917
revision_id = cache_utf8.get_cached_utf8(revision_id)
1919
return revno, revision_id
1921
def last_revision(self):
1922
"""Return last revision id, or None"""
1923
revision_id = self.last_revision_info()[1]
1926
def _write_last_revision_info(self, revno, revision_id):
1927
"""Simply write out the revision id, with no checks.
1929
Use set_last_revision_info to perform this safely.
1931
Does not update the revision_history cache.
1932
Intended to be called by set_last_revision_info and
1933
_write_revision_history.
1935
if revision_id is None:
1936
revision_id = 'null:'
1937
out_string = '%d %s\n' % (revno, revision_id)
1938
self.control_files.put_bytes('last-revision', out_string)
1941
def set_last_revision_info(self, revno, revision_id):
1942
if self._get_append_revisions_only():
1943
self._check_history_violation(revision_id)
1944
self._write_last_revision_info(revno, revision_id)
1945
self._clear_cached_state()
1947
def _check_history_violation(self, revision_id):
1948
last_revision = _mod_revision.ensure_null(self.last_revision())
1949
if _mod_revision.is_null(last_revision):
1951
if last_revision not in self._lefthand_history(revision_id):
1952
raise errors.AppendRevisionsOnlyViolation(self.base)
1954
def _gen_revision_history(self):
1955
"""Generate the revision history from last revision
1957
history = list(self.repository.iter_reverse_revision_history(
1958
self.last_revision()))
1962
def _write_revision_history(self, history):
1963
"""Factored out of set_revision_history.
1965
This performs the actual writing to disk, with format-specific checks.
1966
It is intended to be called by BzrBranch5.set_revision_history.
1968
if len(history) == 0:
1969
last_revision = 'null:'
1971
if history != self._lefthand_history(history[-1]):
1972
raise errors.NotLefthandHistory(history)
1973
last_revision = history[-1]
1974
if self._get_append_revisions_only():
1975
self._check_history_violation(last_revision)
1976
self._write_last_revision_info(len(history), last_revision)
1979
def _set_parent_location(self, url):
1980
"""Set the parent branch"""
1981
self._set_config_location('parent_location', url, make_relative=True)
1984
def _get_parent_location(self):
1985
"""Set the parent branch"""
1986
return self._get_config_location('parent_location')
1988
def set_push_location(self, location):
1989
"""See Branch.set_push_location."""
1990
self._set_config_location('push_location', location)
1992
def set_bound_location(self, location):
1993
"""See Branch.set_push_location."""
1995
config = self.get_config()
1996
if location is None:
1997
if config.get_user_option('bound') != 'True':
2000
config.set_user_option('bound', 'False', warn_masked=True)
2003
self._set_config_location('bound_location', location,
2005
config.set_user_option('bound', 'True', warn_masked=True)
2008
def _get_bound_location(self, bound):
2009
"""Return the bound location in the config file.
2011
Return None if the bound parameter does not match"""
2012
config = self.get_config()
2013
config_bound = (config.get_user_option('bound') == 'True')
2014
if config_bound != bound:
2016
return self._get_config_location('bound_location', config=config)
2018
def get_bound_location(self):
2019
"""See Branch.set_push_location."""
2020
return self._get_bound_location(True)
2022
def get_old_bound_location(self):
2023
"""See Branch.get_old_bound_location"""
2024
return self._get_bound_location(False)
2026
def set_append_revisions_only(self, enabled):
2031
self.get_config().set_user_option('append_revisions_only', value,
2034
def _get_append_revisions_only(self):
2035
value = self.get_config().get_user_option('append_revisions_only')
2036
return value == 'True'
2038
def _synchronize_history(self, destination, revision_id):
2039
"""Synchronize last revision and revision history between branches.
2041
This version is most efficient when the destination is also a
2042
BzrBranch6, but works for BzrBranch5, as long as the destination's
2043
repository contains all the lefthand ancestors of the intended
2044
last_revision. If not, set_last_revision_info will fail.
2046
:param destination: The branch to copy the history into
2047
:param revision_id: The revision-id to truncate history at. May
2048
be None to copy complete history.
2050
source_revno, source_revision_id = self.last_revision_info()
2051
if revision_id is None:
2052
revno, revision_id = source_revno, source_revision_id
2053
elif source_revision_id == revision_id:
2054
# we know the revno without needing to walk all of history
2055
revno = source_revno
2057
# To figure out the revno for a random revision, we need to build
2058
# the revision history, and count its length.
2059
# We don't care about the order, just how long it is.
2060
# Alternatively, we could start at the current location, and count
2061
# backwards. But there is no guarantee that we will find it since
2062
# it may be a merged revision.
2063
revno = len(list(self.repository.iter_reverse_revision_history(
2065
destination.set_last_revision_info(revno, revision_id)
2067
def _make_tags(self):
2068
return BasicTags(self)
2071
######################################################################
2072
# results of operations
2075
class _Result(object):
2077
def _show_tag_conficts(self, to_file):
2078
if not getattr(self, 'tag_conflicts', None):
2080
to_file.write('Conflicting tags:\n')
2081
for name, value1, value2 in self.tag_conflicts:
2082
to_file.write(' %s\n' % (name, ))
2085
class PullResult(_Result):
2086
"""Result of a Branch.pull operation.
2088
:ivar old_revno: Revision number before pull.
2089
:ivar new_revno: Revision number after pull.
2090
:ivar old_revid: Tip revision id before pull.
2091
:ivar new_revid: Tip revision id after pull.
2092
:ivar source_branch: Source (local) branch object.
2093
:ivar master_branch: Master branch of the target, or None.
2094
:ivar target_branch: Target/destination branch object.
2098
# DEPRECATED: pull used to return the change in revno
2099
return self.new_revno - self.old_revno
2101
def report(self, to_file):
2102
if self.old_revid == self.new_revid:
2103
to_file.write('No revisions to pull.\n')
2105
to_file.write('Now on revision %d.\n' % self.new_revno)
2106
self._show_tag_conficts(to_file)
2109
class PushResult(_Result):
2110
"""Result of a Branch.push operation.
2112
:ivar old_revno: Revision number before push.
2113
:ivar new_revno: Revision number after push.
2114
:ivar old_revid: Tip revision id before push.
2115
:ivar new_revid: Tip revision id after push.
2116
:ivar source_branch: Source branch object.
2117
:ivar master_branch: Master branch of the target, or None.
2118
:ivar target_branch: Target/destination branch object.
2122
# DEPRECATED: push used to return the change in revno
2123
return self.new_revno - self.old_revno
2125
def report(self, to_file):
2126
"""Write a human-readable description of the result."""
2127
if self.old_revid == self.new_revid:
2128
to_file.write('No new revisions to push.\n')
2130
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2131
self._show_tag_conficts(to_file)
2134
class BranchCheckResult(object):
2135
"""Results of checking branch consistency.
2140
def __init__(self, branch):
2141
self.branch = branch
2143
def report_results(self, verbose):
2144
"""Report the check results via trace.note.
2146
:param verbose: Requests more detailed display of what was checked,
2149
note('checked branch %s format %s',
2151
self.branch._format)
2154
class Converter5to6(object):
2155
"""Perform an in-place upgrade of format 5 to format 6"""
2157
def convert(self, branch):
2158
# Data for 5 and 6 can peacefully coexist.
2159
format = BzrBranchFormat6()
2160
new_branch = format.open(branch.bzrdir, _found=True)
2162
# Copy source data into target
2163
new_branch.set_last_revision_info(*branch.last_revision_info())
2164
new_branch.set_parent(branch.get_parent())
2165
new_branch.set_bound_location(branch.get_bound_location())
2166
new_branch.set_push_location(branch.get_push_location())
2168
# New branch has no tags by default
2169
new_branch.tags._set_tag_dict({})
2171
# Copying done; now update target format
2172
new_branch.control_files.put_utf8('format',
2173
format.get_format_string())
2175
# Clean up old files
2176
new_branch.control_files._transport.delete('revision-history')
2178
branch.set_parent(None)
2181
branch.set_bound_location(None)
added
removed
bzrlib/branch.py
