« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 737
- compare with another revision
- download diff
- download tarball
- view history from revision 737
- Committer: Martin Pool
- Date: 2005-06-22 06:38:18 UTC
- Revision ID: mbp@sourcefrog.net-20050622063818-cd8d21b14bd4b636
- add plugin patch, still being integrated
- files added:
- bzrlib/statcache.py
- files removed:
- HACKING
- bzrlib/plugins
- bzrlib/util
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- contrib/emacs
- 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
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
# 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.
133
111
Exception.__init__(self, "These branches have diverged.")
134
112
135
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
136
122
######################################################################
137
123
# branch objects
138
124
157
143
_lock_count = None
158
144
_lock = None
159
145
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
146
def __init__(self, base, init=False, find_root=True):
166
147
"""Create new branch object at a particular location.
167
148
177
158
In the test suite, creation of new trees is tested using the
178
159
`ScratchBranch` class.
179
160
"""
180
from bzrlib.store import ImmutableStore
181
161
if init:
182
162
self.base = os.path.realpath(base)
183
163
self._make_control()
269
249
270
250
def controlfilename(self, file_or_path):
271
251
"""Return location relative to branch."""
272
if isinstance(file_or_path, basestring):
252
if isinstance(file_or_path, types.StringTypes):
273
253
file_or_path = [file_or_path]
274
254
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
275
255
302
282
303
283
304
284
def _make_control(self):
305
from bzrlib.inventory import Inventory
306
from bzrlib.xml import pack_xml
307
308
285
os.mkdir(self.controlfilename([]))
309
286
self.controlfile('README', 'w').write(
310
287
"This is a Bazaar-NG control directory.\n"
314
291
os.mkdir(self.controlfilename(d))
315
292
for f in ('revision-history', 'merged-patches',
316
293
'pending-merged-patches', 'branch-name',
317
'branch-lock',
318
'pending-merges'):
294
'branch-lock'):
319
295
self.controlfile(f, 'w').write('')
320
296
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'))
297
Inventory().write_xml(self.controlfile('inventory','w'))
326
298
327
299
328
300
def _check_format(self):
343
315
['use a different bzr version',
344
316
'or remove the .bzr directory and "bzr init" again'])
345
317
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
318
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
319
363
320
def read_working_inventory(self):
364
321
"""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()
322
before = time.time()
323
# ElementTree does its own conversion from UTF-8, so open in
324
# binary.
369
325
self.lock_read()
370
326
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'))
327
inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
375
328
mutter("loaded inventory of %d items in %f"
376
% (len(inv), time() - before))
329
% (len(inv), time.time() - before))
377
330
return inv
378
331
finally:
379
332
self.unlock()
385
338
That is to say, the inventory describing changes underway, that
386
339
will be committed to the next revision.
387
340
"""
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
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
434
383
"""
435
384
# TODO: Re-adding a file that is removed in the working copy
436
385
# should probably put it back with the previous ID.
437
if isinstance(files, basestring):
438
assert(ids is None or isinstance(ids, basestring))
386
if isinstance(files, types.StringTypes):
387
assert(ids is None or isinstance(ids, types.StringTypes))
439
388
files = [files]
440
389
if ids is not None:
441
390
ids = [ids]
473
422
inv.add_path(f, kind=kind, file_id=file_id)
474
423
475
424
if verbose:
476
print 'added', quotefn(f)
425
show_status('A', kind, quotefn(f))
477
426
478
427
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
479
428
490
439
# use inventory as it was in that revision
491
440
file_id = tree.inventory.path2id(file)
492
441
if not file_id:
493
raise BzrError("%r is not present in revision %s" % (file, revno))
442
raise BzrError("%r is not present in revision %d" % (file, revno))
494
443
tree.print_file(file_id)
495
444
finally:
496
445
self.unlock()
512
461
"""
513
462
## TODO: Normalize names
514
463
## TODO: Remove nested loops; better scalability
515
if isinstance(files, basestring):
464
if isinstance(files, types.StringTypes):
516
465
files = [files]
517
466
518
467
self.lock_write()
543
492
544
493
# FIXME: this doesn't need to be a branch method
545
494
def set_inventory(self, new_inventory_list):
546
from bzrlib.inventory import Inventory, InventoryEntry
547
inv = Inventory(self.get_root_id())
495
inv = Inventory()
548
496
for path, file_id, parent, kind in new_inventory_list:
549
497
name = os.path.basename(path)
550
498
if name == "":
572
520
return self.working_tree().unknowns()
573
521
574
522
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
523
def append_revision(self, revision_id):
524
mutter("add {%s} to revision-history" % revision_id)
581
525
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()
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
606
540
607
541
608
542
def get_revision(self, revision_id):
609
543
"""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
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])
619
547
assert r.revision_id == revision_id
620
548
return r
621
549
622
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
550
def get_revision_sha1(self, revision_id):
647
551
"""Hash the stored value of a revision, and return it."""
648
552
# In the future, revision entries will be signed. At that
651
555
# the revision, (add signatures/remove signatures) and still
652
556
# have all hash pointers stay consistent.
653
557
# But for now, just hash the contents.
654
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
558
return sha_file(self.revision_store[revision_id])
655
559
656
560
657
561
def get_inventory(self, inventory_id):
660
564
TODO: Perhaps for this and similar methods, take a revision
661
565
parameter which can be either an integer revno or a
662
566
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
567
i = Inventory.read_xml(self.inventory_store[inventory_id])
568
return i
673
569
674
570
def get_inventory_sha1(self, inventory_id):
675
571
"""Return the sha1 hash of the inventory entry
676
572
"""
677
return sha_file(self.get_inventory_xml(inventory_id))
573
return sha_file(self.inventory_store[inventory_id])
678
574
679
575
680
576
def get_revision_inventory(self, revision_id):
681
577
"""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
578
if revision_id == None:
685
from bzrlib.inventory import Inventory
686
return Inventory(self.get_root_id())
579
return Inventory()
687
580
else:
688
return self.get_inventory(revision_id)
581
return self.get_inventory(self.get_revision(revision_id).inventory_id)
689
582
690
583
691
584
def revision_history(self):
746
639
return r+1, my_history[r]
747
640
return None, None
748
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
749
663
750
664
def revno(self):
751
665
"""Return current revision number for this branch.
766
680
return None
767
681
768
682
769
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
683
def missing_revisions(self, other, stop_revision=None):
770
684
"""
771
685
If self and other have not diverged, return a list of the revisions
772
686
present in other, but missing from self.
810
724
return other_history[self_len:stop_revision]
811
725
812
726
813
def update_revisions(self, other, stop_revision=None, revision_ids=None):
727
def update_revisions(self, other, stop_revision=None):
814
728
"""Pull in all new revisions from other branch.
815
729
816
730
>>> from bzrlib.commit import commit
838
752
pb = ProgressBar()
839
753
840
754
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
755
revision_ids = self.missing_revisions(other, stop_revision)
851
756
revisions = []
852
needed_texts = set()
757
needed_texts = sets.Set()
853
758
i = 0
854
759
for rev_id in revision_ids:
855
760
i += 1
880
785
881
786
882
787
def commit(self, *args, **kw):
788
"""Deprecated"""
883
789
from bzrlib.commit import commit
884
790
commit(self, *args, **kw)
885
791
886
792
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
793
def lookup_revision(self, revno):
794
"""Return revision hash for revision number."""
795
if revno == 0:
796
return None
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
1044
804
1045
805
def revision_tree(self, revision_id):
1046
806
"""Return Tree for a revision on this branch.
1190
950
self.unlock()
1191
951
1192
952
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
953
1280
954
class ScratchBranch(Branch):
1281
955
"""Special test class: a branch that cleans up after itself.
1295
969
1296
970
If any files are listed, they are created in the working copy.
1297
971
"""
1298
from tempfile import mkdtemp
1299
972
init = False
1300
973
if base is None:
1301
base = mkdtemp()
974
base = tempfile.mkdtemp()
1302
975
init = True
1303
976
Branch.__init__(self, base, init=init)
1304
977
for d in dirs:
1317
990
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1318
991
True
1319
992
"""
1320
from shutil import copytree
1321
from tempfile import mkdtemp
1322
base = mkdtemp()
993
base = tempfile.mkdtemp()
1323
994
os.rmdir(base)
1324
copytree(self.base, base, symlinks=True)
995
shutil.copytree(self.base, base, symlinks=True)
1325
996
return ScratchBranch(base=base)
1326
997
1327
998
def __del__(self):
1329
1000
1330
1001
def destroy(self):
1331
1002
"""Destroy the test branch, removing the scratch directory."""
1332
from shutil import rmtree
1333
1003
try:
1334
1004
if self.base:
1335
1005
mutter("delete ScratchBranch %s" % self.base)
1336
rmtree(self.base)
1006
shutil.rmtree(self.base)
1337
1007
except OSError, e:
1338
1008
# Work around for shutil.rmtree failing on Windows when
1339
1009
# readonly files are encountered
1341
1011
for root, dirs, files in os.walk(self.base, topdown=False):
1342
1012
for name in files:
1343
1013
os.chmod(os.path.join(root, name), 0700)
1344
rmtree(self.base)
1014
shutil.rmtree(self.base)
1345
1015
self.base = None
1346
1016
1347
1017
1372
1042
cope with just randomness because running uuidgen every time is
1373
1043
slow."""
1374
1044
import re
1375
from binascii import hexlify
1376
from time import time
1377
1045
1378
1046
# get last component
1379
1047
idx = name.rfind('/')
1391
1059
name = re.sub(r'[^\w.]', '', name)
1392
1060
1393
1061
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
1062
return '-'.join((name, compact_date(time.time()), s))
Loggerhead is a web-based interface for Breezy
Version: 2.0.1