/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Aaron Bentley
  • Date: 2008-03-11 13:18:28 UTC
  • Revision ID: aaron@aaronbentley.com-20080311131828-ypof288xwih1r3x2
Update to use new Tree.iter_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
227
227
#        self.parent_tree.lock_read()
228
228
#        self.rev_tree.lock_read()
229
229
#        try:
230
 
#            self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
 
230
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
231
231
#            self.path_to_status = {}
232
232
#            self.path_to_diff = {}
233
233
#            source_inv = self.parent_tree.inventory
568
568
            source.close()
569
569
 
570
570
 
571
 
def _iter_changes_to_status(source, target):
 
571
def iter_changes_to_status(source, target):
572
572
    """Determine the differences between trees.
573
573
 
574
 
    This is a wrapper around _iter_changes which just yields more
 
574
    This is a wrapper around iter_changes which just yields more
575
575
    understandable results.
576
576
 
577
577
    :param source: The source tree (basis tree)
593
593
        source.lock_read()
594
594
        try:
595
595
            for (file_id, paths, changed_content, versioned, parent_ids, names,
596
 
                 kinds, executables) in target._iter_changes(source):
 
596
                 kinds, executables) in target.iter_changes(source):
597
597
 
598
598
                # Skip the root entry if it isn't very interesting
599
599
                if parent_ids == (None, None):