To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 782
- compare with another revision
- download diff
- download tarball
- view history from revision 782
- Committer: Martin Pool
- Date: 2005-06-24 11:09:36 UTC
- Revision ID: mbp@sourcefrog.net-20050624110935-87a3b29aed05ac19
- Branch.revert copies files to backups before reverting them
- files added:
- bzrlib/statcache.py
- files removed:
- bzrlib/delta.py
- contrib/emacs
- effbot
- effbot/org
- tools
- 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_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
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
39
43
40
def find_branch(f, **args):
44
41
if f and (f.startswith('http://') or f.startswith('https://')):
48
45
return Branch(f, **args)
49
46
50
47
51
def find_cached_branch(f, cache_root, **args):
52
from remotebranch import RemoteBranch
53
br = find_branch(f, **args)
54
def cacheify(br, store_name):
55
from meta_store import CachedStore
56
cache_path = os.path.join(cache_root, store_name)
57
os.mkdir(cache_path)
58
new_store = CachedStore(getattr(br, store_name), cache_path)
59
setattr(br, store_name, new_store)
60
61
if isinstance(br, RemoteBranch):
62
cacheify(br, 'inventory_store')
63
cacheify(br, 'text_store')
64
cacheify(br, 'revision_store')
65
return br
66
67
48
68
49
def _relpath(base, path):
69
50
"""Return path relative to base, or raise exception.
130
111
Exception.__init__(self, "These branches have diverged.")
131
112
132
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
133
122
######################################################################
134
123
# branch objects
135
124
154
143
_lock_count = None
155
144
_lock = None
156
145
157
# Map some sort of prefix into a namespace
158
# stuff like "revno:10", "revid:", etc.
159
# This should match a prefix with a function which accepts
160
REVISION_NAMESPACES = {}
161
162
146
def __init__(self, base, init=False, find_root=True):
163
147
"""Create new branch object at a particular location.
164
148
174
158
In the test suite, creation of new trees is tested using the
175
159
`ScratchBranch` class.
176
160
"""
177
from bzrlib.store import ImmutableStore
178
161
if init:
179
162
self.base = os.path.realpath(base)
180
163
self._make_control()
266
249
267
250
def controlfilename(self, file_or_path):
268
251
"""Return location relative to branch."""
269
if isinstance(file_or_path, basestring):
252
if isinstance(file_or_path, types.StringTypes):
270
253
file_or_path = [file_or_path]
271
254
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
272
255
299
282
300
283
301
284
def _make_control(self):
302
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
304
305
285
os.mkdir(self.controlfilename([]))
306
286
self.controlfile('README', 'w').write(
307
287
"This is a Bazaar-NG control directory.\n"
311
291
os.mkdir(self.controlfilename(d))
312
292
for f in ('revision-history', 'merged-patches',
313
293
'pending-merged-patches', 'branch-name',
314
'branch-lock',
315
'pending-merges'):
294
'branch-lock'):
316
295
self.controlfile(f, 'w').write('')
317
296
mutter('created control directory in ' + self.base)
318
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
297
Inventory().write_xml(self.controlfile('inventory','w'))
320
298
321
299
322
300
def _check_format(self):
337
315
['use a different bzr version',
338
316
'or remove the .bzr directory and "bzr init" again'])
339
317
340
def get_root_id(self):
341
"""Return the id of this branches root"""
342
inv = self.read_working_inventory()
343
return inv.root.file_id
344
318
345
def set_root_id(self, file_id):
346
inv = self.read_working_inventory()
347
orig_root_id = inv.root.file_id
348
del inv._byid[inv.root.file_id]
349
inv.root.file_id = file_id
350
inv._byid[inv.root.file_id] = inv.root
351
for fid in inv:
352
entry = inv[fid]
353
if entry.parent_id in (None, orig_root_id):
354
entry.parent_id = inv.root.file_id
355
self._write_inventory(inv)
356
319
357
320
def read_working_inventory(self):
358
321
"""Read the working inventory."""
359
from bzrlib.inventory import Inventory
360
from bzrlib.xml import unpack_xml
361
from time import time
362
before = time()
322
before = time.time()
323
# ElementTree does its own conversion from UTF-8, so open in
324
# binary.
363
325
self.lock_read()
364
326
try:
365
# ElementTree does its own conversion from UTF-8, so open in
366
# binary.
367
inv = unpack_xml(Inventory,
368
self.controlfile('inventory', 'rb'))
327
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
369
328
mutter("loaded inventory of %d items in %f"
370
% (len(inv), time() - before))
329
% (len(inv), time.time() - before))
371
330
return inv
372
331
finally:
373
332
self.unlock()
379
338
That is to say, the inventory describing changes underway, that
380
339
will be committed to the next revision.
381
340
"""
382
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
384
385
341
self.lock_write()
386
342
try:
343
from bzrlib.atomicfile import AtomicFile
344
387
345
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
346
try:
389
pack_xml(inv, f)
347
inv.write_xml(f)
390
348
f.commit()
391
349
finally:
392
350
f.close()
428
386
"""
429
387
# TODO: Re-adding a file that is removed in the working copy
430
388
# should probably put it back with the previous ID.
431
if isinstance(files, basestring):
432
assert(ids is None or isinstance(ids, basestring))
389
if isinstance(files, types.StringTypes):
390
assert(ids is None or isinstance(ids, types.StringTypes))
433
391
files = [files]
434
392
if ids is not None:
435
393
ids = [ids]
484
442
# use inventory as it was in that revision
485
443
file_id = tree.inventory.path2id(file)
486
444
if not file_id:
487
raise BzrError("%r is not present in revision %s" % (file, revno))
445
raise BzrError("%r is not present in revision %d" % (file, revno))
488
446
tree.print_file(file_id)
489
447
finally:
490
448
self.unlock()
506
464
"""
507
465
## TODO: Normalize names
508
466
## TODO: Remove nested loops; better scalability
509
if isinstance(files, basestring):
467
if isinstance(files, types.StringTypes):
510
468
files = [files]
511
469
512
470
self.lock_write()
537
495
538
496
# FIXME: this doesn't need to be a branch method
539
497
def set_inventory(self, new_inventory_list):
540
from bzrlib.inventory import Inventory, InventoryEntry
541
inv = Inventory(self.get_root_id())
498
inv = Inventory()
542
499
for path, file_id, parent, kind in new_inventory_list:
543
500
name = os.path.basename(path)
544
501
if name == "":
566
523
return self.working_tree().unknowns()
567
524
568
525
569
def append_revision(self, *revision_ids):
526
def append_revision(self, revision_id):
570
527
from bzrlib.atomicfile import AtomicFile
571
528
572
for revision_id in revision_ids:
573
mutter("add {%s} to revision-history" % revision_id)
574
575
rev_history = self.revision_history()
576
rev_history.extend(revision_ids)
529
mutter("add {%s} to revision-history" % revision_id)
530
rev_history = self.revision_history() + [revision_id]
577
531
578
532
f = AtomicFile(self.controlfilename('revision-history'))
579
533
try:
584
538
f.close()
585
539
586
540
587
def get_revision_xml(self, revision_id):
588
"""Return XML file object for revision object."""
589
if not revision_id or not isinstance(revision_id, basestring):
590
raise InvalidRevisionId(revision_id)
591
592
self.lock_read()
593
try:
594
try:
595
return self.revision_store[revision_id]
596
except IndexError:
597
raise bzrlib.errors.NoSuchRevision(revision_id)
598
finally:
599
self.unlock()
600
601
602
541
def get_revision(self, revision_id):
603
542
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
605
606
try:
607
r = unpack_xml(Revision, xml_file)
608
except SyntaxError, e:
609
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
[revision_id,
611
str(e)])
612
543
if not revision_id or not isinstance(revision_id, basestring):
544
raise ValueError('invalid revision-id: %r' % revision_id)
545
r = Revision.read_xml(self.revision_store[revision_id])
613
546
assert r.revision_id == revision_id
614
547
return r
615
548
616
617
def get_revision_delta(self, revno):
618
"""Return the delta for one revision.
619
620
The delta is relative to its mainline predecessor, or the
621
empty tree for revision 1.
622
"""
623
assert isinstance(revno, int)
624
rh = self.revision_history()
625
if not (1 <= revno <= len(rh)):
626
raise InvalidRevisionNumber(revno)
627
628
# revno is 1-based; list is 0-based
629
630
new_tree = self.revision_tree(rh[revno-1])
631
if revno == 1:
632
old_tree = EmptyTree()
633
else:
634
old_tree = self.revision_tree(rh[revno-2])
635
636
return compare_trees(old_tree, new_tree)
637
638
639
640
549
def get_revision_sha1(self, revision_id):
641
550
"""Hash the stored value of a revision, and return it."""
642
551
# In the future, revision entries will be signed. At that
645
554
# the revision, (add signatures/remove signatures) and still
646
555
# have all hash pointers stay consistent.
647
556
# But for now, just hash the contents.
648
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
557
return sha_file(self.revision_store[revision_id])
649
558
650
559
651
560
def get_inventory(self, inventory_id):
654
563
TODO: Perhaps for this and similar methods, take a revision
655
564
parameter which can be either an integer revno or a
656
565
string hash."""
657
from bzrlib.inventory import Inventory
658
from bzrlib.xml import unpack_xml
659
660
return unpack_xml(Inventory, self.inventory_store[inventory_id])
661
566
i = Inventory.read_xml(self.inventory_store[inventory_id])
567
return i
662
568
663
569
def get_inventory_sha1(self, inventory_id):
664
570
"""Return the sha1 hash of the inventory entry
668
574
669
575
def get_revision_inventory(self, revision_id):
670
576
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
672
# must be the same as its revision, so this is trivial.
673
577
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
return Inventory(self.get_root_id())
578
return Inventory()
676
579
else:
677
return self.get_inventory(revision_id)
580
return self.get_inventory(self.get_revision(revision_id).inventory_id)
678
581
679
582
680
583
def revision_history(self):
735
638
return r+1, my_history[r]
736
639
return None, None
737
640
641
def enum_history(self, direction):
642
"""Return (revno, revision_id) for history of branch.
643
644
direction
645
'forward' is from earliest to latest
646
'reverse' is from latest to earliest
647
"""
648
rh = self.revision_history()
649
if direction == 'forward':
650
i = 1
651
for rid in rh:
652
yield i, rid
653
i += 1
654
elif direction == 'reverse':
655
i = len(rh)
656
while i > 0:
657
yield i, rh[i-1]
658
i -= 1
659
else:
660
raise ValueError('invalid history direction', direction)
661
738
662
739
663
def revno(self):
740
664
"""Return current revision number for this branch.
828
752
829
753
pb.update('comparing histories')
830
754
revision_ids = self.missing_revisions(other, stop_revision)
831
832
if hasattr(other.revision_store, "prefetch"):
833
other.revision_store.prefetch(revision_ids)
834
if hasattr(other.inventory_store, "prefetch"):
835
inventory_ids = [other.get_revision(r).inventory_id
836
for r in revision_ids]
837
other.inventory_store.prefetch(inventory_ids)
838
839
755
revisions = []
840
needed_texts = set()
756
needed_texts = sets.Set()
841
757
i = 0
842
758
for rev_id in revision_ids:
843
759
i += 1
872
788
commit(self, *args, **kw)
873
789
874
790
875
def lookup_revision(self, revision):
876
"""Return the revision identifier for a given revision information."""
877
revno, info = self.get_revision_info(revision)
878
return info
879
880
def get_revision_info(self, revision):
881
"""Return (revno, revision id) for revision identifier.
882
883
revision can be an integer, in which case it is assumed to be revno (though
884
this will translate negative values into positive ones)
885
revision can also be a string, in which case it is parsed for something like
886
'date:' or 'revid:' etc.
887
"""
888
if revision is None:
889
return 0, None
890
revno = None
891
try:# Convert to int if possible
892
revision = int(revision)
893
except ValueError:
894
pass
895
revs = self.revision_history()
896
if isinstance(revision, int):
897
if revision == 0:
898
return 0, None
899
# Mabye we should do this first, but we don't need it if revision == 0
900
if revision < 0:
901
revno = len(revs) + revision + 1
902
else:
903
revno = revision
904
elif isinstance(revision, basestring):
905
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
906
if revision.startswith(prefix):
907
revno = func(self, revs, revision)
908
break
909
else:
910
raise BzrError('No namespace registered for string: %r' % revision)
911
912
if revno is None or revno <= 0 or revno > len(revs):
913
raise BzrError("no such revision %s" % revision)
914
return revno, revs[revno-1]
915
916
def _namespace_revno(self, revs, revision):
917
"""Lookup a revision by revision number"""
918
assert revision.startswith('revno:')
919
try:
920
return int(revision[6:])
921
except ValueError:
922
return None
923
REVISION_NAMESPACES['revno:'] = _namespace_revno
924
925
def _namespace_revid(self, revs, revision):
926
assert revision.startswith('revid:')
927
try:
928
return revs.index(revision[6:]) + 1
929
except ValueError:
930
return None
931
REVISION_NAMESPACES['revid:'] = _namespace_revid
932
933
def _namespace_last(self, revs, revision):
934
assert revision.startswith('last:')
935
try:
936
offset = int(revision[5:])
937
except ValueError:
938
return None
939
else:
940
if offset <= 0:
941
raise BzrError('You must supply a positive value for --revision last:XXX')
942
return len(revs) - offset + 1
943
REVISION_NAMESPACES['last:'] = _namespace_last
944
945
def _namespace_tag(self, revs, revision):
946
assert revision.startswith('tag:')
947
raise BzrError('tag: namespace registered, but not implemented.')
948
REVISION_NAMESPACES['tag:'] = _namespace_tag
949
950
def _namespace_date(self, revs, revision):
951
assert revision.startswith('date:')
952
import datetime
953
# Spec for date revisions:
954
# date:value
955
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
956
# it can also start with a '+/-/='. '+' says match the first
957
# entry after the given date. '-' is match the first entry before the date
958
# '=' is match the first entry after, but still on the given date.
959
#
960
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
961
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
962
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
963
# May 13th, 2005 at 0:00
964
#
965
# So the proper way of saying 'give me all entries for today' is:
966
# -r {date:+today}:{date:-tomorrow}
967
# The default is '=' when not supplied
968
val = revision[5:]
969
match_style = '='
970
if val[:1] in ('+', '-', '='):
971
match_style = val[:1]
972
val = val[1:]
973
974
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
975
if val.lower() == 'yesterday':
976
dt = today - datetime.timedelta(days=1)
977
elif val.lower() == 'today':
978
dt = today
979
elif val.lower() == 'tomorrow':
980
dt = today + datetime.timedelta(days=1)
981
else:
982
import re
983
# This should be done outside the function to avoid recompiling it.
984
_date_re = re.compile(
985
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
986
r'(,|T)?\s*'
987
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
988
)
989
m = _date_re.match(val)
990
if not m or (not m.group('date') and not m.group('time')):
991
raise BzrError('Invalid revision date %r' % revision)
992
993
if m.group('date'):
994
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
995
else:
996
year, month, day = today.year, today.month, today.day
997
if m.group('time'):
998
hour = int(m.group('hour'))
999
minute = int(m.group('minute'))
1000
if m.group('second'):
1001
second = int(m.group('second'))
1002
else:
1003
second = 0
1004
else:
1005
hour, minute, second = 0,0,0
1006
1007
dt = datetime.datetime(year=year, month=month, day=day,
1008
hour=hour, minute=minute, second=second)
1009
first = dt
1010
last = None
1011
reversed = False
1012
if match_style == '-':
1013
reversed = True
1014
elif match_style == '=':
1015
last = dt + datetime.timedelta(days=1)
1016
1017
if reversed:
1018
for i in range(len(revs)-1, -1, -1):
1019
r = self.get_revision(revs[i])
1020
# TODO: Handle timezone.
1021
dt = datetime.datetime.fromtimestamp(r.timestamp)
1022
if first >= dt and (last is None or dt >= last):
1023
return i+1
1024
else:
1025
for i in range(len(revs)):
1026
r = self.get_revision(revs[i])
1027
# TODO: Handle timezone.
1028
dt = datetime.datetime.fromtimestamp(r.timestamp)
1029
if first <= dt and (last is None or dt <= last):
1030
return i+1
1031
REVISION_NAMESPACES['date:'] = _namespace_date
791
def lookup_revision(self, revno):
792
"""Return revision hash for revision number."""
793
if revno == 0:
794
return None
795
796
try:
797
# list is 0-based; revisions are 1-based
798
return self.revision_history()[revno-1]
799
except IndexError:
800
raise BzrError("no such revision %s" % revno)
801
1032
802
1033
803
def revision_tree(self, revision_id):
1034
804
"""Return Tree for a revision on this branch.
1222
992
f.close()
1223
993
1224
994
1225
def pending_merges(self):
1226
"""Return a list of pending merges.
1227
1228
These are revisions that have been merged into the working
1229
directory but not yet committed.
1230
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1233
return []
1234
p = []
1235
for l in self.controlfile('pending-merges', 'r').readlines():
1236
p.append(l.rstrip('\n'))
1237
return p
1238
1239
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1244
1245
p = self.pending_merges()
1246
if revision_id in p:
1247
return
1248
p.append(revision_id)
1249
self.set_pending_merges(p)
1250
1251
1252
def set_pending_merges(self, rev_list):
1253
from bzrlib.atomicfile import AtomicFile
1254
self.lock_write()
1255
try:
1256
f = AtomicFile(self.controlfilename('pending-merges'))
1257
try:
1258
for l in rev_list:
1259
print >>f, l
1260
f.commit()
1261
finally:
1262
f.close()
1263
finally:
1264
self.unlock()
1265
1266
1267
995
1268
996
class ScratchBranch(Branch):
1269
997
"""Special test class: a branch that cleans up after itself.
1283
1011
1284
1012
If any files are listed, they are created in the working copy.
1285
1013
"""
1286
from tempfile import mkdtemp
1287
1014
init = False
1288
1015
if base is None:
1289
base = mkdtemp()
1016
base = tempfile.mkdtemp()
1290
1017
init = True
1291
1018
Branch.__init__(self, base, init=init)
1292
1019
for d in dirs:
1305
1032
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
1033
True
1307
1034
"""
1308
from shutil import copytree
1309
from tempfile import mkdtemp
1310
base = mkdtemp()
1035
base = tempfile.mkdtemp()
1311
1036
os.rmdir(base)
1312
copytree(self.base, base, symlinks=True)
1037
shutil.copytree(self.base, base, symlinks=True)
1313
1038
return ScratchBranch(base=base)
1314
1039
1315
1040
def __del__(self):
1317
1042
1318
1043
def destroy(self):
1319
1044
"""Destroy the test branch, removing the scratch directory."""
1320
from shutil import rmtree
1321
1045
try:
1322
1046
if self.base:
1323
1047
mutter("delete ScratchBranch %s" % self.base)
1324
rmtree(self.base)
1048
shutil.rmtree(self.base)
1325
1049
except OSError, e:
1326
1050
# Work around for shutil.rmtree failing on Windows when
1327
1051
# readonly files are encountered
1329
1053
for root, dirs, files in os.walk(self.base, topdown=False):
1330
1054
for name in files:
1331
1055
os.chmod(os.path.join(root, name), 0700)
1332
rmtree(self.base)
1056
shutil.rmtree(self.base)
1333
1057
self.base = None
1334
1058
1335
1059
1360
1084
cope with just randomness because running uuidgen every time is
1361
1085
slow."""
1362
1086
import re
1363
from binascii import hexlify
1364
from time import time
1365
1087
1366
1088
# get last component
1367
1089
idx = name.rfind('/')
1379
1101
name = re.sub(r'[^\w.]', '', name)
1380
1102
1381
1103
s = hexlify(rand_bytes(8))
1382
return '-'.join((name, compact_date(time()), s))
1383
1384
1385
def gen_root_id():
1386
"""Return a new tree-root file id."""
1387
return gen_file_id('TREE_ROOT')
1388
1104
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0