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