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