« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 379
- compare with another revision
- download diff
- download tarball
- view history from revision 379
- Committer: Martin Pool
- Date: 2005-05-05 09:26:27 UTC
- Revision ID: mbp@sourcefrog.net-20050505092627-cfd25ed501e08001
- Simpler compare_inventories() to possibly replace diff_trees
- New TreeDelta class
- Use this in show_log()
- New TreeDelta class
- Use this in show_log()
- files added:
- bzrlib/cache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- patches
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- bzrlib/util/elementtree/ => elementtree/
- bzrlib/util/urlgrabber/ => urlgrabber/
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
import sys
19
import os
18
from sets import Set
19
20
import sys, os, os.path, random, time, sha, sets, types, re, shutil, tempfile
21
import traceback, socket, fnmatch, difflib, time
22
from binascii import hexlify
20
23
21
24
import bzrlib
22
from bzrlib.trace import mutter, note
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
splitpath, \
25
sha_file, appendpath, file_kind
26
27
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId, \
28
DivergedBranches, NotBranchError
29
from bzrlib.textui import show_status
30
from bzrlib.revision import Revision
31
from bzrlib.delta import compare_trees
32
from bzrlib.tree import EmptyTree, RevisionTree
33
import bzrlib.xml
34
import bzrlib.ui
35
36
25
from inventory import Inventory
26
from trace import mutter, note
27
from tree import Tree, EmptyTree, RevisionTree, WorkingTree
28
from inventory import InventoryEntry, Inventory
29
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
30
format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
31
joinpath, sha_string, file_kind, local_time_offset, appendpath
32
from store import ImmutableStore
33
from revision import Revision
34
from errors import bailout, BzrError
35
from textui import show_status
36
from diff import diff_trees
37
37
38
38
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
39
39
## TODO: Maybe include checks for common corruption of newlines, etc?
40
40
41
41
42
# TODO: Some operations like log might retrieve the same revisions
43
# repeatedly to calculate deltas. We could perhaps have a weakref
44
# cache in memory to make this faster.
45
46
# TODO: please move the revision-string syntax stuff out of the branch
47
# object; it's clutter
48
49
50
def find_branch(f, **args):
51
if f and (f.startswith('http://') or f.startswith('https://')):
52
from bzrlib.remotebranch import RemoteBranch
53
return RemoteBranch(f, **args)
54
else:
55
return Branch(f, **args)
56
57
58
def find_cached_branch(f, cache_root, **args):
59
from bzrlib.remotebranch import RemoteBranch
60
br = find_branch(f, **args)
61
def cacheify(br, store_name):
62
from bzrlib.meta_store import CachedStore
63
cache_path = os.path.join(cache_root, store_name)
64
os.mkdir(cache_path)
65
new_store = CachedStore(getattr(br, store_name), cache_path)
66
setattr(br, store_name, new_store)
67
68
if isinstance(br, RemoteBranch):
69
cacheify(br, 'inventory_store')
70
cacheify(br, 'text_store')
71
cacheify(br, 'revision_store')
72
return br
73
74
75
def _relpath(base, path):
76
"""Return path relative to base, or raise exception.
77
78
The path may be either an absolute path or a path relative to the
79
current working directory.
80
81
Lifted out of Branch.relpath for ease of testing.
82
83
os.path.commonprefix (python2.4) has a bad bug that it works just
84
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
85
avoids that problem."""
86
rp = os.path.abspath(path)
87
88
s = []
89
head = rp
90
while len(head) >= len(base):
91
if head == base:
92
break
93
head, tail = os.path.split(head)
94
if tail:
95
s.insert(0, tail)
96
else:
97
raise NotBranchError("path %r is not within branch %r" % (rp, base))
98
99
return os.sep.join(s)
100
101
42
102
43
def find_branch_root(f=None):
103
44
"""Find the branch root enclosing f, or pwd.
104
45
105
f may be a filename or a URL.
106
107
46
It is not necessary that f exists.
108
47
109
48
Basically we keep looking up until we find the control directory or
110
run into the root. If there isn't one, raises NotBranchError.
111
"""
49
run into the root."""
112
50
if f == None:
113
51
f = os.getcwd()
114
52
elif hasattr(os.path, 'realpath'):
115
53
f = os.path.realpath(f)
116
54
else:
117
55
f = os.path.abspath(f)
118
if not os.path.exists(f):
119
raise BzrError('%r does not exist' % f)
120
121
56
122
57
orig_f = f
123
58
127
62
head, tail = os.path.split(f)
128
63
if head == f:
129
64
# reached the root, whatever that may be
130
raise NotBranchError('%s is not in a branch' % orig_f)
65
raise BzrError('%r is not in a branch' % orig_f)
131
66
f = head
132
133
67
134
68
135
69
136
70
######################################################################
137
71
# branch objects
138
72
139
class Branch(object):
73
class Branch:
140
74
"""Branch holding a history of revisions.
141
75
142
76
base
143
77
Base directory of the branch.
144
145
_lock_mode
146
None, or 'r' or 'w'
147
148
_lock_count
149
If _lock_mode is true, a positive count of the number of times the
150
lock has been taken.
151
152
_lock
153
Lock object from bzrlib.lock.
154
78
"""
155
base = None
156
_lock_mode = None
157
_lock_count = None
158
_lock = None
79
_lockmode = None
159
80
160
# Map some sort of prefix into a namespace
161
# stuff like "revno:10", "revid:", etc.
162
# This should match a prefix with a function which accepts
163
REVISION_NAMESPACES = {}
164
165
def __init__(self, base, init=False, find_root=True):
81
def __init__(self, base, init=False, find_root=True, lock_mode='w'):
166
82
"""Create new branch object at a particular location.
167
83
168
base -- Base directory for the branch. May be a file:// url.
84
base -- Base directory for the branch.
169
85
170
86
init -- If True, create new control files in a previously
171
87
unversioned directory. If False, the branch must already
177
93
In the test suite, creation of new trees is tested using the
178
94
`ScratchBranch` class.
179
95
"""
180
from bzrlib.store import ImmutableStore
181
96
if init:
182
97
self.base = os.path.realpath(base)
183
98
self._make_control()
184
99
elif find_root:
185
100
self.base = find_branch_root(base)
186
101
else:
187
if base.startswith("file://"):
188
base = base[7:]
189
102
self.base = os.path.realpath(base)
190
103
if not isdir(self.controlfilename('.')):
191
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
192
['use "bzr init" to initialize a new working tree',
193
'current bzr can only operate from top-of-tree'])
104
bailout("not a bzr branch: %s" % quotefn(base),
105
['use "bzr init" to initialize a new working tree',
106
'current bzr can only operate from top-of-tree'])
194
107
self._check_format()
108
self.lock(lock_mode)
195
109
196
110
self.text_store = ImmutableStore(self.controlfilename('text-store'))
197
111
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
205
119
__repr__ = __str__
206
120
207
121
208
def __del__(self):
209
if self._lock_mode or self._lock:
210
from bzrlib.warnings import warn
211
warn("branch %r was not explicitly unlocked" % self)
212
self._lock.unlock()
213
214
def lock_write(self):
215
if self._lock_mode:
216
if self._lock_mode != 'w':
217
from bzrlib.errors import LockError
218
raise LockError("can't upgrade to a write lock from %r" %
219
self._lock_mode)
220
self._lock_count += 1
221
else:
222
from bzrlib.lock import WriteLock
223
224
self._lock = WriteLock(self.controlfilename('branch-lock'))
225
self._lock_mode = 'w'
226
self._lock_count = 1
227
228
229
def lock_read(self):
230
if self._lock_mode:
231
assert self._lock_mode in ('r', 'w'), \
232
"invalid lock mode %r" % self._lock_mode
233
self._lock_count += 1
234
else:
235
from bzrlib.lock import ReadLock
236
237
self._lock = ReadLock(self.controlfilename('branch-lock'))
238
self._lock_mode = 'r'
239
self._lock_count = 1
240
241
def unlock(self):
242
if not self._lock_mode:
243
from bzrlib.errors import LockError
244
raise LockError('branch %r is not locked' % (self))
245
246
if self._lock_count > 1:
247
self._lock_count -= 1
248
else:
249
self._lock.unlock()
250
self._lock = None
251
self._lock_mode = self._lock_count = None
122
123
def lock(self, mode='w'):
124
"""Lock the on-disk branch, excluding other processes."""
125
try:
126
import fcntl, errno
127
128
if mode == 'w':
129
lm = fcntl.LOCK_EX
130
om = os.O_WRONLY | os.O_CREAT
131
elif mode == 'r':
132
lm = fcntl.LOCK_SH
133
om = os.O_RDONLY
134
else:
135
raise BzrError("invalid locking mode %r" % mode)
136
137
try:
138
lockfile = os.open(self.controlfilename('branch-lock'), om)
139
except OSError, e:
140
if e.errno == errno.ENOENT:
141
# might not exist on branches from <0.0.4
142
self.controlfile('branch-lock', 'w').close()
143
lockfile = os.open(self.controlfilename('branch-lock'), om)
144
else:
145
raise e
146
147
fcntl.lockf(lockfile, lm)
148
def unlock():
149
fcntl.lockf(lockfile, fcntl.LOCK_UN)
150
os.close(lockfile)
151
self._lockmode = None
152
self.unlock = unlock
153
self._lockmode = mode
154
except ImportError:
155
warning("please write a locking method for platform %r" % sys.platform)
156
def unlock():
157
self._lockmode = None
158
self.unlock = unlock
159
self._lockmode = mode
160
161
162
def _need_readlock(self):
163
if self._lockmode not in ['r', 'w']:
164
raise BzrError('need read lock on branch, only have %r' % self._lockmode)
165
166
def _need_writelock(self):
167
if self._lockmode not in ['w']:
168
raise BzrError('need write lock on branch, only have %r' % self._lockmode)
169
252
170
253
171
def abspath(self, name):
254
172
"""Return absolute filename for something in the branch"""
255
173
return os.path.join(self.base, name)
256
174
175
257
176
def relpath(self, path):
258
177
"""Return path relative to this branch of something inside it.
259
178
260
179
Raises an error if path is not in this branch."""
261
return _relpath(self.base, path)
180
rp = os.path.realpath(path)
181
# FIXME: windows
182
if not rp.startswith(self.base):
183
bailout("path %r is not within branch %r" % (rp, self.base))
184
rp = rp[len(self.base):]
185
rp = rp.lstrip(os.sep)
186
return rp
187
262
188
263
189
def controlfilename(self, file_or_path):
264
190
"""Return location relative to branch."""
265
if isinstance(file_or_path, basestring):
191
if isinstance(file_or_path, types.StringTypes):
266
192
file_or_path = [file_or_path]
267
193
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
268
194
274
200
and binary. binary files are untranslated byte streams. Text
275
201
control files are stored with Unix newlines and in UTF-8, even
276
202
if the platform or locale defaults are different.
277
278
Controlfiles should almost never be opened in write mode but
279
rather should be atomically copied and replaced using atomicfile.
280
203
"""
281
204
282
205
fn = self.controlfilename(file_or_path)
292
215
else:
293
216
raise BzrError("invalid controlfile mode %r" % mode)
294
217
218
219
295
220
def _make_control(self):
296
from bzrlib.inventory import Inventory
297
298
221
os.mkdir(self.controlfilename([]))
299
222
self.controlfile('README', 'w').write(
300
223
"This is a Bazaar-NG control directory.\n"
301
"Do not change any files in this directory.\n")
224
"Do not change any files in this directory.")
302
225
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
303
226
for d in ('text-store', 'inventory-store', 'revision-store'):
304
227
os.mkdir(self.controlfilename(d))
305
228
for f in ('revision-history', 'merged-patches',
306
229
'pending-merged-patches', 'branch-name',
307
'branch-lock',
308
'pending-merges'):
230
'branch-lock'):
309
231
self.controlfile(f, 'w').write('')
310
232
mutter('created control directory in ' + self.base)
311
312
# if we want per-tree root ids then this is the place to set
313
# them; they're not needed for now and so ommitted for
314
# simplicity.
315
f = self.controlfile('inventory','w')
316
bzrlib.xml.serializer_v4.write_inventory(Inventory(), f)
233
Inventory().write_xml(self.controlfile('inventory','w'))
317
234
318
235
319
236
def _check_format(self):
328
245
# on Windows from Linux and so on. I think it might be better
329
246
# to always make all internal files in unix format.
330
247
fmt = self.controlfile('branch-format', 'r').read()
331
fmt = fmt.replace('\r\n', '\n')
248
fmt.replace('\r\n', '')
332
249
if fmt != BZR_BRANCH_FORMAT:
333
raise BzrError('sorry, branch format %r not supported' % fmt,
334
['use a different bzr version',
335
'or remove the .bzr directory and "bzr init" again'])
336
337
def get_root_id(self):
338
"""Return the id of this branches root"""
339
inv = self.read_working_inventory()
340
return inv.root.file_id
341
342
def set_root_id(self, file_id):
343
inv = self.read_working_inventory()
344
orig_root_id = inv.root.file_id
345
del inv._byid[inv.root.file_id]
346
inv.root.file_id = file_id
347
inv._byid[inv.root.file_id] = inv.root
348
for fid in inv:
349
entry = inv[fid]
350
if entry.parent_id in (None, orig_root_id):
351
entry.parent_id = inv.root.file_id
352
self._write_inventory(inv)
250
bailout('sorry, branch format %r not supported' % fmt,
251
['use a different bzr version',
252
'or remove the .bzr directory and "bzr init" again'])
253
353
254
354
255
def read_working_inventory(self):
355
256
"""Read the working inventory."""
356
from bzrlib.inventory import Inventory
357
self.lock_read()
358
try:
359
# ElementTree does its own conversion from UTF-8, so open in
360
# binary.
361
f = self.controlfile('inventory', 'rb')
362
return bzrlib.xml.serializer_v4.read_inventory(f)
363
finally:
364
self.unlock()
365
257
self._need_readlock()
258
before = time.time()
259
# ElementTree does its own conversion from UTF-8, so open in
260
# binary.
261
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
262
mutter("loaded inventory of %d items in %f"
263
% (len(inv), time.time() - before))
264
return inv
265
366
266
367
267
def _write_inventory(self, inv):
368
268
"""Update the working inventory.
370
270
That is to say, the inventory describing changes underway, that
371
271
will be committed to the next revision.
372
272
"""
373
from bzrlib.atomicfile import AtomicFile
374
375
self.lock_write()
376
try:
377
f = AtomicFile(self.controlfilename('inventory'), 'wb')
378
try:
379
bzrlib.xml.serializer_v4.write_inventory(inv, f)
380
f.commit()
381
finally:
382
f.close()
383
finally:
384
self.unlock()
385
273
self._need_writelock()
274
## TODO: factor out to atomicfile? is rename safe on windows?
275
## TODO: Maybe some kind of clean/dirty marker on inventory?
276
tmpfname = self.controlfilename('inventory.tmp')
277
tmpf = file(tmpfname, 'wb')
278
inv.write_xml(tmpf)
279
tmpf.close()
280
inv_fname = self.controlfilename('inventory')
281
if sys.platform == 'win32':
282
os.remove(inv_fname)
283
os.rename(tmpfname, inv_fname)
386
284
mutter('wrote working inventory')
387
285
388
286
389
287
inventory = property(read_working_inventory, _write_inventory, None,
390
288
"""Inventory for the working copy.""")
391
289
392
290
393
def add(self, files, ids=None):
291
def add(self, files, verbose=False):
394
292
"""Make files versioned.
395
293
396
Note that the command line normally calls smart_add instead,
397
which can automatically recurse.
294
Note that the command line normally calls smart_add instead.
398
295
399
296
This puts the files in the Added state, so that they will be
400
297
recorded by the next commit.
401
298
402
files
403
List of paths to add, relative to the base of the tree.
404
405
ids
406
If set, use these instead of automatically generated ids.
407
Must be the same length as the list of files, but may
408
contain None for ids that are to be autogenerated.
409
410
299
TODO: Perhaps have an option to add the ids even if the files do
411
not (yet) exist.
412
413
TODO: Perhaps yield the ids and paths as they're added.
300
not (yet) exist.
301
302
TODO: Perhaps return the ids of the files? But then again it
303
is easy to retrieve them if they're needed.
304
305
TODO: Option to specify file id.
306
307
TODO: Adding a directory should optionally recurse down and
308
add all non-ignored children. Perhaps do that in a
309
higher-level method.
310
311
>>> b = ScratchBranch(files=['foo'])
312
>>> 'foo' in b.unknowns()
313
True
314
>>> b.show_status()
315
? foo
316
>>> b.add('foo')
317
>>> 'foo' in b.unknowns()
318
False
319
>>> bool(b.inventory.path2id('foo'))
320
True
321
>>> b.show_status()
322
A foo
323
324
>>> b.add('foo')
325
Traceback (most recent call last):
326
...
327
BzrError: ('foo is already versioned', [])
328
329
>>> b.add(['nothere'])
330
Traceback (most recent call last):
331
BzrError: ('cannot add: not a regular file or directory: nothere', [])
414
332
"""
333
self._need_writelock()
334
415
335
# TODO: Re-adding a file that is removed in the working copy
416
336
# should probably put it back with the previous ID.
417
if isinstance(files, basestring):
418
assert(ids is None or isinstance(ids, basestring))
337
if isinstance(files, types.StringTypes):
419
338
files = [files]
420
if ids is not None:
421
ids = [ids]
422
423
if ids is None:
424
ids = [None] * len(files)
425
else:
426
assert(len(ids) == len(files))
427
428
self.lock_write()
429
try:
430
inv = self.read_working_inventory()
431
for f,file_id in zip(files, ids):
432
if is_control_file(f):
433
raise BzrError("cannot add control file %s" % quotefn(f))
434
435
fp = splitpath(f)
436
437
if len(fp) == 0:
438
raise BzrError("cannot add top-level %r" % f)
439
440
fullpath = os.path.normpath(self.abspath(f))
441
442
try:
443
kind = file_kind(fullpath)
444
except OSError:
445
# maybe something better?
446
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
447
448
if kind != 'file' and kind != 'directory':
449
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
450
451
if file_id is None:
452
file_id = gen_file_id(f)
453
inv.add_path(f, kind=kind, file_id=file_id)
454
455
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
456
457
self._write_inventory(inv)
458
finally:
459
self.unlock()
460
339
340
inv = self.read_working_inventory()
341
for f in files:
342
if is_control_file(f):
343
bailout("cannot add control file %s" % quotefn(f))
344
345
fp = splitpath(f)
346
347
if len(fp) == 0:
348
bailout("cannot add top-level %r" % f)
349
350
fullpath = os.path.normpath(self.abspath(f))
351
352
try:
353
kind = file_kind(fullpath)
354
except OSError:
355
# maybe something better?
356
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
357
358
if kind != 'file' and kind != 'directory':
359
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
360
361
file_id = gen_file_id(f)
362
inv.add_path(f, kind=kind, file_id=file_id)
363
364
if verbose:
365
show_status('A', kind, quotefn(f))
366
367
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
368
369
self._write_inventory(inv)
370
461
371
462
372
def print_file(self, file, revno):
463
373
"""Print `file` to stdout."""
464
self.lock_read()
465
try:
466
tree = self.revision_tree(self.lookup_revision(revno))
467
# use inventory as it was in that revision
468
file_id = tree.inventory.path2id(file)
469
if not file_id:
470
raise BzrError("%r is not present in revision %s" % (file, revno))
471
tree.print_file(file_id)
472
finally:
473
self.unlock()
474
374
self._need_readlock()
375
tree = self.revision_tree(self.lookup_revision(revno))
376
# use inventory as it was in that revision
377
file_id = tree.inventory.path2id(file)
378
if not file_id:
379
bailout("%r is not present in revision %d" % (file, revno))
380
tree.print_file(file_id)
381
475
382
476
383
def remove(self, files, verbose=False):
477
384
"""Mark nominated files for removal from the inventory.
480
387
481
388
TODO: Refuse to remove modified files unless --force is given?
482
389
390
>>> b = ScratchBranch(files=['foo'])
391
>>> b.add('foo')
392
>>> b.inventory.has_filename('foo')
393
True
394
>>> b.remove('foo')
395
>>> b.working_tree().has_filename('foo')
396
True
397
>>> b.inventory.has_filename('foo')
398
False
399
400
>>> b = ScratchBranch(files=['foo'])
401
>>> b.add('foo')
402
>>> b.commit('one')
403
>>> b.remove('foo')
404
>>> b.commit('two')
405
>>> b.inventory.has_filename('foo')
406
False
407
>>> b.basis_tree().has_filename('foo')
408
False
409
>>> b.working_tree().has_filename('foo')
410
True
411
483
412
TODO: Do something useful with directories.
484
413
485
414
TODO: Should this remove the text or not? Tough call; not
489
418
"""
490
419
## TODO: Normalize names
491
420
## TODO: Remove nested loops; better scalability
492
if isinstance(files, basestring):
421
self._need_writelock()
422
423
if isinstance(files, types.StringTypes):
493
424
files = [files]
494
495
self.lock_write()
496
497
try:
498
tree = self.working_tree()
499
inv = tree.inventory
500
501
# do this before any modifications
502
for f in files:
503
fid = inv.path2id(f)
504
if not fid:
505
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
506
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
507
if verbose:
508
# having remove it, it must be either ignored or unknown
509
if tree.is_ignored(f):
510
new_status = 'I'
511
else:
512
new_status = '?'
513
show_status(new_status, inv[fid].kind, quotefn(f))
514
del inv[fid]
515
516
self._write_inventory(inv)
517
finally:
518
self.unlock()
519
520
521
# FIXME: this doesn't need to be a branch method
522
def set_inventory(self, new_inventory_list):
523
from bzrlib.inventory import Inventory, InventoryEntry
524
inv = Inventory(self.get_root_id())
525
for path, file_id, parent, kind in new_inventory_list:
526
name = os.path.basename(path)
527
if name == "":
528
continue
529
inv.add(InventoryEntry(file_id, name, kind, parent))
425
426
tree = self.working_tree()
427
inv = tree.inventory
428
429
# do this before any modifications
430
for f in files:
431
fid = inv.path2id(f)
432
if not fid:
433
bailout("cannot remove unversioned file %s" % quotefn(f))
434
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
435
if verbose:
436
# having remove it, it must be either ignored or unknown
437
if tree.is_ignored(f):
438
new_status = 'I'
439
else:
440
new_status = '?'
441
show_status(new_status, inv[fid].kind, quotefn(f))
442
del inv[fid]
443
530
444
self._write_inventory(inv)
531
445
532
446
549
463
return self.working_tree().unknowns()
550
464
551
465
552
def append_revision(self, *revision_ids):
553
from bzrlib.atomicfile import AtomicFile
554
555
for revision_id in revision_ids:
556
mutter("add {%s} to revision-history" % revision_id)
557
466
def commit(self, message, timestamp=None, timezone=None,
467
committer=None,
468
verbose=False):
469
"""Commit working copy as a new revision.
470
471
The basic approach is to add all the file texts into the
472
store, then the inventory, then make a new revision pointing
473
to that inventory and store that.
474
475
This is not quite safe if the working copy changes during the
476
commit; for the moment that is simply not allowed. A better
477
approach is to make a temporary copy of the files before
478
computing their hashes, and then add those hashes in turn to
479
the inventory. This should mean at least that there are no
480
broken hash pointers. There is no way we can get a snapshot
481
of the whole directory at an instant. This would also have to
482
be robust against files disappearing, moving, etc. So the
483
whole thing is a bit hard.
484
485
timestamp -- if not None, seconds-since-epoch for a
486
postdated/predated commit.
487
"""
488
self._need_writelock()
489
490
## TODO: Show branch names
491
492
# TODO: Don't commit if there are no changes, unless forced?
493
494
# First walk over the working inventory; and both update that
495
# and also build a new revision inventory. The revision
496
# inventory needs to hold the text-id, sha1 and size of the
497
# actual file versions committed in the revision. (These are
498
# not present in the working inventory.) We also need to
499
# detect missing/deleted files, and remove them from the
500
# working inventory.
501
502
work_inv = self.read_working_inventory()
503
inv = Inventory()
504
basis = self.basis_tree()
505
basis_inv = basis.inventory
506
missing_ids = []
507
for path, entry in work_inv.iter_entries():
508
## TODO: Cope with files that have gone missing.
509
510
## TODO: Check that the file kind has not changed from the previous
511
## revision of this file (if any).
512
513
entry = entry.copy()
514
515
p = self.abspath(path)
516
file_id = entry.file_id
517
mutter('commit prep file %s, id %r ' % (p, file_id))
518
519
if not os.path.exists(p):
520
mutter(" file is missing, removing from inventory")
521
if verbose:
522
show_status('D', entry.kind, quotefn(path))
523
missing_ids.append(file_id)
524
continue
525
526
# TODO: Handle files that have been deleted
527
528
# TODO: Maybe a special case for empty files? Seems a
529
# waste to store them many times.
530
531
inv.add(entry)
532
533
if basis_inv.has_id(file_id):
534
old_kind = basis_inv[file_id].kind
535
if old_kind != entry.kind:
536
bailout("entry %r changed kind from %r to %r"
537
% (file_id, old_kind, entry.kind))
538
539
if entry.kind == 'directory':
540
if not isdir(p):
541
bailout("%s is entered as directory but not a directory" % quotefn(p))
542
elif entry.kind == 'file':
543
if not isfile(p):
544
bailout("%s is entered as file but is not a file" % quotefn(p))
545
546
content = file(p, 'rb').read()
547
548
entry.text_sha1 = sha_string(content)
549
entry.text_size = len(content)
550
551
old_ie = basis_inv.has_id(file_id) and basis_inv[file_id]
552
if (old_ie
553
and (old_ie.text_size == entry.text_size)
554
and (old_ie.text_sha1 == entry.text_sha1)):
555
## assert content == basis.get_file(file_id).read()
556
entry.text_id = basis_inv[file_id].text_id
557
mutter(' unchanged from previous text_id {%s}' %
558
entry.text_id)
559
560
else:
561
entry.text_id = gen_file_id(entry.name)
562
self.text_store.add(content, entry.text_id)
563
mutter(' stored with text_id {%s}' % entry.text_id)
564
if verbose:
565
if not old_ie:
566
state = 'A'
567
elif (old_ie.name == entry.name
568
and old_ie.parent_id == entry.parent_id):
569
state = 'M'
570
else:
571
state = 'R'
572
573
show_status(state, entry.kind, quotefn(path))
574
575
for file_id in missing_ids:
576
# have to do this later so we don't mess up the iterator.
577
# since parents may be removed before their children we
578
# have to test.
579
580
# FIXME: There's probably a better way to do this; perhaps
581
# the workingtree should know how to filter itself.
582
if work_inv.has_id(file_id):
583
del work_inv[file_id]
584
585
586
inv_id = rev_id = _gen_revision_id(time.time())
587
588
inv_tmp = tempfile.TemporaryFile()
589
inv.write_xml(inv_tmp)
590
inv_tmp.seek(0)
591
self.inventory_store.add(inv_tmp, inv_id)
592
mutter('new inventory_id is {%s}' % inv_id)
593
594
self._write_inventory(work_inv)
595
596
if timestamp == None:
597
timestamp = time.time()
598
599
if committer == None:
600
committer = username()
601
602
if timezone == None:
603
timezone = local_time_offset()
604
605
mutter("building commit log message")
606
rev = Revision(timestamp=timestamp,
607
timezone=timezone,
608
committer=committer,
609
precursor = self.last_patch(),
610
message = message,
611
inventory_id=inv_id,
612
revision_id=rev_id)
613
614
rev_tmp = tempfile.TemporaryFile()
615
rev.write_xml(rev_tmp)
616
rev_tmp.seek(0)
617
self.revision_store.add(rev_tmp, rev_id)
618
mutter("new revision_id is {%s}" % rev_id)
619
620
## XXX: Everything up to here can simply be orphaned if we abort
621
## the commit; it will leave junk files behind but that doesn't
622
## matter.
623
624
## TODO: Read back the just-generated changeset, and make sure it
625
## applies and recreates the right state.
626
627
## TODO: Also calculate and store the inventory SHA1
628
mutter("committing patch r%d" % (self.revno() + 1))
629
630
631
self.append_revision(rev_id)
632
633
if verbose:
634
note("commited r%d" % self.revno())
635
636
637
def append_revision(self, revision_id):
638
mutter("add {%s} to revision-history" % revision_id)
558
639
rev_history = self.revision_history()
559
rev_history.extend(revision_ids)
560
561
f = AtomicFile(self.controlfilename('revision-history'))
562
try:
563
for rev_id in rev_history:
564
print >>f, rev_id
565
f.commit()
566
finally:
567
f.close()
568
569
570
def get_revision_xml_file(self, revision_id):
571
"""Return XML file object for revision object."""
572
if not revision_id or not isinstance(revision_id, basestring):
573
raise InvalidRevisionId(revision_id)
574
575
self.lock_read()
576
try:
577
try:
578
return self.revision_store[revision_id]
579
except (IndexError, KeyError):
580
raise bzrlib.errors.NoSuchRevision(self, revision_id)
581
finally:
582
self.unlock()
583
584
585
#deprecated
586
get_revision_xml = get_revision_xml_file
640
641
tmprhname = self.controlfilename('revision-history.tmp')
642
rhname = self.controlfilename('revision-history')
643
644
f = file(tmprhname, 'wt')
645
rev_history.append(revision_id)
646
f.write('\n'.join(rev_history))
647
f.write('\n')
648
f.close()
649
650
if sys.platform == 'win32':
651
os.remove(rhname)
652
os.rename(tmprhname, rhname)
653
587
654
588
655
589
656
def get_revision(self, revision_id):
590
657
"""Return the Revision object for a named revision"""
591
xml_file = self.get_revision_xml_file(revision_id)
592
593
try:
594
r = bzrlib.xml.serializer_v4.read_revision(xml_file)
595
except SyntaxError, e:
596
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
597
[revision_id,
598
str(e)])
599
658
self._need_readlock()
659
r = Revision.read_xml(self.revision_store[revision_id])
600
660
assert r.revision_id == revision_id
601
661
return r
602
662
603
663
604
def get_revision_delta(self, revno):
605
"""Return the delta for one revision.
606
607
The delta is relative to its mainline predecessor, or the
608
empty tree for revision 1.
609
"""
610
assert isinstance(revno, int)
611
rh = self.revision_history()
612
if not (1 <= revno <= len(rh)):
613
raise InvalidRevisionNumber(revno)
614
615
# revno is 1-based; list is 0-based
616
617
new_tree = self.revision_tree(rh[revno-1])
618
if revno == 1:
619
old_tree = EmptyTree()
620
else:
621
old_tree = self.revision_tree(rh[revno-2])
622
623
return compare_trees(old_tree, new_tree)
624
625
626
627
def get_revision_sha1(self, revision_id):
628
"""Hash the stored value of a revision, and return it."""
629
# In the future, revision entries will be signed. At that
630
# point, it is probably best *not* to include the signature
631
# in the revision hash. Because that lets you re-sign
632
# the revision, (add signatures/remove signatures) and still
633
# have all hash pointers stay consistent.
634
# But for now, just hash the contents.
635
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
636
637
638
664
def get_inventory(self, inventory_id):
639
665
"""Get Inventory object by hash.
640
666
641
667
TODO: Perhaps for this and similar methods, take a revision
642
668
parameter which can be either an integer revno or a
643
669
string hash."""
644
from bzrlib.inventory import Inventory
645
646
f = self.get_inventory_xml_file(inventory_id)
647
return bzrlib.xml.serializer_v4.read_inventory(f)
648
649
650
def get_inventory_xml(self, inventory_id):
651
"""Get inventory XML as a file object."""
652
return self.inventory_store[inventory_id]
653
654
get_inventory_xml_file = get_inventory_xml
655
656
657
def get_inventory_sha1(self, inventory_id):
658
"""Return the sha1 hash of the inventory entry
659
"""
660
return sha_file(self.get_inventory_xml(inventory_id))
670
self._need_readlock()
671
i = Inventory.read_xml(self.inventory_store[inventory_id])
672
return i
661
673
662
674
663
675
def get_revision_inventory(self, revision_id):
664
676
"""Return inventory of a past revision."""
665
# bzr 0.0.6 imposes the constraint that the inventory_id
666
# must be the same as its revision, so this is trivial.
677
self._need_readlock()
667
678
if revision_id == None:
668
from bzrlib.inventory import Inventory
669
return Inventory(self.get_root_id())
679
return Inventory()
670
680
else:
671
return self.get_inventory(revision_id)
681
return self.get_inventory(self.get_revision(revision_id).inventory_id)
672
682
673
683
674
684
def revision_history(self):
677
687
>>> ScratchBranch().revision_history()
678
688
[]
679
689
"""
680
self.lock_read()
681
try:
682
return [l.rstrip('\r\n') for l in
683
self.controlfile('revision-history', 'r').readlines()]
684
finally:
685
self.unlock()
686
687
688
def common_ancestor(self, other, self_revno=None, other_revno=None):
689
"""
690
>>> from bzrlib.commit import commit
691
>>> sb = ScratchBranch(files=['foo', 'foo~'])
692
>>> sb.common_ancestor(sb) == (None, None)
693
True
694
>>> commit(sb, "Committing first revision", verbose=False)
695
>>> sb.common_ancestor(sb)[0]
696
1
697
>>> clone = sb.clone()
698
>>> commit(sb, "Committing second revision", verbose=False)
699
>>> sb.common_ancestor(sb)[0]
700
2
701
>>> sb.common_ancestor(clone)[0]
702
1
703
>>> commit(clone, "Committing divergent second revision",
704
... verbose=False)
705
>>> sb.common_ancestor(clone)[0]
706
1
707
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
708
True
709
>>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
710
True
711
>>> clone2 = sb.clone()
712
>>> sb.common_ancestor(clone2)[0]
713
2
714
>>> sb.common_ancestor(clone2, self_revno=1)[0]
715
1
716
>>> sb.common_ancestor(clone2, other_revno=1)[0]
717
1
718
"""
719
my_history = self.revision_history()
720
other_history = other.revision_history()
721
if self_revno is None:
722
self_revno = len(my_history)
723
if other_revno is None:
724
other_revno = len(other_history)
725
indices = range(min((self_revno, other_revno)))
726
indices.reverse()
727
for r in indices:
728
if my_history[r] == other_history[r]:
729
return r+1, my_history[r]
730
return None, None
690
self._need_readlock()
691
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
731
692
732
693
733
694
def revno(self):
735
696
736
697
That is equivalent to the number of revisions committed to
737
698
this branch.
699
700
>>> b = ScratchBranch()
701
>>> b.revno()
702
0
703
>>> b.commit('no foo')
704
>>> b.revno()
705
1
738
706
"""
739
707
return len(self.revision_history())
740
708
741
709
742
710
def last_patch(self):
743
711
"""Return last patch hash, or None if no history.
712
713
>>> ScratchBranch().last_patch() == None
714
True
744
715
"""
745
716
ph = self.revision_history()
746
717
if ph:
747
718
return ph[-1]
748
719
else:
749
720
return None
750
751
752
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
753
"""
754
If self and other have not diverged, return a list of the revisions
755
present in other, but missing from self.
756
757
>>> from bzrlib.commit import commit
758
>>> bzrlib.trace.silent = True
759
>>> br1 = ScratchBranch()
760
>>> br2 = ScratchBranch()
761
>>> br1.missing_revisions(br2)
762
[]
763
>>> commit(br2, "lala!", rev_id="REVISION-ID-1")
764
>>> br1.missing_revisions(br2)
765
[u'REVISION-ID-1']
766
>>> br2.missing_revisions(br1)
767
[]
768
>>> commit(br1, "lala!", rev_id="REVISION-ID-1")
769
>>> br1.missing_revisions(br2)
770
[]
771
>>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
772
>>> br1.missing_revisions(br2)
773
[u'REVISION-ID-2A']
774
>>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
775
>>> br1.missing_revisions(br2)
776
Traceback (most recent call last):
777
DivergedBranches: These branches have diverged.
778
"""
779
self_history = self.revision_history()
780
self_len = len(self_history)
781
other_history = other.revision_history()
782
other_len = len(other_history)
783
common_index = min(self_len, other_len) -1
784
if common_index >= 0 and \
785
self_history[common_index] != other_history[common_index]:
786
raise DivergedBranches(self, other)
787
788
if stop_revision is None:
789
stop_revision = other_len
790
elif stop_revision > other_len:
791
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
792
793
return other_history[self_len:stop_revision]
794
795
796
def update_revisions(self, other, stop_revision=None):
797
"""Pull in all new revisions from other branch.
798
"""
799
from bzrlib.fetch import greedy_fetch
800
from bzrlib.revision import get_intervening_revisions
801
802
pb = bzrlib.ui.ui_factory.progress_bar()
803
pb.update('comparing histories')
804
if stop_revision is None:
805
other_revision = other.last_patch()
806
else:
807
other_revision = other.lookup_revision(stop_revision)
808
count = greedy_fetch(self, other, other_revision, pb)[0]
809
try:
810
revision_ids = self.missing_revisions(other, stop_revision)
811
except DivergedBranches, e:
812
try:
813
revision_ids = get_intervening_revisions(self.last_patch(),
814
other_revision, self)
815
assert self.last_patch() not in revision_ids
816
except bzrlib.errors.NotAncestor:
817
raise e
818
819
self.append_revision(*revision_ids)
820
pb.clear()
821
822
def install_revisions(self, other, revision_ids, pb):
823
if hasattr(other.revision_store, "prefetch"):
824
other.revision_store.prefetch(revision_ids)
825
if hasattr(other.inventory_store, "prefetch"):
826
inventory_ids = []
827
for rev_id in revision_ids:
828
try:
829
revision = other.get_revision(rev_id).inventory_id
830
inventory_ids.append(revision)
831
except bzrlib.errors.NoSuchRevision:
832
pass
833
other.inventory_store.prefetch(inventory_ids)
834
835
if pb is None:
836
pb = bzrlib.ui.ui_factory.progress_bar()
837
838
revisions = []
839
needed_texts = set()
840
i = 0
841
842
failures = set()
843
for i, rev_id in enumerate(revision_ids):
844
pb.update('fetching revision', i+1, len(revision_ids))
845
try:
846
rev = other.get_revision(rev_id)
847
except bzrlib.errors.NoSuchRevision:
848
failures.add(rev_id)
849
continue
850
851
revisions.append(rev)
852
inv = other.get_inventory(str(rev.inventory_id))
853
for key, entry in inv.iter_entries():
854
if entry.text_id is None:
855
continue
856
if entry.text_id not in self.text_store:
857
needed_texts.add(entry.text_id)
858
859
pb.clear()
860
861
count, cp_fail = self.text_store.copy_multi(other.text_store,
862
needed_texts)
863
#print "Added %d texts." % count
864
inventory_ids = [ f.inventory_id for f in revisions ]
865
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
866
inventory_ids)
867
#print "Added %d inventories." % count
868
revision_ids = [ f.revision_id for f in revisions]
869
870
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
871
revision_ids,
872
permit_failure=True)
873
assert len(cp_fail) == 0
874
return count, failures
875
876
877
def commit(self, *args, **kw):
878
from bzrlib.commit import commit
879
commit(self, *args, **kw)
880
881
882
def lookup_revision(self, revision):
883
"""Return the revision identifier for a given revision information."""
884
revno, info = self._get_revision_info(revision)
885
return info
886
887
888
def revision_id_to_revno(self, revision_id):
889
"""Given a revision id, return its revno"""
890
history = self.revision_history()
891
try:
892
return history.index(revision_id) + 1
893
except ValueError:
894
raise bzrlib.errors.NoSuchRevision(self, revision_id)
895
896
897
def get_revision_info(self, revision):
898
"""Return (revno, revision id) for revision identifier.
899
900
revision can be an integer, in which case it is assumed to be revno (though
901
this will translate negative values into positive ones)
902
revision can also be a string, in which case it is parsed for something like
903
'date:' or 'revid:' etc.
904
"""
905
revno, rev_id = self._get_revision_info(revision)
906
if revno is None:
907
raise bzrlib.errors.NoSuchRevision(self, revision)
908
return revno, rev_id
909
910
def get_rev_id(self, revno, history=None):
911
"""Find the revision id of the specified revno."""
721
722
723
def lookup_revision(self, revno):
724
"""Return revision hash for revision number."""
912
725
if revno == 0:
913
726
return None
914
if history is None:
915
history = self.revision_history()
916
elif revno <= 0 or revno > len(history):
917
raise bzrlib.errors.NoSuchRevision(self, revno)
918
return history[revno - 1]
919
920
def _get_revision_info(self, revision):
921
"""Return (revno, revision id) for revision specifier.
922
923
revision can be an integer, in which case it is assumed to be revno
924
(though this will translate negative values into positive ones)
925
revision can also be a string, in which case it is parsed for something
926
like 'date:' or 'revid:' etc.
927
928
A revid is always returned. If it is None, the specifier referred to
929
the null revision. If the revid does not occur in the revision
930
history, revno will be None.
931
"""
932
933
if revision is None:
934
return 0, None
935
revno = None
936
try:# Convert to int if possible
937
revision = int(revision)
938
except ValueError:
939
pass
940
revs = self.revision_history()
941
if isinstance(revision, int):
942
if revision < 0:
943
revno = len(revs) + revision + 1
944
else:
945
revno = revision
946
rev_id = self.get_rev_id(revno, revs)
947
elif isinstance(revision, basestring):
948
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
949
if revision.startswith(prefix):
950
result = func(self, revs, revision)
951
if len(result) > 1:
952
revno, rev_id = result
953
else:
954
revno = result[0]
955
rev_id = self.get_rev_id(revno, revs)
956
break
957
else:
958
raise BzrError('No namespace registered for string: %r' %
959
revision)
960
else:
961
raise TypeError('Unhandled revision type %s' % revision)
962
963
if revno is None:
964
if rev_id is None:
965
raise bzrlib.errors.NoSuchRevision(self, revision)
966
return revno, rev_id
967
968
def _namespace_revno(self, revs, revision):
969
"""Lookup a revision by revision number"""
970
assert revision.startswith('revno:')
971
try:
972
return (int(revision[6:]),)
973
except ValueError:
974
return None
975
REVISION_NAMESPACES['revno:'] = _namespace_revno
976
977
def _namespace_revid(self, revs, revision):
978
assert revision.startswith('revid:')
979
rev_id = revision[len('revid:'):]
980
try:
981
return revs.index(rev_id) + 1, rev_id
982
except ValueError:
983
return None, rev_id
984
REVISION_NAMESPACES['revid:'] = _namespace_revid
985
986
def _namespace_last(self, revs, revision):
987
assert revision.startswith('last:')
988
try:
989
offset = int(revision[5:])
990
except ValueError:
991
return (None,)
992
else:
993
if offset <= 0:
994
raise BzrError('You must supply a positive value for --revision last:XXX')
995
return (len(revs) - offset + 1,)
996
REVISION_NAMESPACES['last:'] = _namespace_last
997
998
def _namespace_tag(self, revs, revision):
999
assert revision.startswith('tag:')
1000
raise BzrError('tag: namespace registered, but not implemented.')
1001
REVISION_NAMESPACES['tag:'] = _namespace_tag
1002
1003
def _namespace_date(self, revs, revision):
1004
assert revision.startswith('date:')
1005
import datetime
1006
# Spec for date revisions:
1007
# date:value
1008
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
1009
# it can also start with a '+/-/='. '+' says match the first
1010
# entry after the given date. '-' is match the first entry before the date
1011
# '=' is match the first entry after, but still on the given date.
1012
#
1013
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
1014
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
1015
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
1016
# May 13th, 2005 at 0:00
1017
#
1018
# So the proper way of saying 'give me all entries for today' is:
1019
# -r {date:+today}:{date:-tomorrow}
1020
# The default is '=' when not supplied
1021
val = revision[5:]
1022
match_style = '='
1023
if val[:1] in ('+', '-', '='):
1024
match_style = val[:1]
1025
val = val[1:]
1026
1027
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
1028
if val.lower() == 'yesterday':
1029
dt = today - datetime.timedelta(days=1)
1030
elif val.lower() == 'today':
1031
dt = today
1032
elif val.lower() == 'tomorrow':
1033
dt = today + datetime.timedelta(days=1)
1034
else:
1035
import re
1036
# This should be done outside the function to avoid recompiling it.
1037
_date_re = re.compile(
1038
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
1039
r'(,|T)?\s*'
1040
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
1041
)
1042
m = _date_re.match(val)
1043
if not m or (not m.group('date') and not m.group('time')):
1044
raise BzrError('Invalid revision date %r' % revision)
1045
1046
if m.group('date'):
1047
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
1048
else:
1049
year, month, day = today.year, today.month, today.day
1050
if m.group('time'):
1051
hour = int(m.group('hour'))
1052
minute = int(m.group('minute'))
1053
if m.group('second'):
1054
second = int(m.group('second'))
1055
else:
1056
second = 0
1057
else:
1058
hour, minute, second = 0,0,0
1059
1060
dt = datetime.datetime(year=year, month=month, day=day,
1061
hour=hour, minute=minute, second=second)
1062
first = dt
1063
last = None
1064
reversed = False
1065
if match_style == '-':
1066
reversed = True
1067
elif match_style == '=':
1068
last = dt + datetime.timedelta(days=1)
1069
1070
if reversed:
1071
for i in range(len(revs)-1, -1, -1):
1072
r = self.get_revision(revs[i])
1073
# TODO: Handle timezone.
1074
dt = datetime.datetime.fromtimestamp(r.timestamp)
1075
if first >= dt and (last is None or dt >= last):
1076
return (i+1,)
1077
else:
1078
for i in range(len(revs)):
1079
r = self.get_revision(revs[i])
1080
# TODO: Handle timezone.
1081
dt = datetime.datetime.fromtimestamp(r.timestamp)
1082
if first <= dt and (last is None or dt <= last):
1083
return (i+1,)
1084
REVISION_NAMESPACES['date:'] = _namespace_date
1085
1086
1087
def _namespace_ancestor(self, revs, revision):
1088
from revision import common_ancestor, MultipleRevisionSources
1089
other_branch = find_branch(_trim_namespace('ancestor', revision))
1090
revision_a = self.last_patch()
1091
revision_b = other_branch.last_patch()
1092
for r, b in ((revision_a, self), (revision_b, other_branch)):
1093
if r is None:
1094
raise bzrlib.errors.NoCommits(b)
1095
revision_source = MultipleRevisionSources(self, other_branch)
1096
result = common_ancestor(revision_a, revision_b, revision_source)
1097
try:
1098
revno = self.revision_id_to_revno(result)
1099
except bzrlib.errors.NoSuchRevision:
1100
revno = None
1101
return revno,result
1102
1103
1104
REVISION_NAMESPACES['ancestor:'] = _namespace_ancestor
727
728
try:
729
# list is 0-based; revisions are 1-based
730
return self.revision_history()[revno-1]
731
except IndexError:
732
raise BzrError("no such revision %s" % revno)
733
1105
734
1106
735
def revision_tree(self, revision_id):
1107
736
"""Return Tree for a revision on this branch.
1108
737
1109
738
`revision_id` may be None for the null revision, in which case
1110
739
an `EmptyTree` is returned."""
1111
# TODO: refactor this to use an existing revision object
1112
# so we don't need to read it in twice.
740
self._need_readlock()
1113
741
if revision_id == None:
1114
742
return EmptyTree()
1115
743
else:
1119
747
1120
748
def working_tree(self):
1121
749
"""Return a `Tree` for the working copy."""
1122
from bzrlib.workingtree import WorkingTree
1123
750
return WorkingTree(self.base, self.read_working_inventory())
1124
751
1125
752
1127
754
"""Return `Tree` object for last revision.
1128
755
1129
756
If there are no revisions yet, return an `EmptyTree`.
757
758
>>> b = ScratchBranch(files=['foo'])
759
>>> b.basis_tree().has_filename('foo')
760
False
761
>>> b.working_tree().has_filename('foo')
762
True
763
>>> b.add('foo')
764
>>> b.commit('add foo')
765
>>> b.basis_tree().has_filename('foo')
766
True
1130
767
"""
1131
768
r = self.last_patch()
1132
769
if r == None:
1141
778
1142
779
This can change the directory or the filename or both.
1143
780
"""
1144
self.lock_write()
781
self._need_writelock()
782
tree = self.working_tree()
783
inv = tree.inventory
784
if not tree.has_filename(from_rel):
785
bailout("can't rename: old working file %r does not exist" % from_rel)
786
if tree.has_filename(to_rel):
787
bailout("can't rename: new working file %r already exists" % to_rel)
788
789
file_id = inv.path2id(from_rel)
790
if file_id == None:
791
bailout("can't rename: old name %r is not versioned" % from_rel)
792
793
if inv.path2id(to_rel):
794
bailout("can't rename: new name %r is already versioned" % to_rel)
795
796
to_dir, to_tail = os.path.split(to_rel)
797
to_dir_id = inv.path2id(to_dir)
798
if to_dir_id == None and to_dir != '':
799
bailout("can't determine destination directory id for %r" % to_dir)
800
801
mutter("rename_one:")
802
mutter(" file_id {%s}" % file_id)
803
mutter(" from_rel %r" % from_rel)
804
mutter(" to_rel %r" % to_rel)
805
mutter(" to_dir %r" % to_dir)
806
mutter(" to_dir_id {%s}" % to_dir_id)
807
808
inv.rename(file_id, to_dir_id, to_tail)
809
810
print "%s => %s" % (from_rel, to_rel)
811
812
from_abs = self.abspath(from_rel)
813
to_abs = self.abspath(to_rel)
1145
814
try:
1146
tree = self.working_tree()
1147
inv = tree.inventory
1148
if not tree.has_filename(from_rel):
1149
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1150
if tree.has_filename(to_rel):
1151
raise BzrError("can't rename: new working file %r already exists" % to_rel)
1152
1153
file_id = inv.path2id(from_rel)
1154
if file_id == None:
1155
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1156
1157
if inv.path2id(to_rel):
1158
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1159
1160
to_dir, to_tail = os.path.split(to_rel)
1161
to_dir_id = inv.path2id(to_dir)
1162
if to_dir_id == None and to_dir != '':
1163
raise BzrError("can't determine destination directory id for %r" % to_dir)
1164
1165
mutter("rename_one:")
1166
mutter(" file_id {%s}" % file_id)
1167
mutter(" from_rel %r" % from_rel)
1168
mutter(" to_rel %r" % to_rel)
1169
mutter(" to_dir %r" % to_dir)
1170
mutter(" to_dir_id {%s}" % to_dir_id)
1171
1172
inv.rename(file_id, to_dir_id, to_tail)
1173
1174
from_abs = self.abspath(from_rel)
1175
to_abs = self.abspath(to_rel)
1176
try:
1177
os.rename(from_abs, to_abs)
1178
except OSError, e:
1179
raise BzrError("failed to rename %r to %r: %s"
1180
% (from_abs, to_abs, e[1]),
1181
["rename rolled back"])
1182
1183
self._write_inventory(inv)
1184
finally:
1185
self.unlock()
815
os.rename(from_abs, to_abs)
816
except OSError, e:
817
bailout("failed to rename %r to %r: %s"
818
% (from_abs, to_abs, e[1]),
819
["rename rolled back"])
820
821
self._write_inventory(inv)
822
1186
823
1187
824
1188
825
def move(self, from_paths, to_name):
1195
832
1196
833
Note that to_name is only the last component of the new name;
1197
834
this doesn't change the directory.
1198
1199
This returns a list of (from_path, to_path) pairs for each
1200
entry that is moved.
1201
"""
1202
result = []
1203
self.lock_write()
1204
try:
1205
## TODO: Option to move IDs only
1206
assert not isinstance(from_paths, basestring)
1207
tree = self.working_tree()
1208
inv = tree.inventory
1209
to_abs = self.abspath(to_name)
1210
if not isdir(to_abs):
1211
raise BzrError("destination %r is not a directory" % to_abs)
1212
if not tree.has_filename(to_name):
1213
raise BzrError("destination %r not in working directory" % to_abs)
1214
to_dir_id = inv.path2id(to_name)
1215
if to_dir_id == None and to_name != '':
1216
raise BzrError("destination %r is not a versioned directory" % to_name)
1217
to_dir_ie = inv[to_dir_id]
1218
if to_dir_ie.kind not in ('directory', 'root_directory'):
1219
raise BzrError("destination %r is not a directory" % to_abs)
1220
1221
to_idpath = inv.get_idpath(to_dir_id)
1222
1223
for f in from_paths:
1224
if not tree.has_filename(f):
1225
raise BzrError("%r does not exist in working tree" % f)
1226
f_id = inv.path2id(f)
1227
if f_id == None:
1228
raise BzrError("%r is not versioned" % f)
1229
name_tail = splitpath(f)[-1]
1230
dest_path = appendpath(to_name, name_tail)
1231
if tree.has_filename(dest_path):
1232
raise BzrError("destination %r already exists" % dest_path)
1233
if f_id in to_idpath:
1234
raise BzrError("can't move %r to a subdirectory of itself" % f)
1235
1236
# OK, so there's a race here, it's possible that someone will
1237
# create a file in this interval and then the rename might be
1238
# left half-done. But we should have caught most problems.
1239
1240
for f in from_paths:
1241
name_tail = splitpath(f)[-1]
1242
dest_path = appendpath(to_name, name_tail)
1243
result.append((f, dest_path))
1244
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1245
try:
1246
os.rename(self.abspath(f), self.abspath(dest_path))
1247
except OSError, e:
1248
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1249
["rename rolled back"])
1250
1251
self._write_inventory(inv)
1252
finally:
1253
self.unlock()
1254
1255
return result
1256
1257
1258
def revert(self, filenames, old_tree=None, backups=True):
1259
"""Restore selected files to the versions from a previous tree.
1260
1261
backups
1262
If true (default) backups are made of files before
1263
they're renamed.
1264
"""
1265
from bzrlib.errors import NotVersionedError, BzrError
1266
from bzrlib.atomicfile import AtomicFile
1267
from bzrlib.osutils import backup_file
1268
1269
inv = self.read_working_inventory()
1270
if old_tree is None:
1271
old_tree = self.basis_tree()
1272
old_inv = old_tree.inventory
1273
1274
nids = []
1275
for fn in filenames:
1276
file_id = inv.path2id(fn)
1277
if not file_id:
1278
raise NotVersionedError("not a versioned file", fn)
1279
if not old_inv.has_id(file_id):
1280
raise BzrError("file not present in old tree", fn, file_id)
1281
nids.append((fn, file_id))
1282
1283
# TODO: Rename back if it was previously at a different location
1284
1285
# TODO: If given a directory, restore the entire contents from
1286
# the previous version.
1287
1288
# TODO: Make a backup to a temporary file.
1289
1290
# TODO: If the file previously didn't exist, delete it?
1291
for fn, file_id in nids:
1292
backup_file(fn)
1293
1294
f = AtomicFile(fn, 'wb')
1295
try:
1296
f.write(old_tree.get_file(file_id).read())
1297
f.commit()
1298
finally:
1299
f.close()
1300
1301
1302
def pending_merges(self):
1303
"""Return a list of pending merges.
1304
1305
These are revisions that have been merged into the working
1306
directory but not yet committed.
1307
"""
1308
cfn = self.controlfilename('pending-merges')
1309
if not os.path.exists(cfn):
1310
return []
1311
p = []
1312
for l in self.controlfile('pending-merges', 'r').readlines():
1313
p.append(l.rstrip('\n'))
1314
return p
1315
1316
1317
def add_pending_merge(self, revision_id):
1318
from bzrlib.revision import validate_revision_id
1319
1320
validate_revision_id(revision_id)
1321
1322
p = self.pending_merges()
1323
if revision_id in p:
1324
return
1325
p.append(revision_id)
1326
self.set_pending_merges(p)
1327
1328
1329
def set_pending_merges(self, rev_list):
1330
from bzrlib.atomicfile import AtomicFile
1331
self.lock_write()
1332
try:
1333
f = AtomicFile(self.controlfilename('pending-merges'))
1334
try:
1335
for l in rev_list:
1336
print >>f, l
1337
f.commit()
1338
finally:
1339
f.close()
1340
finally:
1341
self.unlock()
1342
1343
1344
def get_parent(self):
1345
"""Return the parent location of the branch.
1346
1347
This is the default location for push/pull/missing. The usual
1348
pattern is that the user can override it by specifying a
1349
location.
1350
"""
1351
import errno
1352
_locs = ['parent', 'pull', 'x-pull']
1353
for l in _locs:
1354
try:
1355
return self.controlfile(l, 'r').read().strip('\n')
1356
except IOError, e:
1357
if e.errno != errno.ENOENT:
1358
raise
1359
return None
1360
1361
1362
def set_parent(self, url):
1363
# TODO: Maybe delete old location files?
1364
from bzrlib.atomicfile import AtomicFile
1365
self.lock_write()
1366
try:
1367
f = AtomicFile(self.controlfilename('parent'))
1368
try:
1369
f.write(url + '\n')
1370
f.commit()
1371
finally:
1372
f.close()
1373
finally:
1374
self.unlock()
1375
1376
def check_revno(self, revno):
1377
"""\
1378
Check whether a revno corresponds to any revision.
1379
Zero (the NULL revision) is considered valid.
1380
"""
1381
if revno != 0:
1382
self.check_real_revno(revno)
1383
1384
def check_real_revno(self, revno):
1385
"""\
1386
Check whether a revno corresponds to a real revision.
1387
Zero (the NULL revision) is considered invalid
1388
"""
1389
if revno < 1 or revno > self.revno():
1390
raise InvalidRevisionNumber(revno)
1391
1392
835
"""
836
self._need_writelock()
837
## TODO: Option to move IDs only
838
assert not isinstance(from_paths, basestring)
839
tree = self.working_tree()
840
inv = tree.inventory
841
to_abs = self.abspath(to_name)
842
if not isdir(to_abs):
843
bailout("destination %r is not a directory" % to_abs)
844
if not tree.has_filename(to_name):
845
bailout("destination %r not in working directory" % to_abs)
846
to_dir_id = inv.path2id(to_name)
847
if to_dir_id == None and to_name != '':
848
bailout("destination %r is not a versioned directory" % to_name)
849
to_dir_ie = inv[to_dir_id]
850
if to_dir_ie.kind not in ('directory', 'root_directory'):
851
bailout("destination %r is not a directory" % to_abs)
852
853
to_idpath = Set(inv.get_idpath(to_dir_id))
854
855
for f in from_paths:
856
if not tree.has_filename(f):
857
bailout("%r does not exist in working tree" % f)
858
f_id = inv.path2id(f)
859
if f_id == None:
860
bailout("%r is not versioned" % f)
861
name_tail = splitpath(f)[-1]
862
dest_path = appendpath(to_name, name_tail)
863
if tree.has_filename(dest_path):
864
bailout("destination %r already exists" % dest_path)
865
if f_id in to_idpath:
866
bailout("can't move %r to a subdirectory of itself" % f)
867
868
# OK, so there's a race here, it's possible that someone will
869
# create a file in this interval and then the rename might be
870
# left half-done. But we should have caught most problems.
871
872
for f in from_paths:
873
name_tail = splitpath(f)[-1]
874
dest_path = appendpath(to_name, name_tail)
875
print "%s => %s" % (f, dest_path)
876
inv.rename(inv.path2id(f), to_dir_id, name_tail)
877
try:
878
os.rename(self.abspath(f), self.abspath(dest_path))
879
except OSError, e:
880
bailout("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
881
["rename rolled back"])
882
883
self._write_inventory(inv)
884
885
886
887
def show_status(self, show_all=False):
888
"""Display single-line status for non-ignored working files.
889
890
The list is show sorted in order by file name.
891
892
>>> b = ScratchBranch(files=['foo', 'foo~'])
893
>>> b.show_status()
894
? foo
895
>>> b.add('foo')
896
>>> b.show_status()
897
A foo
898
>>> b.commit("add foo")
899
>>> b.show_status()
900
>>> os.unlink(b.abspath('foo'))
901
>>> b.show_status()
902
D foo
903
904
TODO: Get state for single files.
905
"""
906
self._need_readlock()
907
908
# We have to build everything into a list first so that it can
909
# sorted by name, incorporating all the different sources.
910
911
# FIXME: Rather than getting things in random order and then sorting,
912
# just step through in order.
913
914
# Interesting case: the old ID for a file has been removed,
915
# but a new file has been created under that name.
916
917
old = self.basis_tree()
918
new = self.working_tree()
919
920
for fs, fid, oldname, newname, kind in diff_trees(old, new):
921
if fs == 'R':
922
show_status(fs, kind,
923
oldname + ' => ' + newname)
924
elif fs == 'A' or fs == 'M':
925
show_status(fs, kind, newname)
926
elif fs == 'D':
927
show_status(fs, kind, oldname)
928
elif fs == '.':
929
if show_all:
930
show_status(fs, kind, newname)
931
elif fs == 'I':
932
if show_all:
933
show_status(fs, kind, newname)
934
elif fs == '?':
935
show_status(fs, kind, newname)
936
else:
937
bailout("weird file state %r" % ((fs, fid),))
938
1393
939
1394
940
1395
941
class ScratchBranch(Branch):
1399
945
>>> isdir(b.base)
1400
946
True
1401
947
>>> bd = b.base
1402
>>> b.destroy()
948
>>> del b
1403
949
>>> isdir(bd)
1404
950
False
1405
951
"""
1406
def __init__(self, files=[], dirs=[], base=None):
952
def __init__(self, files=[], dirs=[]):
1407
953
"""Make a test branch.
1408
954
1409
955
This creates a temporary directory and runs init-tree in it.
1410
956
1411
957
If any files are listed, they are created in the working copy.
1412
958
"""
1413
from tempfile import mkdtemp
1414
init = False
1415
if base is None:
1416
base = mkdtemp()
1417
init = True
1418
Branch.__init__(self, base, init=init)
959
Branch.__init__(self, tempfile.mkdtemp(), init=True)
1419
960
for d in dirs:
1420
961
os.mkdir(self.abspath(d))
1421
962
1423
964
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1424
965
1425
966
1426
def clone(self):
1427
"""
1428
>>> orig = ScratchBranch(files=["file1", "file2"])
1429
>>> clone = orig.clone()
1430
>>> os.path.samefile(orig.base, clone.base)
1431
False
1432
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1433
True
1434
"""
1435
from shutil import copytree
1436
from tempfile import mkdtemp
1437
base = mkdtemp()
1438
os.rmdir(base)
1439
copytree(self.base, base, symlinks=True)
1440
return ScratchBranch(base=base)
1441
1442
1443
1444
967
def __del__(self):
1445
self.destroy()
1446
1447
def destroy(self):
1448
968
"""Destroy the test branch, removing the scratch directory."""
1449
from shutil import rmtree
1450
969
try:
1451
if self.base:
1452
mutter("delete ScratchBranch %s" % self.base)
1453
rmtree(self.base)
1454
except OSError, e:
970
shutil.rmtree(self.base)
971
except OSError:
1455
972
# Work around for shutil.rmtree failing on Windows when
1456
973
# readonly files are encountered
1457
mutter("hit exception in destroying ScratchBranch: %s" % e)
1458
974
for root, dirs, files in os.walk(self.base, topdown=False):
1459
975
for name in files:
1460
976
os.chmod(os.path.join(root, name), 0700)
1461
rmtree(self.base)
1462
self.base = None
977
shutil.rmtree(self.base)
1463
978
1464
979
1465
980
1482
997
1483
998
1484
999
1000
def _gen_revision_id(when):
1001
"""Return new revision-id."""
1002
s = '%s-%s-' % (user_email(), compact_date(when))
1003
s += hexlify(rand_bytes(8))
1004
return s
1005
1006
1485
1007
def gen_file_id(name):
1486
1008
"""Return new file id.
1487
1009
1488
1010
This should probably generate proper UUIDs, but for the moment we
1489
1011
cope with just randomness because running uuidgen every time is
1490
1012
slow."""
1491
import re
1492
from binascii import hexlify
1493
from time import time
1494
1495
# get last component
1496
1013
idx = name.rfind('/')
1497
1014
if idx != -1:
1498
1015
name = name[idx+1 : ]
1500
1017
if idx != -1:
1501
1018
name = name[idx+1 : ]
1502
1019
1503
# make it not a hidden file
1504
1020
name = name.lstrip('.')
1505
1021
1506
# remove any wierd characters; we don't escape them but rather
1507
# just pull them out
1508
name = re.sub(r'[^\w.]', '', name)
1509
1510
1022
s = hexlify(rand_bytes(8))
1511
return '-'.join((name, compact_date(time()), s))
1512
1513
1514
def gen_root_id():
1515
"""Return a new tree-root file id."""
1516
return gen_file_id('TREE_ROOT')
1517
1518
1519
def copy_branch(branch_from, to_location, revision=None):
1520
"""Copy branch_from into the existing directory to_location.
1521
1522
revision
1523
If not None, only revisions up to this point will be copied.
1524
The head of the new branch will be that revision.
1525
1526
to_location
1527
The name of a local directory that exists but is empty.
1528
"""
1529
from bzrlib.merge import merge
1530
1531
assert isinstance(branch_from, Branch)
1532
assert isinstance(to_location, basestring)
1533
1534
br_to = Branch(to_location, init=True)
1535
br_to.set_root_id(branch_from.get_root_id())
1536
if revision is None:
1537
revno = branch_from.revno()
1538
else:
1539
revno, rev_id = branch_from.get_revision_info(revision)
1540
br_to.update_revisions(branch_from, stop_revision=revno)
1541
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1542
check_clean=False, ignore_zero=True)
1543
br_to.set_parent(branch_from.base)
1544
return br_to
1545
1546
def _trim_namespace(namespace, spec):
1547
full_namespace = namespace + ':'
1548
assert spec.startswith(full_namespace)
1549
return spec[len(full_namespace):]
1023
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1