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 419
- compare with another revision
- download diff
- download tarball
- view history from revision 419
- Committer: Martin Pool
- Date: 2005-05-09 08:47:06 UTC
- Revision ID: mbp@sourcefrog.net-20050509084706-19ca82cc007ab3f8
- RemoteBranch.__str__ and repr
- Better code for locating root of remote branch
- Better code for locating root of remote branch
- files added:
- bzrlib/cache.py
- files removed:
- bzr-man.py
- bzrlib/selftest
- contrib/emacs
- effbot
- effbot/org
- patches
- plugins
- plugins/changeset
- tools
- files renamed:
- contrib/bash/bzr.simple => contrib/bash/bzr
- 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
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
import bzrlib.errors
28
from bzrlib.textui import show_status
29
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
31
from bzrlib.delta import compare_trees
32
from bzrlib.tree import EmptyTree, RevisionTree
33
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
34
38
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
35
39
## TODO: Maybe include checks for common corruption of newlines, etc?
36
40
37
41
38
# TODO: Some operations like log might retrieve the same revisions
39
# repeatedly to calculate deltas. We could perhaps have a weakref
40
# cache in memory to make this faster.
41
42
42
43
43
def find_branch(f, **args):
44
if f and (f.startswith('http://') or f.startswith('https://')):
44
if f.startswith('http://') or f.startswith('https://'):
45
45
import remotebranch
46
46
return remotebranch.RemoteBranch(f, **args)
47
47
else:
48
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
49
95
50
96
51
def find_branch_root(f=None):
108
63
f = os.path.realpath(f)
109
64
else:
110
65
f = os.path.abspath(f)
111
if not os.path.exists(f):
112
raise BzrError('%r does not exist' % f)
113
114
66
115
67
orig_f = f
116
68
123
75
raise BzrError('%r is not in a branch' % orig_f)
124
76
f = head
125
77
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
78
132
79
133
80
######################################################################
134
81
# branch objects
135
82
136
class Branch(object):
83
class Branch:
137
84
"""Branch holding a history of revisions.
138
85
139
86
base
140
87
Base directory of the branch.
141
142
_lock_mode
143
None, or 'r' or 'w'
144
145
_lock_count
146
If _lock_mode is true, a positive count of the number of times the
147
lock has been taken.
148
149
_lock
150
Lock object from bzrlib.lock.
151
88
"""
152
base = None
153
_lock_mode = None
154
_lock_count = None
155
_lock = None
89
_lockmode = None
156
90
157
# Map some sort of prefix into a namespace
158
# stuff like "revno:10", "revid:", etc.
159
# This should match a prefix with a function which accepts
160
REVISION_NAMESPACES = {}
161
162
def __init__(self, base, init=False, find_root=True):
91
def __init__(self, base, init=False, find_root=True, lock_mode='w'):
163
92
"""Create new branch object at a particular location.
164
93
165
94
base -- Base directory for the branch.
174
103
In the test suite, creation of new trees is tested using the
175
104
`ScratchBranch` class.
176
105
"""
177
from bzrlib.store import ImmutableStore
178
106
if init:
179
107
self.base = os.path.realpath(base)
180
108
self._make_control()
183
111
else:
184
112
self.base = os.path.realpath(base)
185
113
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'])
114
bailout("not a bzr branch: %s" % quotefn(base),
115
['use "bzr init" to initialize a new working tree',
116
'current bzr can only operate from top-of-tree'])
190
117
self._check_format()
118
self.lock(lock_mode)
191
119
192
120
self.text_store = ImmutableStore(self.controlfilename('text-store'))
193
121
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
201
129
__repr__ = __str__
202
130
203
131
204
def __del__(self):
205
if self._lock_mode or self._lock:
206
from warnings import warn
207
warn("branch %r was not explicitly unlocked" % self)
208
self._lock.unlock()
209
210
211
212
def lock_write(self):
213
if self._lock_mode:
214
if self._lock_mode != 'w':
215
from errors import LockError
216
raise LockError("can't upgrade to a write lock from %r" %
217
self._lock_mode)
218
self._lock_count += 1
219
else:
220
from bzrlib.lock import WriteLock
221
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
223
self._lock_mode = 'w'
224
self._lock_count = 1
225
226
227
228
def lock_read(self):
229
if self._lock_mode:
230
assert self._lock_mode in ('r', 'w'), \
231
"invalid lock mode %r" % self._lock_mode
232
self._lock_count += 1
233
else:
234
from bzrlib.lock import ReadLock
235
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
237
self._lock_mode = 'r'
238
self._lock_count = 1
239
240
132
133
def lock(self, mode='w'):
134
"""Lock the on-disk branch, excluding other processes."""
135
try:
136
import fcntl, errno
137
138
if mode == 'w':
139
lm = fcntl.LOCK_EX
140
om = os.O_WRONLY | os.O_CREAT
141
elif mode == 'r':
142
lm = fcntl.LOCK_SH
143
om = os.O_RDONLY
144
else:
145
raise BzrError("invalid locking mode %r" % mode)
146
147
try:
148
lockfile = os.open(self.controlfilename('branch-lock'), om)
149
except OSError, e:
150
if e.errno == errno.ENOENT:
151
# might not exist on branches from <0.0.4
152
self.controlfile('branch-lock', 'w').close()
153
lockfile = os.open(self.controlfilename('branch-lock'), om)
154
else:
155
raise e
241
156
242
def unlock(self):
243
if not self._lock_mode:
244
from errors import LockError
245
raise LockError('branch %r is not locked' % (self))
246
247
if self._lock_count > 1:
248
self._lock_count -= 1
249
else:
250
self._lock.unlock()
251
self._lock = None
252
self._lock_mode = self._lock_count = None
157
fcntl.lockf(lockfile, lm)
158
def unlock():
159
fcntl.lockf(lockfile, fcntl.LOCK_UN)
160
os.close(lockfile)
161
self._lockmode = None
162
self.unlock = unlock
163
self._lockmode = mode
164
except ImportError:
165
warning("please write a locking method for platform %r" % sys.platform)
166
def unlock():
167
self._lockmode = None
168
self.unlock = unlock
169
self._lockmode = mode
170
171
172
def _need_readlock(self):
173
if self._lockmode not in ['r', 'w']:
174
raise BzrError('need read lock on branch, only have %r' % self._lockmode)
175
176
def _need_writelock(self):
177
if self._lockmode not in ['w']:
178
raise BzrError('need write lock on branch, only have %r' % self._lockmode)
253
179
254
180
255
181
def abspath(self, name):
261
187
"""Return path relative to this branch of something inside it.
262
188
263
189
Raises an error if path is not in this branch."""
264
return _relpath(self.base, path)
190
rp = os.path.realpath(path)
191
# FIXME: windows
192
if not rp.startswith(self.base):
193
bailout("path %r is not within branch %r" % (rp, self.base))
194
rp = rp[len(self.base):]
195
rp = rp.lstrip(os.sep)
196
return rp
265
197
266
198
267
199
def controlfilename(self, file_or_path):
268
200
"""Return location relative to branch."""
269
if isinstance(file_or_path, basestring):
201
if isinstance(file_or_path, types.StringTypes):
270
202
file_or_path = [file_or_path]
271
203
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
272
204
278
210
and binary. binary files are untranslated byte streams. Text
279
211
control files are stored with Unix newlines and in UTF-8, even
280
212
if the platform or locale defaults are different.
281
282
Controlfiles should almost never be opened in write mode but
283
rather should be atomically copied and replaced using atomicfile.
284
213
"""
285
214
286
215
fn = self.controlfilename(file_or_path)
299
228
300
229
301
230
def _make_control(self):
302
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
304
305
231
os.mkdir(self.controlfilename([]))
306
232
self.controlfile('README', 'w').write(
307
233
"This is a Bazaar-NG control directory.\n"
308
"Do not change any files in this directory.\n")
234
"Do not change any files in this directory.")
309
235
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
310
236
for d in ('text-store', 'inventory-store', 'revision-store'):
311
237
os.mkdir(self.controlfilename(d))
312
238
for f in ('revision-history', 'merged-patches',
313
239
'pending-merged-patches', 'branch-name',
314
'branch-lock',
315
'pending-merges'):
240
'branch-lock'):
316
241
self.controlfile(f, 'w').write('')
317
242
mutter('created control directory in ' + self.base)
318
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
243
Inventory().write_xml(self.controlfile('inventory','w'))
320
244
321
245
322
246
def _check_format(self):
333
257
fmt = self.controlfile('branch-format', 'r').read()
334
258
fmt.replace('\r\n', '')
335
259
if fmt != BZR_BRANCH_FORMAT:
336
raise BzrError('sorry, branch format %r not supported' % fmt,
337
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
339
340
def get_root_id(self):
341
"""Return the id of this branches root"""
342
inv = self.read_working_inventory()
343
return inv.root.file_id
344
345
def set_root_id(self, file_id):
346
inv = self.read_working_inventory()
347
orig_root_id = inv.root.file_id
348
del inv._byid[inv.root.file_id]
349
inv.root.file_id = file_id
350
inv._byid[inv.root.file_id] = inv.root
351
for fid in inv:
352
entry = inv[fid]
353
if entry.parent_id in (None, orig_root_id):
354
entry.parent_id = inv.root.file_id
355
self._write_inventory(inv)
260
bailout('sorry, branch format %r not supported' % fmt,
261
['use a different bzr version',
262
'or remove the .bzr directory and "bzr init" again'])
263
356
264
357
265
def read_working_inventory(self):
358
266
"""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
267
self._need_readlock()
268
before = time.time()
269
# ElementTree does its own conversion from UTF-8, so open in
270
# binary.
271
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
272
mutter("loaded inventory of %d items in %f"
273
% (len(inv), time.time() - before))
274
return inv
275
375
276
376
277
def _write_inventory(self, inv):
377
278
"""Update the working inventory.
379
280
That is to say, the inventory describing changes underway, that
380
281
will be committed to the next revision.
381
282
"""
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()
395
283
self._need_writelock()
284
## TODO: factor out to atomicfile? is rename safe on windows?
285
## TODO: Maybe some kind of clean/dirty marker on inventory?
286
tmpfname = self.controlfilename('inventory.tmp')
287
tmpf = file(tmpfname, 'wb')
288
inv.write_xml(tmpf)
289
tmpf.close()
290
inv_fname = self.controlfilename('inventory')
291
if sys.platform == 'win32':
292
os.remove(inv_fname)
293
os.rename(tmpfname, inv_fname)
396
294
mutter('wrote working inventory')
397
295
398
296
399
297
inventory = property(read_working_inventory, _write_inventory, None,
400
298
"""Inventory for the working copy.""")
401
299
402
300
403
def add(self, files, verbose=False, ids=None):
301
def add(self, files, verbose=False):
404
302
"""Make files versioned.
405
303
406
304
Note that the command line normally calls smart_add instead.
408
306
This puts the files in the Added state, so that they will be
409
307
recorded by the next commit.
410
308
411
files
412
List of paths to add, relative to the base of the tree.
413
414
ids
415
If set, use these instead of automatically generated ids.
416
Must be the same length as the list of files, but may
417
contain None for ids that are to be autogenerated.
418
419
309
TODO: Perhaps have an option to add the ids even if the files do
420
not (yet) exist.
310
not (yet) exist.
421
311
422
312
TODO: Perhaps return the ids of the files? But then again it
423
is easy to retrieve them if they're needed.
313
is easy to retrieve them if they're needed.
314
315
TODO: Option to specify file id.
424
316
425
317
TODO: Adding a directory should optionally recurse down and
426
add all non-ignored children. Perhaps do that in a
427
higher-level method.
318
add all non-ignored children. Perhaps do that in a
319
higher-level method.
320
321
>>> b = ScratchBranch(files=['foo'])
322
>>> 'foo' in b.unknowns()
323
True
324
>>> b.show_status()
325
? foo
326
>>> b.add('foo')
327
>>> 'foo' in b.unknowns()
328
False
329
>>> bool(b.inventory.path2id('foo'))
330
True
331
>>> b.show_status()
332
A foo
333
334
>>> b.add('foo')
335
Traceback (most recent call last):
336
...
337
BzrError: ('foo is already versioned', [])
338
339
>>> b.add(['nothere'])
340
Traceback (most recent call last):
341
BzrError: ('cannot add: not a regular file or directory: nothere', [])
428
342
"""
343
self._need_writelock()
344
429
345
# TODO: Re-adding a file that is removed in the working copy
430
346
# should probably put it back with the previous ID.
431
if isinstance(files, basestring):
432
assert(ids is None or isinstance(ids, basestring))
347
if isinstance(files, types.StringTypes):
433
348
files = [files]
434
if ids is not None:
435
ids = [ids]
436
437
if ids is None:
438
ids = [None] * len(files)
439
else:
440
assert(len(ids) == len(files))
441
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
349
350
inv = self.read_working_inventory()
351
for f in files:
352
if is_control_file(f):
353
bailout("cannot add control file %s" % quotefn(f))
354
355
fp = splitpath(f)
356
357
if len(fp) == 0:
358
bailout("cannot add top-level %r" % f)
359
360
fullpath = os.path.normpath(self.abspath(f))
361
362
try:
363
kind = file_kind(fullpath)
364
except OSError:
365
# maybe something better?
366
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
367
368
if kind != 'file' and kind != 'directory':
369
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
370
371
file_id = gen_file_id(f)
372
inv.add_path(f, kind=kind, file_id=file_id)
373
374
if verbose:
375
show_status('A', kind, quotefn(f))
376
377
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
378
379
self._write_inventory(inv)
380
478
381
479
382
def print_file(self, file, revno):
480
383
"""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
384
self._need_readlock()
385
tree = self.revision_tree(self.lookup_revision(revno))
386
# use inventory as it was in that revision
387
file_id = tree.inventory.path2id(file)
388
if not file_id:
389
bailout("%r is not present in revision %d" % (file, revno))
390
tree.print_file(file_id)
391
492
392
493
393
def remove(self, files, verbose=False):
494
394
"""Mark nominated files for removal from the inventory.
497
397
498
398
TODO: Refuse to remove modified files unless --force is given?
499
399
400
>>> b = ScratchBranch(files=['foo'])
401
>>> b.add('foo')
402
>>> b.inventory.has_filename('foo')
403
True
404
>>> b.remove('foo')
405
>>> b.working_tree().has_filename('foo')
406
True
407
>>> b.inventory.has_filename('foo')
408
False
409
410
>>> b = ScratchBranch(files=['foo'])
411
>>> b.add('foo')
412
>>> b.commit('one')
413
>>> b.remove('foo')
414
>>> b.commit('two')
415
>>> b.inventory.has_filename('foo')
416
False
417
>>> b.basis_tree().has_filename('foo')
418
False
419
>>> b.working_tree().has_filename('foo')
420
True
421
500
422
TODO: Do something useful with directories.
501
423
502
424
TODO: Should this remove the text or not? Tough call; not
506
428
"""
507
429
## TODO: Normalize names
508
430
## TODO: Remove nested loops; better scalability
509
if isinstance(files, basestring):
431
self._need_writelock()
432
433
if isinstance(files, types.StringTypes):
510
434
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
537
538
# FIXME: this doesn't need to be a branch method
539
def set_inventory(self, new_inventory_list):
540
from bzrlib.inventory import Inventory, InventoryEntry
541
inv = Inventory(self.get_root_id())
542
for path, file_id, parent, kind in new_inventory_list:
543
name = os.path.basename(path)
544
if name == "":
545
continue
546
inv.add(InventoryEntry(file_id, name, kind, parent))
435
436
tree = self.working_tree()
437
inv = tree.inventory
438
439
# do this before any modifications
440
for f in files:
441
fid = inv.path2id(f)
442
if not fid:
443
bailout("cannot remove unversioned file %s" % quotefn(f))
444
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
445
if verbose:
446
# having remove it, it must be either ignored or unknown
447
if tree.is_ignored(f):
448
new_status = 'I'
449
else:
450
new_status = '?'
451
show_status(new_status, inv[fid].kind, quotefn(f))
452
del inv[fid]
453
547
454
self._write_inventory(inv)
548
455
549
456
566
473
return self.working_tree().unknowns()
567
474
568
475
569
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
571
572
for revision_id in revision_ids:
573
mutter("add {%s} to revision-history" % revision_id)
574
476
def commit(self, message, timestamp=None, timezone=None,
477
committer=None,
478
verbose=False):
479
"""Commit working copy as a new revision.
480
481
The basic approach is to add all the file texts into the
482
store, then the inventory, then make a new revision pointing
483
to that inventory and store that.
484
485
This is not quite safe if the working copy changes during the
486
commit; for the moment that is simply not allowed. A better
487
approach is to make a temporary copy of the files before
488
computing their hashes, and then add those hashes in turn to
489
the inventory. This should mean at least that there are no
490
broken hash pointers. There is no way we can get a snapshot
491
of the whole directory at an instant. This would also have to
492
be robust against files disappearing, moving, etc. So the
493
whole thing is a bit hard.
494
495
timestamp -- if not None, seconds-since-epoch for a
496
postdated/predated commit.
497
"""
498
self._need_writelock()
499
500
## TODO: Show branch names
501
502
# TODO: Don't commit if there are no changes, unless forced?
503
504
# First walk over the working inventory; and both update that
505
# and also build a new revision inventory. The revision
506
# inventory needs to hold the text-id, sha1 and size of the
507
# actual file versions committed in the revision. (These are
508
# not present in the working inventory.) We also need to
509
# detect missing/deleted files, and remove them from the
510
# working inventory.
511
512
work_inv = self.read_working_inventory()
513
inv = Inventory()
514
basis = self.basis_tree()
515
basis_inv = basis.inventory
516
missing_ids = []
517
for path, entry in work_inv.iter_entries():
518
## TODO: Cope with files that have gone missing.
519
520
## TODO: Check that the file kind has not changed from the previous
521
## revision of this file (if any).
522
523
entry = entry.copy()
524
525
p = self.abspath(path)
526
file_id = entry.file_id
527
mutter('commit prep file %s, id %r ' % (p, file_id))
528
529
if not os.path.exists(p):
530
mutter(" file is missing, removing from inventory")
531
if verbose:
532
show_status('D', entry.kind, quotefn(path))
533
missing_ids.append(file_id)
534
continue
535
536
# TODO: Handle files that have been deleted
537
538
# TODO: Maybe a special case for empty files? Seems a
539
# waste to store them many times.
540
541
inv.add(entry)
542
543
if basis_inv.has_id(file_id):
544
old_kind = basis_inv[file_id].kind
545
if old_kind != entry.kind:
546
bailout("entry %r changed kind from %r to %r"
547
% (file_id, old_kind, entry.kind))
548
549
if entry.kind == 'directory':
550
if not isdir(p):
551
bailout("%s is entered as directory but not a directory" % quotefn(p))
552
elif entry.kind == 'file':
553
if not isfile(p):
554
bailout("%s is entered as file but is not a file" % quotefn(p))
555
556
content = file(p, 'rb').read()
557
558
entry.text_sha1 = sha_string(content)
559
entry.text_size = len(content)
560
561
old_ie = basis_inv.has_id(file_id) and basis_inv[file_id]
562
if (old_ie
563
and (old_ie.text_size == entry.text_size)
564
and (old_ie.text_sha1 == entry.text_sha1)):
565
## assert content == basis.get_file(file_id).read()
566
entry.text_id = basis_inv[file_id].text_id
567
mutter(' unchanged from previous text_id {%s}' %
568
entry.text_id)
569
570
else:
571
entry.text_id = gen_file_id(entry.name)
572
self.text_store.add(content, entry.text_id)
573
mutter(' stored with text_id {%s}' % entry.text_id)
574
if verbose:
575
if not old_ie:
576
state = 'A'
577
elif (old_ie.name == entry.name
578
and old_ie.parent_id == entry.parent_id):
579
state = 'M'
580
else:
581
state = 'R'
582
583
show_status(state, entry.kind, quotefn(path))
584
585
for file_id in missing_ids:
586
# have to do this later so we don't mess up the iterator.
587
# since parents may be removed before their children we
588
# have to test.
589
590
# FIXME: There's probably a better way to do this; perhaps
591
# the workingtree should know how to filter itself.
592
if work_inv.has_id(file_id):
593
del work_inv[file_id]
594
595
596
inv_id = rev_id = _gen_revision_id(time.time())
597
598
inv_tmp = tempfile.TemporaryFile()
599
inv.write_xml(inv_tmp)
600
inv_tmp.seek(0)
601
self.inventory_store.add(inv_tmp, inv_id)
602
mutter('new inventory_id is {%s}' % inv_id)
603
604
self._write_inventory(work_inv)
605
606
if timestamp == None:
607
timestamp = time.time()
608
609
if committer == None:
610
committer = username()
611
612
if timezone == None:
613
timezone = local_time_offset()
614
615
mutter("building commit log message")
616
rev = Revision(timestamp=timestamp,
617
timezone=timezone,
618
committer=committer,
619
precursor = self.last_patch(),
620
message = message,
621
inventory_id=inv_id,
622
revision_id=rev_id)
623
624
rev_tmp = tempfile.TemporaryFile()
625
rev.write_xml(rev_tmp)
626
rev_tmp.seek(0)
627
self.revision_store.add(rev_tmp, rev_id)
628
mutter("new revision_id is {%s}" % rev_id)
629
630
## XXX: Everything up to here can simply be orphaned if we abort
631
## the commit; it will leave junk files behind but that doesn't
632
## matter.
633
634
## TODO: Read back the just-generated changeset, and make sure it
635
## applies and recreates the right state.
636
637
## TODO: Also calculate and store the inventory SHA1
638
mutter("committing patch r%d" % (self.revno() + 1))
639
640
641
self.append_revision(rev_id)
642
643
if verbose:
644
note("commited r%d" % self.revno())
645
646
647
def append_revision(self, revision_id):
648
mutter("add {%s} to revision-history" % revision_id)
575
649
rev_history = self.revision_history()
576
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):
588
"""Return XML file object for revision object."""
589
if not revision_id or not isinstance(revision_id, basestring):
590
raise InvalidRevisionId(revision_id)
591
592
self.lock_read()
593
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()
650
651
tmprhname = self.controlfilename('revision-history.tmp')
652
rhname = self.controlfilename('revision-history')
653
654
f = file(tmprhname, 'wt')
655
rev_history.append(revision_id)
656
f.write('\n'.join(rev_history))
657
f.write('\n')
658
f.close()
659
660
if sys.platform == 'win32':
661
os.remove(rhname)
662
os.rename(tmprhname, rhname)
663
600
664
601
665
602
666
def get_revision(self, revision_id):
603
667
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
605
606
try:
607
r = unpack_xml(Revision, xml_file)
608
except SyntaxError, e:
609
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
[revision_id,
611
str(e)])
612
668
self._need_readlock()
669
r = Revision.read_xml(self.revision_store[revision_id])
613
670
assert r.revision_id == revision_id
614
671
return r
615
672
616
673
617
def get_revision_delta(self, revno):
618
"""Return the delta for one revision.
619
620
The delta is relative to its mainline predecessor, or the
621
empty tree for revision 1.
622
"""
623
assert isinstance(revno, int)
624
rh = self.revision_history()
625
if not (1 <= revno <= len(rh)):
626
raise InvalidRevisionNumber(revno)
627
628
# revno is 1-based; list is 0-based
629
630
new_tree = self.revision_tree(rh[revno-1])
631
if revno == 1:
632
old_tree = EmptyTree()
633
else:
634
old_tree = self.revision_tree(rh[revno-2])
635
636
return compare_trees(old_tree, new_tree)
637
638
639
640
def get_revision_sha1(self, revision_id):
641
"""Hash the stored value of a revision, and return it."""
642
# In the future, revision entries will be signed. At that
643
# point, it is probably best *not* to include the signature
644
# in the revision hash. Because that lets you re-sign
645
# the revision, (add signatures/remove signatures) and still
646
# have all hash pointers stay consistent.
647
# But for now, just hash the contents.
648
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
649
650
651
674
def get_inventory(self, inventory_id):
652
675
"""Get Inventory object by hash.
653
676
654
677
TODO: Perhaps for this and similar methods, take a revision
655
678
parameter which can be either an integer revno or a
656
679
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):
664
"""Return the sha1 hash of the inventory entry
665
"""
666
return sha_file(self.inventory_store[inventory_id])
680
self._need_readlock()
681
i = Inventory.read_xml(self.inventory_store[inventory_id])
682
return i
667
683
668
684
669
685
def get_revision_inventory(self, revision_id):
670
686
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
672
# must be the same as its revision, so this is trivial.
687
self._need_readlock()
673
688
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
return Inventory(self.get_root_id())
689
return Inventory()
676
690
else:
677
return self.get_inventory(revision_id)
691
return self.get_inventory(self.get_revision(revision_id).inventory_id)
678
692
679
693
680
694
def revision_history(self):
683
697
>>> ScratchBranch().revision_history()
684
698
[]
685
699
"""
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
700
self._need_readlock()
701
return [l.rstrip('\r\n') for l in self.controlfile('revision-history', 'r').readlines()]
702
703
704
def enum_history(self, direction):
705
"""Return (revno, revision_id) for history of branch.
706
707
direction
708
'forward' is from earliest to latest
709
'reverse' is from latest to earliest
710
"""
711
rh = self.revision_history()
712
if direction == 'forward':
713
i = 1
714
for rid in rh:
715
yield i, rid
716
i += 1
717
elif direction == 'reverse':
718
i = len(rh)
719
while i > 0:
720
yield i, rh[i-1]
721
i -= 1
722
else:
723
raise BzrError('invalid history direction %r' % direction)
737
724
738
725
739
726
def revno(self):
741
728
742
729
That is equivalent to the number of revisions committed to
743
730
this branch.
731
732
>>> b = ScratchBranch()
733
>>> b.revno()
734
0
735
>>> b.commit('no foo')
736
>>> b.revno()
737
1
744
738
"""
745
739
return len(self.revision_history())
746
740
747
741
748
742
def last_patch(self):
749
743
"""Return last patch hash, or None if no history.
744
745
>>> ScratchBranch().last_patch() == None
746
True
750
747
"""
751
748
ph = self.revision_history()
752
749
if ph:
753
750
return ph[-1]
754
751
else:
755
752
return None
756
757
758
def missing_revisions(self, other, stop_revision=None):
759
"""
760
If self and other have not diverged, return a list of the revisions
761
present in other, but missing from self.
762
763
>>> from bzrlib.commit import commit
764
>>> bzrlib.trace.silent = True
765
>>> br1 = ScratchBranch()
766
>>> br2 = ScratchBranch()
767
>>> br1.missing_revisions(br2)
768
[]
769
>>> commit(br2, "lala!", rev_id="REVISION-ID-1")
770
>>> br1.missing_revisions(br2)
771
[u'REVISION-ID-1']
772
>>> br2.missing_revisions(br1)
773
[]
774
>>> commit(br1, "lala!", rev_id="REVISION-ID-1")
775
>>> br1.missing_revisions(br2)
776
[]
777
>>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
778
>>> br1.missing_revisions(br2)
779
[u'REVISION-ID-2A']
780
>>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
781
>>> br1.missing_revisions(br2)
782
Traceback (most recent call last):
783
DivergedBranches: These branches have diverged.
784
"""
785
self_history = self.revision_history()
786
self_len = len(self_history)
787
other_history = other.revision_history()
788
other_len = len(other_history)
789
common_index = min(self_len, other_len) -1
790
if common_index >= 0 and \
791
self_history[common_index] != other_history[common_index]:
792
raise DivergedBranches(self, other)
793
794
if stop_revision is None:
795
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
798
799
return other_history[self_len:stop_revision]
800
801
802
def update_revisions(self, other, stop_revision=None):
803
"""Pull in all new revisions from other branch.
804
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
808
>>> br1.add('foo')
809
>>> br1.add('bar')
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
813
Added 2 texts.
814
Added 1 inventories.
815
Added 1 revisions.
816
>>> br2.revision_history()
817
[u'REVISION-ID-1']
818
>>> br2.update_revisions(br1)
819
Added 0 texts.
820
Added 0 inventories.
821
Added 0 revisions.
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
823
True
824
"""
825
from bzrlib.progress import ProgressBar
826
827
pb = ProgressBar()
828
829
pb.update('comparing histories')
830
revision_ids = self.missing_revisions(other, stop_revision)
831
832
if hasattr(other.revision_store, "prefetch"):
833
other.revision_store.prefetch(revision_ids)
834
if hasattr(other.inventory_store, "prefetch"):
835
inventory_ids = [other.get_revision(r).inventory_id
836
for r in revision_ids]
837
other.inventory_store.prefetch(inventory_ids)
838
839
revisions = []
840
needed_texts = set()
841
i = 0
842
for rev_id in revision_ids:
843
i += 1
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
846
revisions.append(rev)
847
inv = other.get_inventory(str(rev.inventory_id))
848
for key, entry in inv.iter_entries():
849
if entry.text_id is None:
850
continue
851
if entry.text_id not in self.text_store:
852
needed_texts.add(entry.text_id)
853
854
pb.clear()
855
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
857
print "Added %d texts." % count
858
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
860
inventory_ids)
861
print "Added %d inventories." % count
862
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
864
revision_ids)
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
868
869
870
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
753
754
755
def lookup_revision(self, revno):
756
"""Return revision hash for revision number."""
757
if revno == 0:
758
return None
759
760
try:
761
# list is 0-based; revisions are 1-based
762
return self.revision_history()[revno-1]
763
except IndexError:
764
raise BzrError("no such revision %s" % revno)
765
1032
766
1033
767
def revision_tree(self, revision_id):
1034
768
"""Return Tree for a revision on this branch.
1035
769
1036
770
`revision_id` may be None for the null revision, in which case
1037
771
an `EmptyTree` is returned."""
1038
# TODO: refactor this to use an existing revision object
1039
# so we don't need to read it in twice.
772
self._need_readlock()
1040
773
if revision_id == None:
1041
774
return EmptyTree()
1042
775
else:
1046
779
1047
780
def working_tree(self):
1048
781
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
782
return WorkingTree(self.base, self.read_working_inventory())
1051
783
1052
784
1054
786
"""Return `Tree` object for last revision.
1055
787
1056
788
If there are no revisions yet, return an `EmptyTree`.
789
790
>>> b = ScratchBranch(files=['foo'])
791
>>> b.basis_tree().has_filename('foo')
792
False
793
>>> b.working_tree().has_filename('foo')
794
True
795
>>> b.add('foo')
796
>>> b.commit('add foo')
797
>>> b.basis_tree().has_filename('foo')
798
True
1057
799
"""
1058
800
r = self.last_patch()
1059
801
if r == None:
1068
810
1069
811
This can change the directory or the filename or both.
1070
812
"""
1071
self.lock_write()
813
self._need_writelock()
814
tree = self.working_tree()
815
inv = tree.inventory
816
if not tree.has_filename(from_rel):
817
bailout("can't rename: old working file %r does not exist" % from_rel)
818
if tree.has_filename(to_rel):
819
bailout("can't rename: new working file %r already exists" % to_rel)
820
821
file_id = inv.path2id(from_rel)
822
if file_id == None:
823
bailout("can't rename: old name %r is not versioned" % from_rel)
824
825
if inv.path2id(to_rel):
826
bailout("can't rename: new name %r is already versioned" % to_rel)
827
828
to_dir, to_tail = os.path.split(to_rel)
829
to_dir_id = inv.path2id(to_dir)
830
if to_dir_id == None and to_dir != '':
831
bailout("can't determine destination directory id for %r" % to_dir)
832
833
mutter("rename_one:")
834
mutter(" file_id {%s}" % file_id)
835
mutter(" from_rel %r" % from_rel)
836
mutter(" to_rel %r" % to_rel)
837
mutter(" to_dir %r" % to_dir)
838
mutter(" to_dir_id {%s}" % to_dir_id)
839
840
inv.rename(file_id, to_dir_id, to_tail)
841
842
print "%s => %s" % (from_rel, to_rel)
843
844
from_abs = self.abspath(from_rel)
845
to_abs = self.abspath(to_rel)
1072
846
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()
847
os.rename(from_abs, to_abs)
848
except OSError, e:
849
bailout("failed to rename %r to %r: %s"
850
% (from_abs, to_abs, e[1]),
851
["rename rolled back"])
852
853
self._write_inventory(inv)
854
1115
855
1116
856
1117
857
def move(self, from_paths, to_name):
1125
865
Note that to_name is only the last component of the new name;
1126
866
this doesn't change the directory.
1127
867
"""
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()
1179
1180
1181
def revert(self, filenames, old_tree=None, backups=True):
1182
"""Restore selected files to the versions from a previous tree.
1183
1184
backups
1185
If true (default) backups are made of files before
1186
they're renamed.
1187
"""
1188
from bzrlib.errors import NotVersionedError, BzrError
1189
from bzrlib.atomicfile import AtomicFile
1190
from bzrlib.osutils import backup_file
1191
1192
inv = self.read_working_inventory()
1193
if old_tree is None:
1194
old_tree = self.basis_tree()
1195
old_inv = old_tree.inventory
1196
1197
nids = []
1198
for fn in filenames:
1199
file_id = inv.path2id(fn)
1200
if not file_id:
1201
raise NotVersionedError("not a versioned file", fn)
1202
if not old_inv.has_id(file_id):
1203
raise BzrError("file not present in old tree", fn, file_id)
1204
nids.append((fn, file_id))
1205
1206
# TODO: Rename back if it was previously at a different location
1207
1208
# TODO: If given a directory, restore the entire contents from
1209
# the previous version.
1210
1211
# TODO: Make a backup to a temporary file.
1212
1213
# TODO: If the file previously didn't exist, delete it?
1214
for fn, file_id in nids:
1215
backup_file(fn)
1216
1217
f = AtomicFile(fn, 'wb')
1218
try:
1219
f.write(old_tree.get_file(file_id).read())
1220
f.commit()
1221
finally:
1222
f.close()
1223
1224
1225
def pending_merges(self):
1226
"""Return a list of pending merges.
1227
1228
These are revisions that have been merged into the working
1229
directory but not yet committed.
1230
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1233
return []
1234
p = []
1235
for l in self.controlfile('pending-merges', 'r').readlines():
1236
p.append(l.rstrip('\n'))
1237
return p
1238
1239
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1244
1245
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
1252
def set_pending_merges(self, rev_list):
1253
from bzrlib.atomicfile import AtomicFile
1254
self.lock_write()
1255
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()
1263
finally:
1264
self.unlock()
1265
868
self._need_writelock()
869
## TODO: Option to move IDs only
870
assert not isinstance(from_paths, basestring)
871
tree = self.working_tree()
872
inv = tree.inventory
873
to_abs = self.abspath(to_name)
874
if not isdir(to_abs):
875
bailout("destination %r is not a directory" % to_abs)
876
if not tree.has_filename(to_name):
877
bailout("destination %r not in working directory" % to_abs)
878
to_dir_id = inv.path2id(to_name)
879
if to_dir_id == None and to_name != '':
880
bailout("destination %r is not a versioned directory" % to_name)
881
to_dir_ie = inv[to_dir_id]
882
if to_dir_ie.kind not in ('directory', 'root_directory'):
883
bailout("destination %r is not a directory" % to_abs)
884
885
to_idpath = Set(inv.get_idpath(to_dir_id))
886
887
for f in from_paths:
888
if not tree.has_filename(f):
889
bailout("%r does not exist in working tree" % f)
890
f_id = inv.path2id(f)
891
if f_id == None:
892
bailout("%r is not versioned" % f)
893
name_tail = splitpath(f)[-1]
894
dest_path = appendpath(to_name, name_tail)
895
if tree.has_filename(dest_path):
896
bailout("destination %r already exists" % dest_path)
897
if f_id in to_idpath:
898
bailout("can't move %r to a subdirectory of itself" % f)
899
900
# OK, so there's a race here, it's possible that someone will
901
# create a file in this interval and then the rename might be
902
# left half-done. But we should have caught most problems.
903
904
for f in from_paths:
905
name_tail = splitpath(f)[-1]
906
dest_path = appendpath(to_name, name_tail)
907
print "%s => %s" % (f, dest_path)
908
inv.rename(inv.path2id(f), to_dir_id, name_tail)
909
try:
910
os.rename(self.abspath(f), self.abspath(dest_path))
911
except OSError, e:
912
bailout("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
913
["rename rolled back"])
914
915
self._write_inventory(inv)
916
917
918
919
def show_status(self, show_all=False, file_list=None):
920
"""Display single-line status for non-ignored working files.
921
922
The list is show sorted in order by file name.
923
924
>>> b = ScratchBranch(files=['foo', 'foo~'])
925
>>> b.show_status()
926
? foo
927
>>> b.add('foo')
928
>>> b.show_status()
929
A foo
930
>>> b.commit("add foo")
931
>>> b.show_status()
932
>>> os.unlink(b.abspath('foo'))
933
>>> b.show_status()
934
D foo
935
"""
936
self._need_readlock()
937
938
# We have to build everything into a list first so that it can
939
# sorted by name, incorporating all the different sources.
940
941
# FIXME: Rather than getting things in random order and then sorting,
942
# just step through in order.
943
944
# Interesting case: the old ID for a file has been removed,
945
# but a new file has been created under that name.
946
947
old = self.basis_tree()
948
new = self.working_tree()
949
950
items = diff_trees(old, new)
951
# We want to filter out only if any file was provided in the file_list.
952
if isinstance(file_list, list) and len(file_list):
953
items = [item for item in items if item[3] in file_list]
954
955
for fs, fid, oldname, newname, kind in items:
956
if fs == 'R':
957
show_status(fs, kind,
958
oldname + ' => ' + newname)
959
elif fs == 'A' or fs == 'M':
960
show_status(fs, kind, newname)
961
elif fs == 'D':
962
show_status(fs, kind, oldname)
963
elif fs == '.':
964
if show_all:
965
show_status(fs, kind, newname)
966
elif fs == 'I':
967
if show_all:
968
show_status(fs, kind, newname)
969
elif fs == '?':
970
show_status(fs, kind, newname)
971
else:
972
bailout("weird file state %r" % ((fs, fid),))
973
1266
974
1267
975
1268
976
class ScratchBranch(Branch):
1276
984
>>> isdir(bd)
1277
985
False
1278
986
"""
1279
def __init__(self, files=[], dirs=[], base=None):
987
def __init__(self, files=[], dirs=[]):
1280
988
"""Make a test branch.
1281
989
1282
990
This creates a temporary directory and runs init-tree in it.
1283
991
1284
992
If any files are listed, they are created in the working copy.
1285
993
"""
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)
994
Branch.__init__(self, tempfile.mkdtemp(), init=True)
1292
995
for d in dirs:
1293
996
os.mkdir(self.abspath(d))
1294
997
1296
999
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1297
1000
1298
1001
1299
def clone(self):
1300
"""
1301
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1304
False
1305
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
True
1307
"""
1308
from shutil import copytree
1309
from tempfile import mkdtemp
1310
base = mkdtemp()
1311
os.rmdir(base)
1312
copytree(self.base, base, symlinks=True)
1313
return ScratchBranch(base=base)
1314
1315
1002
def __del__(self):
1316
1003
self.destroy()
1317
1004
1318
1005
def destroy(self):
1319
1006
"""Destroy the test branch, removing the scratch directory."""
1320
from shutil import rmtree
1321
1007
try:
1322
if self.base:
1323
mutter("delete ScratchBranch %s" % self.base)
1324
rmtree(self.base)
1008
mutter("delete ScratchBranch %s" % self.base)
1009
shutil.rmtree(self.base)
1325
1010
except OSError, e:
1326
1011
# Work around for shutil.rmtree failing on Windows when
1327
1012
# readonly files are encountered
1329
1014
for root, dirs, files in os.walk(self.base, topdown=False):
1330
1015
for name in files:
1331
1016
os.chmod(os.path.join(root, name), 0700)
1332
rmtree(self.base)
1017
shutil.rmtree(self.base)
1333
1018
self.base = None
1334
1019
1335
1020
1353
1038
1354
1039
1355
1040
1041
def _gen_revision_id(when):
1042
"""Return new revision-id."""
1043
s = '%s-%s-' % (user_email(), compact_date(when))
1044
s += hexlify(rand_bytes(8))
1045
return s
1046
1047
1356
1048
def gen_file_id(name):
1357
1049
"""Return new file id.
1358
1050
1359
1051
This should probably generate proper UUIDs, but for the moment we
1360
1052
cope with just randomness because running uuidgen every time is
1361
1053
slow."""
1362
import re
1363
from binascii import hexlify
1364
from time import time
1365
1366
# get last component
1367
1054
idx = name.rfind('/')
1368
1055
if idx != -1:
1369
1056
name = name[idx+1 : ]
1371
1058
if idx != -1:
1372
1059
name = name[idx+1 : ]
1373
1060
1374
# make it not a hidden file
1375
1061
name = name.lstrip('.')
1376
1062
1377
# remove any wierd characters; we don't escape them but rather
1378
# just pull them out
1379
name = re.sub(r'[^\w.]', '', name)
1380
1381
1063
s = hexlify(rand_bytes(8))
1382
return '-'.join((name, compact_date(time()), s))
1383
1384
1385
def gen_root_id():
1386
"""Return a new tree-root file id."""
1387
return gen_file_id('TREE_ROOT')
1388
1064
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0