← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
876
876
                raise BzrCommandError('Specify one or more files to remove, or'
877
877
                                      ' use --new.')
878
878
        else:
879
 
            from bzrlib.delta import compare_trees
880
 
            added = [compare_trees(tree.basis_tree(), tree,
881
 
                                   specific_files=file_list).added]
882
 
            file_list = sorted([f[0] for f in added[0]], reverse=True)
 
879
            added = tree.changes_from(tree.basis_tree(),
 
880
                specific_files=file_list).added
 
881
            file_list = sorted([f[0] for f in added], reverse=True)
883
882
            if len(file_list) == 0:
884
883
                raise BzrCommandError('No matching files.')
885
884
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1232
1231
    hidden = True
1233
1232
    @display_command
1234
1233
    def run(self):
1235
 
        from bzrlib.delta import compare_trees
1236
 
 
1237
1234
        tree = WorkingTree.open_containing(u'.')[0]
1238
 
        td = compare_trees(tree.basis_tree(), tree)
1239
 
 
 
1235
        td = tree.changes_from(tree.basis_tree())
1240
1236
        for path, id, kind, text_modified, meta_modified in td.modified:
1241
1237
            self.outf.write(path + '\n')
1242
1238