/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 breezy/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-16 02:23:42 UTC
  • mfrom: (7340 work)
  • mto: This revision was merged to the branch mainline in revision 7350.
  • Revision ID: jelmer@jelmer.uk-20190616022342-ihxzayq04x5culzd
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
852
852
            self.interesting_files, trees=[self.other_tree])
853
853
        this_entries = dict(self.this_tree.iter_entries_by_dir(
854
854
                            specific_files=this_interesting_files))
855
 
        for (file_id, paths, changed, versioned, parents, names, kind,
856
 
             executable) in iterator:
857
 
            if paths[0] is not None:
 
855
        for change in iterator:
 
856
            if change.path[0] is not None:
858
857
                this_path = _mod_tree.find_previous_path(
859
 
                    self.base_tree, self.this_tree, paths[0])
 
858
                    self.base_tree, self.this_tree, change.path[0])
860
859
            else:
861
860
                this_path = _mod_tree.find_previous_path(
862
 
                    self.other_tree, self.this_tree, paths[1])
 
861
                    self.other_tree, self.this_tree, change.path[1])
863
862
            this_entry = this_entries.get(this_path)
864
863
            if this_entry is not None:
865
864
                this_name = this_entry.name
869
868
                this_name = None
870
869
                this_parent = None
871
870
                this_executable = None
872
 
            parents3 = parents + (this_parent,)
873
 
            names3 = names + (this_name,)
874
 
            paths3 = paths + (this_path, )
875
 
            executable3 = executable + (this_executable,)
876
 
            result.append((file_id, changed, paths3,
877
 
                           parents3, names3, executable3))
 
871
            parents3 = change.parent_id + (this_parent,)
 
872
            names3 = change.name + (this_name,)
 
873
            paths3 = change.path + (this_path, )
 
874
            executable3 = change.executable + (this_executable,)
 
875
            result.append(
 
876
                (change.file_id, change.changed_content, paths3,
 
877
                 parents3, names3, executable3))
878
878
        return result
879
879
 
880
880
    def _entries_lca(self):