23
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
25
25
sha_file, appendpath, file_kind
26
27
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
28
import bzrlib.errors
28
29
from bzrlib.textui import show_status
120
128
head, tail = os.path.split(f)
122
130
# reached the root, whatever that may be
123
raise BzrError('%r is not in a branch' % orig_f)
131
raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
136
# XXX: move into bzrlib.errors; subclass BzrError
126
137
class DivergedBranches(Exception):
127
138
def __init__(self, branch1, branch2):
128
139
self.branch1 = branch1
251
258
self._lock = None
252
259
self._lock_mode = self._lock_count = None
255
261
def abspath(self, name):
256
262
"""Return absolute filename for something in the branch"""
257
263
return os.path.join(self.base, name)
260
265
def relpath(self, path):
261
266
"""Return path relative to this branch of something inside it.
263
268
Raises an error if path is not in this branch."""
264
269
return _relpath(self.base, path)
267
271
def controlfilename(self, file_or_path):
268
272
"""Return location relative to branch."""
269
273
if isinstance(file_or_path, basestring):
316
318
self.controlfile(f, 'w').write('')
317
319
mutter('created control directory in ' + self.base)
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
321
# if we want per-tree root ids then this is the place to set
322
# them; they're not needed for now and so ommitted for
324
pack_xml(Inventory(), self.controlfile('inventory','w'))
322
326
def _check_format(self):
323
327
"""Check this branch format is supported.
657
661
from bzrlib.inventory import Inventory
658
662
from bzrlib.xml import unpack_xml
660
return unpack_xml(Inventory, self.inventory_store[inventory_id])
664
return unpack_xml(Inventory, self.get_inventory_xml(inventory_id))
667
def get_inventory_xml(self, inventory_id):
668
"""Get inventory XML as a file object."""
669
return self.inventory_store[inventory_id]
663
672
def get_inventory_sha1(self, inventory_id):
664
673
"""Return the sha1 hash of the inventory entry
666
return sha_file(self.inventory_store[inventory_id])
675
return sha_file(self.get_inventory_xml(inventory_id))
669
678
def get_revision_inventory(self, revision_id):
758
def missing_revisions(self, other, stop_revision=None):
767
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
760
769
If self and other have not diverged, return a list of the revisions
761
770
present in other, but missing from self.
794
803
if stop_revision is None:
795
804
stop_revision = other_len
796
805
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
806
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
799
808
return other_history[self_len:stop_revision]
802
811
def update_revisions(self, other, stop_revision=None):
803
812
"""Pull in all new revisions from other branch.
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
816
>>> br2.revision_history()
818
>>> br2.update_revisions(br1)
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
825
from bzrlib.progress import ProgressBar
814
from bzrlib.fetch import greedy_fetch
816
pb = bzrlib.ui.ui_factory.progress_bar()
829
817
pb.update('comparing histories')
830
819
revision_ids = self.missing_revisions(other, stop_revision)
821
if len(revision_ids) > 0:
822
count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
825
self.append_revision(*revision_ids)
826
## note("Added %d revisions." % count)
829
def install_revisions(self, other, revision_ids, pb):
832
830
if hasattr(other.revision_store, "prefetch"):
833
831
other.revision_store.prefetch(revision_ids)
834
832
if hasattr(other.inventory_store, "prefetch"):
835
833
inventory_ids = [other.get_revision(r).inventory_id
836
834
for r in revision_ids]
837
835
other.inventory_store.prefetch(inventory_ids)
838
pb = bzrlib.ui.ui_factory.progress_bar()
840
841
needed_texts = set()
842
for rev_id in revision_ids:
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
845
for i, rev_id in enumerate(revision_ids):
846
pb.update('fetching revision', i+1, len(revision_ids))
848
rev = other.get_revision(rev_id)
849
except bzrlib.errors.NoSuchRevision:
846
853
revisions.append(rev)
847
854
inv = other.get_inventory(str(rev.inventory_id))
848
855
for key, entry in inv.iter_entries():
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
863
count, cp_fail = self.text_store.copy_multi(other.text_store,
857
865
print "Added %d texts." % count
858
866
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
867
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store,
861
869
print "Added %d inventories." % count
862
870
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
872
count, cp_fail = self.revision_store.copy_multi(other.revision_store,
875
assert len(cp_fail) == 0
876
return count, failures
870
879
def commit(self, *args, **kw):
871
880
from bzrlib.commit import commit
872
881
commit(self, *args, **kw)
877
886
revno, info = self.get_revision_info(revision)
890
def revision_id_to_revno(self, revision_id):
891
"""Given a revision id, return its revno"""
892
history = self.revision_history()
894
return history.index(revision_id) + 1
896
raise bzrlib.errors.NoSuchRevision(self, revision_id)
880
899
def get_revision_info(self, revision):
881
900
"""Return (revno, revision id) for revision identifier.
1386
1405
"""Return a new tree-root file id."""
1387
1406
return gen_file_id('TREE_ROOT')
1409
def pull_loc(branch):
1410
# TODO: Should perhaps just make attribute be 'base' in
1411
# RemoteBranch and Branch?
1412
if hasattr(branch, "baseurl"):
1413
return branch.baseurl
1418
def copy_branch(branch_from, to_location, revision=None):
1419
"""Copy branch_from into the existing directory to_location.
1421
If revision is not None, the head of the new branch will be revision.
1423
from bzrlib.merge import merge
1424
from bzrlib.branch import Branch
1425
br_to = Branch(to_location, init=True)
1426
br_to.set_root_id(branch_from.get_root_id())
1427
if revision is None:
1428
revno = branch_from.revno()
1430
revno, rev_id = branch_from.get_revision_info(revision)
1431
br_to.update_revisions(branch_from, stop_revision=revno)
1432
merge((to_location, -1), (to_location, 0), this_dir=to_location,
1433
check_clean=False, ignore_zero=True)
1434
from_location = pull_loc(branch_from)
1435
br_to.controlfile("x-pull", "wb").write(from_location + "\n")
added
removed
bzrlib/branch.py
