/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: Robert Collins
  • Date: 2007-03-05 01:15:25 UTC
  • mto: (2255.11.4 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070305011525-fakb9irlbxyxaukb
Change _iter_changes interface to yield both old and new paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1021
1021
            to_name, to_parent, to_kind, to_executable = \
1022
1022
                self._to_file_data(to_trans_id, from_trans_id, from_executable)
1023
1023
 
1024
 
            to_path = final_paths.get_path(to_trans_id)
 
1024
            if not from_versioned:
 
1025
                from_path = None
 
1026
            else:
 
1027
                from_path = self._tree_id_paths.get(from_trans_id)
 
1028
            if not to_versioned:
 
1029
                to_path = None
 
1030
            else:
 
1031
                to_path = final_paths.get_path(to_trans_id)
1025
1032
            if from_kind != to_kind:
1026
1033
                modified = True
1027
1034
            elif to_kind in ('file' or 'symlink') and (
1032
1039
                from_parent==to_parent and from_name == to_name and
1033
1040
                from_executable == to_executable):
1034
1041
                continue
1035
 
            results.append((file_id, to_path, modified,
 
1042
            results.append((file_id, (from_path, to_path), modified,
1036
1043
                   (from_versioned, to_versioned),
1037
1044
                   (from_parent, to_parent),
1038
1045
                   (from_name, to_name),
1380
1387
            child_pb.finished()
1381
1388
        conflicts = cook_conflicts(raw_conflicts, tt)
1382
1389
        if change_reporter:
1383
 
            change_reporter = delta.ChangeReporter(working_tree.inventory)
 
1390
            change_reporter = delta.ChangeReporter()
1384
1391
            delta.report_changes(tt._iter_changes(), change_reporter)
1385
1392
        for conflict in conflicts:
1386
1393
            warning(conflict)