« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 645
- compare with another revision
- download diff
- download tarball
- view history from revision 645
- Committer: Martin Pool
- Date: 2005-06-10 06:29:35 UTC
- Revision ID: mbp@sourcefrog.net-20050610062935-cd2fc37ca7ae1e09
- split out proposed progress module
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/selftest
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- tools
- files renamed:
- bzrlib/selftest/__init__.py => bzrlib/selftest.py
- bzrlib/selftest/whitebox.py => bzrlib/whitebox.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
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
20
21
21
22
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
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_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
34
35
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
35
36
## TODO: Maybe include checks for common corruption of newlines, etc?
36
37
37
38
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
39
46
40
def find_branch(f, **args):
47
41
if f and (f.startswith('http://') or f.startswith('https://')):
51
45
return Branch(f, **args)
52
46
53
47
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
48
71
49
def _relpath(base, path):
72
50
"""Return path relative to base, or raise exception.
132
110
self.branch2 = branch2
133
111
Exception.__init__(self, "These branches have diverged.")
134
112
135
136
113
######################################################################
137
114
# branch objects
138
115
157
134
_lock_count = None
158
135
_lock = None
159
136
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
137
def __init__(self, base, init=False, find_root=True):
166
138
"""Create new branch object at a particular location.
167
139
177
149
In the test suite, creation of new trees is tested using the
178
150
`ScratchBranch` class.
179
151
"""
180
from bzrlib.store import ImmutableStore
181
152
if init:
182
153
self.base = os.path.realpath(base)
183
154
self._make_control()
269
240
270
241
def controlfilename(self, file_or_path):
271
242
"""Return location relative to branch."""
272
if isinstance(file_or_path, basestring):
243
if isinstance(file_or_path, types.StringTypes):
273
244
file_or_path = [file_or_path]
274
245
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
275
246
302
273
303
274
304
275
def _make_control(self):
305
from bzrlib.inventory import Inventory
306
from bzrlib.xml import pack_xml
307
308
276
os.mkdir(self.controlfilename([]))
309
277
self.controlfile('README', 'w').write(
310
278
"This is a Bazaar-NG control directory.\n"
311
"Do not change any files in this directory.\n")
279
"Do not change any files in this directory.")
312
280
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
313
281
for d in ('text-store', 'inventory-store', 'revision-store'):
314
282
os.mkdir(self.controlfilename(d))
315
283
for f in ('revision-history', 'merged-patches',
316
284
'pending-merged-patches', 'branch-name',
317
'branch-lock',
318
'pending-merges'):
285
'branch-lock'):
319
286
self.controlfile(f, 'w').write('')
320
287
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'))
288
Inventory().write_xml(self.controlfile('inventory','w'))
326
289
327
290
328
291
def _check_format(self):
343
306
['use a different bzr version',
344
307
'or remove the .bzr directory and "bzr init" again'])
345
308
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
309
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)
362
310
363
311
def read_working_inventory(self):
364
312
"""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()
313
before = time.time()
314
# ElementTree does its own conversion from UTF-8, so open in
315
# binary.
369
316
self.lock_read()
370
317
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'))
318
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
375
319
mutter("loaded inventory of %d items in %f"
376
% (len(inv), time() - before))
320
% (len(inv), time.time() - before))
377
321
return inv
378
322
finally:
379
323
self.unlock()
385
329
That is to say, the inventory describing changes underway, that
386
330
will be committed to the next revision.
387
331
"""
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
332
## TODO: factor out to atomicfile? is rename safe on windows?
333
## TODO: Maybe some kind of clean/dirty marker on inventory?
334
tmpfname = self.controlfilename('inventory.tmp')
335
tmpf = file(tmpfname, 'wb')
336
inv.write_xml(tmpf)
337
tmpf.close()
338
inv_fname = self.controlfilename('inventory')
339
if sys.platform == 'win32':
340
os.remove(inv_fname)
341
os.rename(tmpfname, inv_fname)
402
342
mutter('wrote working inventory')
403
343
404
344
434
374
"""
435
375
# TODO: Re-adding a file that is removed in the working copy
436
376
# should probably put it back with the previous ID.
437
if isinstance(files, basestring):
438
assert(ids is None or isinstance(ids, basestring))
377
if isinstance(files, types.StringTypes):
378
assert(ids is None or isinstance(ids, types.StringTypes))
439
379
files = [files]
440
380
if ids is not None:
441
381
ids = [ids]
473
413
inv.add_path(f, kind=kind, file_id=file_id)
474
414
475
415
if verbose:
476
print 'added', quotefn(f)
416
show_status('A', kind, quotefn(f))
477
417
478
418
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
479
419
490
430
# use inventory as it was in that revision
491
431
file_id = tree.inventory.path2id(file)
492
432
if not file_id:
493
raise BzrError("%r is not present in revision %s" % (file, revno))
433
raise BzrError("%r is not present in revision %d" % (file, revno))
494
434
tree.print_file(file_id)
495
435
finally:
496
436
self.unlock()
512
452
"""
513
453
## TODO: Normalize names
514
454
## TODO: Remove nested loops; better scalability
515
if isinstance(files, basestring):
455
if isinstance(files, types.StringTypes):
516
456
files = [files]
517
457
518
458
self.lock_write()
543
483
544
484
# FIXME: this doesn't need to be a branch method
545
485
def set_inventory(self, new_inventory_list):
546
from bzrlib.inventory import Inventory, InventoryEntry
547
inv = Inventory(self.get_root_id())
486
inv = Inventory()
548
487
for path, file_id, parent, kind in new_inventory_list:
549
488
name = os.path.basename(path)
550
489
if name == "":
572
511
return self.working_tree().unknowns()
573
512
574
513
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
514
def append_revision(self, revision_id):
515
mutter("add {%s} to revision-history" % revision_id)
581
516
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()
517
518
tmprhname = self.controlfilename('revision-history.tmp')
519
rhname = self.controlfilename('revision-history')
520
521
f = file(tmprhname, 'wt')
522
rev_history.append(revision_id)
523
f.write('\n'.join(rev_history))
524
f.write('\n')
525
f.close()
526
527
if sys.platform == 'win32':
528
os.remove(rhname)
529
os.rename(tmprhname, rhname)
530
606
531
607
532
608
533
def get_revision(self, revision_id):
609
534
"""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
535
r = Revision.read_xml(self.revision_store[revision_id])
619
536
assert r.revision_id == revision_id
620
537
return r
621
538
622
539
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
540
def get_inventory(self, inventory_id):
658
541
"""Get Inventory object by hash.
659
542
660
543
TODO: Perhaps for this and similar methods, take a revision
661
544
parameter which can be either an integer revno or a
662
545
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))
546
i = Inventory.read_xml(self.inventory_store[inventory_id])
547
return i
678
548
679
549
680
550
def get_revision_inventory(self, revision_id):
681
551
"""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
552
if revision_id == None:
685
from bzrlib.inventory import Inventory
686
return Inventory(self.get_root_id())
553
return Inventory()
687
554
else:
688
return self.get_inventory(revision_id)
555
return self.get_inventory(self.get_revision(revision_id).inventory_id)
689
556
690
557
691
558
def revision_history(self):
746
613
return r+1, my_history[r]
747
614
return None, None
748
615
616
def enum_history(self, direction):
617
"""Return (revno, revision_id) for history of branch.
618
619
direction
620
'forward' is from earliest to latest
621
'reverse' is from latest to earliest
622
"""
623
rh = self.revision_history()
624
if direction == 'forward':
625
i = 1
626
for rid in rh:
627
yield i, rid
628
i += 1
629
elif direction == 'reverse':
630
i = len(rh)
631
while i > 0:
632
yield i, rh[i-1]
633
i -= 1
634
else:
635
raise ValueError('invalid history direction', direction)
636
749
637
750
638
def revno(self):
751
639
"""Return current revision number for this branch.
766
654
return None
767
655
768
656
769
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
657
def missing_revisions(self, other):
770
658
"""
771
659
If self and other have not diverged, return a list of the revisions
772
660
present in other, but missing from self.
801
689
if common_index >= 0 and \
802
690
self_history[common_index] != other_history[common_index]:
803
691
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
692
if self_len < other_len:
693
return other_history[self_len:]
694
return []
695
696
697
def update_revisions(self, other):
698
"""If self and other have not diverged, ensure self has all the
699
revisions in other
700
816
701
>>> from bzrlib.commit import commit
817
702
>>> bzrlib.trace.silent = True
818
703
>>> br1 = ScratchBranch(files=['foo', 'bar'])
833
718
>>> br1.text_store.total_size() == br2.text_store.total_size()
834
719
True
835
720
"""
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)
721
revision_ids = self.missing_revisions(other)
722
revisions = [other.get_revision(f) for f in revision_ids]
723
needed_texts = sets.Set()
724
for rev in revisions:
859
725
inv = other.get_inventory(str(rev.inventory_id))
860
726
for key, entry in inv.iter_entries():
861
727
if entry.text_id is None:
862
728
continue
863
729
if entry.text_id not in self.text_store:
864
730
needed_texts.add(entry.text_id)
865
866
pb.clear()
867
868
731
count = self.text_store.copy_multi(other.text_store, needed_texts)
869
732
print "Added %d texts." % count
870
733
inventory_ids = [ f.inventory_id for f in revisions ]
880
743
881
744
882
745
def commit(self, *args, **kw):
746
"""Deprecated"""
883
747
from bzrlib.commit import commit
884
748
commit(self, *args, **kw)
885
749
886
750
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
751
def lookup_revision(self, revno):
752
"""Return revision hash for revision number."""
753
if revno == 0:
754
return None
755
756
try:
757
# list is 0-based; revisions are 1-based
758
return self.revision_history()[revno-1]
759
except IndexError:
760
raise BzrError("no such revision %s" % revno)
761
1044
762
1045
763
def revision_tree(self, revision_id):
1046
764
"""Return Tree for a revision on this branch.
1190
908
self.unlock()
1191
909
1192
910
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
1203
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.
1242
"""
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
1278
1279
911
1280
912
class ScratchBranch(Branch):
1281
913
"""Special test class: a branch that cleans up after itself.
1295
927
1296
928
If any files are listed, they are created in the working copy.
1297
929
"""
1298
from tempfile import mkdtemp
1299
930
init = False
1300
931
if base is None:
1301
base = mkdtemp()
932
base = tempfile.mkdtemp()
1302
933
init = True
1303
934
Branch.__init__(self, base, init=init)
1304
935
for d in dirs:
1317
948
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1318
949
True
1319
950
"""
1320
from shutil import copytree
1321
from tempfile import mkdtemp
1322
base = mkdtemp()
951
base = tempfile.mkdtemp()
1323
952
os.rmdir(base)
1324
copytree(self.base, base, symlinks=True)
953
shutil.copytree(self.base, base, symlinks=True)
1325
954
return ScratchBranch(base=base)
1326
955
1327
956
def __del__(self):
1329
958
1330
959
def destroy(self):
1331
960
"""Destroy the test branch, removing the scratch directory."""
1332
from shutil import rmtree
1333
961
try:
1334
962
if self.base:
1335
963
mutter("delete ScratchBranch %s" % self.base)
1336
rmtree(self.base)
964
shutil.rmtree(self.base)
1337
965
except OSError, e:
1338
966
# Work around for shutil.rmtree failing on Windows when
1339
967
# readonly files are encountered
1341
969
for root, dirs, files in os.walk(self.base, topdown=False):
1342
970
for name in files:
1343
971
os.chmod(os.path.join(root, name), 0700)
1344
rmtree(self.base)
972
shutil.rmtree(self.base)
1345
973
self.base = None
1346
974
1347
975
1372
1000
cope with just randomness because running uuidgen every time is
1373
1001
slow."""
1374
1002
import re
1375
from binascii import hexlify
1376
from time import time
1377
1003
1378
1004
# get last component
1379
1005
idx = name.rfind('/')
1391
1017
name = re.sub(r'[^\w.]', '', name)
1392
1018
1393
1019
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
1020
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1