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 1479
- compare with another revision
- download diff
- download tarball
- view history from revision 1479
- Committer: Robert Collins
- Date: 2005-10-23 11:46:19 UTC
- Revision ID: robertc@robertcollins.net-20051023114619-cec8ca25207b1344
More quoting at the transport layer bugfixes.
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- 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
- bzr *
- setup.py *
added
removed
bzrlib/branch.py
17
17
18
18
import sys
19
19
import os
20
import errno
21
from warnings import warn
22
from cStringIO import StringIO
23
20
24
21
25
import bzrlib
26
from bzrlib.inventory import InventoryEntry
27
import bzrlib.inventory as inventory
22
28
from bzrlib.trace import mutter, note
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
splitpath, \
25
sha_file, appendpath, file_kind
26
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, abspath)
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, NotVersionedError)
28
37
from bzrlib.textui import show_status
29
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
38
from bzrlib.revision import Revision, is_ancestor, get_intervening_revisions
39
31
40
from bzrlib.delta import compare_trees
32
41
from bzrlib.tree import EmptyTree, RevisionTree
33
34
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
42
from bzrlib.inventory import Inventory
43
from bzrlib.store import copy_all
44
from bzrlib.store.compressed_text import CompressedTextStore
45
from bzrlib.store.text import TextStore
46
from bzrlib.store.weave import WeaveStore
47
from bzrlib.testament import Testament
48
import bzrlib.transactions as transactions
49
from bzrlib.transport import Transport, get_transport
50
import bzrlib.xml5
51
import bzrlib.ui
52
53
54
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
55
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
56
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
35
57
## TODO: Maybe include checks for common corruption of newlines, etc?
36
58
37
59
38
60
# TODO: Some operations like log might retrieve the same revisions
39
61
# 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
68
def _relpath(base, path):
69
"""Return path relative to base, or raise exception.
70
71
The path may be either an absolute path or a path relative to the
72
current working directory.
73
74
Lifted out of Branch.relpath for ease of testing.
75
76
os.path.commonprefix (python2.4) has a bad bug that it works just
77
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
78
avoids that problem."""
79
rp = os.path.abspath(path)
80
81
s = []
82
head = rp
83
while len(head) >= len(base):
84
if head == base:
85
break
86
head, tail = os.path.split(head)
87
if tail:
88
s.insert(0, tail)
89
else:
90
from errors import NotBranchError
91
raise NotBranchError("path %r is not within branch %r" % (rp, base))
92
93
return os.sep.join(s)
94
95
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.
102
103
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
117
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:
122
# 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.")
131
62
# cache in memory to make this faster. In general anything can be
63
# cached in memory between lock and unlock operations.
64
65
def find_branch(*ignored, **ignored_too):
66
# XXX: leave this here for about one release, then remove it
67
raise NotImplementedError('find_branch() is not supported anymore, '
68
'please use one of the new branch constructors')
69
70
71
def needs_read_lock(unbound):
72
"""Decorate unbound to take out and release a read lock."""
73
def decorated(self, *args, **kwargs):
74
self.lock_read()
75
try:
76
return unbound(self, *args, **kwargs)
77
finally:
78
self.unlock()
79
return decorated
80
81
82
def needs_write_lock(unbound):
83
"""Decorate unbound to take out and release a write lock."""
84
def decorated(self, *args, **kwargs):
85
self.lock_write()
86
try:
87
return unbound(self, *args, **kwargs)
88
finally:
89
self.unlock()
90
return decorated
132
91
133
92
######################################################################
134
93
# branch objects
137
96
"""Branch holding a history of revisions.
138
97
139
98
base
140
Base directory of the branch.
99
Base directory/url of the branch.
100
"""
101
base = None
102
103
def __init__(self, *ignored, **ignored_too):
104
raise NotImplementedError('The Branch class is abstract')
105
106
@staticmethod
107
def open_downlevel(base):
108
"""Open a branch which may be of an old format.
109
110
Only local branches are supported."""
111
return _Branch(get_transport(base), relax_version_check=True)
112
113
@staticmethod
114
def open(base):
115
"""Open an existing branch, rooted at 'base' (url)"""
116
t = get_transport(base)
117
mutter("trying to open %r with transport %r", base, t)
118
return _Branch(t)
119
120
@staticmethod
121
def open_containing(url):
122
"""Open an existing branch which contains url.
123
124
This probes for a branch at url, and searches upwards from there.
125
126
Basically we keep looking up until we find the control directory or
127
run into the root. If there isn't one, raises NotBranchError.
128
If there is one, it is returned, along with the unused portion of url.
129
"""
130
t = get_transport(url)
131
while True:
132
try:
133
return _Branch(t), t.relpath(url)
134
except NotBranchError:
135
pass
136
new_t = t.clone('..')
137
if new_t.base == t.base:
138
# reached the root, whatever that may be
139
raise NotBranchError(path=url)
140
t = new_t
141
142
@staticmethod
143
def initialize(base):
144
"""Create a new branch, rooted at 'base' (url)"""
145
t = get_transport(base)
146
return _Branch(t, init=True)
147
148
def setup_caching(self, cache_root):
149
"""Subclasses that care about caching should override this, and set
150
up cached stores located under cache_root.
151
"""
152
self.cache_root = cache_root
153
154
155
class _Branch(Branch):
156
"""A branch stored in the actual filesystem.
157
158
Note that it's "local" in the context of the filesystem; it doesn't
159
really matter if it's on an nfs/smb/afs/coda/... share, as long as
160
it's writable, and can be accessed via the normal filesystem API.
141
161
142
162
_lock_mode
143
163
None, or 'r' or 'w'
149
169
_lock
150
170
Lock object from bzrlib.lock.
151
171
"""
152
base = None
172
# We actually expect this class to be somewhat short-lived; part of its
173
# purpose is to try to isolate what bits of the branch logic are tied to
174
# filesystem access, so that in a later step, we can extricate them to
175
# a separarte ("storage") class.
153
176
_lock_mode = None
154
177
_lock_count = None
155
178
_lock = None
179
_inventory_weave = None
156
180
157
181
# Map some sort of prefix into a namespace
158
182
# stuff like "revno:10", "revid:", etc.
159
183
# This should match a prefix with a function which accepts
160
184
REVISION_NAMESPACES = {}
161
185
162
def __init__(self, base, init=False, find_root=True):
186
def push_stores(self, branch_to):
187
"""Copy the content of this branches store to branch_to."""
188
if (self._branch_format != branch_to._branch_format
189
or self._branch_format != 4):
190
from bzrlib.fetch import greedy_fetch
191
mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
192
self, self._branch_format, branch_to, branch_to._branch_format)
193
greedy_fetch(to_branch=branch_to, from_branch=self,
194
revision=self.last_revision())
195
return
196
197
store_pairs = ((self.text_store, branch_to.text_store),
198
(self.inventory_store, branch_to.inventory_store),
199
(self.revision_store, branch_to.revision_store))
200
try:
201
for from_store, to_store in store_pairs:
202
copy_all(from_store, to_store)
203
except UnlistableStore:
204
raise UnlistableBranch(from_store)
205
206
def __init__(self, transport, init=False,
207
relax_version_check=False):
163
208
"""Create new branch object at a particular location.
164
209
165
base -- Base directory for the branch.
210
transport -- A Transport object, defining how to access files.
211
(If a string, transport.transport() will be used to
212
create a Transport object)
166
213
167
214
init -- If True, create new control files in a previously
168
215
unversioned directory. If False, the branch must already
169
216
be versioned.
170
217
171
find_root -- If true and init is false, find the root of the
172
existing branch containing base.
218
relax_version_check -- If true, the usual check for the branch
219
version is not applied. This is intended only for
220
upgrade/recovery type use; it's not guaranteed that
221
all operations will work on old format branches.
173
222
174
223
In the test suite, creation of new trees is tested using the
175
224
`ScratchBranch` class.
176
225
"""
177
from bzrlib.store import ImmutableStore
226
assert isinstance(transport, Transport), \
227
"%r is not a Transport" % transport
228
self._transport = transport
178
229
if init:
179
self.base = os.path.realpath(base)
180
230
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
231
self._check_format(relax_version_check)
232
233
def get_store(name, compressed=True, prefixed=False):
234
# FIXME: This approach of assuming stores are all entirely compressed
235
# or entirely uncompressed is tidy, but breaks upgrade from
236
# some existing branches where there's a mixture; we probably
237
# still want the option to look for both.
238
relpath = self._rel_controlfilename(name)
239
if compressed:
240
store = CompressedTextStore(self._transport.clone(relpath),
241
prefixed=prefixed)
242
else:
243
store = TextStore(self._transport.clone(relpath),
244
prefixed=prefixed)
245
#if self._transport.should_cache():
246
# cache_path = os.path.join(self.cache_root, name)
247
# os.mkdir(cache_path)
248
# store = bzrlib.store.CachedStore(store, cache_path)
249
return store
250
def get_weave(name, prefixed=False):
251
relpath = self._rel_controlfilename(name)
252
ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
253
if self._transport.should_cache():
254
ws.enable_cache = True
255
return ws
256
257
if self._branch_format == 4:
258
self.inventory_store = get_store('inventory-store')
259
self.text_store = get_store('text-store')
260
self.revision_store = get_store('revision-store')
261
elif self._branch_format == 5:
262
self.control_weaves = get_weave('')
263
self.weave_store = get_weave('weaves')
264
self.revision_store = get_store('revision-store', compressed=False)
265
elif self._branch_format == 6:
266
self.control_weaves = get_weave('')
267
self.weave_store = get_weave('weaves', prefixed=True)
268
self.revision_store = get_store('revision-store', compressed=False,
269
prefixed=True)
270
self.revision_store.register_suffix('sig')
271
self._transaction = None
196
272
197
273
def __str__(self):
198
return '%s(%r)' % (self.__class__.__name__, self.base)
274
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
199
275
200
276
201
277
__repr__ = __str__
203
279
204
280
def __del__(self):
205
281
if self._lock_mode or self._lock:
206
from warnings import warn
282
# XXX: This should show something every time, and be suitable for
283
# headless operation and embedding
207
284
warn("branch %r was not explicitly unlocked" % self)
208
285
self._lock.unlock()
209
286
210
287
# TODO: It might be best to do this somewhere else,
288
# but it is nice for a Branch object to automatically
289
# cache it's information.
290
# Alternatively, we could have the Transport objects cache requests
291
# See the earlier discussion about how major objects (like Branch)
292
# should never expect their __del__ function to run.
293
if hasattr(self, 'cache_root') and self.cache_root is not None:
294
try:
295
import shutil
296
shutil.rmtree(self.cache_root)
297
except:
298
pass
299
self.cache_root = None
300
301
def _get_base(self):
302
if self._transport:
303
return self._transport.base
304
return None
305
306
base = property(_get_base, doc="The URL for the root of this branch.")
307
308
def _finish_transaction(self):
309
"""Exit the current transaction."""
310
if self._transaction is None:
311
raise errors.LockError('Branch %s is not in a transaction' %
312
self)
313
transaction = self._transaction
314
self._transaction = None
315
transaction.finish()
316
317
def get_transaction(self):
318
"""Return the current active transaction.
319
320
If no transaction is active, this returns a passthrough object
321
for which all data is immedaitely flushed and no caching happens.
322
"""
323
if self._transaction is None:
324
return transactions.PassThroughTransaction()
325
else:
326
return self._transaction
327
328
def _set_transaction(self, new_transaction):
329
"""Set a new active transaction."""
330
if self._transaction is not None:
331
raise errors.LockError('Branch %s is in a transaction already.' %
332
self)
333
self._transaction = new_transaction
211
334
212
335
def lock_write(self):
336
mutter("lock write: %s (%s)", self, self._lock_count)
337
# TODO: Upgrade locking to support using a Transport,
338
# and potentially a remote locking protocol
213
339
if self._lock_mode:
214
340
if self._lock_mode != 'w':
215
from errors import LockError
216
341
raise LockError("can't upgrade to a write lock from %r" %
217
342
self._lock_mode)
218
343
self._lock_count += 1
219
344
else:
220
from bzrlib.lock import WriteLock
221
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
345
self._lock = self._transport.lock_write(
346
self._rel_controlfilename('branch-lock'))
223
347
self._lock_mode = 'w'
224
348
self._lock_count = 1
225
226
349
self._set_transaction(transactions.PassThroughTransaction())
227
350
228
351
def lock_read(self):
352
mutter("lock read: %s (%s)", self, self._lock_count)
229
353
if self._lock_mode:
230
354
assert self._lock_mode in ('r', 'w'), \
231
355
"invalid lock mode %r" % self._lock_mode
232
356
self._lock_count += 1
233
357
else:
234
from bzrlib.lock import ReadLock
235
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
358
self._lock = self._transport.lock_read(
359
self._rel_controlfilename('branch-lock'))
237
360
self._lock_mode = 'r'
238
361
self._lock_count = 1
362
self._set_transaction(transactions.ReadOnlyTransaction())
363
# 5K may be excessive, but hey, its a knob.
364
self.get_transaction().set_cache_size(5000)
239
365
240
241
242
366
def unlock(self):
367
mutter("unlock: %s (%s)", self, self._lock_count)
243
368
if not self._lock_mode:
244
from errors import LockError
245
369
raise LockError('branch %r is not locked' % (self))
246
370
247
371
if self._lock_count > 1:
248
372
self._lock_count -= 1
249
373
else:
374
self._finish_transaction()
250
375
self._lock.unlock()
251
376
self._lock = None
252
377
self._lock_mode = self._lock_count = None
253
378
254
255
379
def abspath(self, name):
256
"""Return absolute filename for something in the branch"""
257
return os.path.join(self.base, name)
258
259
260
def relpath(self, path):
261
"""Return path relative to this branch of something inside it.
262
263
Raises an error if path is not in this branch."""
264
return _relpath(self.base, path)
265
380
"""Return absolute filename for something in the branch
381
382
XXX: Robert Collins 20051017 what is this used for? why is it a branch
383
method and not a tree method.
384
"""
385
return self._transport.abspath(name)
386
387
def _rel_controlfilename(self, file_or_path):
388
if not isinstance(file_or_path, basestring):
389
file_or_path = '/'.join(file_or_path)
390
if file_or_path == '':
391
return bzrlib.BZRDIR
392
return bzrlib.transport.urlescape(bzrlib.BZRDIR + '/' + file_or_path)
266
393
267
394
def controlfilename(self, file_or_path):
268
395
"""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)
272
396
return self._transport.abspath(self._rel_controlfilename(file_or_path))
273
397
274
398
def controlfile(self, file_or_path, mode='r'):
275
399
"""Open a control file for this branch.
282
406
Controlfiles should almost never be opened in write mode but
283
407
rather should be atomically copied and replaced using atomicfile.
284
408
"""
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)
409
import codecs
410
411
relpath = self._rel_controlfilename(file_or_path)
412
#TODO: codecs.open() buffers linewise, so it was overloaded with
413
# a much larger buffer, do we need to do the same for getreader/getwriter?
414
if mode == 'rb':
415
return self._transport.get(relpath)
416
elif mode == 'wb':
417
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
418
elif mode == 'r':
419
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
420
elif mode == 'w':
421
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
296
422
else:
297
423
raise BzrError("invalid controlfile mode %r" % mode)
298
424
299
425
def put_controlfile(self, path, f, encode=True):
426
"""Write an entry as a controlfile.
427
428
:param path: The path to put the file, relative to the .bzr control
429
directory
430
:param f: A file-like or string object whose contents should be copied.
431
:param encode: If true, encode the contents as utf-8
432
"""
433
self.put_controlfiles([(path, f)], encode=encode)
434
435
def put_controlfiles(self, files, encode=True):
436
"""Write several entries as controlfiles.
437
438
:param files: A list of [(path, file)] pairs, where the path is the directory
439
underneath the bzr control directory
440
:param encode: If true, encode the contents as utf-8
441
"""
442
import codecs
443
ctrl_files = []
444
for path, f in files:
445
if encode:
446
if isinstance(f, basestring):
447
f = f.encode('utf-8', 'replace')
448
else:
449
f = codecs.getwriter('utf-8')(f, errors='replace')
450
path = self._rel_controlfilename(path)
451
ctrl_files.append((path, f))
452
self._transport.put_multi(ctrl_files)
300
453
301
454
def _make_control(self):
302
455
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
456
from bzrlib.weavefile import write_weave_v5
457
from bzrlib.weave import Weave
304
458
305
os.mkdir(self.controlfilename([]))
306
self.controlfile('README', 'w').write(
459
# Create an empty inventory
460
sio = StringIO()
461
# if we want per-tree root ids then this is the place to set
462
# them; they're not needed for now and so ommitted for
463
# simplicity.
464
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
465
empty_inv = sio.getvalue()
466
sio = StringIO()
467
bzrlib.weavefile.write_weave_v5(Weave(), sio)
468
empty_weave = sio.getvalue()
469
470
dirs = [[], 'revision-store', 'weaves']
471
files = [('README',
307
472
"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):
473
"Do not change any files in this directory.\n"),
474
('branch-format', BZR_BRANCH_FORMAT_6),
475
('revision-history', ''),
476
('branch-name', ''),
477
('branch-lock', ''),
478
('pending-merges', ''),
479
('inventory', empty_inv),
480
('inventory.weave', empty_weave),
481
('ancestry.weave', empty_weave)
482
]
483
cfn = self._rel_controlfilename
484
self._transport.mkdir_multi([cfn(d) for d in dirs])
485
self.put_controlfiles(files)
486
mutter('created control directory in ' + self._transport.base)
487
488
def _check_format(self, relax_version_check):
323
489
"""Check this branch format is supported.
324
490
325
The current tool only supports the current unstable format.
491
The format level is stored, as an integer, in
492
self._branch_format for code that needs to check it later.
326
493
327
494
In the future, we might need different in-memory Branch
328
495
classes to support downlevel branches. But not yet.
329
496
"""
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:
336
raise BzrError('sorry, branch format %r not supported' % fmt,
497
try:
498
fmt = self.controlfile('branch-format', 'r').read()
499
except NoSuchFile:
500
raise NotBranchError(path=self.base)
501
mutter("got branch format %r", fmt)
502
if fmt == BZR_BRANCH_FORMAT_6:
503
self._branch_format = 6
504
elif fmt == BZR_BRANCH_FORMAT_5:
505
self._branch_format = 5
506
elif fmt == BZR_BRANCH_FORMAT_4:
507
self._branch_format = 4
508
509
if (not relax_version_check
510
and self._branch_format not in (5, 6)):
511
raise errors.UnsupportedFormatError(
512
'sorry, branch format %r not supported' % fmt,
337
513
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
514
'or remove the .bzr directory'
515
' and "bzr init" again'])
339
516
340
517
def get_root_id(self):
341
518
"""Return the id of this branches root"""
354
531
entry.parent_id = inv.root.file_id
355
532
self._write_inventory(inv)
356
533
534
@needs_read_lock
357
535
def read_working_inventory(self):
358
536
"""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
self.lock_read()
364
try:
365
# ElementTree does its own conversion from UTF-8, so open in
366
# 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
372
finally:
373
self.unlock()
374
537
# ElementTree does its own conversion from UTF-8, so open in
538
# binary.
539
f = self.controlfile('inventory', 'rb')
540
return bzrlib.xml5.serializer_v5.read_inventory(f)
375
541
542
@needs_write_lock
376
543
def _write_inventory(self, inv):
377
544
"""Update the working inventory.
378
545
379
546
That is to say, the inventory describing changes underway, that
380
547
will be committed to the next revision.
381
548
"""
382
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
384
385
self.lock_write()
386
try:
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
try:
389
pack_xml(inv, f)
390
f.commit()
391
finally:
392
f.close()
393
finally:
394
self.unlock()
549
from cStringIO import StringIO
550
sio = StringIO()
551
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
552
sio.seek(0)
553
# Transport handles atomicity
554
self.put_controlfile('inventory', sio)
395
555
396
556
mutter('wrote working inventory')
397
557
398
399
558
inventory = property(read_working_inventory, _write_inventory, None,
400
559
"""Inventory for the working copy.""")
401
560
402
403
def add(self, files, verbose=False, ids=None):
561
@needs_write_lock
562
def add(self, files, ids=None):
404
563
"""Make files versioned.
405
564
406
Note that the command line normally calls smart_add instead.
565
Note that the command line normally calls smart_add instead,
566
which can automatically recurse.
407
567
408
568
This puts the files in the Added state, so that they will be
409
569
recorded by the next commit.
419
579
TODO: Perhaps have an option to add the ids even if the files do
420
580
not (yet) exist.
421
581
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.
582
TODO: Perhaps yield the ids and paths as they're added.
428
583
"""
429
584
# TODO: Re-adding a file that is removed in the working copy
430
585
# should probably put it back with the previous ID.
439
594
else:
440
595
assert(len(ids) == len(files))
441
596
442
self.lock_write()
443
try:
444
inv = self.read_working_inventory()
445
for f,file_id in zip(files, ids):
446
if is_control_file(f):
447
raise BzrError("cannot add control file %s" % quotefn(f))
448
449
fp = splitpath(f)
450
451
if len(fp) == 0:
452
raise BzrError("cannot add top-level %r" % f)
453
454
fullpath = os.path.normpath(self.abspath(f))
455
456
try:
457
kind = file_kind(fullpath)
458
except OSError:
459
# maybe something better?
460
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
461
462
if kind != 'file' and kind != 'directory':
463
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
464
465
if file_id is None:
466
file_id = gen_file_id(f)
467
inv.add_path(f, kind=kind, file_id=file_id)
468
469
if verbose:
470
print 'added', quotefn(f)
471
472
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
473
474
self._write_inventory(inv)
475
finally:
476
self.unlock()
477
478
597
inv = self.read_working_inventory()
598
for f,file_id in zip(files, ids):
599
if is_control_file(f):
600
raise BzrError("cannot add control file %s" % quotefn(f))
601
602
fp = splitpath(f)
603
604
if len(fp) == 0:
605
raise BzrError("cannot add top-level %r" % f)
606
607
fullpath = os.path.normpath(self.abspath(f))
608
609
try:
610
kind = file_kind(fullpath)
611
except OSError:
612
# maybe something better?
613
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
614
615
if not InventoryEntry.versionable_kind(kind):
616
raise BzrError('cannot add: not a versionable file ('
617
'i.e. regular file, symlink or directory): %s' % quotefn(f))
618
619
if file_id is None:
620
file_id = gen_file_id(f)
621
inv.add_path(f, kind=kind, file_id=file_id)
622
623
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
624
625
self._write_inventory(inv)
626
627
@needs_read_lock
479
628
def print_file(self, file, revno):
480
629
"""Print `file` to stdout."""
481
self.lock_read()
482
try:
483
tree = self.revision_tree(self.lookup_revision(revno))
484
# use inventory as it was in that revision
485
file_id = tree.inventory.path2id(file)
486
if not file_id:
487
raise BzrError("%r is not present in revision %s" % (file, revno))
488
tree.print_file(file_id)
489
finally:
490
self.unlock()
491
492
493
def remove(self, files, verbose=False):
494
"""Mark nominated files for removal from the inventory.
495
496
This does not remove their text. This does not run on
497
498
TODO: Refuse to remove modified files unless --force is given?
499
500
TODO: Do something useful with directories.
501
502
TODO: Should this remove the text or not? Tough call; not
503
removing may be useful and the user can just use use rm, and
504
is the opposite of add. Removing it is consistent with most
505
other tools. Maybe an option.
506
"""
507
## TODO: Normalize names
508
## TODO: Remove nested loops; better scalability
509
if isinstance(files, basestring):
510
files = [files]
511
512
self.lock_write()
513
514
try:
515
tree = self.working_tree()
516
inv = tree.inventory
517
518
# do this before any modifications
519
for f in files:
520
fid = inv.path2id(f)
521
if not fid:
522
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
523
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
524
if verbose:
525
# having remove it, it must be either ignored or unknown
526
if tree.is_ignored(f):
527
new_status = 'I'
528
else:
529
new_status = '?'
530
show_status(new_status, inv[fid].kind, quotefn(f))
531
del inv[fid]
532
533
self._write_inventory(inv)
534
finally:
535
self.unlock()
536
630
tree = self.revision_tree(self.get_rev_id(revno))
631
# use inventory as it was in that revision
632
file_id = tree.inventory.path2id(file)
633
if not file_id:
634
raise BzrError("%r is not present in revision %s" % (file, revno))
635
tree.print_file(file_id)
537
636
538
637
# FIXME: this doesn't need to be a branch method
539
638
def set_inventory(self, new_inventory_list):
543
642
name = os.path.basename(path)
544
643
if name == "":
545
644
continue
546
inv.add(InventoryEntry(file_id, name, kind, parent))
645
# fixme, there should be a factory function inv,add_??
646
if kind == 'directory':
647
inv.add(inventory.InventoryDirectory(file_id, name, parent))
648
elif kind == 'file':
649
inv.add(inventory.InventoryFile(file_id, name, parent))
650
elif kind == 'symlink':
651
inv.add(inventory.InventoryLink(file_id, name, parent))
652
else:
653
raise BzrError("unknown kind %r" % kind)
547
654
self._write_inventory(inv)
548
655
549
550
656
def unknowns(self):
551
657
"""Return all unknown files.
552
658
553
659
These are files in the working directory that are not versioned or
554
660
control files or ignored.
555
661
662
>>> from bzrlib.workingtree import WorkingTree
556
663
>>> b = ScratchBranch(files=['foo', 'foo~'])
557
>>> list(b.unknowns())
664
>>> map(str, b.unknowns())
558
665
['foo']
559
666
>>> b.add('foo')
560
667
>>> list(b.unknowns())
561
668
[]
562
>>> b.remove('foo')
669
>>> WorkingTree(b.base, b).remove('foo')
563
670
>>> list(b.unknowns())
564
['foo']
671
[u'foo']
565
672
"""
566
673
return self.working_tree().unknowns()
567
674
568
675
@needs_write_lock
569
676
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
571
572
677
for revision_id in revision_ids:
573
678
mutter("add {%s} to revision-history" % revision_id)
574
575
679
rev_history = self.revision_history()
576
680
rev_history.extend(revision_ids)
577
578
f = AtomicFile(self.controlfilename('revision-history'))
579
try:
580
for rev_id in rev_history:
581
print >>f, rev_id
582
f.commit()
583
finally:
584
f.close()
585
586
587
def get_revision_xml(self, revision_id):
681
self.set_revision_history(rev_history)
682
683
@needs_write_lock
684
def set_revision_history(self, rev_history):
685
self.put_controlfile('revision-history', '\n'.join(rev_history))
686
687
def has_revision(self, revision_id):
688
"""True if this branch has a copy of the revision.
689
690
This does not necessarily imply the revision is merge
691
or on the mainline."""
692
return (revision_id is None
693
or self.revision_store.has_id(revision_id))
694
695
@needs_read_lock
696
def get_revision_xml_file(self, revision_id):
588
697
"""Return XML file object for revision object."""
589
698
if not revision_id or not isinstance(revision_id, basestring):
590
699
raise InvalidRevisionId(revision_id)
591
592
self.lock_read()
593
700
try:
594
try:
595
return self.revision_store[revision_id]
596
except IndexError:
597
raise bzrlib.errors.NoSuchRevision(revision_id)
598
finally:
599
self.unlock()
701
return self.revision_store.get(revision_id)
702
except (IndexError, KeyError):
703
raise bzrlib.errors.NoSuchRevision(self, revision_id)
704
705
#deprecated
706
get_revision_xml = get_revision_xml_file
707
708
def get_revision_xml(self, revision_id):
709
return self.get_revision_xml_file(revision_id).read()
600
710
601
711
602
712
def get_revision(self, revision_id):
603
713
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
714
xml_file = self.get_revision_xml_file(revision_id)
605
715
606
716
try:
607
r = unpack_xml(Revision, xml_file)
717
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
608
718
except SyntaxError, e:
609
719
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
720
[revision_id,
613
723
assert r.revision_id == revision_id
614
724
return r
615
725
616
617
726
def get_revision_delta(self, revno):
618
727
"""Return the delta for one revision.
619
728
635
744
636
745
return compare_trees(old_tree, new_tree)
637
746
638
639
640
747
def get_revision_sha1(self, revision_id):
641
748
"""Hash the stored value of a revision, and return it."""
642
749
# In the future, revision entries will be signed. At that
645
752
# the revision, (add signatures/remove signatures) and still
646
753
# have all hash pointers stay consistent.
647
754
# 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):
755
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
756
757
def get_ancestry(self, revision_id):
758
"""Return a list of revision-ids integrated by a revision.
759
760
This currently returns a list, but the ordering is not guaranteed:
761
treat it as a set.
762
"""
763
if revision_id is None:
764
return [None]
765
w = self.get_inventory_weave()
766
return [None] + map(w.idx_to_name,
767
w.inclusions([w.lookup(revision_id)]))
768
769
def get_inventory_weave(self):
770
return self.control_weaves.get_weave('inventory',
771
self.get_transaction())
772
773
def get_inventory(self, revision_id):
774
"""Get Inventory object by hash."""
775
xml = self.get_inventory_xml(revision_id)
776
return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
777
778
def get_inventory_xml(self, revision_id):
779
"""Get inventory XML as a file object."""
780
try:
781
assert isinstance(revision_id, basestring), type(revision_id)
782
iw = self.get_inventory_weave()
783
return iw.get_text(iw.lookup(revision_id))
784
except IndexError:
785
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
786
787
def get_inventory_sha1(self, revision_id):
664
788
"""Return the sha1 hash of the inventory entry
665
789
"""
666
return sha_file(self.inventory_store[inventory_id])
667
790
return self.get_revision(revision_id).inventory_sha1
668
791
669
792
def get_revision_inventory(self, revision_id):
670
793
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
794
# TODO: Unify this with get_inventory()
795
# bzr 0.0.6 and later imposes the constraint that the inventory_id
672
796
# must be the same as its revision, so this is trivial.
673
797
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
798
return Inventory(self.get_root_id())
676
799
else:
677
800
return self.get_inventory(revision_id)
678
801
679
802
@needs_read_lock
680
803
def revision_history(self):
681
"""Return sequence of revision hashes on to this branch.
682
683
>>> ScratchBranch().revision_history()
684
[]
685
"""
686
self.lock_read()
687
try:
688
return [l.rstrip('\r\n') for l in
689
self.controlfile('revision-history', 'r').readlines()]
690
finally:
691
self.unlock()
692
693
694
def common_ancestor(self, other, self_revno=None, other_revno=None):
695
"""
696
>>> import commit
697
>>> sb = ScratchBranch(files=['foo', 'foo~'])
698
>>> sb.common_ancestor(sb) == (None, None)
699
True
700
>>> commit.commit(sb, "Committing first revision", verbose=False)
701
>>> sb.common_ancestor(sb)[0]
702
1
703
>>> clone = sb.clone()
704
>>> commit.commit(sb, "Committing second revision", verbose=False)
705
>>> sb.common_ancestor(sb)[0]
706
2
707
>>> sb.common_ancestor(clone)[0]
708
1
709
>>> commit.commit(clone, "Committing divergent second revision",
710
... verbose=False)
711
>>> sb.common_ancestor(clone)[0]
712
1
713
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
714
True
715
>>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
716
True
717
>>> clone2 = sb.clone()
718
>>> sb.common_ancestor(clone2)[0]
719
2
720
>>> sb.common_ancestor(clone2, self_revno=1)[0]
721
1
722
>>> sb.common_ancestor(clone2, other_revno=1)[0]
723
1
724
"""
725
my_history = self.revision_history()
726
other_history = other.revision_history()
727
if self_revno is None:
728
self_revno = len(my_history)
729
if other_revno is None:
730
other_revno = len(other_history)
731
indices = range(min((self_revno, other_revno)))
732
indices.reverse()
733
for r in indices:
734
if my_history[r] == other_history[r]:
735
return r+1, my_history[r]
736
return None, None
737
804
"""Return sequence of revision hashes on to this branch."""
805
transaction = self.get_transaction()
806
history = transaction.map.find_revision_history()
807
if history is not None:
808
mutter("cache hit for revision-history in %s", self)
809
return list(history)
810
history = [l.rstrip('\r\n') for l in
811
self.controlfile('revision-history', 'r').readlines()]
812
transaction.map.add_revision_history(history)
813
# this call is disabled because revision_history is
814
# not really an object yet, and the transaction is for objects.
815
# transaction.register_clean(history, precious=True)
816
return list(history)
738
817
739
818
def revno(self):
740
819
"""Return current revision number for this branch.
744
823
"""
745
824
return len(self.revision_history())
746
825
747
748
def last_patch(self):
826
def last_revision(self):
749
827
"""Return last patch hash, or None if no history.
750
828
"""
751
829
ph = self.revision_history()
754
832
else:
755
833
return None
756
834
757
758
def missing_revisions(self, other, stop_revision=None):
759
"""
835
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
836
"""Return a list of new revisions that would perfectly fit.
837
760
838
If self and other have not diverged, return a list of the revisions
761
839
present in other, but missing from self.
762
840
793
871
794
872
if stop_revision is None:
795
873
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
798
874
else:
875
assert isinstance(stop_revision, int)
876
if stop_revision > other_len:
877
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
799
878
return other_history[self_len:stop_revision]
800
879
801
802
880
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
881
"""Pull in new perfect-fit revisions."""
882
# FIXME: If the branches have diverged, but the latest
883
# revision in this branch is completely merged into the other,
884
# then we should still be able to pull.
885
from bzrlib.fetch import greedy_fetch
886
if stop_revision is None:
887
stop_revision = other.last_revision()
888
### Should this be checking is_ancestor instead of revision_history?
889
if (stop_revision is not None and
890
stop_revision in self.revision_history()):
891
return
892
greedy_fetch(to_branch=self, from_branch=other,
893
revision=stop_revision)
894
pullable_revs = self.pullable_revisions(other, stop_revision)
895
if len(pullable_revs) > 0:
896
self.append_revision(*pullable_revs)
897
898
def pullable_revisions(self, other, stop_revision):
899
other_revno = other.revision_id_to_revno(stop_revision)
900
try:
901
return self.missing_revisions(other, other_revno)
902
except DivergedBranches, e:
903
try:
904
pullable_revs = get_intervening_revisions(self.last_revision(),
905
stop_revision, self)
906
assert self.last_revision() not in pullable_revs
907
return pullable_revs
908
except bzrlib.errors.NotAncestor:
909
if is_ancestor(self.last_revision(), stop_revision, self):
910
return []
911
else:
912
raise e
869
913
870
914
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
915
from bzrlib.commit import Commit
916
Commit().commit(self, *args, **kw)
917
918
def revision_id_to_revno(self, revision_id):
919
"""Given a revision id, return its revno"""
920
if revision_id is None:
921
return 0
922
history = self.revision_history()
923
try:
924
return history.index(revision_id) + 1
925
except ValueError:
926
raise bzrlib.errors.NoSuchRevision(self, revision_id)
927
928
def get_rev_id(self, revno, history=None):
929
"""Find the revision id of the specified revno."""
930
if revno == 0:
931
return None
932
if history is None:
933
history = self.revision_history()
934
elif revno <= 0 or revno > len(history):
935
raise bzrlib.errors.NoSuchRevision(self, revno)
936
return history[revno - 1]
1032
937
1033
938
def revision_tree(self, revision_id):
1034
939
"""Return Tree for a revision on this branch.
1041
946
return EmptyTree()
1042
947
else:
1043
948
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
1045
949
return RevisionTree(self.weave_store, inv, revision_id)
1046
950
1047
951
def working_tree(self):
1048
952
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
return WorkingTree(self.base, self.read_working_inventory())
953
from bzrlib.workingtree import WorkingTree
954
# TODO: In the future, perhaps WorkingTree should utilize Transport
955
# RobertCollins 20051003 - I don't think it should - working trees are
956
# much more complex to keep consistent than our careful .bzr subset.
957
# instead, we should say that working trees are local only, and optimise
958
# for that.
959
return WorkingTree(self.base, branch=self)
1051
960
1052
961
1053
962
def basis_tree(self):
1055
964
1056
965
If there are no revisions yet, return an `EmptyTree`.
1057
966
"""
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
1064
1065
967
return self.revision_tree(self.last_revision())
968
969
@needs_write_lock
1066
970
def rename_one(self, from_rel, to_rel):
1067
971
"""Rename one file.
1068
972
1069
973
This can change the directory or the filename or both.
1070
974
"""
1071
self.lock_write()
975
tree = self.working_tree()
976
inv = tree.inventory
977
if not tree.has_filename(from_rel):
978
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
979
if tree.has_filename(to_rel):
980
raise BzrError("can't rename: new working file %r already exists" % to_rel)
981
982
file_id = inv.path2id(from_rel)
983
if file_id == None:
984
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
985
986
if inv.path2id(to_rel):
987
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
988
989
to_dir, to_tail = os.path.split(to_rel)
990
to_dir_id = inv.path2id(to_dir)
991
if to_dir_id == None and to_dir != '':
992
raise BzrError("can't determine destination directory id for %r" % to_dir)
993
994
mutter("rename_one:")
995
mutter(" file_id {%s}" % file_id)
996
mutter(" from_rel %r" % from_rel)
997
mutter(" to_rel %r" % to_rel)
998
mutter(" to_dir %r" % to_dir)
999
mutter(" to_dir_id {%s}" % to_dir_id)
1000
1001
inv.rename(file_id, to_dir_id, to_tail)
1002
1003
from_abs = self.abspath(from_rel)
1004
to_abs = self.abspath(to_rel)
1072
1005
try:
1073
tree = self.working_tree()
1074
inv = tree.inventory
1075
if not tree.has_filename(from_rel):
1076
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1077
if tree.has_filename(to_rel):
1078
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1079
1080
file_id = inv.path2id(from_rel)
1081
if file_id == None:
1082
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1083
1084
if inv.path2id(to_rel):
1085
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1086
1087
to_dir, to_tail = os.path.split(to_rel)
1088
to_dir_id = inv.path2id(to_dir)
1089
if to_dir_id == None and to_dir != '':
1090
raise BzrError("can't determine destination directory id for %r" % to_dir)
1091
1092
mutter("rename_one:")
1093
mutter(" file_id {%s}" % file_id)
1094
mutter(" from_rel %r" % from_rel)
1095
mutter(" to_rel %r" % to_rel)
1096
mutter(" to_dir %r" % to_dir)
1097
mutter(" to_dir_id {%s}" % to_dir_id)
1098
1099
inv.rename(file_id, to_dir_id, to_tail)
1100
1101
print "%s => %s" % (from_rel, to_rel)
1102
1103
from_abs = self.abspath(from_rel)
1104
to_abs = self.abspath(to_rel)
1105
try:
1106
os.rename(from_abs, to_abs)
1107
except OSError, e:
1108
raise BzrError("failed to rename %r to %r: %s"
1109
% (from_abs, to_abs, e[1]),
1110
["rename rolled back"])
1111
1112
self._write_inventory(inv)
1113
finally:
1114
self.unlock()
1115
1116
1006
rename(from_abs, to_abs)
1007
except OSError, e:
1008
raise BzrError("failed to rename %r to %r: %s"
1009
% (from_abs, to_abs, e[1]),
1010
["rename rolled back"])
1011
1012
self._write_inventory(inv)
1013
1014
@needs_write_lock
1117
1015
def move(self, from_paths, to_name):
1118
1016
"""Rename files.
1119
1017
1124
1022
1125
1023
Note that to_name is only the last component of the new name;
1126
1024
this doesn't change the directory.
1025
1026
This returns a list of (from_path, to_path) pairs for each
1027
entry that is moved.
1127
1028
"""
1128
self.lock_write()
1129
try:
1130
## TODO: Option to move IDs only
1131
assert not isinstance(from_paths, basestring)
1132
tree = self.working_tree()
1133
inv = tree.inventory
1134
to_abs = self.abspath(to_name)
1135
if not isdir(to_abs):
1136
raise BzrError("destination %r is not a directory" % to_abs)
1137
if not tree.has_filename(to_name):
1138
raise BzrError("destination %r not in working directory" % to_abs)
1139
to_dir_id = inv.path2id(to_name)
1140
if to_dir_id == None and to_name != '':
1141
raise BzrError("destination %r is not a versioned directory" % to_name)
1142
to_dir_ie = inv[to_dir_id]
1143
if to_dir_ie.kind not in ('directory', 'root_directory'):
1144
raise BzrError("destination %r is not a directory" % to_abs)
1145
1146
to_idpath = inv.get_idpath(to_dir_id)
1147
1148
for f in from_paths:
1149
if not tree.has_filename(f):
1150
raise BzrError("%r does not exist in working tree" % f)
1151
f_id = inv.path2id(f)
1152
if f_id == None:
1153
raise BzrError("%r is not versioned" % f)
1154
name_tail = splitpath(f)[-1]
1155
dest_path = appendpath(to_name, name_tail)
1156
if tree.has_filename(dest_path):
1157
raise BzrError("destination %r already exists" % dest_path)
1158
if f_id in to_idpath:
1159
raise BzrError("can't move %r to a subdirectory of itself" % f)
1160
1161
# OK, so there's a race here, it's possible that someone will
1162
# create a file in this interval and then the rename might be
1163
# left half-done. But we should have caught most problems.
1164
1165
for f in from_paths:
1166
name_tail = splitpath(f)[-1]
1167
dest_path = appendpath(to_name, name_tail)
1168
print "%s => %s" % (f, dest_path)
1169
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1170
try:
1171
os.rename(self.abspath(f), self.abspath(dest_path))
1172
except OSError, e:
1173
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1174
["rename rolled back"])
1175
1176
self._write_inventory(inv)
1177
finally:
1178
self.unlock()
1029
result = []
1030
## TODO: Option to move IDs only
1031
assert not isinstance(from_paths, basestring)
1032
tree = self.working_tree()
1033
inv = tree.inventory
1034
to_abs = self.abspath(to_name)
1035
if not isdir(to_abs):
1036
raise BzrError("destination %r is not a directory" % to_abs)
1037
if not tree.has_filename(to_name):
1038
raise BzrError("destination %r not in working directory" % to_abs)
1039
to_dir_id = inv.path2id(to_name)
1040
if to_dir_id == None and to_name != '':
1041
raise BzrError("destination %r is not a versioned directory" % to_name)
1042
to_dir_ie = inv[to_dir_id]
1043
if to_dir_ie.kind not in ('directory', 'root_directory'):
1044
raise BzrError("destination %r is not a directory" % to_abs)
1045
1046
to_idpath = inv.get_idpath(to_dir_id)
1047
1048
for f in from_paths:
1049
if not tree.has_filename(f):
1050
raise BzrError("%r does not exist in working tree" % f)
1051
f_id = inv.path2id(f)
1052
if f_id == None:
1053
raise BzrError("%r is not versioned" % f)
1054
name_tail = splitpath(f)[-1]
1055
dest_path = appendpath(to_name, name_tail)
1056
if tree.has_filename(dest_path):
1057
raise BzrError("destination %r already exists" % dest_path)
1058
if f_id in to_idpath:
1059
raise BzrError("can't move %r to a subdirectory of itself" % f)
1060
1061
# OK, so there's a race here, it's possible that someone will
1062
# create a file in this interval and then the rename might be
1063
# left half-done. But we should have caught most problems.
1064
1065
for f in from_paths:
1066
name_tail = splitpath(f)[-1]
1067
dest_path = appendpath(to_name, name_tail)
1068
result.append((f, dest_path))
1069
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1070
try:
1071
rename(self.abspath(f), self.abspath(dest_path))
1072
except OSError, e:
1073
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1074
["rename rolled back"])
1075
1076
self._write_inventory(inv)
1077
return result
1179
1078
1180
1079
1181
1080
def revert(self, filenames, old_tree=None, backups=True):
1185
1084
If true (default) backups are made of files before
1186
1085
they're renamed.
1187
1086
"""
1188
from bzrlib.errors import NotVersionedError, BzrError
1189
1087
from bzrlib.atomicfile import AtomicFile
1190
1088
from bzrlib.osutils import backup_file
1191
1089
1198
1096
for fn in filenames:
1199
1097
file_id = inv.path2id(fn)
1200
1098
if not file_id:
1201
raise NotVersionedError("not a versioned file", fn)
1099
raise NotVersionedError(path=fn)
1202
1100
if not old_inv.has_id(file_id):
1203
1101
raise BzrError("file not present in old tree", fn, file_id)
1204
1102
nids.append((fn, file_id))
1228
1126
These are revisions that have been merged into the working
1229
1127
directory but not yet committed.
1230
1128
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1129
cfn = self._rel_controlfilename('pending-merges')
1130
if not self._transport.has(cfn):
1233
1131
return []
1234
1132
p = []
1235
1133
for l in self.controlfile('pending-merges', 'r').readlines():
1237
1135
return p
1238
1136
1239
1137
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1244
1138
def add_pending_merge(self, *revision_ids):
1139
# TODO: Perhaps should check at this point that the
1140
# history of the revision is actually present?
1245
1141
p = self.pending_merges()
1246
if revision_id in p:
1247
return
1248
p.append(revision_id)
1249
self.set_pending_merges(p)
1250
1251
1142
updated = False
1143
for rev_id in revision_ids:
1144
if rev_id in p:
1145
continue
1146
p.append(rev_id)
1147
updated = True
1148
if updated:
1149
self.set_pending_merges(p)
1150
1151
@needs_write_lock
1252
1152
def set_pending_merges(self, rev_list):
1153
self.put_controlfile('pending-merges', '\n'.join(rev_list))
1154
1155
def get_parent(self):
1156
"""Return the parent location of the branch.
1157
1158
This is the default location for push/pull/missing. The usual
1159
pattern is that the user can override it by specifying a
1160
location.
1161
"""
1162
import errno
1163
_locs = ['parent', 'pull', 'x-pull']
1164
for l in _locs:
1165
try:
1166
return self.controlfile(l, 'r').read().strip('\n')
1167
except IOError, e:
1168
if e.errno != errno.ENOENT:
1169
raise
1170
return None
1171
1172
@needs_write_lock
1173
def set_parent(self, url):
1174
# TODO: Maybe delete old location files?
1253
1175
from bzrlib.atomicfile import AtomicFile
1254
self.lock_write()
1176
f = AtomicFile(self.controlfilename('parent'))
1255
1177
try:
1256
f = AtomicFile(self.controlfilename('pending-merges'))
1257
try:
1258
for l in rev_list:
1259
print >>f, l
1260
f.commit()
1261
finally:
1262
f.close()
1178
f.write(url + '\n')
1179
f.commit()
1263
1180
finally:
1264
self.unlock()
1265
1266
1267
1268
class ScratchBranch(Branch):
1181
f.close()
1182
1183
def check_revno(self, revno):
1184
"""\
1185
Check whether a revno corresponds to any revision.
1186
Zero (the NULL revision) is considered valid.
1187
"""
1188
if revno != 0:
1189
self.check_real_revno(revno)
1190
1191
def check_real_revno(self, revno):
1192
"""\
1193
Check whether a revno corresponds to a real revision.
1194
Zero (the NULL revision) is considered invalid
1195
"""
1196
if revno < 1 or revno > self.revno():
1197
raise InvalidRevisionNumber(revno)
1198
1199
def sign_revision(self, revision_id, gpg_strategy):
1200
plaintext = Testament.from_revision(self, revision_id).as_short_text()
1201
self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1202
1203
@needs_write_lock
1204
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1205
self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)),
1206
revision_id, "sig")
1207
1208
1209
class ScratchBranch(_Branch):
1269
1210
"""Special test class: a branch that cleans up after itself.
1270
1211
1271
1212
>>> b = ScratchBranch()
1272
1213
>>> isdir(b.base)
1273
1214
True
1274
1215
>>> bd = b.base
1275
>>> b.destroy()
1216
>>> b._transport.__del__()
1276
1217
>>> isdir(bd)
1277
1218
False
1278
1219
"""
1279
def __init__(self, files=[], dirs=[], base=None):
1220
1221
def __init__(self, files=[], dirs=[], transport=None):
1280
1222
"""Make a test branch.
1281
1223
1282
1224
This creates a temporary directory and runs init-tree in it.
1283
1225
1284
1226
If any files are listed, they are created in the working copy.
1285
1227
"""
1286
from tempfile import mkdtemp
1287
init = False
1288
if base is None:
1289
base = mkdtemp()
1290
init = True
1291
Branch.__init__(self, base, init=init)
1228
if transport is None:
1229
transport = bzrlib.transport.local.ScratchTransport()
1230
super(ScratchBranch, self).__init__(transport, init=True)
1231
else:
1232
super(ScratchBranch, self).__init__(transport)
1233
1292
1234
for d in dirs:
1293
os.mkdir(self.abspath(d))
1235
self._transport.mkdir(d)
1294
1236
1295
1237
for f in files:
1296
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1238
self._transport.put(f, 'content of %s' % f)
1297
1239
1298
1240
1299
1241
def clone(self):
1300
1242
"""
1301
1243
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
1244
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1245
>>> if os.name != 'nt':
1246
... os.path.samefile(orig.base, clone.base)
1247
... else:
1248
... orig.base == clone.base
1249
...
1304
1250
False
1305
1251
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
1252
True
1310
1256
base = mkdtemp()
1311
1257
os.rmdir(base)
1312
1258
copytree(self.base, base, symlinks=True)
1313
return ScratchBranch(base=base)
1314
1315
def __del__(self):
1316
self.destroy()
1317
1318
def destroy(self):
1319
"""Destroy the test branch, removing the scratch directory."""
1320
from shutil import rmtree
1321
try:
1322
if self.base:
1323
mutter("delete ScratchBranch %s" % self.base)
1324
rmtree(self.base)
1325
except OSError, e:
1326
# Work around for shutil.rmtree failing on Windows when
1327
# readonly files are encountered
1328
mutter("hit exception in destroying ScratchBranch: %s" % e)
1329
for root, dirs, files in os.walk(self.base, topdown=False):
1330
for name in files:
1331
os.chmod(os.path.join(root, name), 0700)
1332
rmtree(self.base)
1333
self.base = None
1334
1259
return ScratchBranch(
1260
transport=bzrlib.transport.local.ScratchTransport(base))
1335
1261
1336
1262
1337
1263
######################################################################
1386
1312
"""Return a new tree-root file id."""
1387
1313
return gen_file_id('TREE_ROOT')
1388
1314
1315
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0