← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Michael Hudson
  • Date: 2007-11-27 13:58:49 UTC
  • mto: (3008.1.10 tree-less-merge-diffs)
  • mto: This revision was merged to the branch mainline in revision 3189.
  • Revision ID: michael.hudson@canonical.com-20071127135849-yw00pfi6nrs5twf6
wanton hacking that lets me write an efficient version of get_diff_as_merged
that works at least sometimes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1220
1220
    def canonical_path(self, path):
1221
1221
        return path
1222
1222
 
 
1223
    def tree_kind(self, trans_id):
 
1224
        path = self._tree_id_paths.get(trans_id)
 
1225
        file_id = self._tree.path2id(path)
 
1226
        return self._tree.kind(file_id)
 
1227
 
 
1228
    def _set_mode(self, trans_id, mode_id, typefunc):
 
1229
        """Set the mode of new file contents.
 
1230
        The mode_id is the existing file to get the mode from (often the same
 
1231
        as trans_id).  The operation is only performed if there's a mode match
 
1232
        according to typefunc.
 
1233
        """
 
1234
        # is it ok to ignore this?  probably
 
1235
        pass
 
1236
 
 
1237
    def iter_tree_children(self, parent_id):
 
1238
        """Iterate through the entry's tree children, if any"""
 
1239
        # This can't possibly be right :) It's only called from
 
1240
        # _add_tree_children (where the comment is "") which is called
 
1241
        # from find_conflicts.  I don't understand the conflict
 
1242
        # resolution well enough yet to know what the right thing to
 
1243
        # do is, though in the simplest cases this seems to work.
 
1244
        return []
 
1245
 
1223
1246
 
1224
1247
class PreviewTree(object):
1225
1248