« back to all changes in this revision
Viewing changes to bzrlib/workingtree.py
- browse files at revision 5019
- compare with another revision
- compare with revision 6059
- download diff
- download tarball
- view history from revision 5019
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-02-10 03:06:24 UTC
- mfrom: (4961.2.22 progress)
- Revision ID: pqm@pqm.ubuntu.com-20100210030624-wnjdp7yy7zb8vu7u
(mbp) Remove passing-around of ProgressBars
- files modified:
- bzrlib/builtins.py
added
removed
bzrlib/workingtree.py
101
101
from bzrlib.filters import filtered_input_file
102
102
from bzrlib.trace import mutter, note
103
103
from bzrlib.transport.local import LocalTransport
104
from bzrlib.progress import DummyProgress, ProgressPhase
104
from bzrlib.progress import ProgressPhase
105
105
from bzrlib.revision import CURRENT_REVISION
106
106
from bzrlib.rio import RioReader, rio_file, Stanza
107
107
from bzrlib.symbol_versioning import (
912
912
branch.last_revision().
913
913
"""
914
914
from bzrlib.merge import Merger, Merge3Merger
915
pb = ui.ui_factory.nested_progress_bar()
916
try:
917
merger = Merger(self.branch, this_tree=self, pb=pb)
918
merger.pp = ProgressPhase("Merge phase", 5, pb)
919
merger.pp.next_phase()
920
# check that there are no local alterations
921
if not force and self.has_changes():
922
raise errors.UncommittedChanges(self)
923
if to_revision is None:
924
to_revision = _mod_revision.ensure_null(branch.last_revision())
925
merger.other_rev_id = to_revision
926
if _mod_revision.is_null(merger.other_rev_id):
927
raise errors.NoCommits(branch)
928
self.branch.fetch(branch, last_revision=merger.other_rev_id)
929
merger.other_basis = merger.other_rev_id
930
merger.other_tree = self.branch.repository.revision_tree(
931
merger.other_rev_id)
932
merger.other_branch = branch
933
merger.pp.next_phase()
934
if from_revision is None:
935
merger.find_base()
936
else:
937
merger.set_base_revision(from_revision, branch)
938
if merger.base_rev_id == merger.other_rev_id:
939
raise errors.PointlessMerge
940
merger.backup_files = False
941
if merge_type is None:
942
merger.merge_type = Merge3Merger
943
else:
944
merger.merge_type = merge_type
945
merger.set_interesting_files(None)
946
merger.show_base = False
947
merger.reprocess = False
948
conflicts = merger.do_merge()
949
merger.set_pending()
950
finally:
951
pb.finished()
915
merger = Merger(self.branch, this_tree=self)
916
# check that there are no local alterations
917
if not force and self.has_changes():
918
raise errors.UncommittedChanges(self)
919
if to_revision is None:
920
to_revision = _mod_revision.ensure_null(branch.last_revision())
921
merger.other_rev_id = to_revision
922
if _mod_revision.is_null(merger.other_rev_id):
923
raise errors.NoCommits(branch)
924
self.branch.fetch(branch, last_revision=merger.other_rev_id)
925
merger.other_basis = merger.other_rev_id
926
merger.other_tree = self.branch.repository.revision_tree(
927
merger.other_rev_id)
928
merger.other_branch = branch
929
if from_revision is None:
930
merger.find_base()
931
else:
932
merger.set_base_revision(from_revision, branch)
933
if merger.base_rev_id == merger.other_rev_id:
934
raise errors.PointlessMerge
935
merger.backup_files = False
936
if merge_type is None:
937
merger.merge_type = Merge3Merger
938
else:
939
merger.merge_type = merge_type
940
merger.set_interesting_files(None)
941
merger.show_base = False
942
merger.reprocess = False
943
conflicts = merger.do_merge()
944
merger.set_pending()
952
945
return conflicts
953
946
954
947
@needs_read_lock
1605
1598
@needs_write_lock
1606
1599
def pull(self, source, overwrite=False, stop_revision=None,
1607
1600
change_reporter=None, possible_transports=None, local=False):
1608
top_pb = ui.ui_factory.nested_progress_bar()
1609
1601
source.lock_read()
1610
1602
try:
1611
pp = ProgressPhase("Pull phase", 2, top_pb)
1612
pp.next_phase()
1613
1603
old_revision_info = self.branch.last_revision_info()
1614
1604
basis_tree = self.basis_tree()
1615
1605
count = self.branch.pull(source, overwrite, stop_revision,
1617
1607
local=local)
1618
1608
new_revision_info = self.branch.last_revision_info()
1619
1609
if new_revision_info != old_revision_info:
1620
pp.next_phase()
1621
1610
repository = self.branch.repository
1622
pb = ui.ui_factory.nested_progress_bar()
1623
1611
basis_tree.lock_read()
1624
1612
try:
1625
1613
new_basis_tree = self.branch.basis_tree()
1628
1616
new_basis_tree,
1629
1617
basis_tree,
1630
1618
this_tree=self,
1631
pb=pb,
1619
pb=None,
1632
1620
change_reporter=change_reporter)
1633
1621
basis_root_id = basis_tree.get_root_id()
1634
1622
new_root_id = new_basis_tree.get_root_id()
1635
1623
if basis_root_id != new_root_id:
1636
1624
self.set_root_id(new_root_id)
1637
1625
finally:
1638
pb.finished()
1639
1626
basis_tree.unlock()
1640
1627
# TODO - dedup parents list with things merged by pull ?
1641
1628
# reuse the revisiontree we merged against to set the new
1654
1641
return count
1655
1642
finally:
1656
1643
source.unlock()
1657
top_pb.finished()
1658
1644
1659
1645
@needs_write_lock
1660
1646
def put_file_bytes_non_atomic(self, file_id, bytes):
2069
2055
2070
2056
@needs_tree_write_lock
2071
2057
def revert(self, filenames=None, old_tree=None, backups=True,
2072
pb=DummyProgress(), report_changes=False):
2058
pb=None, report_changes=False):
2073
2059
from bzrlib.conflicts import resolve
2074
2060
if filenames == []:
2075
2061
filenames = None
Loggerhead is a web-based interface for Breezy
Version: 2.0.1