« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 736
- compare with another revision
- download diff
- download tarball
- view history from revision 736
- Committer: Martin Pool
- Date: 2005-06-22 06:37:43 UTC
- Revision ID: mbp@sourcefrog.net-20050622063743-e395f04c4db8977f
- move old blackbox code from testbzr into bzrlib.selftest.blackbox
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files renamed:
- contrib/newinventory.py => bzrlib/newinventory.py
- 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
20
from cStringIO import StringIO
18
import sys, os, os.path, random, time, sha, sets, types, re, shutil, tempfile
19
import traceback, socket, fnmatch, difflib, time
20
from binascii import hexlify
21
21
22
22
import bzrlib
23
from bzrlib.trace import mutter, note
24
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
25
splitpath, \
26
sha_file, appendpath, file_kind
27
28
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
29
NoSuchRevision)
30
from bzrlib.textui import show_status
31
from bzrlib.revision import Revision
32
from bzrlib.delta import compare_trees
33
from bzrlib.tree import EmptyTree, RevisionTree
34
from bzrlib.inventory import Inventory
35
from bzrlib.weavestore import WeaveStore
36
from bzrlib.store import ImmutableStore
37
import bzrlib.xml5
38
import bzrlib.ui
39
40
41
INVENTORY_FILEID = '__inventory'
42
ANCESTRY_FILEID = '__ancestry'
43
44
45
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
46
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
23
from inventory import Inventory
24
from trace import mutter, note
25
from tree import Tree, EmptyTree, RevisionTree
26
from inventory import InventoryEntry, Inventory
27
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
28
format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
29
joinpath, sha_file, sha_string, file_kind, local_time_offset, appendpath
30
from store import ImmutableStore
31
from revision import Revision
32
from errors import BzrError
33
from textui import show_status
34
35
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
47
36
## TODO: Maybe include checks for common corruption of newlines, etc?
48
37
49
38
50
# TODO: Some operations like log might retrieve the same revisions
51
# repeatedly to calculate deltas. We could perhaps have a weakref
52
# cache in memory to make this faster. In general anything can be
53
# cached in memory between lock and unlock operations.
54
55
# TODO: please move the revision-string syntax stuff out of the branch
56
# object; it's clutter
57
58
39
59
40
def find_branch(f, **args):
60
41
if f and (f.startswith('http://') or f.startswith('https://')):
64
45
return Branch(f, **args)
65
46
66
47
67
def find_cached_branch(f, cache_root, **args):
68
from remotebranch import RemoteBranch
69
br = find_branch(f, **args)
70
def cacheify(br, store_name):
71
from meta_store import CachedStore
72
cache_path = os.path.join(cache_root, store_name)
73
os.mkdir(cache_path)
74
new_store = CachedStore(getattr(br, store_name), cache_path)
75
setattr(br, store_name, new_store)
76
77
if isinstance(br, RemoteBranch):
78
cacheify(br, 'inventory_store')
79
cacheify(br, 'text_store')
80
cacheify(br, 'revision_store')
81
return br
82
83
48
84
49
def _relpath(base, path):
85
50
"""Return path relative to base, or raise exception.
117
82
It is not necessary that f exists.
118
83
119
84
Basically we keep looking up until we find the control directory or
120
run into the root. If there isn't one, raises NotBranchError.
121
"""
85
run into the root."""
122
86
if f == None:
123
87
f = os.getcwd()
124
88
elif hasattr(os.path, 'realpath'):
137
101
head, tail = os.path.split(f)
138
102
if head == f:
139
103
# reached the root, whatever that may be
140
raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
104
raise BzrError('%r is not in a branch' % orig_f)
141
105
f = head
142
143
144
145
# XXX: move into bzrlib.errors; subclass BzrError
106
146
107
class DivergedBranches(Exception):
147
108
def __init__(self, branch1, branch2):
148
109
self.branch1 = branch1
150
111
Exception.__init__(self, "These branches have diverged.")
151
112
152
113
114
class NoSuchRevision(BzrError):
115
def __init__(self, branch, revision):
116
self.branch = branch
117
self.revision = revision
118
msg = "Branch %s has no revision %d" % (branch, revision)
119
BzrError.__init__(self, msg)
120
121
153
122
######################################################################
154
123
# branch objects
155
124
173
142
_lock_mode = None
174
143
_lock_count = None
175
144
_lock = None
176
_inventory_weave = None
177
145
178
# Map some sort of prefix into a namespace
179
# stuff like "revno:10", "revid:", etc.
180
# This should match a prefix with a function which accepts
181
REVISION_NAMESPACES = {}
182
183
146
def __init__(self, base, init=False, find_root=True):
184
147
"""Create new branch object at a particular location.
185
148
209
172
'current bzr can only operate from top-of-tree'])
210
173
self._check_format()
211
174
212
self.weave_store = WeaveStore(self.controlfilename('weaves'))
175
self.text_store = ImmutableStore(self.controlfilename('text-store'))
213
176
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
177
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
214
178
215
179
216
180
def __str__(self):
227
191
self._lock.unlock()
228
192
229
193
194
230
195
def lock_write(self):
231
196
if self._lock_mode:
232
197
if self._lock_mode != 'w':
242
207
self._lock_count = 1
243
208
244
209
210
245
211
def lock_read(self):
246
212
if self._lock_mode:
247
213
assert self._lock_mode in ('r', 'w'), \
254
220
self._lock_mode = 'r'
255
221
self._lock_count = 1
256
222
223
224
257
225
def unlock(self):
258
226
if not self._lock_mode:
259
227
from errors import LockError
266
234
self._lock = None
267
235
self._lock_mode = self._lock_count = None
268
236
237
269
238
def abspath(self, name):
270
239
"""Return absolute filename for something in the branch"""
271
240
return os.path.join(self.base, name)
272
241
242
273
243
def relpath(self, path):
274
244
"""Return path relative to this branch of something inside it.
275
245
276
246
Raises an error if path is not in this branch."""
277
247
return _relpath(self.base, path)
278
248
249
279
250
def controlfilename(self, file_or_path):
280
251
"""Return location relative to branch."""
281
if isinstance(file_or_path, basestring):
252
if isinstance(file_or_path, types.StringTypes):
282
253
file_or_path = [file_or_path]
283
254
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
284
255
308
279
else:
309
280
raise BzrError("invalid controlfile mode %r" % mode)
310
281
282
283
311
284
def _make_control(self):
312
285
os.mkdir(self.controlfilename([]))
313
286
self.controlfile('README', 'w').write(
314
287
"This is a Bazaar-NG control directory.\n"
315
288
"Do not change any files in this directory.\n")
316
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT_5)
317
for d in ('text-store', 'revision-store',
318
'weaves'):
289
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
290
for d in ('text-store', 'inventory-store', 'revision-store'):
319
291
os.mkdir(self.controlfilename(d))
320
292
for f in ('revision-history', 'merged-patches',
321
293
'pending-merged-patches', 'branch-name',
322
'branch-lock',
323
'pending-merges'):
294
'branch-lock'):
324
295
self.controlfile(f, 'w').write('')
325
296
mutter('created control directory in ' + self.base)
326
327
# if we want per-tree root ids then this is the place to set
328
# them; they're not needed for now and so ommitted for
329
# simplicity.
330
f = self.controlfile('inventory','w')
331
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), f)
332
297
Inventory().write_xml(self.controlfile('inventory','w'))
333
298
334
299
335
300
def _check_format(self):
336
301
"""Check this branch format is supported.
337
302
338
The format level is stored, as an integer, in
339
self._branch_format for code that needs to check it later.
303
The current tool only supports the current unstable format.
340
304
341
305
In the future, we might need different in-memory Branch
342
306
classes to support downlevel branches. But not yet.
343
307
"""
308
# This ignores newlines so that we can open branches created
309
# on Windows from Linux and so on. I think it might be better
310
# to always make all internal files in unix format.
344
311
fmt = self.controlfile('branch-format', 'r').read()
345
if fmt == BZR_BRANCH_FORMAT_5:
346
self._branch_format = 5
347
else:
348
raise BzrError('sorry, branch format "%s" not supported; '
349
'use a different bzr version, '
350
'or run "bzr upgrade", '
351
'or remove the .bzr directory and "bzr init" again'
352
% fmt.rstrip('\n\r'))
353
354
def get_root_id(self):
355
"""Return the id of this branches root"""
356
inv = self.read_working_inventory()
357
return inv.root.file_id
358
359
def set_root_id(self, file_id):
360
inv = self.read_working_inventory()
361
orig_root_id = inv.root.file_id
362
del inv._byid[inv.root.file_id]
363
inv.root.file_id = file_id
364
inv._byid[inv.root.file_id] = inv.root
365
for fid in inv:
366
entry = inv[fid]
367
if entry.parent_id in (None, orig_root_id):
368
entry.parent_id = inv.root.file_id
369
self._write_inventory(inv)
312
fmt.replace('\r\n', '')
313
if fmt != BZR_BRANCH_FORMAT:
314
raise BzrError('sorry, branch format %r not supported' % fmt,
315
['use a different bzr version',
316
'or remove the .bzr directory and "bzr init" again'])
317
318
370
319
371
320
def read_working_inventory(self):
372
321
"""Read the working inventory."""
322
before = time.time()
323
# ElementTree does its own conversion from UTF-8, so open in
324
# binary.
373
325
self.lock_read()
374
326
try:
375
# ElementTree does its own conversion from UTF-8, so open in
376
# binary.
377
f = self.controlfile('inventory', 'rb')
378
return bzrlib.xml5.serializer_v5.read_inventory(f)
327
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
328
mutter("loaded inventory of %d items in %f"
329
% (len(inv), time.time() - before))
330
return inv
379
331
finally:
380
332
self.unlock()
381
333
386
338
That is to say, the inventory describing changes underway, that
387
339
will be committed to the next revision.
388
340
"""
389
from bzrlib.atomicfile import AtomicFile
390
391
self.lock_write()
392
try:
393
f = AtomicFile(self.controlfilename('inventory'), 'wb')
394
try:
395
bzrlib.xml5.serializer_v5.write_inventory(inv, f)
396
f.commit()
397
finally:
398
f.close()
399
finally:
400
self.unlock()
401
341
## TODO: factor out to atomicfile? is rename safe on windows?
342
## TODO: Maybe some kind of clean/dirty marker on inventory?
343
tmpfname = self.controlfilename('inventory.tmp')
344
tmpf = file(tmpfname, 'wb')
345
inv.write_xml(tmpf)
346
tmpf.close()
347
inv_fname = self.controlfilename('inventory')
348
if sys.platform == 'win32':
349
os.remove(inv_fname)
350
os.rename(tmpfname, inv_fname)
402
351
mutter('wrote working inventory')
403
352
404
353
406
355
"""Inventory for the working copy.""")
407
356
408
357
409
def add(self, files, ids=None):
358
def add(self, files, verbose=False, ids=None):
410
359
"""Make files versioned.
411
360
412
Note that the command line normally calls smart_add instead,
413
which can automatically recurse.
361
Note that the command line normally calls smart_add instead.
414
362
415
363
This puts the files in the Added state, so that they will be
416
364
recorded by the next commit.
426
374
TODO: Perhaps have an option to add the ids even if the files do
427
375
not (yet) exist.
428
376
429
TODO: Perhaps yield the ids and paths as they're added.
377
TODO: Perhaps return the ids of the files? But then again it
378
is easy to retrieve them if they're needed.
379
380
TODO: Adding a directory should optionally recurse down and
381
add all non-ignored children. Perhaps do that in a
382
higher-level method.
430
383
"""
431
384
# TODO: Re-adding a file that is removed in the working copy
432
385
# should probably put it back with the previous ID.
433
if isinstance(files, basestring):
434
assert(ids is None or isinstance(ids, basestring))
386
if isinstance(files, types.StringTypes):
387
assert(ids is None or isinstance(ids, types.StringTypes))
435
388
files = [files]
436
389
if ids is not None:
437
390
ids = [ids]
468
421
file_id = gen_file_id(f)
469
422
inv.add_path(f, kind=kind, file_id=file_id)
470
423
424
if verbose:
425
show_status('A', kind, quotefn(f))
426
471
427
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
472
428
473
429
self._write_inventory(inv)
483
439
# use inventory as it was in that revision
484
440
file_id = tree.inventory.path2id(file)
485
441
if not file_id:
486
raise BzrError("%r is not present in revision %s" % (file, revno))
442
raise BzrError("%r is not present in revision %d" % (file, revno))
487
443
tree.print_file(file_id)
488
444
finally:
489
445
self.unlock()
505
461
"""
506
462
## TODO: Normalize names
507
463
## TODO: Remove nested loops; better scalability
508
if isinstance(files, basestring):
464
if isinstance(files, types.StringTypes):
509
465
files = [files]
510
466
511
467
self.lock_write()
536
492
537
493
# FIXME: this doesn't need to be a branch method
538
494
def set_inventory(self, new_inventory_list):
539
from bzrlib.inventory import Inventory, InventoryEntry
540
inv = Inventory(self.get_root_id())
495
inv = Inventory()
541
496
for path, file_id, parent, kind in new_inventory_list:
542
497
name = os.path.basename(path)
543
498
if name == "":
565
520
return self.working_tree().unknowns()
566
521
567
522
568
def append_revision(self, *revision_ids):
569
from bzrlib.atomicfile import AtomicFile
570
571
for revision_id in revision_ids:
572
mutter("add {%s} to revision-history" % revision_id)
573
523
def append_revision(self, revision_id):
524
mutter("add {%s} to revision-history" % revision_id)
574
525
rev_history = self.revision_history()
575
rev_history.extend(revision_ids)
576
577
f = AtomicFile(self.controlfilename('revision-history'))
578
try:
579
for rev_id in rev_history:
580
print >>f, rev_id
581
f.commit()
582
finally:
583
f.close()
584
585
586
def get_revision_xml_file(self, revision_id):
587
"""Return XML file object for revision object."""
588
if not revision_id or not isinstance(revision_id, basestring):
589
raise InvalidRevisionId(revision_id)
590
591
self.lock_read()
592
try:
593
try:
594
return self.revision_store[revision_id]
595
except IndexError:
596
raise bzrlib.errors.NoSuchRevision(self, revision_id)
597
finally:
598
self.unlock()
599
600
601
#deprecated
602
get_revision_xml = get_revision_xml_file
526
527
tmprhname = self.controlfilename('revision-history.tmp')
528
rhname = self.controlfilename('revision-history')
529
530
f = file(tmprhname, 'wt')
531
rev_history.append(revision_id)
532
f.write('\n'.join(rev_history))
533
f.write('\n')
534
f.close()
535
536
if sys.platform == 'win32':
537
os.remove(rhname)
538
os.rename(tmprhname, rhname)
539
603
540
604
541
605
542
def get_revision(self, revision_id):
606
543
"""Return the Revision object for a named revision"""
607
xml_file = self.get_revision_xml_file(revision_id)
608
609
try:
610
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
611
except SyntaxError, e:
612
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
613
[revision_id,
614
str(e)])
615
544
if not revision_id or not isinstance(revision_id, basestring):
545
raise ValueError('invalid revision-id: %r' % revision_id)
546
r = Revision.read_xml(self.revision_store[revision_id])
616
547
assert r.revision_id == revision_id
617
548
return r
618
549
619
620
def get_revision_delta(self, revno):
621
"""Return the delta for one revision.
622
623
The delta is relative to its mainline predecessor, or the
624
empty tree for revision 1.
625
"""
626
assert isinstance(revno, int)
627
rh = self.revision_history()
628
if not (1 <= revno <= len(rh)):
629
raise InvalidRevisionNumber(revno)
630
631
# revno is 1-based; list is 0-based
632
633
new_tree = self.revision_tree(rh[revno-1])
634
if revno == 1:
635
old_tree = EmptyTree()
636
else:
637
old_tree = self.revision_tree(rh[revno-2])
638
639
return compare_trees(old_tree, new_tree)
640
641
642
643
550
def get_revision_sha1(self, revision_id):
644
551
"""Hash the stored value of a revision, and return it."""
645
552
# In the future, revision entries will be signed. At that
648
555
# the revision, (add signatures/remove signatures) and still
649
556
# have all hash pointers stay consistent.
650
557
# But for now, just hash the contents.
651
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
652
653
654
def get_ancestry(self, revision_id):
655
"""Return a list of revision-ids integrated by a revision.
656
"""
657
w = self.weave_store.get_weave(ANCESTRY_FILEID)
658
# strip newlines
659
return [l[:-1] for l in w.get_iter(w.lookup(revision_id))]
660
661
662
def get_inventory_weave(self):
663
return self.weave_store.get_weave(INVENTORY_FILEID)
664
665
666
def get_inventory(self, revision_id):
667
"""Get Inventory object by hash."""
668
# FIXME: The text gets passed around a lot coming from the weave.
669
f = StringIO(self.get_inventory_xml(revision_id))
670
return bzrlib.xml5.serializer_v5.read_inventory(f)
671
672
673
def get_inventory_xml(self, revision_id):
674
"""Get inventory XML as a file object."""
675
try:
676
assert isinstance(revision_id, basestring), type(revision_id)
677
iw = self.get_inventory_weave()
678
return iw.get_text(iw.lookup(revision_id))
679
except IndexError:
680
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
681
682
683
def get_inventory_sha1(self, revision_id):
558
return sha_file(self.revision_store[revision_id])
559
560
561
def get_inventory(self, inventory_id):
562
"""Get Inventory object by hash.
563
564
TODO: Perhaps for this and similar methods, take a revision
565
parameter which can be either an integer revno or a
566
string hash."""
567
i = Inventory.read_xml(self.inventory_store[inventory_id])
568
return i
569
570
def get_inventory_sha1(self, inventory_id):
684
571
"""Return the sha1 hash of the inventory entry
685
572
"""
686
return self.get_revision(revision_id).inventory_sha1
573
return sha_file(self.inventory_store[inventory_id])
687
574
688
575
689
576
def get_revision_inventory(self, revision_id):
690
577
"""Return inventory of a past revision."""
691
# bzr 0.0.6 and later imposes the constraint that the inventory_id
692
# must be the same as its revision, so this is trivial.
693
578
if revision_id == None:
694
return Inventory(self.get_root_id())
579
return Inventory()
695
580
else:
696
return self.get_inventory(revision_id)
581
return self.get_inventory(self.get_revision(revision_id).inventory_id)
697
582
698
583
699
584
def revision_history(self):
716
601
>>> sb = ScratchBranch(files=['foo', 'foo~'])
717
602
>>> sb.common_ancestor(sb) == (None, None)
718
603
True
719
>>> commit.commit(sb, "Committing first revision")
604
>>> commit.commit(sb, "Committing first revision", verbose=False)
720
605
>>> sb.common_ancestor(sb)[0]
721
606
1
722
607
>>> clone = sb.clone()
723
>>> commit.commit(sb, "Committing second revision")
608
>>> commit.commit(sb, "Committing second revision", verbose=False)
724
609
>>> sb.common_ancestor(sb)[0]
725
610
2
726
611
>>> sb.common_ancestor(clone)[0]
727
612
1
728
>>> commit.commit(clone, "Committing divergent second revision")
613
>>> commit.commit(clone, "Committing divergent second revision",
614
... verbose=False)
729
615
>>> sb.common_ancestor(clone)[0]
730
616
1
731
617
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
753
639
return r+1, my_history[r]
754
640
return None, None
755
641
642
def enum_history(self, direction):
643
"""Return (revno, revision_id) for history of branch.
644
645
direction
646
'forward' is from earliest to latest
647
'reverse' is from latest to earliest
648
"""
649
rh = self.revision_history()
650
if direction == 'forward':
651
i = 1
652
for rid in rh:
653
yield i, rid
654
i += 1
655
elif direction == 'reverse':
656
i = len(rh)
657
while i > 0:
658
yield i, rh[i-1]
659
i -= 1
660
else:
661
raise ValueError('invalid history direction', direction)
662
756
663
757
664
def revno(self):
758
665
"""Return current revision number for this branch.
773
680
return None
774
681
775
682
776
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
683
def missing_revisions(self, other, stop_revision=None):
777
684
"""
778
685
If self and other have not diverged, return a list of the revisions
779
686
present in other, but missing from self.
812
719
if stop_revision is None:
813
720
stop_revision = other_len
814
721
elif stop_revision > other_len:
815
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
722
raise NoSuchRevision(self, stop_revision)
816
723
817
724
return other_history[self_len:stop_revision]
818
725
819
726
820
727
def update_revisions(self, other, stop_revision=None):
821
728
"""Pull in all new revisions from other branch.
729
730
>>> from bzrlib.commit import commit
731
>>> bzrlib.trace.silent = True
732
>>> br1 = ScratchBranch(files=['foo', 'bar'])
733
>>> br1.add('foo')
734
>>> br1.add('bar')
735
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
736
>>> br2 = ScratchBranch()
737
>>> br2.update_revisions(br1)
738
Added 2 texts.
739
Added 1 inventories.
740
Added 1 revisions.
741
>>> br2.revision_history()
742
[u'REVISION-ID-1']
743
>>> br2.update_revisions(br1)
744
Added 0 texts.
745
Added 0 inventories.
746
Added 0 revisions.
747
>>> br1.text_store.total_size() == br2.text_store.total_size()
748
True
822
749
"""
823
from bzrlib.fetch import greedy_fetch
824
825
pb = bzrlib.ui.ui_factory.progress_bar()
750
from bzrlib.progress import ProgressBar
751
752
pb = ProgressBar()
753
826
754
pb.update('comparing histories')
827
828
755
revision_ids = self.missing_revisions(other, stop_revision)
756
revisions = []
757
needed_texts = sets.Set()
758
i = 0
759
for rev_id in revision_ids:
760
i += 1
761
pb.update('fetching revision', i, len(revision_ids))
762
rev = other.get_revision(rev_id)
763
revisions.append(rev)
764
inv = other.get_inventory(str(rev.inventory_id))
765
for key, entry in inv.iter_entries():
766
if entry.text_id is None:
767
continue
768
if entry.text_id not in self.text_store:
769
needed_texts.add(entry.text_id)
829
770
830
if len(revision_ids) > 0:
831
count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
832
else:
833
count = 0
834
self.append_revision(*revision_ids)
835
## note("Added %d revisions." % count)
836
771
pb.clear()
837
838
772
773
count = self.text_store.copy_multi(other.text_store, needed_texts)
774
print "Added %d texts." % count
775
inventory_ids = [ f.inventory_id for f in revisions ]
776
count = self.inventory_store.copy_multi(other.inventory_store,
777
inventory_ids)
778
print "Added %d inventories." % count
779
revision_ids = [ f.revision_id for f in revisions]
780
count = self.revision_store.copy_multi(other.revision_store,
781
revision_ids)
782
for revision_id in revision_ids:
783
self.append_revision(revision_id)
784
print "Added %d revisions." % count
785
786
839
787
def commit(self, *args, **kw):
840
from bzrlib.commit import Commit
841
Commit().commit(self, *args, **kw)
788
"""Deprecated"""
789
from bzrlib.commit import commit
790
commit(self, *args, **kw)
842
791
843
792
844
def lookup_revision(self, revision):
845
"""Return the revision identifier for a given revision information."""
846
revno, info = self._get_revision_info(revision)
847
return info
848
849
850
def revision_id_to_revno(self, revision_id):
851
"""Given a revision id, return its revno"""
852
history = self.revision_history()
853
try:
854
return history.index(revision_id) + 1
855
except ValueError:
856
raise bzrlib.errors.NoSuchRevision(self, revision_id)
857
858
859
def get_revision_info(self, revision):
860
"""Return (revno, revision id) for revision identifier.
861
862
revision can be an integer, in which case it is assumed to be revno (though
863
this will translate negative values into positive ones)
864
revision can also be a string, in which case it is parsed for something like
865
'date:' or 'revid:' etc.
866
"""
867
revno, rev_id = self._get_revision_info(revision)
868
if revno is None:
869
raise bzrlib.errors.NoSuchRevision(self, revision)
870
return revno, rev_id
871
872
def get_rev_id(self, revno, history=None):
873
"""Find the revision id of the specified revno."""
793
def lookup_revision(self, revno):
794
"""Return revision hash for revision number."""
874
795
if revno == 0:
875
796
return None
876
if history is None:
877
history = self.revision_history()
878
elif revno <= 0 or revno > len(history):
879
raise bzrlib.errors.NoSuchRevision(self, revno)
880
return history[revno - 1]
881
882
def _get_revision_info(self, revision):
883
"""Return (revno, revision id) for revision specifier.
884
885
revision can be an integer, in which case it is assumed to be revno
886
(though this will translate negative values into positive ones)
887
revision can also be a string, in which case it is parsed for something
888
like 'date:' or 'revid:' etc.
889
890
A revid is always returned. If it is None, the specifier referred to
891
the null revision. If the revid does not occur in the revision
892
history, revno will be None.
893
"""
894
895
if revision is None:
896
return 0, None
897
revno = None
898
try:# Convert to int if possible
899
revision = int(revision)
900
except ValueError:
901
pass
902
revs = self.revision_history()
903
if isinstance(revision, int):
904
if revision < 0:
905
revno = len(revs) + revision + 1
906
else:
907
revno = revision
908
rev_id = self.get_rev_id(revno, revs)
909
elif isinstance(revision, basestring):
910
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
911
if revision.startswith(prefix):
912
result = func(self, revs, revision)
913
if len(result) > 1:
914
revno, rev_id = result
915
else:
916
revno = result[0]
917
rev_id = self.get_rev_id(revno, revs)
918
break
919
else:
920
raise BzrError('No namespace registered for string: %r' %
921
revision)
922
else:
923
raise TypeError('Unhandled revision type %s' % revision)
924
925
if revno is None:
926
if rev_id is None:
927
raise bzrlib.errors.NoSuchRevision(self, revision)
928
return revno, rev_id
929
930
def _namespace_revno(self, revs, revision):
931
"""Lookup a revision by revision number"""
932
assert revision.startswith('revno:')
933
try:
934
return (int(revision[6:]),)
935
except ValueError:
936
return None
937
REVISION_NAMESPACES['revno:'] = _namespace_revno
938
939
def _namespace_revid(self, revs, revision):
940
assert revision.startswith('revid:')
941
rev_id = revision[len('revid:'):]
942
try:
943
return revs.index(rev_id) + 1, rev_id
944
except ValueError:
945
return None, rev_id
946
REVISION_NAMESPACES['revid:'] = _namespace_revid
947
948
def _namespace_last(self, revs, revision):
949
assert revision.startswith('last:')
950
try:
951
offset = int(revision[5:])
952
except ValueError:
953
return (None,)
954
else:
955
if offset <= 0:
956
raise BzrError('You must supply a positive value for --revision last:XXX')
957
return (len(revs) - offset + 1,)
958
REVISION_NAMESPACES['last:'] = _namespace_last
959
960
def _namespace_tag(self, revs, revision):
961
assert revision.startswith('tag:')
962
raise BzrError('tag: namespace registered, but not implemented.')
963
REVISION_NAMESPACES['tag:'] = _namespace_tag
964
965
def _namespace_date(self, revs, revision):
966
assert revision.startswith('date:')
967
import datetime
968
# Spec for date revisions:
969
# date:value
970
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
971
# it can also start with a '+/-/='. '+' says match the first
972
# entry after the given date. '-' is match the first entry before the date
973
# '=' is match the first entry after, but still on the given date.
974
#
975
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
976
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
977
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
978
# May 13th, 2005 at 0:00
979
#
980
# So the proper way of saying 'give me all entries for today' is:
981
# -r {date:+today}:{date:-tomorrow}
982
# The default is '=' when not supplied
983
val = revision[5:]
984
match_style = '='
985
if val[:1] in ('+', '-', '='):
986
match_style = val[:1]
987
val = val[1:]
988
989
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
990
if val.lower() == 'yesterday':
991
dt = today - datetime.timedelta(days=1)
992
elif val.lower() == 'today':
993
dt = today
994
elif val.lower() == 'tomorrow':
995
dt = today + datetime.timedelta(days=1)
996
else:
997
import re
998
# This should be done outside the function to avoid recompiling it.
999
_date_re = re.compile(
1000
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
1001
r'(,|T)?\s*'
1002
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
1003
)
1004
m = _date_re.match(val)
1005
if not m or (not m.group('date') and not m.group('time')):
1006
raise BzrError('Invalid revision date %r' % revision)
1007
1008
if m.group('date'):
1009
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
1010
else:
1011
year, month, day = today.year, today.month, today.day
1012
if m.group('time'):
1013
hour = int(m.group('hour'))
1014
minute = int(m.group('minute'))
1015
if m.group('second'):
1016
second = int(m.group('second'))
1017
else:
1018
second = 0
1019
else:
1020
hour, minute, second = 0,0,0
1021
1022
dt = datetime.datetime(year=year, month=month, day=day,
1023
hour=hour, minute=minute, second=second)
1024
first = dt
1025
last = None
1026
reversed = False
1027
if match_style == '-':
1028
reversed = True
1029
elif match_style == '=':
1030
last = dt + datetime.timedelta(days=1)
1031
1032
if reversed:
1033
for i in range(len(revs)-1, -1, -1):
1034
r = self.get_revision(revs[i])
1035
# TODO: Handle timezone.
1036
dt = datetime.datetime.fromtimestamp(r.timestamp)
1037
if first >= dt and (last is None or dt >= last):
1038
return (i+1,)
1039
else:
1040
for i in range(len(revs)):
1041
r = self.get_revision(revs[i])
1042
# TODO: Handle timezone.
1043
dt = datetime.datetime.fromtimestamp(r.timestamp)
1044
if first <= dt and (last is None or dt <= last):
1045
return (i+1,)
1046
REVISION_NAMESPACES['date:'] = _namespace_date
797
798
try:
799
# list is 0-based; revisions are 1-based
800
return self.revision_history()[revno-1]
801
except IndexError:
802
raise BzrError("no such revision %s" % revno)
803
1047
804
1048
805
def revision_tree(self, revision_id):
1049
806
"""Return Tree for a revision on this branch.
1056
813
return EmptyTree()
1057
814
else:
1058
815
inv = self.get_revision_inventory(revision_id)
1059
return RevisionTree(self.weave_store, inv, revision_id)
816
return RevisionTree(self.text_store, inv)
1060
817
1061
818
1062
819
def working_tree(self):
1070
827
1071
828
If there are no revisions yet, return an `EmptyTree`.
1072
829
"""
1073
return self.revision_tree(self.last_patch())
830
r = self.last_patch()
831
if r == None:
832
return EmptyTree()
833
else:
834
return RevisionTree(self.text_store, self.get_revision_inventory(r))
835
1074
836
1075
837
1076
838
def rename_one(self, from_rel, to_rel):
1108
870
1109
871
inv.rename(file_id, to_dir_id, to_tail)
1110
872
873
print "%s => %s" % (from_rel, to_rel)
874
1111
875
from_abs = self.abspath(from_rel)
1112
876
to_abs = self.abspath(to_rel)
1113
877
try:
1132
896
1133
897
Note that to_name is only the last component of the new name;
1134
898
this doesn't change the directory.
1135
1136
This returns a list of (from_path, to_path) pairs for each
1137
entry that is moved.
1138
899
"""
1139
result = []
1140
900
self.lock_write()
1141
901
try:
1142
902
## TODO: Option to move IDs only
1177
937
for f in from_paths:
1178
938
name_tail = splitpath(f)[-1]
1179
939
dest_path = appendpath(to_name, name_tail)
1180
result.append((f, dest_path))
940
print "%s => %s" % (f, dest_path)
1181
941
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1182
942
try:
1183
943
os.rename(self.abspath(f), self.abspath(dest_path))
1189
949
finally:
1190
950
self.unlock()
1191
951
1192
return result
1193
1194
1195
def revert(self, filenames, old_tree=None, backups=True):
1196
"""Restore selected files to the versions from a previous tree.
1197
1198
backups
1199
If true (default) backups are made of files before
1200
they're renamed.
1201
"""
1202
from bzrlib.errors import NotVersionedError, BzrError
1203
from bzrlib.atomicfile import AtomicFile
1204
from bzrlib.osutils import backup_file
1205
1206
inv = self.read_working_inventory()
1207
if old_tree is None:
1208
old_tree = self.basis_tree()
1209
old_inv = old_tree.inventory
1210
1211
nids = []
1212
for fn in filenames:
1213
file_id = inv.path2id(fn)
1214
if not file_id:
1215
raise NotVersionedError("not a versioned file", fn)
1216
if not old_inv.has_id(file_id):
1217
raise BzrError("file not present in old tree", fn, file_id)
1218
nids.append((fn, file_id))
1219
1220
# TODO: Rename back if it was previously at a different location
1221
1222
# TODO: If given a directory, restore the entire contents from
1223
# the previous version.
1224
1225
# TODO: Make a backup to a temporary file.
1226
1227
# TODO: If the file previously didn't exist, delete it?
1228
for fn, file_id in nids:
1229
backup_file(fn)
1230
1231
f = AtomicFile(fn, 'wb')
1232
try:
1233
f.write(old_tree.get_file(file_id).read())
1234
f.commit()
1235
finally:
1236
f.close()
1237
1238
1239
def pending_merges(self):
1240
"""Return a list of pending merges.
1241
1242
These are revisions that have been merged into the working
1243
directory but not yet committed.
1244
"""
1245
cfn = self.controlfilename('pending-merges')
1246
if not os.path.exists(cfn):
1247
return []
1248
p = []
1249
for l in self.controlfile('pending-merges', 'r').readlines():
1250
p.append(l.rstrip('\n'))
1251
return p
1252
1253
1254
def add_pending_merge(self, revision_id):
1255
from bzrlib.revision import validate_revision_id
1256
1257
validate_revision_id(revision_id)
1258
1259
p = self.pending_merges()
1260
if revision_id in p:
1261
return
1262
p.append(revision_id)
1263
self.set_pending_merges(p)
1264
1265
1266
def set_pending_merges(self, rev_list):
1267
from bzrlib.atomicfile import AtomicFile
1268
self.lock_write()
1269
try:
1270
f = AtomicFile(self.controlfilename('pending-merges'))
1271
try:
1272
for l in rev_list:
1273
print >>f, l
1274
f.commit()
1275
finally:
1276
f.close()
1277
finally:
1278
self.unlock()
1279
1280
1281
def get_parent(self):
1282
"""Return the parent location of the branch.
1283
1284
This is the default location for push/pull/missing. The usual
1285
pattern is that the user can override it by specifying a
1286
location.
1287
"""
1288
import errno
1289
_locs = ['parent', 'pull', 'x-pull']
1290
for l in _locs:
1291
try:
1292
return self.controlfile(l, 'r').read().strip('\n')
1293
except IOError, e:
1294
if e.errno != errno.ENOENT:
1295
raise
1296
return None
1297
1298
1299
def set_parent(self, url):
1300
# TODO: Maybe delete old location files?
1301
from bzrlib.atomicfile import AtomicFile
1302
self.lock_write()
1303
try:
1304
f = AtomicFile(self.controlfilename('parent'))
1305
try:
1306
f.write(url + '\n')
1307
f.commit()
1308
finally:
1309
f.close()
1310
finally:
1311
self.unlock()
1312
1313
def check_revno(self, revno):
1314
"""\
1315
Check whether a revno corresponds to any revision.
1316
Zero (the NULL revision) is considered valid.
1317
"""
1318
if revno != 0:
1319
self.check_real_revno(revno)
1320
1321
def check_real_revno(self, revno):
1322
"""\
1323
Check whether a revno corresponds to a real revision.
1324
Zero (the NULL revision) is considered invalid
1325
"""
1326
if revno < 1 or revno > self.revno():
1327
raise InvalidRevisionNumber(revno)
1328
1329
1330
952
1331
953
1332
954
class ScratchBranch(Branch):
1347
969
1348
970
If any files are listed, they are created in the working copy.
1349
971
"""
1350
from tempfile import mkdtemp
1351
972
init = False
1352
973
if base is None:
1353
base = mkdtemp()
974
base = tempfile.mkdtemp()
1354
975
init = True
1355
976
Branch.__init__(self, base, init=init)
1356
977
for d in dirs:
1369
990
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1370
991
True
1371
992
"""
1372
from shutil import copytree
1373
from tempfile import mkdtemp
1374
base = mkdtemp()
993
base = tempfile.mkdtemp()
1375
994
os.rmdir(base)
1376
copytree(self.base, base, symlinks=True)
995
shutil.copytree(self.base, base, symlinks=True)
1377
996
return ScratchBranch(base=base)
1378
1379
1380
997
1381
998
def __del__(self):
1382
999
self.destroy()
1383
1000
1384
1001
def destroy(self):
1385
1002
"""Destroy the test branch, removing the scratch directory."""
1386
from shutil import rmtree
1387
1003
try:
1388
1004
if self.base:
1389
1005
mutter("delete ScratchBranch %s" % self.base)
1390
rmtree(self.base)
1006
shutil.rmtree(self.base)
1391
1007
except OSError, e:
1392
1008
# Work around for shutil.rmtree failing on Windows when
1393
1009
# readonly files are encountered
1395
1011
for root, dirs, files in os.walk(self.base, topdown=False):
1396
1012
for name in files:
1397
1013
os.chmod(os.path.join(root, name), 0700)
1398
rmtree(self.base)
1014
shutil.rmtree(self.base)
1399
1015
self.base = None
1400
1016
1401
1017
1426
1042
cope with just randomness because running uuidgen every time is
1427
1043
slow."""
1428
1044
import re
1429
from binascii import hexlify
1430
from time import time
1431
1045
1432
1046
# get last component
1433
1047
idx = name.rfind('/')
1445
1059
name = re.sub(r'[^\w.]', '', name)
1446
1060
1447
1061
s = hexlify(rand_bytes(8))
1448
return '-'.join((name, compact_date(time()), s))
1449
1450
1451
def gen_root_id():
1452
"""Return a new tree-root file id."""
1453
return gen_file_id('TREE_ROOT')
1454
1455
1456
def pull_loc(branch):
1457
# TODO: Should perhaps just make attribute be 'base' in
1458
# RemoteBranch and Branch?
1459
if hasattr(branch, "baseurl"):
1460
return branch.baseurl
1461
else:
1462
return branch.base
1463
1464
1465
def copy_branch(branch_from, to_location, revision=None):
1466
"""Copy branch_from into the existing directory to_location.
1467
1468
revision
1469
If not None, only revisions up to this point will be copied.
1470
The head of the new branch will be that revision.
1471
1472
to_location
1473
The name of a local directory that exists but is empty.
1474
"""
1475
from bzrlib.merge import merge
1476
from bzrlib.branch import Branch
1477
1478
assert isinstance(branch_from, Branch)
1479
assert isinstance(to_location, basestring)
1480
1481
br_to = Branch(to_location, init=True)
1482
br_to.set_root_id(branch_from.get_root_id())
1483
if revision is None:
1484
revno = branch_from.revno()
1485
else:
1486
revno, rev_id = branch_from.get_revision_info(revision)
1487
br_to.update_revisions(branch_from, stop_revision=revno)
1488
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1489
check_clean=False, ignore_zero=True)
1490
1491
from_location = pull_loc(branch_from)
1492
br_to.set_parent(pull_loc(branch_from))
1493
1062
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1