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 1198
- compare with another revision
- download diff
- download tarball
- view history from revision 1198
- Committer: Martin Pool
- Date: 2005-09-08 11:17:45 UTC
- Revision ID: mbp@sourcefrog.net-20050908111745-b36aa1b62bb3c73b
- move away newinventory module which isn't actually used
- files added:
- HACKING
- bzrlib/util
- files removed:
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
23
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
24
splitpath, \
25
25
sha_file, appendpath, file_kind
26
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
import bzrlib.errors
26
27
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
28
NoSuchRevision)
28
29
from bzrlib.textui import show_status
29
30
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
31
31
from bzrlib.delta import compare_trees
32
32
from bzrlib.tree import EmptyTree, RevisionTree
33
34
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
33
from bzrlib.inventory import Inventory
34
from bzrlib.weavestore import WeaveStore
35
import bzrlib.xml5
36
import bzrlib.ui
37
38
39
40
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
41
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
35
42
## TODO: Maybe include checks for common corruption of newlines, etc?
36
43
37
44
39
46
# repeatedly to calculate deltas. We could perhaps have a weakref
40
47
# cache in memory to make this faster.
41
48
49
# TODO: please move the revision-string syntax stuff out of the branch
50
# object; it's clutter
51
42
52
43
53
def find_branch(f, **args):
44
54
if f and (f.startswith('http://') or f.startswith('https://')):
101
111
It is not necessary that f exists.
102
112
103
113
Basically we keep looking up until we find the control directory or
104
run into the root."""
114
run into the root. If there isn't one, raises NotBranchError.
115
"""
105
116
if f == None:
106
117
f = os.getcwd()
107
118
elif hasattr(os.path, 'realpath'):
120
131
head, tail = os.path.split(f)
121
132
if head == f:
122
133
# reached the root, whatever that may be
123
raise BzrError('%r is not in a branch' % orig_f)
134
raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
124
135
f = head
125
136
137
138
139
# XXX: move into bzrlib.errors; subclass BzrError
126
140
class DivergedBranches(Exception):
127
141
def __init__(self, branch1, branch2):
128
142
self.branch1 = branch1
189
203
'current bzr can only operate from top-of-tree'])
190
204
self._check_format()
191
205
192
self.text_store = ImmutableStore(self.controlfilename('text-store'))
206
self.weave_store = WeaveStore(self.controlfilename('weaves'))
193
207
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
194
208
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
195
209
208
222
self._lock.unlock()
209
223
210
224
211
212
225
def lock_write(self):
213
226
if self._lock_mode:
214
227
if self._lock_mode != 'w':
224
237
self._lock_count = 1
225
238
226
239
227
228
240
def lock_read(self):
229
241
if self._lock_mode:
230
242
assert self._lock_mode in ('r', 'w'), \
237
249
self._lock_mode = 'r'
238
250
self._lock_count = 1
239
251
240
241
242
252
def unlock(self):
243
253
if not self._lock_mode:
244
254
from errors import LockError
251
261
self._lock = None
252
262
self._lock_mode = self._lock_count = None
253
263
254
255
264
def abspath(self, name):
256
265
"""Return absolute filename for something in the branch"""
257
266
return os.path.join(self.base, name)
258
267
259
260
268
def relpath(self, path):
261
269
"""Return path relative to this branch of something inside it.
262
270
263
271
Raises an error if path is not in this branch."""
264
272
return _relpath(self.base, path)
265
273
266
267
274
def controlfilename(self, file_or_path):
268
275
"""Return location relative to branch."""
269
276
if isinstance(file_or_path, basestring):
296
303
else:
297
304
raise BzrError("invalid controlfile mode %r" % mode)
298
305
299
300
301
306
def _make_control(self):
302
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
304
305
307
os.mkdir(self.controlfilename([]))
306
308
self.controlfile('README', 'w').write(
307
309
"This is a Bazaar-NG control directory.\n"
308
310
"Do not change any files in this directory.\n")
309
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
310
for d in ('text-store', 'inventory-store', 'revision-store'):
311
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT_5)
312
for d in ('text-store', 'inventory-store', 'revision-store',
313
'weaves'):
311
314
os.mkdir(self.controlfilename(d))
312
315
for f in ('revision-history', 'merged-patches',
313
316
'pending-merged-patches', 'branch-name',
316
319
self.controlfile(f, 'w').write('')
317
320
mutter('created control directory in ' + self.base)
318
321
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
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
f = self.controlfile('inventory','w')
326
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), f)
320
327
321
328
322
329
def _check_format(self):
323
330
"""Check this branch format is supported.
324
331
325
The current tool only supports the current unstable format.
332
The format level is stored, as an integer, in
333
self._branch_format for code that needs to check it later.
326
334
327
335
In the future, we might need different in-memory Branch
328
336
classes to support downlevel branches. But not yet.
329
337
"""
330
# This ignores newlines so that we can open branches created
331
# on Windows from Linux and so on. I think it might be better
332
# to always make all internal files in unix format.
333
338
fmt = self.controlfile('branch-format', 'r').read()
334
fmt.replace('\r\n', '')
335
if fmt != BZR_BRANCH_FORMAT:
336
raise BzrError('sorry, branch format %r not supported' % fmt,
337
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
339
if fmt == BZR_BRANCH_FORMAT_5:
340
self._branch_format = 5
341
else:
342
raise BzrError('sorry, branch format "%s" not supported; '
343
'use a different bzr version, '
344
'or run "bzr upgrade", '
345
'or remove the .bzr directory and "bzr init" again'
346
% fmt.rstrip('\n\r'))
339
347
340
348
def get_root_id(self):
341
349
"""Return the id of this branches root"""
356
364
357
365
def read_working_inventory(self):
358
366
"""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()
363
367
self.lock_read()
364
368
try:
365
369
# ElementTree does its own conversion from UTF-8, so open in
366
370
# binary.
367
inv = unpack_xml(Inventory,
368
self.controlfile('inventory', 'rb'))
369
mutter("loaded inventory of %d items in %f"
370
% (len(inv), time() - before))
371
return inv
371
f = self.controlfile('inventory', 'rb')
372
return bzrlib.xml5.serializer_v5.read_inventory(f)
372
373
finally:
373
374
self.unlock()
374
375
380
381
will be committed to the next revision.
381
382
"""
382
383
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
384
384
385
385
self.lock_write()
386
386
try:
387
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
388
try:
389
pack_xml(inv, f)
389
bzrlib.xml5.serializer_v5.write_inventory(inv, f)
390
390
f.commit()
391
391
finally:
392
392
f.close()
400
400
"""Inventory for the working copy.""")
401
401
402
402
403
def add(self, files, verbose=False, ids=None):
403
def add(self, files, ids=None):
404
404
"""Make files versioned.
405
405
406
Note that the command line normally calls smart_add instead.
406
Note that the command line normally calls smart_add instead,
407
which can automatically recurse.
407
408
408
409
This puts the files in the Added state, so that they will be
409
410
recorded by the next commit.
419
420
TODO: Perhaps have an option to add the ids even if the files do
420
421
not (yet) exist.
421
422
422
TODO: Perhaps return the ids of the files? But then again it
423
is easy to retrieve them if they're needed.
424
425
TODO: Adding a directory should optionally recurse down and
426
add all non-ignored children. Perhaps do that in a
427
higher-level method.
423
TODO: Perhaps yield the ids and paths as they're added.
428
424
"""
429
425
# TODO: Re-adding a file that is removed in the working copy
430
426
# should probably put it back with the previous ID.
466
462
file_id = gen_file_id(f)
467
463
inv.add_path(f, kind=kind, file_id=file_id)
468
464
469
if verbose:
470
print 'added', quotefn(f)
471
472
465
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
473
466
474
467
self._write_inventory(inv)
584
577
f.close()
585
578
586
579
587
def get_revision_xml(self, revision_id):
580
def get_revision_xml_file(self, revision_id):
588
581
"""Return XML file object for revision object."""
589
582
if not revision_id or not isinstance(revision_id, basestring):
590
583
raise InvalidRevisionId(revision_id)
594
587
try:
595
588
return self.revision_store[revision_id]
596
589
except IndexError:
597
raise bzrlib.errors.NoSuchRevision(revision_id)
590
raise bzrlib.errors.NoSuchRevision(self, revision_id)
598
591
finally:
599
592
self.unlock()
600
593
601
594
595
#deprecated
596
get_revision_xml = get_revision_xml_file
597
598
602
599
def get_revision(self, revision_id):
603
600
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
601
xml_file = self.get_revision_xml_file(revision_id)
605
602
606
603
try:
607
r = unpack_xml(Revision, xml_file)
604
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
608
605
except SyntaxError, e:
609
606
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
607
[revision_id,
648
645
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
649
646
650
647
651
def get_inventory(self, inventory_id):
648
def get_inventory(self, revision_id):
652
649
"""Get Inventory object by hash.
653
650
654
651
TODO: Perhaps for this and similar methods, take a revision
655
652
parameter which can be either an integer revno or a
656
653
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])
654
f = self.get_inventory_xml_file(revision_id)
655
return bzrlib.xml5.serializer_v5.read_inventory(f)
656
657
658
def get_inventory_xml(self, revision_id):
659
"""Get inventory XML as a file object."""
660
try:
661
assert isinstance(revision_id, basestring), type(revision_id)
662
return self.inventory_store[revision_id]
663
except IndexError:
664
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
665
666
get_inventory_xml_file = get_inventory_xml
661
667
662
668
663
def get_inventory_sha1(self, inventory_id):
669
def get_inventory_sha1(self, revision_id):
664
670
"""Return the sha1 hash of the inventory entry
665
671
"""
666
return sha_file(self.inventory_store[inventory_id])
672
return sha_file(self.get_inventory_xml_file(revision_id))
667
673
668
674
669
675
def get_revision_inventory(self, revision_id):
671
677
# bzr 0.0.6 imposes the constraint that the inventory_id
672
678
# must be the same as its revision, so this is trivial.
673
679
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
680
return Inventory(self.get_root_id())
676
681
else:
677
682
return self.get_inventory(revision_id)
755
760
return None
756
761
757
762
758
def missing_revisions(self, other, stop_revision=None):
763
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
759
764
"""
760
765
If self and other have not diverged, return a list of the revisions
761
766
present in other, but missing from self.
794
799
if stop_revision is None:
795
800
stop_revision = other_len
796
801
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
802
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
798
803
799
804
return other_history[self_len:stop_revision]
800
805
801
806
802
807
def update_revisions(self, other, stop_revision=None):
803
808
"""Pull in all new revisions from other branch.
804
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
808
>>> br1.add('foo')
809
>>> br1.add('bar')
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
813
Added 2 texts.
814
Added 1 inventories.
815
Added 1 revisions.
816
>>> br2.revision_history()
817
[u'REVISION-ID-1']
818
>>> br2.update_revisions(br1)
819
Added 0 texts.
820
Added 0 inventories.
821
Added 0 revisions.
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
823
True
824
809
"""
825
from bzrlib.progress import ProgressBar
826
827
pb = ProgressBar()
828
810
from bzrlib.fetch import greedy_fetch
811
812
pb = bzrlib.ui.ui_factory.progress_bar()
829
813
pb.update('comparing histories')
814
830
815
revision_ids = self.missing_revisions(other, stop_revision)
831
816
817
if len(revision_ids) > 0:
818
count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
819
else:
820
count = 0
821
self.append_revision(*revision_ids)
822
## note("Added %d revisions." % count)
823
pb.clear()
824
825
def install_revisions(self, other, revision_ids, pb):
832
826
if hasattr(other.revision_store, "prefetch"):
833
827
other.revision_store.prefetch(revision_ids)
834
828
if hasattr(other.inventory_store, "prefetch"):
835
829
inventory_ids = [other.get_revision(r).inventory_id
836
830
for r in revision_ids]
837
831
other.inventory_store.prefetch(inventory_ids)
832
833
if pb is None:
834
pb = bzrlib.ui.ui_factory.progress_bar()
838
835
839
836
revisions = []
840
837
needed_texts = set()
841
838
i = 0
842
for rev_id in revision_ids:
843
i += 1
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
839
840
failures = set()
841
for i, rev_id in enumerate(revision_ids):
842
pb.update('fetching revision', i+1, len(revision_ids))
843
try:
844
rev = other.get_revision(rev_id)
845
except bzrlib.errors.NoSuchRevision:
846
failures.add(rev_id)
847
continue
848
846
849
revisions.append(rev)
847
850
inv = other.get_inventory(str(rev.inventory_id))
848
851
for key, entry in inv.iter_entries():
853
856
854
857
pb.clear()
855
858
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
857
print "Added %d texts." % count
859
count, cp_fail = self.text_store.copy_multi(other.text_store,
860
needed_texts)
861
#print "Added %d texts." % count
858
862
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
860
inventory_ids)
861
print "Added %d inventories." % count
863
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
864
inventory_ids)
865
#print "Added %d inventories." % count
862
866
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
864
revision_ids)
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
868
869
867
868
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
869
revision_ids,
870
permit_failure=True)
871
assert len(cp_fail) == 0
872
return count, failures
873
874
870
875
def commit(self, *args, **kw):
871
from bzrlib.commit import commit
872
commit(self, *args, **kw)
876
from bzrlib.commit import Commit
877
Commit().commit(self, *args, **kw)
873
878
874
879
875
880
def lookup_revision(self, revision):
876
881
"""Return the revision identifier for a given revision information."""
877
revno, info = self.get_revision_info(revision)
882
revno, info = self._get_revision_info(revision)
878
883
return info
879
884
885
886
def revision_id_to_revno(self, revision_id):
887
"""Given a revision id, return its revno"""
888
history = self.revision_history()
889
try:
890
return history.index(revision_id) + 1
891
except ValueError:
892
raise bzrlib.errors.NoSuchRevision(self, revision_id)
893
894
880
895
def get_revision_info(self, revision):
881
896
"""Return (revno, revision id) for revision identifier.
882
897
885
900
revision can also be a string, in which case it is parsed for something like
886
901
'date:' or 'revid:' etc.
887
902
"""
903
revno, rev_id = self._get_revision_info(revision)
904
if revno is None:
905
raise bzrlib.errors.NoSuchRevision(self, revision)
906
return revno, rev_id
907
908
def get_rev_id(self, revno, history=None):
909
"""Find the revision id of the specified revno."""
910
if revno == 0:
911
return None
912
if history is None:
913
history = self.revision_history()
914
elif revno <= 0 or revno > len(history):
915
raise bzrlib.errors.NoSuchRevision(self, revno)
916
return history[revno - 1]
917
918
def _get_revision_info(self, revision):
919
"""Return (revno, revision id) for revision specifier.
920
921
revision can be an integer, in which case it is assumed to be revno
922
(though this will translate negative values into positive ones)
923
revision can also be a string, in which case it is parsed for something
924
like 'date:' or 'revid:' etc.
925
926
A revid is always returned. If it is None, the specifier referred to
927
the null revision. If the revid does not occur in the revision
928
history, revno will be None.
929
"""
930
888
931
if revision is None:
889
932
return 0, None
890
933
revno = None
894
937
pass
895
938
revs = self.revision_history()
896
939
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
940
if revision < 0:
901
941
revno = len(revs) + revision + 1
902
942
else:
903
943
revno = revision
944
rev_id = self.get_rev_id(revno, revs)
904
945
elif isinstance(revision, basestring):
905
946
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
906
947
if revision.startswith(prefix):
907
revno = func(self, revs, revision)
948
result = func(self, revs, revision)
949
if len(result) > 1:
950
revno, rev_id = result
951
else:
952
revno = result[0]
953
rev_id = self.get_rev_id(revno, revs)
908
954
break
909
955
else:
910
raise BzrError('No namespace registered for string: %r' % revision)
956
raise BzrError('No namespace registered for string: %r' %
957
revision)
958
else:
959
raise TypeError('Unhandled revision type %s' % revision)
911
960
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]
961
if revno is None:
962
if rev_id is None:
963
raise bzrlib.errors.NoSuchRevision(self, revision)
964
return revno, rev_id
915
965
916
966
def _namespace_revno(self, revs, revision):
917
967
"""Lookup a revision by revision number"""
918
968
assert revision.startswith('revno:')
919
969
try:
920
return int(revision[6:])
970
return (int(revision[6:]),)
921
971
except ValueError:
922
972
return None
923
973
REVISION_NAMESPACES['revno:'] = _namespace_revno
924
974
925
975
def _namespace_revid(self, revs, revision):
926
976
assert revision.startswith('revid:')
977
rev_id = revision[len('revid:'):]
927
978
try:
928
return revs.index(revision[6:]) + 1
979
return revs.index(rev_id) + 1, rev_id
929
980
except ValueError:
930
return None
981
return None, rev_id
931
982
REVISION_NAMESPACES['revid:'] = _namespace_revid
932
983
933
984
def _namespace_last(self, revs, revision):
935
986
try:
936
987
offset = int(revision[5:])
937
988
except ValueError:
938
return None
989
return (None,)
939
990
else:
940
991
if offset <= 0:
941
992
raise BzrError('You must supply a positive value for --revision last:XXX')
942
return len(revs) - offset + 1
993
return (len(revs) - offset + 1,)
943
994
REVISION_NAMESPACES['last:'] = _namespace_last
944
995
945
996
def _namespace_tag(self, revs, revision):
1020
1071
# TODO: Handle timezone.
1021
1072
dt = datetime.datetime.fromtimestamp(r.timestamp)
1022
1073
if first >= dt and (last is None or dt >= last):
1023
return i+1
1074
return (i+1,)
1024
1075
else:
1025
1076
for i in range(len(revs)):
1026
1077
r = self.get_revision(revs[i])
1027
1078
# TODO: Handle timezone.
1028
1079
dt = datetime.datetime.fromtimestamp(r.timestamp)
1029
1080
if first <= dt and (last is None or dt <= last):
1030
return i+1
1081
return (i+1,)
1031
1082
REVISION_NAMESPACES['date:'] = _namespace_date
1032
1083
1033
1084
def revision_tree(self, revision_id):
1041
1092
return EmptyTree()
1042
1093
else:
1043
1094
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
1095
return RevisionTree(self.weave_store, inv, revision_id)
1045
1096
1046
1097
1047
1098
def working_tree(self):
1055
1106
1056
1107
If there are no revisions yet, return an `EmptyTree`.
1057
1108
"""
1058
r = self.last_patch()
1059
if r == None:
1060
return EmptyTree()
1061
else:
1062
return RevisionTree(self.text_store, self.get_revision_inventory(r))
1063
1109
return self.revision_tree(self.last_patch())
1064
1110
1065
1111
1066
1112
def rename_one(self, from_rel, to_rel):
1098
1144
1099
1145
inv.rename(file_id, to_dir_id, to_tail)
1100
1146
1101
print "%s => %s" % (from_rel, to_rel)
1102
1103
1147
from_abs = self.abspath(from_rel)
1104
1148
to_abs = self.abspath(to_rel)
1105
1149
try:
1124
1168
1125
1169
Note that to_name is only the last component of the new name;
1126
1170
this doesn't change the directory.
1171
1172
This returns a list of (from_path, to_path) pairs for each
1173
entry that is moved.
1127
1174
"""
1175
result = []
1128
1176
self.lock_write()
1129
1177
try:
1130
1178
## TODO: Option to move IDs only
1165
1213
for f in from_paths:
1166
1214
name_tail = splitpath(f)[-1]
1167
1215
dest_path = appendpath(to_name, name_tail)
1168
print "%s => %s" % (f, dest_path)
1216
result.append((f, dest_path))
1169
1217
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1170
1218
try:
1171
1219
os.rename(self.abspath(f), self.abspath(dest_path))
1177
1225
finally:
1178
1226
self.unlock()
1179
1227
1228
return result
1229
1180
1230
1181
1231
def revert(self, filenames, old_tree=None, backups=True):
1182
1232
"""Restore selected files to the versions from a previous tree.
1264
1314
self.unlock()
1265
1315
1266
1316
1317
def get_parent(self):
1318
"""Return the parent location of the branch.
1319
1320
This is the default location for push/pull/missing. The usual
1321
pattern is that the user can override it by specifying a
1322
location.
1323
"""
1324
import errno
1325
_locs = ['parent', 'pull', 'x-pull']
1326
for l in _locs:
1327
try:
1328
return self.controlfile(l, 'r').read().strip('\n')
1329
except IOError, e:
1330
if e.errno != errno.ENOENT:
1331
raise
1332
return None
1333
1334
1335
def set_parent(self, url):
1336
# TODO: Maybe delete old location files?
1337
from bzrlib.atomicfile import AtomicFile
1338
self.lock_write()
1339
try:
1340
f = AtomicFile(self.controlfilename('parent'))
1341
try:
1342
f.write(url + '\n')
1343
f.commit()
1344
finally:
1345
f.close()
1346
finally:
1347
self.unlock()
1348
1349
def check_revno(self, revno):
1350
"""\
1351
Check whether a revno corresponds to any revision.
1352
Zero (the NULL revision) is considered valid.
1353
"""
1354
if revno != 0:
1355
self.check_real_revno(revno)
1356
1357
def check_real_revno(self, revno):
1358
"""\
1359
Check whether a revno corresponds to a real revision.
1360
Zero (the NULL revision) is considered invalid
1361
"""
1362
if revno < 1 or revno > self.revno():
1363
raise InvalidRevisionNumber(revno)
1364
1365
1366
1267
1367
1268
1368
class ScratchBranch(Branch):
1269
1369
"""Special test class: a branch that cleans up after itself.
1311
1411
os.rmdir(base)
1312
1412
copytree(self.base, base, symlinks=True)
1313
1413
return ScratchBranch(base=base)
1414
1415
1314
1416
1315
1417
def __del__(self):
1316
1418
self.destroy()
1386
1488
"""Return a new tree-root file id."""
1387
1489
return gen_file_id('TREE_ROOT')
1388
1490
1491
1492
def pull_loc(branch):
1493
# TODO: Should perhaps just make attribute be 'base' in
1494
# RemoteBranch and Branch?
1495
if hasattr(branch, "baseurl"):
1496
return branch.baseurl
1497
else:
1498
return branch.base
1499
1500
1501
def copy_branch(branch_from, to_location, revision=None):
1502
"""Copy branch_from into the existing directory to_location.
1503
1504
revision
1505
If not None, only revisions up to this point will be copied.
1506
The head of the new branch will be that revision.
1507
1508
to_location
1509
The name of a local directory that exists but is empty.
1510
"""
1511
from bzrlib.merge import merge
1512
from bzrlib.branch import Branch
1513
1514
assert isinstance(branch_from, Branch)
1515
assert isinstance(to_location, basestring)
1516
1517
br_to = Branch(to_location, init=True)
1518
br_to.set_root_id(branch_from.get_root_id())
1519
if revision is None:
1520
revno = branch_from.revno()
1521
else:
1522
revno, rev_id = branch_from.get_revision_info(revision)
1523
br_to.update_revisions(branch_from, stop_revision=revno)
1524
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1525
check_clean=False, ignore_zero=True)
1526
1527
from_location = pull_loc(branch_from)
1528
br_to.set_parent(pull_loc(branch_from))
1529
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0