To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 1414
- compare with another revision
- download diff
- download tarball
- view history from revision 1414
- Committer: Robert Collins
- Date: 2005-10-06 05:13:21 UTC
- mfrom: (1393.3.3)
- Revision ID: robertc@robertcollins.net-20051006051321-88f1053c3bf1ca4a
merge in an adjusted version of Jelmer's empty-log detection patch.
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
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
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
import bzrlib.errors
29
from bzrlib.osutils import (isdir, quotefn, compact_date, rand_bytes,
30
rename, splitpath, sha_file, appendpath,
31
file_kind)
32
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
33
NoSuchRevision, HistoryMissing, NotBranchError,
34
DivergedBranches, LockError, UnlistableStore,
35
UnlistableBranch, NoSuchFile)
28
36
from bzrlib.textui import show_status
29
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
37
from bzrlib.revision import Revision, is_ancestor
31
38
from bzrlib.delta import compare_trees
32
39
from bzrlib.tree import EmptyTree, RevisionTree
33
34
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
40
from bzrlib.inventory import Inventory
41
from bzrlib.store import copy_all
42
from bzrlib.store.compressed_text import CompressedTextStore
43
from bzrlib.store.text import TextStore
44
from bzrlib.store.weave import WeaveStore
45
from bzrlib.transport import Transport, get_transport
46
import bzrlib.xml5
47
import bzrlib.ui
48
49
50
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
51
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
35
52
## TODO: Maybe include checks for common corruption of newlines, etc?
36
53
37
54
38
55
# TODO: Some operations like log might retrieve the same revisions
39
56
# repeatedly to calculate deltas. We could perhaps have a weakref
40
# cache in memory to make this faster.
41
42
43
def find_branch(f, **args):
44
if f and (f.startswith('http://') or f.startswith('https://')):
45
import remotebranch
46
return remotebranch.RemoteBranch(f, **args)
47
else:
48
return Branch(f, **args)
49
50
51
def find_cached_branch(f, cache_root, **args):
52
from remotebranch import RemoteBranch
53
br = find_branch(f, **args)
54
def cacheify(br, store_name):
55
from meta_store import CachedStore
56
cache_path = os.path.join(cache_root, store_name)
57
os.mkdir(cache_path)
58
new_store = CachedStore(getattr(br, store_name), cache_path)
59
setattr(br, store_name, new_store)
60
61
if isinstance(br, RemoteBranch):
62
cacheify(br, 'inventory_store')
63
cacheify(br, 'text_store')
64
cacheify(br, 'revision_store')
65
return br
66
67
57
# cache in memory to make this faster. In general anything can be
58
# cached in memory between lock and unlock operations.
59
60
def find_branch(*ignored, **ignored_too):
61
# XXX: leave this here for about one release, then remove it
62
raise NotImplementedError('find_branch() is not supported anymore, '
63
'please use one of the new branch constructors')
68
64
def _relpath(base, path):
69
65
"""Return path relative to base, or raise exception.
70
66
87
83
if tail:
88
84
s.insert(0, tail)
89
85
else:
90
from errors import NotBranchError
91
86
raise NotBranchError("path %r is not within branch %r" % (rp, base))
92
87
93
88
return os.sep.join(s)
94
89
95
90
96
def find_branch_root(f=None):
97
"""Find the branch root enclosing f, or pwd.
98
99
f may be a filename or a URL.
100
101
It is not necessary that f exists.
91
def find_branch_root(t):
92
"""Find the branch root enclosing the transport's base.
93
94
t is a Transport object.
95
96
It is not necessary that the base of t exists.
102
97
103
98
Basically we keep looking up until we find the control directory or
104
run into the root."""
105
if f == None:
106
f = os.getcwd()
107
elif hasattr(os.path, 'realpath'):
108
f = os.path.realpath(f)
109
else:
110
f = os.path.abspath(f)
111
if not os.path.exists(f):
112
raise BzrError('%r does not exist' % f)
113
114
115
orig_f = f
116
99
run into the root. If there isn't one, raises NotBranchError.
100
"""
101
orig_base = t.base
117
102
while True:
118
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
119
return f
120
head, tail = os.path.split(f)
121
if head == f:
103
if t.has(bzrlib.BZRDIR):
104
return t
105
new_t = t.clone('..')
106
if new_t.base == t.base:
122
107
# reached the root, whatever that may be
123
raise BzrError('%r is not in a branch' % orig_f)
124
f = head
125
126
class DivergedBranches(Exception):
127
def __init__(self, branch1, branch2):
128
self.branch1 = branch1
129
self.branch2 = branch2
130
Exception.__init__(self, "These branches have diverged.")
108
raise NotBranchError('%s is not in a branch' % orig_base)
109
t = new_t
131
110
132
111
133
112
######################################################################
137
116
"""Branch holding a history of revisions.
138
117
139
118
base
140
Base directory of the branch.
119
Base directory/url of the branch.
120
"""
121
base = None
122
123
def __init__(self, *ignored, **ignored_too):
124
raise NotImplementedError('The Branch class is abstract')
125
126
@staticmethod
127
def open_downlevel(base):
128
"""Open a branch which may be of an old format.
129
130
Only local branches are supported."""
131
return _Branch(get_transport(base), relax_version_check=True)
132
133
@staticmethod
134
def open(base):
135
"""Open an existing branch, rooted at 'base' (url)"""
136
t = get_transport(base)
137
return _Branch(t)
138
139
@staticmethod
140
def open_containing(url):
141
"""Open an existing branch which contains url.
142
143
This probes for a branch at url, and searches upwards from there.
144
"""
145
t = get_transport(url)
146
t = find_branch_root(t)
147
return _Branch(t)
148
149
@staticmethod
150
def initialize(base):
151
"""Create a new branch, rooted at 'base' (url)"""
152
t = get_transport(base)
153
return _Branch(t, init=True)
154
155
def setup_caching(self, cache_root):
156
"""Subclasses that care about caching should override this, and set
157
up cached stores located under cache_root.
158
"""
159
self.cache_root = cache_root
160
161
162
class _Branch(Branch):
163
"""A branch stored in the actual filesystem.
164
165
Note that it's "local" in the context of the filesystem; it doesn't
166
really matter if it's on an nfs/smb/afs/coda/... share, as long as
167
it's writable, and can be accessed via the normal filesystem API.
141
168
142
169
_lock_mode
143
170
None, or 'r' or 'w'
149
176
_lock
150
177
Lock object from bzrlib.lock.
151
178
"""
152
base = None
179
# We actually expect this class to be somewhat short-lived; part of its
180
# purpose is to try to isolate what bits of the branch logic are tied to
181
# filesystem access, so that in a later step, we can extricate them to
182
# a separarte ("storage") class.
153
183
_lock_mode = None
154
184
_lock_count = None
155
185
_lock = None
186
_inventory_weave = None
156
187
157
188
# Map some sort of prefix into a namespace
158
189
# stuff like "revno:10", "revid:", etc.
159
190
# This should match a prefix with a function which accepts
160
191
REVISION_NAMESPACES = {}
161
192
162
def __init__(self, base, init=False, find_root=True):
193
def push_stores(self, branch_to):
194
"""Copy the content of this branches store to branch_to."""
195
if (self._branch_format != branch_to._branch_format
196
or self._branch_format != 4):
197
from bzrlib.fetch import greedy_fetch
198
mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
199
self, self._branch_format, branch_to, branch_to._branch_format)
200
greedy_fetch(to_branch=branch_to, from_branch=self,
201
revision=self.last_revision())
202
return
203
204
store_pairs = ((self.text_store, branch_to.text_store),
205
(self.inventory_store, branch_to.inventory_store),
206
(self.revision_store, branch_to.revision_store))
207
try:
208
for from_store, to_store in store_pairs:
209
copy_all(from_store, to_store)
210
except UnlistableStore:
211
raise UnlistableBranch(from_store)
212
213
def __init__(self, transport, init=False,
214
relax_version_check=False):
163
215
"""Create new branch object at a particular location.
164
216
165
base -- Base directory for the branch.
217
transport -- A Transport object, defining how to access files.
218
(If a string, transport.transport() will be used to
219
create a Transport object)
166
220
167
221
init -- If True, create new control files in a previously
168
222
unversioned directory. If False, the branch must already
169
223
be versioned.
170
224
171
find_root -- If true and init is false, find the root of the
172
existing branch containing base.
225
relax_version_check -- If true, the usual check for the branch
226
version is not applied. This is intended only for
227
upgrade/recovery type use; it's not guaranteed that
228
all operations will work on old format branches.
173
229
174
230
In the test suite, creation of new trees is tested using the
175
231
`ScratchBranch` class.
176
232
"""
177
from bzrlib.store import ImmutableStore
233
assert isinstance(transport, Transport), \
234
"%r is not a Transport" % transport
235
self._transport = transport
178
236
if init:
179
self.base = os.path.realpath(base)
180
237
self._make_control()
181
elif find_root:
182
self.base = find_branch_root(base)
183
else:
184
self.base = os.path.realpath(base)
185
if not isdir(self.controlfilename('.')):
186
from errors import NotBranchError
187
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
188
['use "bzr init" to initialize a new working tree',
189
'current bzr can only operate from top-of-tree'])
190
self._check_format()
191
192
self.text_store = ImmutableStore(self.controlfilename('text-store'))
193
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
194
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
195
238
self._check_format(relax_version_check)
239
240
def get_store(name, compressed=True):
241
# FIXME: This approach of assuming stores are all entirely compressed
242
# or entirely uncompressed is tidy, but breaks upgrade from
243
# some existing branches where there's a mixture; we probably
244
# still want the option to look for both.
245
relpath = self._rel_controlfilename(name)
246
if compressed:
247
store = CompressedTextStore(self._transport.clone(relpath))
248
else:
249
store = TextStore(self._transport.clone(relpath))
250
#if self._transport.should_cache():
251
# cache_path = os.path.join(self.cache_root, name)
252
# os.mkdir(cache_path)
253
# store = bzrlib.store.CachedStore(store, cache_path)
254
return store
255
def get_weave(name):
256
relpath = self._rel_controlfilename(name)
257
ws = WeaveStore(self._transport.clone(relpath))
258
if self._transport.should_cache():
259
ws.enable_cache = True
260
return ws
261
262
if self._branch_format == 4:
263
self.inventory_store = get_store('inventory-store')
264
self.text_store = get_store('text-store')
265
self.revision_store = get_store('revision-store')
266
elif self._branch_format == 5:
267
self.control_weaves = get_weave([])
268
self.weave_store = get_weave('weaves')
269
self.revision_store = get_store('revision-store', compressed=False)
196
270
197
271
def __str__(self):
198
return '%s(%r)' % (self.__class__.__name__, self.base)
272
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
199
273
200
274
201
275
__repr__ = __str__
203
277
204
278
def __del__(self):
205
279
if self._lock_mode or self._lock:
206
from warnings import warn
280
# XXX: This should show something every time, and be suitable for
281
# headless operation and embedding
207
282
warn("branch %r was not explicitly unlocked" % self)
208
283
self._lock.unlock()
209
284
285
# TODO: It might be best to do this somewhere else,
286
# but it is nice for a Branch object to automatically
287
# cache it's information.
288
# Alternatively, we could have the Transport objects cache requests
289
# See the earlier discussion about how major objects (like Branch)
290
# should never expect their __del__ function to run.
291
if hasattr(self, 'cache_root') and self.cache_root is not None:
292
try:
293
import shutil
294
shutil.rmtree(self.cache_root)
295
except:
296
pass
297
self.cache_root = None
298
299
def _get_base(self):
300
if self._transport:
301
return self._transport.base
302
return None
303
304
base = property(_get_base)
210
305
211
306
212
307
def lock_write(self):
308
# TODO: Upgrade locking to support using a Transport,
309
# and potentially a remote locking protocol
213
310
if self._lock_mode:
214
311
if self._lock_mode != 'w':
215
from errors import LockError
216
312
raise LockError("can't upgrade to a write lock from %r" %
217
313
self._lock_mode)
218
314
self._lock_count += 1
219
315
else:
220
from bzrlib.lock import WriteLock
221
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
316
self._lock = self._transport.lock_write(
317
self._rel_controlfilename('branch-lock'))
223
318
self._lock_mode = 'w'
224
319
self._lock_count = 1
225
320
226
321
227
228
322
def lock_read(self):
229
323
if self._lock_mode:
230
324
assert self._lock_mode in ('r', 'w'), \
231
325
"invalid lock mode %r" % self._lock_mode
232
326
self._lock_count += 1
233
327
else:
234
from bzrlib.lock import ReadLock
235
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
328
self._lock = self._transport.lock_read(
329
self._rel_controlfilename('branch-lock'))
237
330
self._lock_mode = 'r'
238
331
self._lock_count = 1
239
332
240
241
242
333
def unlock(self):
243
334
if not self._lock_mode:
244
from errors import LockError
245
335
raise LockError('branch %r is not locked' % (self))
246
336
247
337
if self._lock_count > 1:
251
341
self._lock = None
252
342
self._lock_mode = self._lock_count = None
253
343
254
255
344
def abspath(self, name):
256
345
"""Return absolute filename for something in the branch"""
257
return os.path.join(self.base, name)
258
346
return self._transport.abspath(name)
259
347
260
348
def relpath(self, path):
261
349
"""Return path relative to this branch of something inside it.
262
350
263
351
Raises an error if path is not in this branch."""
264
return _relpath(self.base, path)
265
352
return self._transport.relpath(path)
353
354
355
def _rel_controlfilename(self, file_or_path):
356
if isinstance(file_or_path, basestring):
357
file_or_path = [file_or_path]
358
return [bzrlib.BZRDIR] + file_or_path
266
359
267
360
def controlfilename(self, file_or_path):
268
361
"""Return location relative to branch."""
269
if isinstance(file_or_path, basestring):
270
file_or_path = [file_or_path]
271
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
362
return self._transport.abspath(self._rel_controlfilename(file_or_path))
272
363
273
364
274
365
def controlfile(self, file_or_path, mode='r'):
282
373
Controlfiles should almost never be opened in write mode but
283
374
rather should be atomically copied and replaced using atomicfile.
284
375
"""
285
286
fn = self.controlfilename(file_or_path)
287
288
if mode == 'rb' or mode == 'wb':
289
return file(fn, mode)
290
elif mode == 'r' or mode == 'w':
291
# open in binary mode anyhow so there's no newline translation;
292
# codecs uses line buffering by default; don't want that.
293
import codecs
294
return codecs.open(fn, mode + 'b', 'utf-8',
295
buffering=60000)
376
import codecs
377
378
relpath = self._rel_controlfilename(file_or_path)
379
#TODO: codecs.open() buffers linewise, so it was overloaded with
380
# a much larger buffer, do we need to do the same for getreader/getwriter?
381
if mode == 'rb':
382
return self._transport.get(relpath)
383
elif mode == 'wb':
384
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
385
elif mode == 'r':
386
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
387
elif mode == 'w':
388
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
296
389
else:
297
390
raise BzrError("invalid controlfile mode %r" % mode)
298
391
299
392
def put_controlfile(self, path, f, encode=True):
393
"""Write an entry as a controlfile.
394
395
:param path: The path to put the file, relative to the .bzr control
396
directory
397
:param f: A file-like or string object whose contents should be copied.
398
:param encode: If true, encode the contents as utf-8
399
"""
400
self.put_controlfiles([(path, f)], encode=encode)
401
402
def put_controlfiles(self, files, encode=True):
403
"""Write several entries as controlfiles.
404
405
:param files: A list of [(path, file)] pairs, where the path is the directory
406
underneath the bzr control directory
407
:param encode: If true, encode the contents as utf-8
408
"""
409
import codecs
410
ctrl_files = []
411
for path, f in files:
412
if encode:
413
if isinstance(f, basestring):
414
f = f.encode('utf-8', 'replace')
415
else:
416
f = codecs.getwriter('utf-8')(f, errors='replace')
417
path = self._rel_controlfilename(path)
418
ctrl_files.append((path, f))
419
self._transport.put_multi(ctrl_files)
300
420
301
421
def _make_control(self):
302
422
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
423
from bzrlib.weavefile import write_weave_v5
424
from bzrlib.weave import Weave
304
425
305
os.mkdir(self.controlfilename([]))
306
self.controlfile('README', 'w').write(
426
# Create an empty inventory
427
sio = StringIO()
428
# if we want per-tree root ids then this is the place to set
429
# them; they're not needed for now and so ommitted for
430
# simplicity.
431
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
432
empty_inv = sio.getvalue()
433
sio = StringIO()
434
bzrlib.weavefile.write_weave_v5(Weave(), sio)
435
empty_weave = sio.getvalue()
436
437
dirs = [[], 'revision-store', 'weaves']
438
files = [('README',
307
439
"This is a Bazaar-NG control directory.\n"
308
"Do not change any files in this directory.\n")
309
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
310
for d in ('text-store', 'inventory-store', 'revision-store'):
311
os.mkdir(self.controlfilename(d))
312
for f in ('revision-history', 'merged-patches',
313
'pending-merged-patches', 'branch-name',
314
'branch-lock',
315
'pending-merges'):
316
self.controlfile(f, 'w').write('')
317
mutter('created control directory in ' + self.base)
318
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
320
321
322
def _check_format(self):
440
"Do not change any files in this directory.\n"),
441
('branch-format', BZR_BRANCH_FORMAT_5),
442
('revision-history', ''),
443
('branch-name', ''),
444
('branch-lock', ''),
445
('pending-merges', ''),
446
('inventory', empty_inv),
447
('inventory.weave', empty_weave),
448
('ancestry.weave', empty_weave)
449
]
450
cfn = self._rel_controlfilename
451
self._transport.mkdir_multi([cfn(d) for d in dirs])
452
self.put_controlfiles(files)
453
mutter('created control directory in ' + self._transport.base)
454
455
def _check_format(self, relax_version_check):
323
456
"""Check this branch format is supported.
324
457
325
The current tool only supports the current unstable format.
458
The format level is stored, as an integer, in
459
self._branch_format for code that needs to check it later.
326
460
327
461
In the future, we might need different in-memory Branch
328
462
classes to support downlevel branches. But not yet.
329
463
"""
330
# This ignores newlines so that we can open branches created
331
# on Windows from Linux and so on. I think it might be better
332
# to always make all internal files in unix format.
333
fmt = self.controlfile('branch-format', 'r').read()
334
fmt.replace('\r\n', '')
335
if fmt != BZR_BRANCH_FORMAT:
464
try:
465
fmt = self.controlfile('branch-format', 'r').read()
466
except NoSuchFile:
467
raise NotBranchError(self.base)
468
469
if fmt == BZR_BRANCH_FORMAT_5:
470
self._branch_format = 5
471
elif fmt == BZR_BRANCH_FORMAT_4:
472
self._branch_format = 4
473
474
if (not relax_version_check
475
and self._branch_format != 5):
336
476
raise BzrError('sorry, branch format %r not supported' % fmt,
337
477
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
478
'or remove the .bzr directory'
479
' and "bzr init" again'])
339
480
340
481
def get_root_id(self):
341
482
"""Return the id of this branches root"""
356
497
357
498
def read_working_inventory(self):
358
499
"""Read the working inventory."""
359
from bzrlib.inventory import Inventory
360
from bzrlib.xml import unpack_xml
361
from time import time
362
before = time()
363
500
self.lock_read()
364
501
try:
365
502
# ElementTree does its own conversion from UTF-8, so open in
366
503
# binary.
367
inv = unpack_xml(Inventory,
368
self.controlfile('inventory', 'rb'))
369
mutter("loaded inventory of %d items in %f"
370
% (len(inv), time() - before))
371
return inv
504
f = self.controlfile('inventory', 'rb')
505
return bzrlib.xml5.serializer_v5.read_inventory(f)
372
506
finally:
373
507
self.unlock()
374
508
379
513
That is to say, the inventory describing changes underway, that
380
514
will be committed to the next revision.
381
515
"""
382
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
384
516
from cStringIO import StringIO
385
517
self.lock_write()
386
518
try:
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
try:
389
pack_xml(inv, f)
390
f.commit()
391
finally:
392
f.close()
519
sio = StringIO()
520
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
521
sio.seek(0)
522
# Transport handles atomicity
523
self.put_controlfile('inventory', sio)
393
524
finally:
394
525
self.unlock()
395
526
396
527
mutter('wrote working inventory')
397
528
398
399
529
inventory = property(read_working_inventory, _write_inventory, None,
400
530
"""Inventory for the working copy.""")
401
531
402
403
def add(self, files, verbose=False, ids=None):
532
def add(self, files, ids=None):
404
533
"""Make files versioned.
405
534
406
Note that the command line normally calls smart_add instead.
535
Note that the command line normally calls smart_add instead,
536
which can automatically recurse.
407
537
408
538
This puts the files in the Added state, so that they will be
409
539
recorded by the next commit.
419
549
TODO: Perhaps have an option to add the ids even if the files do
420
550
not (yet) exist.
421
551
422
TODO: Perhaps return the ids of the files? But then again it
423
is easy to retrieve them if they're needed.
424
425
TODO: Adding a directory should optionally recurse down and
426
add all non-ignored children. Perhaps do that in a
427
higher-level method.
552
TODO: Perhaps yield the ids and paths as they're added.
428
553
"""
429
554
# TODO: Re-adding a file that is removed in the working copy
430
555
# should probably put it back with the previous ID.
457
582
kind = file_kind(fullpath)
458
583
except OSError:
459
584
# maybe something better?
460
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
585
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
461
586
462
if kind != 'file' and kind != 'directory':
463
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
587
if not InventoryEntry.versionable_kind(kind):
588
raise BzrError('cannot add: not a versionable file ('
589
'i.e. regular file, symlink or directory): %s' % quotefn(f))
464
590
465
591
if file_id is None:
466
592
file_id = gen_file_id(f)
467
593
inv.add_path(f, kind=kind, file_id=file_id)
468
594
469
if verbose:
470
print 'added', quotefn(f)
471
472
595
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
473
596
474
597
self._write_inventory(inv)
480
603
"""Print `file` to stdout."""
481
604
self.lock_read()
482
605
try:
483
tree = self.revision_tree(self.lookup_revision(revno))
606
tree = self.revision_tree(self.get_rev_id(revno))
484
607
# use inventory as it was in that revision
485
608
file_id = tree.inventory.path2id(file)
486
609
if not file_id:
534
657
finally:
535
658
self.unlock()
536
659
537
538
660
# FIXME: this doesn't need to be a branch method
539
661
def set_inventory(self, new_inventory_list):
540
662
from bzrlib.inventory import Inventory, InventoryEntry
543
665
name = os.path.basename(path)
544
666
if name == "":
545
667
continue
546
inv.add(InventoryEntry(file_id, name, kind, parent))
668
# fixme, there should be a factory function inv,add_??
669
if kind == 'directory':
670
inv.add(inventory.InventoryDirectory(file_id, name, parent))
671
elif kind == 'file':
672
inv.add(inventory.InventoryFile(file_id, name, parent))
673
elif kind == 'symlink':
674
inv.add(inventory.InventoryLink(file_id, name, parent))
675
else:
676
raise BzrError("unknown kind %r" % kind)
547
677
self._write_inventory(inv)
548
678
549
550
679
def unknowns(self):
551
680
"""Return all unknown files.
552
681
567
696
568
697
569
698
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
571
572
699
for revision_id in revision_ids:
573
700
mutter("add {%s} to revision-history" % revision_id)
574
575
rev_history = self.revision_history()
576
rev_history.extend(revision_ids)
577
578
f = AtomicFile(self.controlfilename('revision-history'))
701
self.lock_write()
579
702
try:
580
for rev_id in rev_history:
581
print >>f, rev_id
582
f.commit()
703
rev_history = self.revision_history()
704
rev_history.extend(revision_ids)
705
self.put_controlfile('revision-history', '\n'.join(rev_history))
583
706
finally:
584
f.close()
585
586
587
def get_revision_xml(self, revision_id):
707
self.unlock()
708
709
def has_revision(self, revision_id):
710
"""True if this branch has a copy of the revision.
711
712
This does not necessarily imply the revision is merge
713
or on the mainline."""
714
return (revision_id is None
715
or revision_id in self.revision_store)
716
717
def get_revision_xml_file(self, revision_id):
588
718
"""Return XML file object for revision object."""
589
719
if not revision_id or not isinstance(revision_id, basestring):
590
720
raise InvalidRevisionId(revision_id)
593
723
try:
594
724
try:
595
725
return self.revision_store[revision_id]
596
except IndexError:
597
raise bzrlib.errors.NoSuchRevision(revision_id)
726
except (IndexError, KeyError):
727
raise bzrlib.errors.NoSuchRevision(self, revision_id)
598
728
finally:
599
729
self.unlock()
600
730
731
#deprecated
732
get_revision_xml = get_revision_xml_file
733
734
def get_revision_xml(self, revision_id):
735
return self.get_revision_xml_file(revision_id).read()
736
601
737
602
738
def get_revision(self, revision_id):
603
739
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
740
xml_file = self.get_revision_xml_file(revision_id)
605
741
606
742
try:
607
r = unpack_xml(Revision, xml_file)
743
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
608
744
except SyntaxError, e:
609
745
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
746
[revision_id,
613
749
assert r.revision_id == revision_id
614
750
return r
615
751
616
617
752
def get_revision_delta(self, revno):
618
753
"""Return the delta for one revision.
619
754
635
770
636
771
return compare_trees(old_tree, new_tree)
637
772
638
639
640
773
def get_revision_sha1(self, revision_id):
641
774
"""Hash the stored value of a revision, and return it."""
642
775
# In the future, revision entries will be signed. At that
645
778
# the revision, (add signatures/remove signatures) and still
646
779
# have all hash pointers stay consistent.
647
780
# But for now, just hash the contents.
648
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
649
650
651
def get_inventory(self, inventory_id):
652
"""Get Inventory object by hash.
653
654
TODO: Perhaps for this and similar methods, take a revision
655
parameter which can be either an integer revno or a
656
string hash."""
657
from bzrlib.inventory import Inventory
658
from bzrlib.xml import unpack_xml
659
660
return unpack_xml(Inventory, self.inventory_store[inventory_id])
661
662
663
def get_inventory_sha1(self, inventory_id):
781
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
782
783
def _get_ancestry_weave(self):
784
return self.control_weaves.get_weave('ancestry')
785
786
def get_ancestry(self, revision_id):
787
"""Return a list of revision-ids integrated by a revision."""
788
if revision_id is None:
789
return [None]
790
w = self._get_ancestry_weave()
791
return [None] + [l[:-1] for l in w.get_iter(w.lookup(revision_id))]
792
793
def get_inventory_weave(self):
794
return self.control_weaves.get_weave('inventory')
795
796
def get_inventory(self, revision_id):
797
"""Get Inventory object by hash."""
798
xml = self.get_inventory_xml(revision_id)
799
return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
800
801
def get_inventory_xml(self, revision_id):
802
"""Get inventory XML as a file object."""
803
try:
804
assert isinstance(revision_id, basestring), type(revision_id)
805
iw = self.get_inventory_weave()
806
return iw.get_text(iw.lookup(revision_id))
807
except IndexError:
808
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
809
810
def get_inventory_sha1(self, revision_id):
664
811
"""Return the sha1 hash of the inventory entry
665
812
"""
666
return sha_file(self.inventory_store[inventory_id])
667
813
return self.get_revision(revision_id).inventory_sha1
668
814
669
815
def get_revision_inventory(self, revision_id):
670
816
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
817
# TODO: Unify this with get_inventory()
818
# bzr 0.0.6 and later imposes the constraint that the inventory_id
672
819
# must be the same as its revision, so this is trivial.
673
820
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
821
return Inventory(self.get_root_id())
676
822
else:
677
823
return self.get_inventory(revision_id)
678
824
679
680
825
def revision_history(self):
681
"""Return sequence of revision hashes on to this branch.
682
683
>>> ScratchBranch().revision_history()
684
[]
685
"""
826
"""Return sequence of revision hashes on to this branch."""
686
827
self.lock_read()
687
828
try:
688
829
return [l.rstrip('\r\n') for l in
690
831
finally:
691
832
self.unlock()
692
833
693
694
834
def common_ancestor(self, other, self_revno=None, other_revno=None):
695
835
"""
696
>>> import commit
836
>>> from bzrlib.commit import commit
697
837
>>> sb = ScratchBranch(files=['foo', 'foo~'])
698
838
>>> sb.common_ancestor(sb) == (None, None)
699
839
True
700
>>> commit.commit(sb, "Committing first revision", verbose=False)
840
>>> commit(sb, "Committing first revision", verbose=False)
701
841
>>> sb.common_ancestor(sb)[0]
702
842
1
703
843
>>> clone = sb.clone()
704
>>> commit.commit(sb, "Committing second revision", verbose=False)
844
>>> commit(sb, "Committing second revision", verbose=False)
705
845
>>> sb.common_ancestor(sb)[0]
706
846
2
707
847
>>> sb.common_ancestor(clone)[0]
708
848
1
709
>>> commit.commit(clone, "Committing divergent second revision",
849
>>> commit(clone, "Committing divergent second revision",
710
850
... verbose=False)
711
851
>>> sb.common_ancestor(clone)[0]
712
852
1
745
885
return len(self.revision_history())
746
886
747
887
748
def last_patch(self):
888
def last_revision(self):
749
889
"""Return last patch hash, or None if no history.
750
890
"""
751
891
ph = self.revision_history()
755
895
return None
756
896
757
897
758
def missing_revisions(self, other, stop_revision=None):
759
"""
898
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
899
"""Return a list of new revisions that would perfectly fit.
900
760
901
If self and other have not diverged, return a list of the revisions
761
902
present in other, but missing from self.
762
903
782
923
Traceback (most recent call last):
783
924
DivergedBranches: These branches have diverged.
784
925
"""
926
# FIXME: If the branches have diverged, but the latest
927
# revision in this branch is completely merged into the other,
928
# then we should still be able to pull.
785
929
self_history = self.revision_history()
786
930
self_len = len(self_history)
787
931
other_history = other.revision_history()
793
937
794
938
if stop_revision is None:
795
939
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
798
940
else:
941
assert isinstance(stop_revision, int)
942
if stop_revision > other_len:
943
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
799
944
return other_history[self_len:stop_revision]
800
945
801
802
946
def update_revisions(self, other, stop_revision=None):
803
"""Pull in all new revisions from other branch.
804
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
808
>>> br1.add('foo')
809
>>> br1.add('bar')
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
813
Added 2 texts.
814
Added 1 inventories.
815
Added 1 revisions.
816
>>> br2.revision_history()
817
[u'REVISION-ID-1']
818
>>> br2.update_revisions(br1)
819
Added 0 texts.
820
Added 0 inventories.
821
Added 0 revisions.
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
823
True
824
"""
825
from bzrlib.progress import ProgressBar
826
827
pb = ProgressBar()
828
829
pb.update('comparing histories')
830
revision_ids = self.missing_revisions(other, stop_revision)
831
832
if hasattr(other.revision_store, "prefetch"):
833
other.revision_store.prefetch(revision_ids)
834
if hasattr(other.inventory_store, "prefetch"):
835
inventory_ids = [other.get_revision(r).inventory_id
836
for r in revision_ids]
837
other.inventory_store.prefetch(inventory_ids)
838
839
revisions = []
840
needed_texts = set()
841
i = 0
842
for rev_id in revision_ids:
843
i += 1
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
846
revisions.append(rev)
847
inv = other.get_inventory(str(rev.inventory_id))
848
for key, entry in inv.iter_entries():
849
if entry.text_id is None:
850
continue
851
if entry.text_id not in self.text_store:
852
needed_texts.add(entry.text_id)
853
854
pb.clear()
855
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
857
print "Added %d texts." % count
858
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
860
inventory_ids)
861
print "Added %d inventories." % count
862
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
864
revision_ids)
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
868
869
947
"""Pull in new perfect-fit revisions."""
948
from bzrlib.fetch import greedy_fetch
949
from bzrlib.revision import get_intervening_revisions
950
if stop_revision is None:
951
stop_revision = other.last_revision()
952
greedy_fetch(to_branch=self, from_branch=other,
953
revision=stop_revision)
954
pullable_revs = self.missing_revisions(
955
other, other.revision_id_to_revno(stop_revision))
956
if pullable_revs:
957
greedy_fetch(to_branch=self,
958
from_branch=other,
959
revision=pullable_revs[-1])
960
self.append_revision(*pullable_revs)
961
962
870
963
def commit(self, *args, **kw):
871
from bzrlib.commit import commit
872
commit(self, *args, **kw)
873
874
875
def lookup_revision(self, revision):
876
"""Return the revision identifier for a given revision information."""
877
revno, info = self.get_revision_info(revision)
878
return info
879
880
def get_revision_info(self, revision):
881
"""Return (revno, revision id) for revision identifier.
882
883
revision can be an integer, in which case it is assumed to be revno (though
884
this will translate negative values into positive ones)
885
revision can also be a string, in which case it is parsed for something like
886
'date:' or 'revid:' etc.
887
"""
888
if revision is None:
889
return 0, None
890
revno = None
891
try:# Convert to int if possible
892
revision = int(revision)
893
except ValueError:
894
pass
895
revs = self.revision_history()
896
if isinstance(revision, int):
897
if revision == 0:
898
return 0, None
899
# Mabye we should do this first, but we don't need it if revision == 0
900
if revision < 0:
901
revno = len(revs) + revision + 1
902
else:
903
revno = revision
904
elif isinstance(revision, basestring):
905
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
906
if revision.startswith(prefix):
907
revno = func(self, revs, revision)
908
break
909
else:
910
raise BzrError('No namespace registered for string: %r' % revision)
911
912
if revno is None or revno <= 0 or revno > len(revs):
913
raise BzrError("no such revision %s" % revision)
914
return revno, revs[revno-1]
915
916
def _namespace_revno(self, revs, revision):
917
"""Lookup a revision by revision number"""
918
assert revision.startswith('revno:')
919
try:
920
return int(revision[6:])
921
except ValueError:
922
return None
923
REVISION_NAMESPACES['revno:'] = _namespace_revno
924
925
def _namespace_revid(self, revs, revision):
926
assert revision.startswith('revid:')
927
try:
928
return revs.index(revision[6:]) + 1
929
except ValueError:
930
return None
931
REVISION_NAMESPACES['revid:'] = _namespace_revid
932
933
def _namespace_last(self, revs, revision):
934
assert revision.startswith('last:')
935
try:
936
offset = int(revision[5:])
937
except ValueError:
938
return None
939
else:
940
if offset <= 0:
941
raise BzrError('You must supply a positive value for --revision last:XXX')
942
return len(revs) - offset + 1
943
REVISION_NAMESPACES['last:'] = _namespace_last
944
945
def _namespace_tag(self, revs, revision):
946
assert revision.startswith('tag:')
947
raise BzrError('tag: namespace registered, but not implemented.')
948
REVISION_NAMESPACES['tag:'] = _namespace_tag
949
950
def _namespace_date(self, revs, revision):
951
assert revision.startswith('date:')
952
import datetime
953
# Spec for date revisions:
954
# date:value
955
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
956
# it can also start with a '+/-/='. '+' says match the first
957
# entry after the given date. '-' is match the first entry before the date
958
# '=' is match the first entry after, but still on the given date.
959
#
960
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
961
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
962
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
963
# May 13th, 2005 at 0:00
964
#
965
# So the proper way of saying 'give me all entries for today' is:
966
# -r {date:+today}:{date:-tomorrow}
967
# The default is '=' when not supplied
968
val = revision[5:]
969
match_style = '='
970
if val[:1] in ('+', '-', '='):
971
match_style = val[:1]
972
val = val[1:]
973
974
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
975
if val.lower() == 'yesterday':
976
dt = today - datetime.timedelta(days=1)
977
elif val.lower() == 'today':
978
dt = today
979
elif val.lower() == 'tomorrow':
980
dt = today + datetime.timedelta(days=1)
981
else:
982
import re
983
# This should be done outside the function to avoid recompiling it.
984
_date_re = re.compile(
985
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
986
r'(,|T)?\s*'
987
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
988
)
989
m = _date_re.match(val)
990
if not m or (not m.group('date') and not m.group('time')):
991
raise BzrError('Invalid revision date %r' % revision)
992
993
if m.group('date'):
994
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
995
else:
996
year, month, day = today.year, today.month, today.day
997
if m.group('time'):
998
hour = int(m.group('hour'))
999
minute = int(m.group('minute'))
1000
if m.group('second'):
1001
second = int(m.group('second'))
1002
else:
1003
second = 0
1004
else:
1005
hour, minute, second = 0,0,0
1006
1007
dt = datetime.datetime(year=year, month=month, day=day,
1008
hour=hour, minute=minute, second=second)
1009
first = dt
1010
last = None
1011
reversed = False
1012
if match_style == '-':
1013
reversed = True
1014
elif match_style == '=':
1015
last = dt + datetime.timedelta(days=1)
1016
1017
if reversed:
1018
for i in range(len(revs)-1, -1, -1):
1019
r = self.get_revision(revs[i])
1020
# TODO: Handle timezone.
1021
dt = datetime.datetime.fromtimestamp(r.timestamp)
1022
if first >= dt and (last is None or dt >= last):
1023
return i+1
1024
else:
1025
for i in range(len(revs)):
1026
r = self.get_revision(revs[i])
1027
# TODO: Handle timezone.
1028
dt = datetime.datetime.fromtimestamp(r.timestamp)
1029
if first <= dt and (last is None or dt <= last):
1030
return i+1
1031
REVISION_NAMESPACES['date:'] = _namespace_date
964
from bzrlib.commit import Commit
965
Commit().commit(self, *args, **kw)
966
967
def revision_id_to_revno(self, revision_id):
968
"""Given a revision id, return its revno"""
969
if revision_id is None:
970
return 0
971
history = self.revision_history()
972
try:
973
return history.index(revision_id) + 1
974
except ValueError:
975
raise bzrlib.errors.NoSuchRevision(self, revision_id)
976
977
def get_rev_id(self, revno, history=None):
978
"""Find the revision id of the specified revno."""
979
if revno == 0:
980
return None
981
if history is None:
982
history = self.revision_history()
983
elif revno <= 0 or revno > len(history):
984
raise bzrlib.errors.NoSuchRevision(self, revno)
985
return history[revno - 1]
1032
986
1033
987
def revision_tree(self, revision_id):
1034
988
"""Return Tree for a revision on this branch.
1041
995
return EmptyTree()
1042
996
else:
1043
997
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
998
return RevisionTree(self.weave_store, inv, revision_id)
1045
999
1046
1000
1047
1001
def working_tree(self):
1048
1002
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
return WorkingTree(self.base, self.read_working_inventory())
1003
from bzrlib.workingtree import WorkingTree
1004
# TODO: In the future, WorkingTree should utilize Transport
1005
# RobertCollins 20051003 - I don't think it should - working trees are
1006
# much more complex to keep consistent than our careful .bzr subset.
1007
# instead, we should say that working trees are local only, and optimise
1008
# for that.
1009
return WorkingTree(self._transport.base, self.read_working_inventory())
1051
1010
1052
1011
1053
1012
def basis_tree(self):
1055
1014
1056
1015
If there are no revisions yet, return an `EmptyTree`.
1057
1016
"""
1058
r = self.last_patch()
1059
if r == None:
1060
return EmptyTree()
1061
else:
1062
return RevisionTree(self.text_store, self.get_revision_inventory(r))
1063
1017
return self.revision_tree(self.last_revision())
1064
1018
1065
1019
1066
1020
def rename_one(self, from_rel, to_rel):
1098
1052
1099
1053
inv.rename(file_id, to_dir_id, to_tail)
1100
1054
1101
print "%s => %s" % (from_rel, to_rel)
1102
1103
1055
from_abs = self.abspath(from_rel)
1104
1056
to_abs = self.abspath(to_rel)
1105
1057
try:
1106
os.rename(from_abs, to_abs)
1058
rename(from_abs, to_abs)
1107
1059
except OSError, e:
1108
1060
raise BzrError("failed to rename %r to %r: %s"
1109
1061
% (from_abs, to_abs, e[1]),
1124
1076
1125
1077
Note that to_name is only the last component of the new name;
1126
1078
this doesn't change the directory.
1079
1080
This returns a list of (from_path, to_path) pairs for each
1081
entry that is moved.
1127
1082
"""
1083
result = []
1128
1084
self.lock_write()
1129
1085
try:
1130
1086
## TODO: Option to move IDs only
1165
1121
for f in from_paths:
1166
1122
name_tail = splitpath(f)[-1]
1167
1123
dest_path = appendpath(to_name, name_tail)
1168
print "%s => %s" % (f, dest_path)
1124
result.append((f, dest_path))
1169
1125
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1170
1126
try:
1171
os.rename(self.abspath(f), self.abspath(dest_path))
1127
rename(self.abspath(f), self.abspath(dest_path))
1172
1128
except OSError, e:
1173
1129
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1174
1130
["rename rolled back"])
1177
1133
finally:
1178
1134
self.unlock()
1179
1135
1136
return result
1137
1180
1138
1181
1139
def revert(self, filenames, old_tree=None, backups=True):
1182
1140
"""Restore selected files to the versions from a previous tree.
1228
1186
These are revisions that have been merged into the working
1229
1187
directory but not yet committed.
1230
1188
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1189
cfn = self._rel_controlfilename('pending-merges')
1190
if not self._transport.has(cfn):
1233
1191
return []
1234
1192
p = []
1235
1193
for l in self.controlfile('pending-merges', 'r').readlines():
1237
1195
return p
1238
1196
1239
1197
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1244
1198
def add_pending_merge(self, *revision_ids):
1199
# TODO: Perhaps should check at this point that the
1200
# history of the revision is actually present?
1245
1201
p = self.pending_merges()
1246
if revision_id in p:
1247
return
1248
p.append(revision_id)
1249
self.set_pending_merges(p)
1250
1202
updated = False
1203
for rev_id in revision_ids:
1204
if rev_id in p:
1205
continue
1206
p.append(rev_id)
1207
updated = True
1208
if updated:
1209
self.set_pending_merges(p)
1251
1210
1252
1211
def set_pending_merges(self, rev_list):
1212
self.lock_write()
1213
try:
1214
self.put_controlfile('pending-merges', '\n'.join(rev_list))
1215
finally:
1216
self.unlock()
1217
1218
1219
def get_parent(self):
1220
"""Return the parent location of the branch.
1221
1222
This is the default location for push/pull/missing. The usual
1223
pattern is that the user can override it by specifying a
1224
location.
1225
"""
1226
import errno
1227
_locs = ['parent', 'pull', 'x-pull']
1228
for l in _locs:
1229
try:
1230
return self.controlfile(l, 'r').read().strip('\n')
1231
except IOError, e:
1232
if e.errno != errno.ENOENT:
1233
raise
1234
return None
1235
1236
1237
def set_parent(self, url):
1238
# TODO: Maybe delete old location files?
1253
1239
from bzrlib.atomicfile import AtomicFile
1254
1240
self.lock_write()
1255
1241
try:
1256
f = AtomicFile(self.controlfilename('pending-merges'))
1242
f = AtomicFile(self.controlfilename('parent'))
1257
1243
try:
1258
for l in rev_list:
1259
print >>f, l
1244
f.write(url + '\n')
1260
1245
f.commit()
1261
1246
finally:
1262
1247
f.close()
1263
1248
finally:
1264
1249
self.unlock()
1265
1250
1266
1267
1268
class ScratchBranch(Branch):
1251
def check_revno(self, revno):
1252
"""\
1253
Check whether a revno corresponds to any revision.
1254
Zero (the NULL revision) is considered valid.
1255
"""
1256
if revno != 0:
1257
self.check_real_revno(revno)
1258
1259
def check_real_revno(self, revno):
1260
"""\
1261
Check whether a revno corresponds to a real revision.
1262
Zero (the NULL revision) is considered invalid
1263
"""
1264
if revno < 1 or revno > self.revno():
1265
raise InvalidRevisionNumber(revno)
1266
1267
1268
1269
1270
1271
class ScratchBranch(_Branch):
1269
1272
"""Special test class: a branch that cleans up after itself.
1270
1273
1271
1274
>>> b = ScratchBranch()
1288
1291
if base is None:
1289
1292
base = mkdtemp()
1290
1293
init = True
1291
Branch.__init__(self, base, init=init)
1294
if isinstance(base, basestring):
1295
base = get_transport(base)
1296
_Branch.__init__(self, base, init=init)
1292
1297
for d in dirs:
1293
os.mkdir(self.abspath(d))
1298
self._transport.mkdir(d)
1294
1299
1295
1300
for f in files:
1296
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1301
self._transport.put(f, 'content of %s' % f)
1297
1302
1298
1303
1299
1304
def clone(self):
1300
1305
"""
1301
1306
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
1307
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1308
>>> if os.name != 'nt':
1309
... os.path.samefile(orig.base, clone.base)
1310
... else:
1311
... orig.base == clone.base
1312
...
1304
1313
False
1305
1314
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
1315
True
1311
1320
os.rmdir(base)
1312
1321
copytree(self.base, base, symlinks=True)
1313
1322
return ScratchBranch(base=base)
1314
1323
1315
1324
def __del__(self):
1316
1325
self.destroy()
1317
1326
1330
1339
for name in files:
1331
1340
os.chmod(os.path.join(root, name), 0700)
1332
1341
rmtree(self.base)
1333
self.base = None
1342
self._transport = None
1334
1343
1335
1344
1336
1345
1386
1395
"""Return a new tree-root file id."""
1387
1396
return gen_file_id('TREE_ROOT')
1388
1397
1398
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0