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 1185.21.8
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.21.8
- Committer: Jelmer Vernooij
- Date: 2005-10-19 09:34:39 UTC
- mfrom: (1185.16.78)
- mto: (1185.16.102)
- mto: This revision was merged to the branch mainline in revision 1488.
- Revision ID: jelmer@samba.org-20051019093439-e1d8e3508d1ba46b
Merge from Martin
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
- 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.
166
211
167
212
init -- If True, create new control files in a previously
168
213
unversioned directory. If False, the branch must already
169
214
be versioned.
170
215
171
find_root -- If true and init is false, find the root of the
172
existing branch containing base.
216
relax_version_check -- If true, the usual check for the branch
217
version is not applied. This is intended only for
218
upgrade/recovery type use; it's not guaranteed that
219
all operations will work on old format branches.
173
220
174
221
In the test suite, creation of new trees is tested using the
175
222
`ScratchBranch` class.
176
223
"""
177
from bzrlib.store import ImmutableStore
224
assert isinstance(transport, Transport), \
225
"%r is not a Transport" % transport
226
self._transport = transport
178
227
if init:
179
self.base = os.path.realpath(base)
180
228
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
229
self._check_format(relax_version_check)
230
231
def get_store(name, compressed=True, prefixed=False):
232
# FIXME: This approach of assuming stores are all entirely compressed
233
# or entirely uncompressed is tidy, but breaks upgrade from
234
# some existing branches where there's a mixture; we probably
235
# still want the option to look for both.
236
relpath = self._rel_controlfilename(name)
237
if compressed:
238
store = CompressedTextStore(self._transport.clone(relpath),
239
prefixed=prefixed)
240
else:
241
store = TextStore(self._transport.clone(relpath),
242
prefixed=prefixed)
243
#if self._transport.should_cache():
244
# cache_path = os.path.join(self.cache_root, name)
245
# os.mkdir(cache_path)
246
# store = bzrlib.store.CachedStore(store, cache_path)
247
return store
248
def get_weave(name, prefixed=False):
249
relpath = self._rel_controlfilename(name)
250
ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
251
if self._transport.should_cache():
252
ws.enable_cache = True
253
return ws
254
255
if self._branch_format == 4:
256
self.inventory_store = get_store('inventory-store')
257
self.text_store = get_store('text-store')
258
self.revision_store = get_store('revision-store')
259
elif self._branch_format == 5:
260
self.control_weaves = get_weave([])
261
self.weave_store = get_weave('weaves')
262
self.revision_store = get_store('revision-store', compressed=False)
263
elif self._branch_format == 6:
264
self.control_weaves = get_weave([])
265
self.weave_store = get_weave('weaves', prefixed=True)
266
self.revision_store = get_store('revision-store', compressed=False,
267
prefixed=True)
268
self.revision_store.register_suffix('sig')
269
self._transaction = None
196
270
197
271
def __str__(self):
198
return '%s(%r)' % (self.__class__.__name__, self.base)
272
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
199
273
200
274
201
275
__repr__ = __str__
203
277
204
278
def __del__(self):
205
279
if self._lock_mode or self._lock:
206
from warnings import warn
280
# XXX: This should show something every time, and be suitable for
281
# headless operation and embedding
207
282
warn("branch %r was not explicitly unlocked" % self)
208
283
self._lock.unlock()
209
284
210
285
# TODO: It might be best to do this somewhere else,
286
# but it is nice for a Branch object to automatically
287
# cache it's information.
288
# Alternatively, we could have the Transport objects cache requests
289
# See the earlier discussion about how major objects (like Branch)
290
# should never expect their __del__ function to run.
291
if hasattr(self, 'cache_root') and self.cache_root is not None:
292
try:
293
import shutil
294
shutil.rmtree(self.cache_root)
295
except:
296
pass
297
self.cache_root = None
298
299
def _get_base(self):
300
if self._transport:
301
return self._transport.base
302
return None
303
304
base = property(_get_base, doc="The URL for the root of this branch.")
305
306
def _finish_transaction(self):
307
"""Exit the current transaction."""
308
if self._transaction is None:
309
raise errors.LockError('Branch %s is not in a transaction' %
310
self)
311
transaction = self._transaction
312
self._transaction = None
313
transaction.finish()
314
315
def get_transaction(self):
316
"""Return the current active transaction.
317
318
If no transaction is active, this returns a passthrough object
319
for which all data is immediately flushed and no caching happens.
320
"""
321
if self._transaction is None:
322
return transactions.PassThroughTransaction()
323
else:
324
return self._transaction
325
326
def _set_transaction(self, new_transaction):
327
"""Set a new active transaction."""
328
if self._transaction is not None:
329
raise errors.LockError('Branch %s is in a transaction already.' %
330
self)
331
self._transaction = new_transaction
211
332
212
333
def lock_write(self):
334
mutter("lock write: %s (%s)", self, self._lock_count)
335
# TODO: Upgrade locking to support using a Transport,
336
# and potentially a remote locking protocol
213
337
if self._lock_mode:
214
338
if self._lock_mode != 'w':
215
from errors import LockError
216
339
raise LockError("can't upgrade to a write lock from %r" %
217
340
self._lock_mode)
218
341
self._lock_count += 1
219
342
else:
220
from bzrlib.lock import WriteLock
221
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
343
self._lock = self._transport.lock_write(
344
self._rel_controlfilename('branch-lock'))
223
345
self._lock_mode = 'w'
224
346
self._lock_count = 1
225
226
347
self._set_transaction(transactions.PassThroughTransaction())
227
348
228
349
def lock_read(self):
350
mutter("lock read: %s (%s)", self, self._lock_count)
229
351
if self._lock_mode:
230
352
assert self._lock_mode in ('r', 'w'), \
231
353
"invalid lock mode %r" % self._lock_mode
232
354
self._lock_count += 1
233
355
else:
234
from bzrlib.lock import ReadLock
235
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
356
self._lock = self._transport.lock_read(
357
self._rel_controlfilename('branch-lock'))
237
358
self._lock_mode = 'r'
238
359
self._lock_count = 1
360
self._set_transaction(transactions.ReadOnlyTransaction())
361
# 5K may be excessive, but hey, its a knob.
362
self.get_transaction().set_cache_size(5000)
239
363
240
241
242
364
def unlock(self):
365
mutter("unlock: %s (%s)", self, self._lock_count)
243
366
if not self._lock_mode:
244
from errors import LockError
245
367
raise LockError('branch %r is not locked' % (self))
246
368
247
369
if self._lock_count > 1:
248
370
self._lock_count -= 1
249
371
else:
372
self._finish_transaction()
250
373
self._lock.unlock()
251
374
self._lock = None
252
375
self._lock_mode = self._lock_count = None
253
376
254
255
377
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
378
"""Return absolute filename for something in the branch
379
380
XXX: Robert Collins 20051017 what is this used for? why is it a branch
381
method and not a tree method.
382
"""
383
return self._transport.abspath(name)
384
385
def _rel_controlfilename(self, file_or_path):
386
if isinstance(file_or_path, basestring):
387
file_or_path = [file_or_path]
388
return [bzrlib.BZRDIR] + file_or_path
266
389
267
390
def controlfilename(self, file_or_path):
268
391
"""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)
392
return self._transport.abspath(self._rel_controlfilename(file_or_path))
272
393
273
394
274
395
def controlfile(self, file_or_path, mode='r'):
282
403
Controlfiles should almost never be opened in write mode but
283
404
rather should be atomically copied and replaced using atomicfile.
284
405
"""
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)
406
import codecs
407
408
relpath = self._rel_controlfilename(file_or_path)
409
#TODO: codecs.open() buffers linewise, so it was overloaded with
410
# a much larger buffer, do we need to do the same for getreader/getwriter?
411
if mode == 'rb':
412
return self._transport.get(relpath)
413
elif mode == 'wb':
414
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
415
elif mode == 'r':
416
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
417
elif mode == 'w':
418
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
296
419
else:
297
420
raise BzrError("invalid controlfile mode %r" % mode)
298
421
299
422
def put_controlfile(self, path, f, encode=True):
423
"""Write an entry as a controlfile.
424
425
:param path: The path to put the file, relative to the .bzr control
426
directory
427
:param f: A file-like or string object whose contents should be copied.
428
:param encode: If true, encode the contents as utf-8
429
"""
430
self.put_controlfiles([(path, f)], encode=encode)
431
432
def put_controlfiles(self, files, encode=True):
433
"""Write several entries as controlfiles.
434
435
:param files: A list of [(path, file)] pairs, where the path is the directory
436
underneath the bzr control directory
437
:param encode: If true, encode the contents as utf-8
438
"""
439
import codecs
440
ctrl_files = []
441
for path, f in files:
442
if encode:
443
if isinstance(f, basestring):
444
f = f.encode('utf-8', 'replace')
445
else:
446
f = codecs.getwriter('utf-8')(f, errors='replace')
447
path = self._rel_controlfilename(path)
448
ctrl_files.append((path, f))
449
self._transport.put_multi(ctrl_files)
300
450
301
451
def _make_control(self):
302
452
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
453
from bzrlib.weavefile import write_weave_v5
454
from bzrlib.weave import Weave
304
455
305
os.mkdir(self.controlfilename([]))
306
self.controlfile('README', 'w').write(
456
# Create an empty inventory
457
sio = StringIO()
458
# if we want per-tree root ids then this is the place to set
459
# them; they're not needed for now and so ommitted for
460
# simplicity.
461
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
462
empty_inv = sio.getvalue()
463
sio = StringIO()
464
bzrlib.weavefile.write_weave_v5(Weave(), sio)
465
empty_weave = sio.getvalue()
466
467
dirs = [[], 'revision-store', 'weaves']
468
files = [('README',
307
469
"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):
470
"Do not change any files in this directory.\n"),
471
('branch-format', BZR_BRANCH_FORMAT_6),
472
('revision-history', ''),
473
('branch-name', ''),
474
('branch-lock', ''),
475
('pending-merges', ''),
476
('inventory', empty_inv),
477
('inventory.weave', empty_weave),
478
('ancestry.weave', empty_weave)
479
]
480
cfn = self._rel_controlfilename
481
self._transport.mkdir_multi([cfn(d) for d in dirs])
482
self.put_controlfiles(files)
483
mutter('created control directory in ' + self._transport.base)
484
485
def _check_format(self, relax_version_check):
323
486
"""Check this branch format is supported.
324
487
325
The current tool only supports the current unstable format.
488
The format level is stored, as an integer, in
489
self._branch_format for code that needs to check it later.
326
490
327
491
In the future, we might need different in-memory Branch
328
492
classes to support downlevel branches. But not yet.
329
493
"""
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,
494
try:
495
fmt = self.controlfile('branch-format', 'r').read()
496
except NoSuchFile:
497
raise NotBranchError(path=self.base)
498
mutter("got branch format %r", fmt)
499
if fmt == BZR_BRANCH_FORMAT_6:
500
self._branch_format = 6
501
elif fmt == BZR_BRANCH_FORMAT_5:
502
self._branch_format = 5
503
elif fmt == BZR_BRANCH_FORMAT_4:
504
self._branch_format = 4
505
506
if (not relax_version_check
507
and self._branch_format not in (5, 6)):
508
raise errors.UnsupportedFormatError(
509
'sorry, branch format %r not supported' % fmt,
337
510
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
511
'or remove the .bzr directory'
512
' and "bzr init" again'])
339
513
340
514
def get_root_id(self):
341
515
"""Return the id of this branches root"""
354
528
entry.parent_id = inv.root.file_id
355
529
self._write_inventory(inv)
356
530
531
@needs_read_lock
357
532
def read_working_inventory(self):
358
533
"""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
534
# ElementTree does its own conversion from UTF-8, so open in
535
# binary.
536
f = self.controlfile('inventory', 'rb')
537
return bzrlib.xml5.serializer_v5.read_inventory(f)
375
538
539
@needs_write_lock
376
540
def _write_inventory(self, inv):
377
541
"""Update the working inventory.
378
542
379
543
That is to say, the inventory describing changes underway, that
380
544
will be committed to the next revision.
381
545
"""
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()
546
from cStringIO import StringIO
547
sio = StringIO()
548
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
549
sio.seek(0)
550
# Transport handles atomicity
551
self.put_controlfile('inventory', sio)
395
552
396
553
mutter('wrote working inventory')
397
554
398
399
555
inventory = property(read_working_inventory, _write_inventory, None,
400
556
"""Inventory for the working copy.""")
401
557
402
403
def add(self, files, verbose=False, ids=None):
558
@needs_write_lock
559
def add(self, files, ids=None):
404
560
"""Make files versioned.
405
561
406
Note that the command line normally calls smart_add instead.
562
Note that the command line normally calls smart_add instead,
563
which can automatically recurse.
407
564
408
565
This puts the files in the Added state, so that they will be
409
566
recorded by the next commit.
419
576
TODO: Perhaps have an option to add the ids even if the files do
420
577
not (yet) exist.
421
578
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.
579
TODO: Perhaps yield the ids and paths as they're added.
428
580
"""
429
581
# TODO: Re-adding a file that is removed in the working copy
430
582
# should probably put it back with the previous ID.
439
591
else:
440
592
assert(len(ids) == len(files))
441
593
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
594
inv = self.read_working_inventory()
595
for f,file_id in zip(files, ids):
596
if is_control_file(f):
597
raise BzrError("cannot add control file %s" % quotefn(f))
598
599
fp = splitpath(f)
600
601
if len(fp) == 0:
602
raise BzrError("cannot add top-level %r" % f)
603
604
fullpath = os.path.normpath(self.abspath(f))
605
606
try:
607
kind = file_kind(fullpath)
608
except OSError:
609
# maybe something better?
610
raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
611
612
if not InventoryEntry.versionable_kind(kind):
613
raise BzrError('cannot add: not a versionable file ('
614
'i.e. regular file, symlink or directory): %s' % quotefn(f))
615
616
if file_id is None:
617
file_id = gen_file_id(f)
618
inv.add_path(f, kind=kind, file_id=file_id)
619
620
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
621
622
self._write_inventory(inv)
623
624
@needs_read_lock
479
625
def print_file(self, file, revno):
480
626
"""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
627
tree = self.revision_tree(self.get_rev_id(revno))
628
# use inventory as it was in that revision
629
file_id = tree.inventory.path2id(file)
630
if not file_id:
631
raise BzrError("%r is not present in revision %s" % (file, revno))
632
tree.print_file(file_id)
537
633
538
634
# FIXME: this doesn't need to be a branch method
539
635
def set_inventory(self, new_inventory_list):
543
639
name = os.path.basename(path)
544
640
if name == "":
545
641
continue
546
inv.add(InventoryEntry(file_id, name, kind, parent))
642
# fixme, there should be a factory function inv,add_??
643
if kind == 'directory':
644
inv.add(inventory.InventoryDirectory(file_id, name, parent))
645
elif kind == 'file':
646
inv.add(inventory.InventoryFile(file_id, name, parent))
647
elif kind == 'symlink':
648
inv.add(inventory.InventoryLink(file_id, name, parent))
649
else:
650
raise BzrError("unknown kind %r" % kind)
547
651
self._write_inventory(inv)
548
652
549
550
653
def unknowns(self):
551
654
"""Return all unknown files.
552
655
553
656
These are files in the working directory that are not versioned or
554
657
control files or ignored.
555
658
659
>>> from bzrlib.workingtree import WorkingTree
556
660
>>> b = ScratchBranch(files=['foo', 'foo~'])
557
>>> list(b.unknowns())
661
>>> map(str, b.unknowns())
558
662
['foo']
559
663
>>> b.add('foo')
560
664
>>> list(b.unknowns())
561
665
[]
562
>>> b.remove('foo')
666
>>> WorkingTree(b.base, b).remove('foo')
563
667
>>> list(b.unknowns())
564
668
['foo']
565
669
"""
566
670
return self.working_tree().unknowns()
567
671
568
672
@needs_write_lock
569
673
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
571
572
674
for revision_id in revision_ids:
573
675
mutter("add {%s} to revision-history" % revision_id)
574
575
676
rev_history = self.revision_history()
576
677
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):
678
self.put_controlfile('revision-history', '\n'.join(rev_history))
679
680
def has_revision(self, revision_id):
681
"""True if this branch has a copy of the revision.
682
683
This does not necessarily imply the revision is merge
684
or on the mainline."""
685
return (revision_id is None
686
or self.revision_store.has_id(revision_id))
687
688
@needs_read_lock
689
def get_revision_xml_file(self, revision_id):
588
690
"""Return XML file object for revision object."""
589
691
if not revision_id or not isinstance(revision_id, basestring):
590
692
raise InvalidRevisionId(revision_id)
591
592
self.lock_read()
593
693
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()
694
return self.revision_store.get(revision_id)
695
except (IndexError, KeyError):
696
raise bzrlib.errors.NoSuchRevision(self, revision_id)
697
698
#deprecated
699
get_revision_xml = get_revision_xml_file
700
701
def get_revision_xml(self, revision_id):
702
return self.get_revision_xml_file(revision_id).read()
600
703
601
704
602
705
def get_revision(self, revision_id):
603
706
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
707
xml_file = self.get_revision_xml_file(revision_id)
605
708
606
709
try:
607
r = unpack_xml(Revision, xml_file)
710
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
608
711
except SyntaxError, e:
609
712
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
713
[revision_id,
613
716
assert r.revision_id == revision_id
614
717
return r
615
718
616
617
719
def get_revision_delta(self, revno):
618
720
"""Return the delta for one revision.
619
721
635
737
636
738
return compare_trees(old_tree, new_tree)
637
739
638
639
640
740
def get_revision_sha1(self, revision_id):
641
741
"""Hash the stored value of a revision, and return it."""
642
742
# In the future, revision entries will be signed. At that
645
745
# the revision, (add signatures/remove signatures) and still
646
746
# have all hash pointers stay consistent.
647
747
# 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):
748
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
749
750
def get_ancestry(self, revision_id):
751
"""Return a list of revision-ids integrated by a revision.
752
753
This currently returns a list, but the ordering is not guaranteed:
754
treat it as a set.
755
"""
756
if revision_id is None:
757
return [None]
758
w = self.get_inventory_weave()
759
return [None] + map(w.idx_to_name,
760
w.inclusions([w.lookup(revision_id)]))
761
762
def get_inventory_weave(self):
763
return self.control_weaves.get_weave('inventory',
764
self.get_transaction())
765
766
def get_inventory(self, revision_id):
767
"""Get Inventory object by hash."""
768
xml = self.get_inventory_xml(revision_id)
769
return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
770
771
def get_inventory_xml(self, revision_id):
772
"""Get inventory XML as a file object."""
773
try:
774
assert isinstance(revision_id, basestring), type(revision_id)
775
iw = self.get_inventory_weave()
776
return iw.get_text(iw.lookup(revision_id))
777
except IndexError:
778
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
779
780
def get_inventory_sha1(self, revision_id):
664
781
"""Return the sha1 hash of the inventory entry
665
782
"""
666
return sha_file(self.inventory_store[inventory_id])
667
783
return self.get_revision(revision_id).inventory_sha1
668
784
669
785
def get_revision_inventory(self, revision_id):
670
786
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
787
# TODO: Unify this with get_inventory()
788
# bzr 0.0.6 and later imposes the constraint that the inventory_id
672
789
# must be the same as its revision, so this is trivial.
673
790
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
791
return Inventory(self.get_root_id())
676
792
else:
677
793
return self.get_inventory(revision_id)
678
794
679
795
@needs_read_lock
680
796
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
797
"""Return sequence of revision hashes on to this branch."""
798
transaction = self.get_transaction()
799
history = transaction.map.find_revision_history()
800
if history is not None:
801
mutter("cache hit for revision-history in %s", self)
802
return list(history)
803
history = [l.rstrip('\r\n') for l in
804
self.controlfile('revision-history', 'r').readlines()]
805
transaction.map.add_revision_history(history)
806
# this call is disabled because revision_history is
807
# not really an object yet, and the transaction is for objects.
808
# transaction.register_clean(history, precious=True)
809
return list(history)
738
810
739
811
def revno(self):
740
812
"""Return current revision number for this branch.
744
816
"""
745
817
return len(self.revision_history())
746
818
747
748
def last_patch(self):
819
def last_revision(self):
749
820
"""Return last patch hash, or None if no history.
750
821
"""
751
822
ph = self.revision_history()
754
825
else:
755
826
return None
756
827
757
758
def missing_revisions(self, other, stop_revision=None):
759
"""
828
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
829
"""Return a list of new revisions that would perfectly fit.
830
760
831
If self and other have not diverged, return a list of the revisions
761
832
present in other, but missing from self.
762
833
793
864
794
865
if stop_revision is None:
795
866
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
798
867
else:
868
assert isinstance(stop_revision, int)
869
if stop_revision > other_len:
870
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
799
871
return other_history[self_len:stop_revision]
800
872
801
802
873
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
874
"""Pull in new perfect-fit revisions."""
875
# FIXME: If the branches have diverged, but the latest
876
# revision in this branch is completely merged into the other,
877
# then we should still be able to pull.
878
from bzrlib.fetch import greedy_fetch
879
if stop_revision is None:
880
stop_revision = other.last_revision()
881
### Should this be checking is_ancestor instead of revision_history?
882
if (stop_revision is not None and
883
stop_revision in self.revision_history()):
884
return
885
greedy_fetch(to_branch=self, from_branch=other,
886
revision=stop_revision)
887
pullable_revs = self.pullable_revisions(other, stop_revision)
888
if len(pullable_revs) > 0:
889
self.append_revision(*pullable_revs)
890
891
def pullable_revisions(self, other, stop_revision):
892
other_revno = other.revision_id_to_revno(stop_revision)
893
try:
894
return self.missing_revisions(other, other_revno)
895
except DivergedBranches, e:
896
try:
897
pullable_revs = get_intervening_revisions(self.last_revision(),
898
stop_revision, self)
899
assert self.last_revision() not in pullable_revs
900
return pullable_revs
901
except bzrlib.errors.NotAncestor:
902
if is_ancestor(self.last_revision(), stop_revision, self):
903
return []
904
else:
905
raise e
869
906
870
907
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
908
from bzrlib.commit import Commit
909
Commit().commit(self, *args, **kw)
910
911
def revision_id_to_revno(self, revision_id):
912
"""Given a revision id, return its revno"""
913
if revision_id is None:
914
return 0
915
history = self.revision_history()
916
try:
917
return history.index(revision_id) + 1
918
except ValueError:
919
raise bzrlib.errors.NoSuchRevision(self, revision_id)
920
921
def get_rev_id(self, revno, history=None):
922
"""Find the revision id of the specified revno."""
923
if revno == 0:
924
return None
925
if history is None:
926
history = self.revision_history()
927
elif revno <= 0 or revno > len(history):
928
raise bzrlib.errors.NoSuchRevision(self, revno)
929
return history[revno - 1]
1032
930
1033
931
def revision_tree(self, revision_id):
1034
932
"""Return Tree for a revision on this branch.
1041
939
return EmptyTree()
1042
940
else:
1043
941
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
1045
942
return RevisionTree(self.weave_store, inv, revision_id)
1046
943
1047
944
def working_tree(self):
1048
945
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
return WorkingTree(self.base, self.read_working_inventory())
946
from bzrlib.workingtree import WorkingTree
947
# TODO: In the future, perhaps WorkingTree should utilize Transport
948
# RobertCollins 20051003 - I don't think it should - working trees are
949
# much more complex to keep consistent than our careful .bzr subset.
950
# instead, we should say that working trees are local only, and optimise
951
# for that.
952
return WorkingTree(self.base, branch=self)
1051
953
1052
954
1053
955
def basis_tree(self):
1055
957
1056
958
If there are no revisions yet, return an `EmptyTree`.
1057
959
"""
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
960
return self.revision_tree(self.last_revision())
961
962
@needs_write_lock
1066
963
def rename_one(self, from_rel, to_rel):
1067
964
"""Rename one file.
1068
965
1069
966
This can change the directory or the filename or both.
1070
967
"""
1071
self.lock_write()
968
tree = self.working_tree()
969
inv = tree.inventory
970
if not tree.has_filename(from_rel):
971
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
972
if tree.has_filename(to_rel):
973
raise BzrError("can't rename: new working file %r already exists" % to_rel)
974
975
file_id = inv.path2id(from_rel)
976
if file_id == None:
977
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
978
979
if inv.path2id(to_rel):
980
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
981
982
to_dir, to_tail = os.path.split(to_rel)
983
to_dir_id = inv.path2id(to_dir)
984
if to_dir_id == None and to_dir != '':
985
raise BzrError("can't determine destination directory id for %r" % to_dir)
986
987
mutter("rename_one:")
988
mutter(" file_id {%s}" % file_id)
989
mutter(" from_rel %r" % from_rel)
990
mutter(" to_rel %r" % to_rel)
991
mutter(" to_dir %r" % to_dir)
992
mutter(" to_dir_id {%s}" % to_dir_id)
993
994
inv.rename(file_id, to_dir_id, to_tail)
995
996
from_abs = self.abspath(from_rel)
997
to_abs = self.abspath(to_rel)
1072
998
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
999
rename(from_abs, to_abs)
1000
except OSError, e:
1001
raise BzrError("failed to rename %r to %r: %s"
1002
% (from_abs, to_abs, e[1]),
1003
["rename rolled back"])
1004
1005
self._write_inventory(inv)
1006
1007
@needs_write_lock
1117
1008
def move(self, from_paths, to_name):
1118
1009
"""Rename files.
1119
1010
1124
1015
1125
1016
Note that to_name is only the last component of the new name;
1126
1017
this doesn't change the directory.
1018
1019
This returns a list of (from_path, to_path) pairs for each
1020
entry that is moved.
1127
1021
"""
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()
1022
result = []
1023
## TODO: Option to move IDs only
1024
assert not isinstance(from_paths, basestring)
1025
tree = self.working_tree()
1026
inv = tree.inventory
1027
to_abs = self.abspath(to_name)
1028
if not isdir(to_abs):
1029
raise BzrError("destination %r is not a directory" % to_abs)
1030
if not tree.has_filename(to_name):
1031
raise BzrError("destination %r not in working directory" % to_abs)
1032
to_dir_id = inv.path2id(to_name)
1033
if to_dir_id == None and to_name != '':
1034
raise BzrError("destination %r is not a versioned directory" % to_name)
1035
to_dir_ie = inv[to_dir_id]
1036
if to_dir_ie.kind not in ('directory', 'root_directory'):
1037
raise BzrError("destination %r is not a directory" % to_abs)
1038
1039
to_idpath = inv.get_idpath(to_dir_id)
1040
1041
for f in from_paths:
1042
if not tree.has_filename(f):
1043
raise BzrError("%r does not exist in working tree" % f)
1044
f_id = inv.path2id(f)
1045
if f_id == None:
1046
raise BzrError("%r is not versioned" % f)
1047
name_tail = splitpath(f)[-1]
1048
dest_path = appendpath(to_name, name_tail)
1049
if tree.has_filename(dest_path):
1050
raise BzrError("destination %r already exists" % dest_path)
1051
if f_id in to_idpath:
1052
raise BzrError("can't move %r to a subdirectory of itself" % f)
1053
1054
# OK, so there's a race here, it's possible that someone will
1055
# create a file in this interval and then the rename might be
1056
# left half-done. But we should have caught most problems.
1057
1058
for f in from_paths:
1059
name_tail = splitpath(f)[-1]
1060
dest_path = appendpath(to_name, name_tail)
1061
result.append((f, dest_path))
1062
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1063
try:
1064
rename(self.abspath(f), self.abspath(dest_path))
1065
except OSError, e:
1066
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1067
["rename rolled back"])
1068
1069
self._write_inventory(inv)
1070
return result
1179
1071
1180
1072
1181
1073
def revert(self, filenames, old_tree=None, backups=True):
1185
1077
If true (default) backups are made of files before
1186
1078
they're renamed.
1187
1079
"""
1188
from bzrlib.errors import NotVersionedError, BzrError
1189
1080
from bzrlib.atomicfile import AtomicFile
1190
1081
from bzrlib.osutils import backup_file
1191
1082
1198
1089
for fn in filenames:
1199
1090
file_id = inv.path2id(fn)
1200
1091
if not file_id:
1201
raise NotVersionedError("not a versioned file", fn)
1092
raise NotVersionedError(path=fn)
1202
1093
if not old_inv.has_id(file_id):
1203
1094
raise BzrError("file not present in old tree", fn, file_id)
1204
1095
nids.append((fn, file_id))
1228
1119
These are revisions that have been merged into the working
1229
1120
directory but not yet committed.
1230
1121
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1122
cfn = self._rel_controlfilename('pending-merges')
1123
if not self._transport.has(cfn):
1233
1124
return []
1234
1125
p = []
1235
1126
for l in self.controlfile('pending-merges', 'r').readlines():
1237
1128
return p
1238
1129
1239
1130
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1244
1131
def add_pending_merge(self, *revision_ids):
1132
# TODO: Perhaps should check at this point that the
1133
# history of the revision is actually present?
1245
1134
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
1135
updated = False
1136
for rev_id in revision_ids:
1137
if rev_id in p:
1138
continue
1139
p.append(rev_id)
1140
updated = True
1141
if updated:
1142
self.set_pending_merges(p)
1143
1144
@needs_write_lock
1252
1145
def set_pending_merges(self, rev_list):
1146
self.put_controlfile('pending-merges', '\n'.join(rev_list))
1147
1148
def get_parent(self):
1149
"""Return the parent location of the branch.
1150
1151
This is the default location for push/pull/missing. The usual
1152
pattern is that the user can override it by specifying a
1153
location.
1154
"""
1155
import errno
1156
_locs = ['parent', 'pull', 'x-pull']
1157
for l in _locs:
1158
try:
1159
return self.controlfile(l, 'r').read().strip('\n')
1160
except IOError, e:
1161
if e.errno != errno.ENOENT:
1162
raise
1163
return None
1164
1165
@needs_write_lock
1166
def set_parent(self, url):
1167
# TODO: Maybe delete old location files?
1253
1168
from bzrlib.atomicfile import AtomicFile
1254
self.lock_write()
1169
f = AtomicFile(self.controlfilename('parent'))
1255
1170
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()
1171
f.write(url + '\n')
1172
f.commit()
1263
1173
finally:
1264
self.unlock()
1265
1266
1267
1268
class ScratchBranch(Branch):
1174
f.close()
1175
1176
def check_revno(self, revno):
1177
"""\
1178
Check whether a revno corresponds to any revision.
1179
Zero (the NULL revision) is considered valid.
1180
"""
1181
if revno != 0:
1182
self.check_real_revno(revno)
1183
1184
def check_real_revno(self, revno):
1185
"""\
1186
Check whether a revno corresponds to a real revision.
1187
Zero (the NULL revision) is considered invalid
1188
"""
1189
if revno < 1 or revno > self.revno():
1190
raise InvalidRevisionNumber(revno)
1191
1192
def sign_revision(self, revision_id, gpg_strategy):
1193
plaintext = Testament.from_revision(self, revision_id).as_short_text()
1194
self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1195
1196
@needs_write_lock
1197
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1198
self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)),
1199
revision_id, "sig")
1200
1201
1202
class ScratchBranch(_Branch):
1269
1203
"""Special test class: a branch that cleans up after itself.
1270
1204
1271
1205
>>> b = ScratchBranch()
1272
1206
>>> isdir(b.base)
1273
1207
True
1274
1208
>>> bd = b.base
1275
>>> b.destroy()
1209
>>> b._transport.__del__()
1276
1210
>>> isdir(bd)
1277
1211
False
1278
1212
"""
1279
def __init__(self, files=[], dirs=[], base=None):
1213
1214
def __init__(self, files=[], dirs=[], transport=None):
1280
1215
"""Make a test branch.
1281
1216
1282
1217
This creates a temporary directory and runs init-tree in it.
1283
1218
1284
1219
If any files are listed, they are created in the working copy.
1285
1220
"""
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)
1221
if transport is None:
1222
transport = bzrlib.transport.local.ScratchTransport()
1223
super(ScratchBranch, self).__init__(transport, init=True)
1224
else:
1225
super(ScratchBranch, self).__init__(transport)
1226
1292
1227
for d in dirs:
1293
os.mkdir(self.abspath(d))
1228
self._transport.mkdir(d)
1294
1229
1295
1230
for f in files:
1296
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1231
self._transport.put(f, 'content of %s' % f)
1297
1232
1298
1233
1299
1234
def clone(self):
1300
1235
"""
1301
1236
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
1237
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1238
>>> if os.name != 'nt':
1239
... os.path.samefile(orig.base, clone.base)
1240
... else:
1241
... orig.base == clone.base
1242
...
1304
1243
False
1305
1244
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
1245
True
1310
1249
base = mkdtemp()
1311
1250
os.rmdir(base)
1312
1251
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
1252
return ScratchBranch(
1253
transport=bzrlib.transport.local.ScratchTransport(base))
1335
1254
1336
1255
1337
1256
######################################################################
1386
1305
"""Return a new tree-root file id."""
1387
1306
return gen_file_id('TREE_ROOT')
1388
1307
1308
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0