« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 1445
- compare with another revision
- download diff
- download tarball
- view history from revision 1445
- Committer: Robert Collins
- Date: 2005-10-11 08:31:29 UTC
- Revision ID: robertc@lifelesslap.robertcollins.net-20051011083129-fa720bc6cd6c039f
inline and simplify branch.find_branch_root, it should just try to create a branch at each step, which is simpler than probing for a specific dir and has less round trips.
- files added:
- NEWS.developers
- bzrlib/store
- bzrlib/transport
- files removed:
- bzrlib/meta_store.py
- files renamed:
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- bzrlib/weavestore.py => bzrlib/store/weave.py
- tools/history2weaves.py => bzrlib/upgrade.py
- files modified:
- .bzrignore
- bzr *
- setup.py *
added
removed
bzrlib/branch.py
17
17
18
18
import sys
19
19
import os
20
import errno
21
from warnings import warn
22
from cStringIO import StringIO
23
20
24
21
25
import bzrlib
26
from bzrlib.inventory import InventoryEntry
27
import bzrlib.inventory as inventory
22
28
from bzrlib.trace import mutter, note
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
splitpath, \
25
sha_file, appendpath, file_kind
26
29
from bzrlib.osutils import (isdir, quotefn, compact_date, rand_bytes,
30
rename, splitpath, sha_file, appendpath,
31
file_kind)
32
import bzrlib.errors as errors
27
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
28
NoSuchRevision)
34
NoSuchRevision, HistoryMissing, NotBranchError,
35
DivergedBranches, LockError, UnlistableStore,
36
UnlistableBranch, NoSuchFile)
29
37
from bzrlib.textui import show_status
30
38
from bzrlib.revision import Revision
31
39
from bzrlib.delta import compare_trees
32
40
from bzrlib.tree import EmptyTree, RevisionTree
33
41
from bzrlib.inventory import Inventory
34
from bzrlib.weavestore import WeaveStore
42
from bzrlib.store import copy_all
43
from bzrlib.store.compressed_text import CompressedTextStore
44
from bzrlib.store.text import TextStore
45
from bzrlib.store.weave import WeaveStore
46
import bzrlib.transactions as transactions
47
from bzrlib.transport import Transport, get_transport
35
48
import bzrlib.xml5
36
49
import bzrlib.ui
37
50
38
51
39
40
52
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
41
53
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
54
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
42
55
## TODO: Maybe include checks for common corruption of newlines, etc?
43
56
44
57
45
58
# TODO: Some operations like log might retrieve the same revisions
46
59
# repeatedly to calculate deltas. We could perhaps have a weakref
47
# cache in memory to make this faster.
48
49
# TODO: please move the revision-string syntax stuff out of the branch
50
# object; it's clutter
51
52
53
def find_branch(f, **args):
54
if f and (f.startswith('http://') or f.startswith('https://')):
55
import remotebranch
56
return remotebranch.RemoteBranch(f, **args)
57
else:
58
return Branch(f, **args)
59
60
61
def find_cached_branch(f, cache_root, **args):
62
from remotebranch import RemoteBranch
63
br = find_branch(f, **args)
64
def cacheify(br, store_name):
65
from meta_store import CachedStore
66
cache_path = os.path.join(cache_root, store_name)
67
os.mkdir(cache_path)
68
new_store = CachedStore(getattr(br, store_name), cache_path)
69
setattr(br, store_name, new_store)
70
71
if isinstance(br, RemoteBranch):
72
cacheify(br, 'inventory_store')
73
cacheify(br, 'text_store')
74
cacheify(br, 'revision_store')
75
return br
76
77
60
# cache in memory to make this faster. In general anything can be
61
# cached in memory between lock and unlock operations.
62
63
def find_branch(*ignored, **ignored_too):
64
# XXX: leave this here for about one release, then remove it
65
raise NotImplementedError('find_branch() is not supported anymore, '
66
'please use one of the new branch constructors')
78
67
def _relpath(base, path):
79
68
"""Return path relative to base, or raise exception.
80
69
97
86
if tail:
98
87
s.insert(0, tail)
99
88
else:
100
from errors import NotBranchError
101
89
raise NotBranchError("path %r is not within branch %r" % (rp, base))
102
90
103
91
return os.sep.join(s)
104
92
105
93
106
def find_branch_root(f=None):
107
"""Find the branch root enclosing f, or pwd.
108
109
f may be a filename or a URL.
110
111
It is not necessary that f exists.
112
113
Basically we keep looking up until we find the control directory or
114
run into the root. If there isn't one, raises NotBranchError.
115
"""
116
if f == None:
117
f = os.getcwd()
118
elif hasattr(os.path, 'realpath'):
119
f = os.path.realpath(f)
120
else:
121
f = os.path.abspath(f)
122
if not os.path.exists(f):
123
raise BzrError('%r does not exist' % f)
124
125
126
orig_f = f
127
128
while True:
129
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
130
return f
131
head, tail = os.path.split(f)
132
if head == f:
133
# reached the root, whatever that may be
134
raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
135
f = head
136
137
138
139
# XXX: move into bzrlib.errors; subclass BzrError
140
class DivergedBranches(Exception):
141
def __init__(self, branch1, branch2):
142
self.branch1 = branch1
143
self.branch2 = branch2
144
Exception.__init__(self, "These branches have diverged.")
145
146
147
94
######################################################################
148
95
# branch objects
149
96
151
98
"""Branch holding a history of revisions.
152
99
153
100
base
154
Base directory of the branch.
101
Base directory/url of the branch.
102
"""
103
base = None
104
105
def __init__(self, *ignored, **ignored_too):
106
raise NotImplementedError('The Branch class is abstract')
107
108
@staticmethod
109
def open_downlevel(base):
110
"""Open a branch which may be of an old format.
111
112
Only local branches are supported."""
113
return _Branch(get_transport(base), relax_version_check=True)
114
115
@staticmethod
116
def open(base):
117
"""Open an existing branch, rooted at 'base' (url)"""
118
t = get_transport(base)
119
mutter("trying to open %r with transport %r", base, t)
120
return _Branch(t)
121
122
@staticmethod
123
def open_containing(url):
124
"""Open an existing branch which contains url.
125
126
This probes for a branch at url, and searches upwards from there.
127
128
Basically we keep looking up until we find the control directory or
129
run into the root. If there isn't one, raises NotBranchError.
130
"""
131
t = get_transport(url)
132
while True:
133
try:
134
return _Branch(t)
135
except NotBranchError:
136
pass
137
new_t = t.clone('..')
138
if new_t.base == t.base:
139
# reached the root, whatever that may be
140
raise NotBranchError('%s is not in a branch' % url)
141
t = new_t
142
143
@staticmethod
144
def initialize(base):
145
"""Create a new branch, rooted at 'base' (url)"""
146
t = get_transport(base)
147
return _Branch(t, init=True)
148
149
def setup_caching(self, cache_root):
150
"""Subclasses that care about caching should override this, and set
151
up cached stores located under cache_root.
152
"""
153
self.cache_root = cache_root
154
155
156
class _Branch(Branch):
157
"""A branch stored in the actual filesystem.
158
159
Note that it's "local" in the context of the filesystem; it doesn't
160
really matter if it's on an nfs/smb/afs/coda/... share, as long as
161
it's writable, and can be accessed via the normal filesystem API.
155
162
156
163
_lock_mode
157
164
None, or 'r' or 'w'
163
170
_lock
164
171
Lock object from bzrlib.lock.
165
172
"""
166
base = None
173
# We actually expect this class to be somewhat short-lived; part of its
174
# purpose is to try to isolate what bits of the branch logic are tied to
175
# filesystem access, so that in a later step, we can extricate them to
176
# a separarte ("storage") class.
167
177
_lock_mode = None
168
178
_lock_count = None
169
179
_lock = None
180
_inventory_weave = None
170
181
171
182
# Map some sort of prefix into a namespace
172
183
# stuff like "revno:10", "revid:", etc.
173
184
# This should match a prefix with a function which accepts
174
185
REVISION_NAMESPACES = {}
175
186
176
def __init__(self, base, init=False, find_root=True):
187
def push_stores(self, branch_to):
188
"""Copy the content of this branches store to branch_to."""
189
if (self._branch_format != branch_to._branch_format
190
or self._branch_format != 4):
191
from bzrlib.fetch import greedy_fetch
192
mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
193
self, self._branch_format, branch_to, branch_to._branch_format)
194
greedy_fetch(to_branch=branch_to, from_branch=self,
195
revision=self.last_revision())
196
return
197
198
store_pairs = ((self.text_store, branch_to.text_store),
199
(self.inventory_store, branch_to.inventory_store),
200
(self.revision_store, branch_to.revision_store))
201
try:
202
for from_store, to_store in store_pairs:
203
copy_all(from_store, to_store)
204
except UnlistableStore:
205
raise UnlistableBranch(from_store)
206
207
def __init__(self, transport, init=False,
208
relax_version_check=False):
177
209
"""Create new branch object at a particular location.
178
210
179
base -- Base directory for the branch.
211
transport -- A Transport object, defining how to access files.
212
(If a string, transport.transport() will be used to
213
create a Transport object)
180
214
181
215
init -- If True, create new control files in a previously
182
216
unversioned directory. If False, the branch must already
183
217
be versioned.
184
218
185
find_root -- If true and init is false, find the root of the
186
existing branch containing base.
219
relax_version_check -- If true, the usual check for the branch
220
version is not applied. This is intended only for
221
upgrade/recovery type use; it's not guaranteed that
222
all operations will work on old format branches.
187
223
188
224
In the test suite, creation of new trees is tested using the
189
225
`ScratchBranch` class.
190
226
"""
191
from bzrlib.store import ImmutableStore
227
assert isinstance(transport, Transport), \
228
"%r is not a Transport" % transport
229
self._transport = transport
192
230
if init:
193
self.base = os.path.realpath(base)
194
231
self._make_control()
195
elif find_root:
196
self.base = find_branch_root(base)
197
else:
198
self.base = os.path.realpath(base)
199
if not isdir(self.controlfilename('.')):
200
from errors import NotBranchError
201
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
202
['use "bzr init" to initialize a new working tree',
203
'current bzr can only operate from top-of-tree'])
204
self._check_format()
205
206
self.weave_store = WeaveStore(self.controlfilename('weaves'))
207
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
208
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
209
232
self._check_format(relax_version_check)
233
234
def get_store(name, compressed=True, prefixed=False):
235
# FIXME: This approach of assuming stores are all entirely compressed
236
# or entirely uncompressed is tidy, but breaks upgrade from
237
# some existing branches where there's a mixture; we probably
238
# still want the option to look for both.
239
relpath = self._rel_controlfilename(name)
240
if compressed:
241
store = CompressedTextStore(self._transport.clone(relpath),
242
prefixed=prefixed)
243
else:
244
store = TextStore(self._transport.clone(relpath),
245
prefixed=prefixed)
246
#if self._transport.should_cache():
247
# cache_path = os.path.join(self.cache_root, name)
248
# os.mkdir(cache_path)
249
# store = bzrlib.store.CachedStore(store, cache_path)
250
return store
251
def get_weave(name, prefixed=False):
252
relpath = self._rel_controlfilename(name)
253
ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
254
if self._transport.should_cache():
255
ws.enable_cache = True
256
return ws
257
258
if self._branch_format == 4:
259
self.inventory_store = get_store('inventory-store')
260
self.text_store = get_store('text-store')
261
self.revision_store = get_store('revision-store')
262
elif self._branch_format == 5:
263
self.control_weaves = get_weave([])
264
self.weave_store = get_weave('weaves')
265
self.revision_store = get_store('revision-store', compressed=False)
266
elif self._branch_format == 6:
267
self.control_weaves = get_weave([])
268
self.weave_store = get_weave('weaves', prefixed=True)
269
self.revision_store = get_store('revision-store', compressed=False,
270
prefixed=True)
271
self._transaction = None
210
272
211
273
def __str__(self):
212
return '%s(%r)' % (self.__class__.__name__, self.base)
274
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
213
275
214
276
215
277
__repr__ = __str__
217
279
218
280
def __del__(self):
219
281
if self._lock_mode or self._lock:
220
from warnings import warn
282
# XXX: This should show something every time, and be suitable for
283
# headless operation and embedding
221
284
warn("branch %r was not explicitly unlocked" % self)
222
285
self._lock.unlock()
223
286
287
# TODO: It might be best to do this somewhere else,
288
# but it is nice for a Branch object to automatically
289
# cache it's information.
290
# Alternatively, we could have the Transport objects cache requests
291
# See the earlier discussion about how major objects (like Branch)
292
# should never expect their __del__ function to run.
293
if hasattr(self, 'cache_root') and self.cache_root is not None:
294
try:
295
import shutil
296
shutil.rmtree(self.cache_root)
297
except:
298
pass
299
self.cache_root = None
300
301
def _get_base(self):
302
if self._transport:
303
return self._transport.base
304
return None
305
306
base = property(_get_base)
307
308
def _finish_transaction(self):
309
"""Exit the current transaction."""
310
if self._transaction is None:
311
raise errors.LockError('Branch %s is not in a transaction' %
312
self)
313
transaction = self._transaction
314
self._transaction = None
315
transaction.finish()
316
317
def get_transaction(self):
318
"""Return the current active transaction.
319
320
If no transaction is active, this returns a passthrough object
321
for which all data is immedaitely flushed and no caching happens.
322
"""
323
if self._transaction is None:
324
return transactions.PassThroughTransaction()
325
else:
326
return self._transaction
327
328
def _set_transaction(self, new_transaction):
329
"""Set a new active transaction."""
330
if self._transaction is not None:
331
raise errors.LockError('Branch %s is in a transaction already.' %
332
self)
333
self._transaction = new_transaction
224
334
225
335
def lock_write(self):
336
mutter("lock write: %s (%s)", self, self._lock_count)
337
# TODO: Upgrade locking to support using a Transport,
338
# and potentially a remote locking protocol
226
339
if self._lock_mode:
227
340
if self._lock_mode != 'w':
228
from errors import LockError
229
341
raise LockError("can't upgrade to a write lock from %r" %
230
342
self._lock_mode)
231
343
self._lock_count += 1
232
344
else:
233
from bzrlib.lock import WriteLock
234
235
self._lock = WriteLock(self.controlfilename('branch-lock'))
345
self._lock = self._transport.lock_write(
346
self._rel_controlfilename('branch-lock'))
236
347
self._lock_mode = 'w'
237
348
self._lock_count = 1
238
349
self._set_transaction(transactions.PassThroughTransaction())
239
350
240
351
def lock_read(self):
352
mutter("lock read: %s (%s)", self, self._lock_count)
241
353
if self._lock_mode:
242
354
assert self._lock_mode in ('r', 'w'), \
243
355
"invalid lock mode %r" % self._lock_mode
244
356
self._lock_count += 1
245
357
else:
246
from bzrlib.lock import ReadLock
247
248
self._lock = ReadLock(self.controlfilename('branch-lock'))
358
self._lock = self._transport.lock_read(
359
self._rel_controlfilename('branch-lock'))
249
360
self._lock_mode = 'r'
250
361
self._lock_count = 1
362
self._set_transaction(transactions.ReadOnlyTransaction())
363
# 5K may be excessive, but hey, its a knob.
364
self.get_transaction().set_cache_size(5000)
251
365
252
366
def unlock(self):
367
mutter("unlock: %s (%s)", self, self._lock_count)
253
368
if not self._lock_mode:
254
from errors import LockError
255
369
raise LockError('branch %r is not locked' % (self))
256
370
257
371
if self._lock_count > 1:
258
372
self._lock_count -= 1
259
373
else:
374
self._finish_transaction()
260
375
self._lock.unlock()
261
376
self._lock = None
262
377
self._lock_mode = self._lock_count = None
263
378
264
379
def abspath(self, name):
265
380
"""Return absolute filename for something in the branch"""
266
return os.path.join(self.base, name)
381
return self._transport.abspath(name)
267
382
268
383
def relpath(self, path):
269
384
"""Return path relative to this branch of something inside it.
270
385
271
386
Raises an error if path is not in this branch."""
272
return _relpath(self.base, path)
387
return self._transport.relpath(path)
388
389
390
def _rel_controlfilename(self, file_or_path):
391
if isinstance(file_or_path, basestring):
392
file_or_path = [file_or_path]
393
return [bzrlib.BZRDIR] + file_or_path
273
394
274
395
def controlfilename(self, file_or_path):
275
396
"""Return location relative to branch."""
276
if isinstance(file_or_path, basestring):
277
file_or_path = [file_or_path]
278
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
397
return self._transport.abspath(self._rel_controlfilename(file_or_path))
279
398
280
399
281
400
def controlfile(self, file_or_path, mode='r'):
289
408
Controlfiles should almost never be opened in write mode but
290
409
rather should be atomically copied and replaced using atomicfile.
291
410
"""
292
293
fn = self.controlfilename(file_or_path)
294
295
if mode == 'rb' or mode == 'wb':
296
return file(fn, mode)
297
elif mode == 'r' or mode == 'w':
298
# open in binary mode anyhow so there's no newline translation;
299
# codecs uses line buffering by default; don't want that.
300
import codecs
301
return codecs.open(fn, mode + 'b', 'utf-8',
302
buffering=60000)
411
import codecs
412
413
relpath = self._rel_controlfilename(file_or_path)
414
#TODO: codecs.open() buffers linewise, so it was overloaded with
415
# a much larger buffer, do we need to do the same for getreader/getwriter?
416
if mode == 'rb':
417
return self._transport.get(relpath)
418
elif mode == 'wb':
419
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
420
elif mode == 'r':
421
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
422
elif mode == 'w':
423
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
303
424
else:
304
425
raise BzrError("invalid controlfile mode %r" % mode)
305
426
427
def put_controlfile(self, path, f, encode=True):
428
"""Write an entry as a controlfile.
429
430
:param path: The path to put the file, relative to the .bzr control
431
directory
432
:param f: A file-like or string object whose contents should be copied.
433
:param encode: If true, encode the contents as utf-8
434
"""
435
self.put_controlfiles([(path, f)], encode=encode)
436
437
def put_controlfiles(self, files, encode=True):
438
"""Write several entries as controlfiles.
439
440
:param files: A list of [(path, file)] pairs, where the path is the directory
441
underneath the bzr control directory
442
:param encode: If true, encode the contents as utf-8
443
"""
444
import codecs
445
ctrl_files = []
446
for path, f in files:
447
if encode:
448
if isinstance(f, basestring):
449
f = f.encode('utf-8', 'replace')
450
else:
451
f = codecs.getwriter('utf-8')(f, errors='replace')
452
path = self._rel_controlfilename(path)
453
ctrl_files.append((path, f))
454
self._transport.put_multi(ctrl_files)
455
306
456
def _make_control(self):
307
os.mkdir(self.controlfilename([]))
308
self.controlfile('README', 'w').write(
309
"This is a Bazaar-NG control directory.\n"
310
"Do not change any files in this directory.\n")
311
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT_5)
312
for d in ('text-store', 'inventory-store', 'revision-store',
313
'weaves'):
314
os.mkdir(self.controlfilename(d))
315
for f in ('revision-history', 'merged-patches',
316
'pending-merged-patches', 'branch-name',
317
'branch-lock',
318
'pending-merges'):
319
self.controlfile(f, 'w').write('')
320
mutter('created control directory in ' + self.base)
321
457
from bzrlib.inventory import Inventory
458
from bzrlib.weavefile import write_weave_v5
459
from bzrlib.weave import Weave
460
461
# Create an empty inventory
462
sio = StringIO()
322
463
# if we want per-tree root ids then this is the place to set
323
464
# them; they're not needed for now and so ommitted for
324
465
# simplicity.
325
f = self.controlfile('inventory','w')
326
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), f)
327
328
329
def _check_format(self):
466
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
467
empty_inv = sio.getvalue()
468
sio = StringIO()
469
bzrlib.weavefile.write_weave_v5(Weave(), sio)
470
empty_weave = sio.getvalue()
471
472
dirs = [[], 'revision-store', 'weaves']
473
files = [('README',
474
"This is a Bazaar-NG control directory.\n"
475
"Do not change any files in this directory.\n"),
476
('branch-format', BZR_BRANCH_FORMAT_6),
477
('revision-history', ''),
478
('branch-name', ''),
479
('branch-lock', ''),
480
('pending-merges', ''),
481
('inventory', empty_inv),
482
('inventory.weave', empty_weave),
483
('ancestry.weave', empty_weave)
484
]
485
cfn = self._rel_controlfilename
486
self._transport.mkdir_multi([cfn(d) for d in dirs])
487
self.put_controlfiles(files)
488
mutter('created control directory in ' + self._transport.base)
489
490
def _check_format(self, relax_version_check):
330
491
"""Check this branch format is supported.
331
492
332
493
The format level is stored, as an integer, in
335
496
In the future, we might need different in-memory Branch
336
497
classes to support downlevel branches. But not yet.
337
498
"""
338
fmt = self.controlfile('branch-format', 'r').read()
339
if fmt == BZR_BRANCH_FORMAT_5:
499
try:
500
fmt = self.controlfile('branch-format', 'r').read()
501
except NoSuchFile:
502
raise NotBranchError(self.base)
503
mutter("got branch format %r", fmt)
504
if fmt == BZR_BRANCH_FORMAT_6:
505
self._branch_format = 6
506
elif fmt == BZR_BRANCH_FORMAT_5:
340
507
self._branch_format = 5
341
else:
342
raise BzrError('sorry, branch format "%s" not supported; '
343
'use a different bzr version, '
344
'or run "bzr upgrade", '
345
'or remove the .bzr directory and "bzr init" again'
346
% fmt.rstrip('\n\r'))
508
elif fmt == BZR_BRANCH_FORMAT_4:
509
self._branch_format = 4
510
511
if (not relax_version_check
512
and self._branch_format not in (5, 6)):
513
raise errors.UnsupportedFormatError(
514
'sorry, branch format %r not supported' % fmt,
515
['use a different bzr version',
516
'or remove the .bzr directory'
517
' and "bzr init" again'])
347
518
348
519
def get_root_id(self):
349
520
"""Return the id of this branches root"""
380
551
That is to say, the inventory describing changes underway, that
381
552
will be committed to the next revision.
382
553
"""
383
from bzrlib.atomicfile import AtomicFile
384
554
from cStringIO import StringIO
385
555
self.lock_write()
386
556
try:
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
try:
389
bzrlib.xml5.serializer_v5.write_inventory(inv, f)
390
f.commit()
391
finally:
392
f.close()
557
sio = StringIO()
558
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
559
sio.seek(0)
560
# Transport handles atomicity
561
self.put_controlfile('inventory', sio)
393
562
finally:
394
563
self.unlock()
395
564
396
565
mutter('wrote working inventory')
397
566
398
399
567
inventory = property(read_working_inventory, _write_inventory, None,
400
568
"""Inventory for the working copy.""")
401
569
402
403
570
def add(self, files, ids=None):
404
571
"""Make files versioned.
405
572
453
620
kind = file_kind(fullpath)
454
621
except OSError:
455
622
# maybe something better?
456
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
623
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
457
624
458
if kind != 'file' and kind != 'directory':
459
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
625
if not InventoryEntry.versionable_kind(kind):
626
raise BzrError('cannot add: not a versionable file ('
627
'i.e. regular file, symlink or directory): %s' % quotefn(f))
460
628
461
629
if file_id is None:
462
630
file_id = gen_file_id(f)
473
641
"""Print `file` to stdout."""
474
642
self.lock_read()
475
643
try:
476
tree = self.revision_tree(self.lookup_revision(revno))
644
tree = self.revision_tree(self.get_rev_id(revno))
477
645
# use inventory as it was in that revision
478
646
file_id = tree.inventory.path2id(file)
479
647
if not file_id:
527
695
finally:
528
696
self.unlock()
529
697
530
531
698
# FIXME: this doesn't need to be a branch method
532
699
def set_inventory(self, new_inventory_list):
533
700
from bzrlib.inventory import Inventory, InventoryEntry
536
703
name = os.path.basename(path)
537
704
if name == "":
538
705
continue
539
inv.add(InventoryEntry(file_id, name, kind, parent))
706
# fixme, there should be a factory function inv,add_??
707
if kind == 'directory':
708
inv.add(inventory.InventoryDirectory(file_id, name, parent))
709
elif kind == 'file':
710
inv.add(inventory.InventoryFile(file_id, name, parent))
711
elif kind == 'symlink':
712
inv.add(inventory.InventoryLink(file_id, name, parent))
713
else:
714
raise BzrError("unknown kind %r" % kind)
540
715
self._write_inventory(inv)
541
716
542
543
717
def unknowns(self):
544
718
"""Return all unknown files.
545
719
560
734
561
735
562
736
def append_revision(self, *revision_ids):
563
from bzrlib.atomicfile import AtomicFile
564
565
737
for revision_id in revision_ids:
566
738
mutter("add {%s} to revision-history" % revision_id)
567
568
rev_history = self.revision_history()
569
rev_history.extend(revision_ids)
570
571
f = AtomicFile(self.controlfilename('revision-history'))
739
self.lock_write()
572
740
try:
573
for rev_id in rev_history:
574
print >>f, rev_id
575
f.commit()
741
rev_history = self.revision_history()
742
rev_history.extend(revision_ids)
743
self.put_controlfile('revision-history', '\n'.join(rev_history))
576
744
finally:
577
f.close()
578
745
self.unlock()
746
747
def has_revision(self, revision_id):
748
"""True if this branch has a copy of the revision.
749
750
This does not necessarily imply the revision is merge
751
or on the mainline."""
752
return (revision_id is None
753
or revision_id in self.revision_store)
579
754
580
755
def get_revision_xml_file(self, revision_id):
581
756
"""Return XML file object for revision object."""
586
761
try:
587
762
try:
588
763
return self.revision_store[revision_id]
589
except IndexError:
764
except (IndexError, KeyError):
590
765
raise bzrlib.errors.NoSuchRevision(self, revision_id)
591
766
finally:
592
767
self.unlock()
593
768
594
595
769
#deprecated
596
770
get_revision_xml = get_revision_xml_file
597
771
772
def get_revision_xml(self, revision_id):
773
return self.get_revision_xml_file(revision_id).read()
774
598
775
599
776
def get_revision(self, revision_id):
600
777
"""Return the Revision object for a named revision"""
610
787
assert r.revision_id == revision_id
611
788
return r
612
789
613
614
790
def get_revision_delta(self, revno):
615
791
"""Return the delta for one revision.
616
792
632
808
633
809
return compare_trees(old_tree, new_tree)
634
810
635
636
637
811
def get_revision_sha1(self, revision_id):
638
812
"""Hash the stored value of a revision, and return it."""
639
813
# In the future, revision entries will be signed. At that
642
816
# the revision, (add signatures/remove signatures) and still
643
817
# have all hash pointers stay consistent.
644
818
# But for now, just hash the contents.
645
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
646
819
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
820
821
def get_ancestry(self, revision_id):
822
"""Return a list of revision-ids integrated by a revision.
823
824
This currently returns a list, but the ordering is not guaranteed:
825
treat it as a set.
826
"""
827
if revision_id is None:
828
return [None]
829
w = self.get_inventory_weave()
830
return [None] + map(w.idx_to_name,
831
w.inclusions([w.lookup(revision_id)]))
832
833
def get_inventory_weave(self):
834
return self.control_weaves.get_weave('inventory',
835
self.get_transaction())
647
836
648
837
def get_inventory(self, revision_id):
649
"""Get Inventory object by hash.
650
651
TODO: Perhaps for this and similar methods, take a revision
652
parameter which can be either an integer revno or a
653
string hash."""
654
f = self.get_inventory_xml_file(revision_id)
655
return bzrlib.xml5.serializer_v5.read_inventory(f)
656
838
"""Get Inventory object by hash."""
839
xml = self.get_inventory_xml(revision_id)
840
return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
657
841
658
842
def get_inventory_xml(self, revision_id):
659
843
"""Get inventory XML as a file object."""
660
844
try:
661
845
assert isinstance(revision_id, basestring), type(revision_id)
662
return self.inventory_store[revision_id]
846
iw = self.get_inventory_weave()
847
return iw.get_text(iw.lookup(revision_id))
663
848
except IndexError:
664
849
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
665
850
666
get_inventory_xml_file = get_inventory_xml
667
668
669
851
def get_inventory_sha1(self, revision_id):
670
852
"""Return the sha1 hash of the inventory entry
671
853
"""
672
return sha_file(self.get_inventory_xml_file(revision_id))
673
854
return self.get_revision(revision_id).inventory_sha1
674
855
675
856
def get_revision_inventory(self, revision_id):
676
857
"""Return inventory of a past revision."""
677
# bzr 0.0.6 imposes the constraint that the inventory_id
858
# TODO: Unify this with get_inventory()
859
# bzr 0.0.6 and later imposes the constraint that the inventory_id
678
860
# must be the same as its revision, so this is trivial.
679
861
if revision_id == None:
680
862
return Inventory(self.get_root_id())
681
863
else:
682
864
return self.get_inventory(revision_id)
683
865
684
685
866
def revision_history(self):
686
"""Return sequence of revision hashes on to this branch.
687
688
>>> ScratchBranch().revision_history()
689
[]
690
"""
867
"""Return sequence of revision hashes on to this branch."""
691
868
self.lock_read()
692
869
try:
693
return [l.rstrip('\r\n') for l in
870
transaction = self.get_transaction()
871
history = transaction.map.find_revision_history()
872
if history is not None:
873
mutter("cache hit for revision-history in %s", self)
874
return list(history)
875
history = [l.rstrip('\r\n') for l in
694
876
self.controlfile('revision-history', 'r').readlines()]
877
transaction.map.add_revision_history(history)
878
# this call is disabled because revision_history is
879
# not really an object yet, and the transaction is for objects.
880
# transaction.register_clean(history, precious=True)
881
return list(history)
695
882
finally:
696
883
self.unlock()
697
884
698
699
885
def common_ancestor(self, other, self_revno=None, other_revno=None):
700
886
"""
701
>>> import commit
887
>>> from bzrlib.commit import commit
702
888
>>> sb = ScratchBranch(files=['foo', 'foo~'])
703
889
>>> sb.common_ancestor(sb) == (None, None)
704
890
True
705
>>> commit.commit(sb, "Committing first revision", verbose=False)
891
>>> commit(sb, "Committing first revision", verbose=False)
706
892
>>> sb.common_ancestor(sb)[0]
707
893
1
708
894
>>> clone = sb.clone()
709
>>> commit.commit(sb, "Committing second revision", verbose=False)
895
>>> commit(sb, "Committing second revision", verbose=False)
710
896
>>> sb.common_ancestor(sb)[0]
711
897
2
712
898
>>> sb.common_ancestor(clone)[0]
713
899
1
714
>>> commit.commit(clone, "Committing divergent second revision",
900
>>> commit(clone, "Committing divergent second revision",
715
901
... verbose=False)
716
902
>>> sb.common_ancestor(clone)[0]
717
903
1
750
936
return len(self.revision_history())
751
937
752
938
753
def last_patch(self):
939
def last_revision(self):
754
940
"""Return last patch hash, or None if no history.
755
941
"""
756
942
ph = self.revision_history()
761
947
762
948
763
949
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
764
"""
950
"""Return a list of new revisions that would perfectly fit.
951
765
952
If self and other have not diverged, return a list of the revisions
766
953
present in other, but missing from self.
767
954
787
974
Traceback (most recent call last):
788
975
DivergedBranches: These branches have diverged.
789
976
"""
977
# FIXME: If the branches have diverged, but the latest
978
# revision in this branch is completely merged into the other,
979
# then we should still be able to pull.
790
980
self_history = self.revision_history()
791
981
self_len = len(self_history)
792
982
other_history = other.revision_history()
798
988
799
989
if stop_revision is None:
800
990
stop_revision = other_len
801
elif stop_revision > other_len:
802
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
803
991
else:
992
assert isinstance(stop_revision, int)
993
if stop_revision > other_len:
994
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
804
995
return other_history[self_len:stop_revision]
805
996
806
807
997
def update_revisions(self, other, stop_revision=None):
808
"""Pull in all new revisions from other branch.
809
"""
998
"""Pull in new perfect-fit revisions."""
810
999
from bzrlib.fetch import greedy_fetch
811
812
pb = bzrlib.ui.ui_factory.progress_bar()
813
pb.update('comparing histories')
814
815
revision_ids = self.missing_revisions(other, stop_revision)
816
817
if len(revision_ids) > 0:
818
count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
819
else:
820
count = 0
821
self.append_revision(*revision_ids)
822
## note("Added %d revisions." % count)
823
pb.clear()
824
825
def install_revisions(self, other, revision_ids, pb):
826
if hasattr(other.revision_store, "prefetch"):
827
other.revision_store.prefetch(revision_ids)
828
if hasattr(other.inventory_store, "prefetch"):
829
inventory_ids = [other.get_revision(r).inventory_id
830
for r in revision_ids]
831
other.inventory_store.prefetch(inventory_ids)
832
833
if pb is None:
834
pb = bzrlib.ui.ui_factory.progress_bar()
835
836
revisions = []
837
needed_texts = set()
838
i = 0
839
840
failures = set()
841
for i, rev_id in enumerate(revision_ids):
842
pb.update('fetching revision', i+1, len(revision_ids))
843
try:
844
rev = other.get_revision(rev_id)
845
except bzrlib.errors.NoSuchRevision:
846
failures.add(rev_id)
847
continue
848
849
revisions.append(rev)
850
inv = other.get_inventory(str(rev.inventory_id))
851
for key, entry in inv.iter_entries():
852
if entry.text_id is None:
853
continue
854
if entry.text_id not in self.text_store:
855
needed_texts.add(entry.text_id)
856
857
pb.clear()
858
859
count, cp_fail = self.text_store.copy_multi(other.text_store,
860
needed_texts)
861
#print "Added %d texts." % count
862
inventory_ids = [ f.inventory_id for f in revisions ]
863
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
864
inventory_ids)
865
#print "Added %d inventories." % count
866
revision_ids = [ f.revision_id for f in revisions]
867
868
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
869
revision_ids,
870
permit_failure=True)
871
assert len(cp_fail) == 0
872
return count, failures
873
1000
from bzrlib.revision import get_intervening_revisions
1001
if stop_revision is None:
1002
stop_revision = other.last_revision()
1003
if (stop_revision is not None and
1004
stop_revision in self.revision_history()):
1005
return
1006
greedy_fetch(to_branch=self, from_branch=other,
1007
revision=stop_revision)
1008
pullable_revs = self.missing_revisions(
1009
other, other.revision_id_to_revno(stop_revision))
1010
if pullable_revs:
1011
greedy_fetch(to_branch=self,
1012
from_branch=other,
1013
revision=pullable_revs[-1])
1014
self.append_revision(*pullable_revs)
1015
874
1016
875
1017
def commit(self, *args, **kw):
876
1018
from bzrlib.commit import Commit
877
1019
Commit().commit(self, *args, **kw)
878
879
880
def lookup_revision(self, revision):
881
"""Return the revision identifier for a given revision information."""
882
revno, info = self._get_revision_info(revision)
883
return info
884
885
1020
886
1021
def revision_id_to_revno(self, revision_id):
887
1022
"""Given a revision id, return its revno"""
1023
if revision_id is None:
1024
return 0
888
1025
history = self.revision_history()
889
1026
try:
890
1027
return history.index(revision_id) + 1
891
1028
except ValueError:
892
1029
raise bzrlib.errors.NoSuchRevision(self, revision_id)
893
1030
894
895
def get_revision_info(self, revision):
896
"""Return (revno, revision id) for revision identifier.
897
898
revision can be an integer, in which case it is assumed to be revno (though
899
this will translate negative values into positive ones)
900
revision can also be a string, in which case it is parsed for something like
901
'date:' or 'revid:' etc.
902
"""
903
revno, rev_id = self._get_revision_info(revision)
904
if revno is None:
905
raise bzrlib.errors.NoSuchRevision(self, revision)
906
return revno, rev_id
907
908
1031
def get_rev_id(self, revno, history=None):
909
1032
"""Find the revision id of the specified revno."""
910
1033
if revno == 0:
915
1038
raise bzrlib.errors.NoSuchRevision(self, revno)
916
1039
return history[revno - 1]
917
1040
918
def _get_revision_info(self, revision):
919
"""Return (revno, revision id) for revision specifier.
920
921
revision can be an integer, in which case it is assumed to be revno
922
(though this will translate negative values into positive ones)
923
revision can also be a string, in which case it is parsed for something
924
like 'date:' or 'revid:' etc.
925
926
A revid is always returned. If it is None, the specifier referred to
927
the null revision. If the revid does not occur in the revision
928
history, revno will be None.
929
"""
930
931
if revision is None:
932
return 0, None
933
revno = None
934
try:# Convert to int if possible
935
revision = int(revision)
936
except ValueError:
937
pass
938
revs = self.revision_history()
939
if isinstance(revision, int):
940
if revision < 0:
941
revno = len(revs) + revision + 1
942
else:
943
revno = revision
944
rev_id = self.get_rev_id(revno, revs)
945
elif isinstance(revision, basestring):
946
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
947
if revision.startswith(prefix):
948
result = func(self, revs, revision)
949
if len(result) > 1:
950
revno, rev_id = result
951
else:
952
revno = result[0]
953
rev_id = self.get_rev_id(revno, revs)
954
break
955
else:
956
raise BzrError('No namespace registered for string: %r' %
957
revision)
958
else:
959
raise TypeError('Unhandled revision type %s' % revision)
960
961
if revno is None:
962
if rev_id is None:
963
raise bzrlib.errors.NoSuchRevision(self, revision)
964
return revno, rev_id
965
966
def _namespace_revno(self, revs, revision):
967
"""Lookup a revision by revision number"""
968
assert revision.startswith('revno:')
969
try:
970
return (int(revision[6:]),)
971
except ValueError:
972
return None
973
REVISION_NAMESPACES['revno:'] = _namespace_revno
974
975
def _namespace_revid(self, revs, revision):
976
assert revision.startswith('revid:')
977
rev_id = revision[len('revid:'):]
978
try:
979
return revs.index(rev_id) + 1, rev_id
980
except ValueError:
981
return None, rev_id
982
REVISION_NAMESPACES['revid:'] = _namespace_revid
983
984
def _namespace_last(self, revs, revision):
985
assert revision.startswith('last:')
986
try:
987
offset = int(revision[5:])
988
except ValueError:
989
return (None,)
990
else:
991
if offset <= 0:
992
raise BzrError('You must supply a positive value for --revision last:XXX')
993
return (len(revs) - offset + 1,)
994
REVISION_NAMESPACES['last:'] = _namespace_last
995
996
def _namespace_tag(self, revs, revision):
997
assert revision.startswith('tag:')
998
raise BzrError('tag: namespace registered, but not implemented.')
999
REVISION_NAMESPACES['tag:'] = _namespace_tag
1000
1001
def _namespace_date(self, revs, revision):
1002
assert revision.startswith('date:')
1003
import datetime
1004
# Spec for date revisions:
1005
# date:value
1006
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
1007
# it can also start with a '+/-/='. '+' says match the first
1008
# entry after the given date. '-' is match the first entry before the date
1009
# '=' is match the first entry after, but still on the given date.
1010
#
1011
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
1012
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
1013
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
1014
# May 13th, 2005 at 0:00
1015
#
1016
# So the proper way of saying 'give me all entries for today' is:
1017
# -r {date:+today}:{date:-tomorrow}
1018
# The default is '=' when not supplied
1019
val = revision[5:]
1020
match_style = '='
1021
if val[:1] in ('+', '-', '='):
1022
match_style = val[:1]
1023
val = val[1:]
1024
1025
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
1026
if val.lower() == 'yesterday':
1027
dt = today - datetime.timedelta(days=1)
1028
elif val.lower() == 'today':
1029
dt = today
1030
elif val.lower() == 'tomorrow':
1031
dt = today + datetime.timedelta(days=1)
1032
else:
1033
import re
1034
# This should be done outside the function to avoid recompiling it.
1035
_date_re = re.compile(
1036
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
1037
r'(,|T)?\s*'
1038
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
1039
)
1040
m = _date_re.match(val)
1041
if not m or (not m.group('date') and not m.group('time')):
1042
raise BzrError('Invalid revision date %r' % revision)
1043
1044
if m.group('date'):
1045
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
1046
else:
1047
year, month, day = today.year, today.month, today.day
1048
if m.group('time'):
1049
hour = int(m.group('hour'))
1050
minute = int(m.group('minute'))
1051
if m.group('second'):
1052
second = int(m.group('second'))
1053
else:
1054
second = 0
1055
else:
1056
hour, minute, second = 0,0,0
1057
1058
dt = datetime.datetime(year=year, month=month, day=day,
1059
hour=hour, minute=minute, second=second)
1060
first = dt
1061
last = None
1062
reversed = False
1063
if match_style == '-':
1064
reversed = True
1065
elif match_style == '=':
1066
last = dt + datetime.timedelta(days=1)
1067
1068
if reversed:
1069
for i in range(len(revs)-1, -1, -1):
1070
r = self.get_revision(revs[i])
1071
# TODO: Handle timezone.
1072
dt = datetime.datetime.fromtimestamp(r.timestamp)
1073
if first >= dt and (last is None or dt >= last):
1074
return (i+1,)
1075
else:
1076
for i in range(len(revs)):
1077
r = self.get_revision(revs[i])
1078
# TODO: Handle timezone.
1079
dt = datetime.datetime.fromtimestamp(r.timestamp)
1080
if first <= dt and (last is None or dt <= last):
1081
return (i+1,)
1082
REVISION_NAMESPACES['date:'] = _namespace_date
1083
1084
1041
def revision_tree(self, revision_id):
1085
1042
"""Return Tree for a revision on this branch.
1086
1043
1097
1054
1098
1055
def working_tree(self):
1099
1056
"""Return a `Tree` for the working copy."""
1100
from workingtree import WorkingTree
1101
return WorkingTree(self.base, self.read_working_inventory())
1057
from bzrlib.workingtree import WorkingTree
1058
# TODO: In the future, WorkingTree should utilize Transport
1059
# RobertCollins 20051003 - I don't think it should - working trees are
1060
# much more complex to keep consistent than our careful .bzr subset.
1061
# instead, we should say that working trees are local only, and optimise
1062
# for that.
1063
return WorkingTree(self._transport.base, self.read_working_inventory())
1102
1064
1103
1065
1104
1066
def basis_tree(self):
1106
1068
1107
1069
If there are no revisions yet, return an `EmptyTree`.
1108
1070
"""
1109
return self.revision_tree(self.last_patch())
1071
return self.revision_tree(self.last_revision())
1110
1072
1111
1073
1112
1074
def rename_one(self, from_rel, to_rel):
1147
1109
from_abs = self.abspath(from_rel)
1148
1110
to_abs = self.abspath(to_rel)
1149
1111
try:
1150
os.rename(from_abs, to_abs)
1112
rename(from_abs, to_abs)
1151
1113
except OSError, e:
1152
1114
raise BzrError("failed to rename %r to %r: %s"
1153
1115
% (from_abs, to_abs, e[1]),
1216
1178
result.append((f, dest_path))
1217
1179
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1218
1180
try:
1219
os.rename(self.abspath(f), self.abspath(dest_path))
1181
rename(self.abspath(f), self.abspath(dest_path))
1220
1182
except OSError, e:
1221
1183
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1222
1184
["rename rolled back"])
1278
1240
These are revisions that have been merged into the working
1279
1241
directory but not yet committed.
1280
1242
"""
1281
cfn = self.controlfilename('pending-merges')
1282
if not os.path.exists(cfn):
1243
cfn = self._rel_controlfilename('pending-merges')
1244
if not self._transport.has(cfn):
1283
1245
return []
1284
1246
p = []
1285
1247
for l in self.controlfile('pending-merges', 'r').readlines():
1287
1249
return p
1288
1250
1289
1251
1290
def add_pending_merge(self, revision_id):
1291
from bzrlib.revision import validate_revision_id
1292
1293
validate_revision_id(revision_id)
1294
1252
def add_pending_merge(self, *revision_ids):
1253
# TODO: Perhaps should check at this point that the
1254
# history of the revision is actually present?
1295
1255
p = self.pending_merges()
1296
if revision_id in p:
1297
return
1298
p.append(revision_id)
1299
self.set_pending_merges(p)
1300
1256
updated = False
1257
for rev_id in revision_ids:
1258
if rev_id in p:
1259
continue
1260
p.append(rev_id)
1261
updated = True
1262
if updated:
1263
self.set_pending_merges(p)
1301
1264
1302
1265
def set_pending_merges(self, rev_list):
1303
from bzrlib.atomicfile import AtomicFile
1304
1266
self.lock_write()
1305
1267
try:
1306
f = AtomicFile(self.controlfilename('pending-merges'))
1307
try:
1308
for l in rev_list:
1309
print >>f, l
1310
f.commit()
1311
finally:
1312
f.close()
1268
self.put_controlfile('pending-merges', '\n'.join(rev_list))
1313
1269
finally:
1314
1270
self.unlock()
1315
1271
1363
1319
raise InvalidRevisionNumber(revno)
1364
1320
1365
1321
1366
1367
1368
class ScratchBranch(Branch):
1322
1323
1324
1325
class ScratchBranch(_Branch):
1369
1326
"""Special test class: a branch that cleans up after itself.
1370
1327
1371
1328
>>> b = ScratchBranch()
1388
1345
if base is None:
1389
1346
base = mkdtemp()
1390
1347
init = True
1391
Branch.__init__(self, base, init=init)
1348
if isinstance(base, basestring):
1349
base = get_transport(base)
1350
_Branch.__init__(self, base, init=init)
1392
1351
for d in dirs:
1393
os.mkdir(self.abspath(d))
1352
self._transport.mkdir(d)
1394
1353
1395
1354
for f in files:
1396
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1355
self._transport.put(f, 'content of %s' % f)
1397
1356
1398
1357
1399
1358
def clone(self):
1400
1359
"""
1401
1360
>>> orig = ScratchBranch(files=["file1", "file2"])
1402
1361
>>> clone = orig.clone()
1403
>>> os.path.samefile(orig.base, clone.base)
1362
>>> if os.name != 'nt':
1363
... os.path.samefile(orig.base, clone.base)
1364
... else:
1365
... orig.base == clone.base
1366
...
1404
1367
False
1405
1368
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1406
1369
True
1412
1375
copytree(self.base, base, symlinks=True)
1413
1376
return ScratchBranch(base=base)
1414
1377
1415
1416
1417
1378
def __del__(self):
1418
1379
self.destroy()
1419
1380
1432
1393
for name in files:
1433
1394
os.chmod(os.path.join(root, name), 0700)
1434
1395
rmtree(self.base)
1435
self.base = None
1396
self._transport = None
1436
1397
1437
1398
1438
1399
1489
1450
return gen_file_id('TREE_ROOT')
1490
1451
1491
1452
1492
def pull_loc(branch):
1493
# TODO: Should perhaps just make attribute be 'base' in
1494
# RemoteBranch and Branch?
1495
if hasattr(branch, "baseurl"):
1496
return branch.baseurl
1497
else:
1498
return branch.base
1499
1500
1501
def copy_branch(branch_from, to_location, revision=None):
1502
"""Copy branch_from into the existing directory to_location.
1503
1504
revision
1505
If not None, only revisions up to this point will be copied.
1506
The head of the new branch will be that revision.
1507
1508
to_location
1509
The name of a local directory that exists but is empty.
1510
"""
1511
from bzrlib.merge import merge
1512
from bzrlib.branch import Branch
1513
1514
assert isinstance(branch_from, Branch)
1515
assert isinstance(to_location, basestring)
1516
1517
br_to = Branch(to_location, init=True)
1518
br_to.set_root_id(branch_from.get_root_id())
1519
if revision is None:
1520
revno = branch_from.revno()
1521
else:
1522
revno, rev_id = branch_from.get_revision_info(revision)
1523
br_to.update_revisions(branch_from, stop_revision=revno)
1524
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1525
check_clean=False, ignore_zero=True)
1526
1527
from_location = pull_loc(branch_from)
1528
br_to.set_parent(pull_loc(branch_from))
1529
Loggerhead is a web-based interface for Breezy
Version: 2.0.1