← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-30 14:37:31 UTC
  • mfrom: (1711.9.11 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060830143731-af84f2be15714815
(Robey Pointer) replace foo.has_key(bar) with bar in foo

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
475
475
 
476
476
    def path_changed(self, trans_id):
477
477
        """Return True if a trans_id's path has changed."""
478
 
        return trans_id in self._new_name or trans_id in self._new_parent
 
478
        return (trans_id in self._new_name) or (trans_id in self._new_parent)
479
479
 
480
480
    def find_conflicts(self):
481
481
        """Find any violations of inventory or filesystem invariants"""
1085
1085
    """Revert a working tree's contents to those of a target tree."""
1086
1086
    interesting_ids = find_interesting(working_tree, target_tree, filenames)
1087
1087
    def interesting(file_id):
1088
 
        return interesting_ids is None or file_id in interesting_ids
 
1088
        return interesting_ids is None or (file_id in interesting_ids)
1089
1089
 
1090
1090
    tt = TreeTransform(working_tree, pb)
1091
1091
    try: