/brz/remove-bazaar

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/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-04-28 20:53:28 UTC
  • mfrom: (3363.3.5 preview-tree)
  • Revision ID: pqm@pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
(abentley) correct _PreviewTree testing merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1373
1373
                return changes
1374
1374
 
1375
1375
    def _content_change(self, file_id):
 
1376
        """Return True if the content of this file changed"""
1376
1377
        changes = self._changes(file_id)
 
1378
        # changes[2] is true if the file content changed.  See
 
1379
        # InterTree.iter_changes.
1377
1380
        return (changes is not None and changes[2])
1378
1381
 
1379
1382
    def _get_file_revision(self, file_id, vf, tree_revision):
1446
1449
        return self._stat_limbo_file(file_id).st_mtime
1447
1450
 
1448
1451
    def get_file_size(self, file_id):
 
1452
        """See Tree.get_file_size"""
1449
1453
        if self.kind(file_id) == 'file':
1450
1454
            return self._transform._tree.get_file_size(file_id)
 
1455
        else:
 
1456
            return None
1451
1457
 
1452
1458
    def get_file_sha1(self, file_id, path=None, stat_value=None):
1453
1459
        return self._transform._tree.get_file_sha1(file_id)
1939
1945
    tt = TreeTransform(working_tree, pb)
1940
1946
    try:
1941
1947
        pp = ProgressPhase("Revert phase", 3, pb)
1942
 
        conflicts, merge_modified = _prepare_revert_transform(
1943
 
            working_tree, target_tree, tt, filenames, backups, pp)
 
1948
        pp.next_phase()
 
1949
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1950
        try:
 
1951
            merge_modified = _alter_files(working_tree, target_tree, tt,
 
1952
                                          child_pb, filenames, backups)
 
1953
        finally:
 
1954
            child_pb.finished()
 
1955
        pp.next_phase()
 
1956
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1957
        try:
 
1958
            raw_conflicts = resolve_conflicts(tt, child_pb,
 
1959
                lambda t, c: conflict_pass(t, c, target_tree))
 
1960
        finally:
 
1961
            child_pb.finished()
 
1962
        conflicts = cook_conflicts(raw_conflicts, tt)
1944
1963
        if change_reporter:
1945
1964
            change_reporter = delta._ChangeReporter(
1946
1965
                unversioned_filter=working_tree.is_ignored)
1957
1976
    return conflicts
1958
1977
 
1959
1978
 
1960
 
def _prepare_revert_transform(working_tree, target_tree, tt, filenames,
1961
 
                              backups, pp):
1962
 
    pp.next_phase()
1963
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1964
 
    try:
1965
 
        merge_modified = _alter_files(working_tree, target_tree, tt,
1966
 
                                      child_pb, filenames, backups)
1967
 
    finally:
1968
 
        child_pb.finished()
1969
 
    pp.next_phase()
1970
 
    child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1971
 
    try:
1972
 
        raw_conflicts = resolve_conflicts(tt, child_pb,
1973
 
            lambda t, c: conflict_pass(t, c, target_tree))
1974
 
    finally:
1975
 
        child_pb.finished()
1976
 
    conflicts = cook_conflicts(raw_conflicts, tt)
1977
 
    return conflicts, merge_modified
1978
 
 
1979
 
 
1980
1979
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1981
1980
                 backups):
1982
1981
    merge_modified = working_tree.merge_modified()