/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 bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-08-29 16:09:51 UTC
  • mto: (2796.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 2797.
  • Revision ID: abentley@panoramicfeedback.com-20070829160951-jxts3918bwtbyutq
Fix revert, remove-tree, and various tests to use None for 'no files specified'

Show diffs side-by-side

added added

removed removed

Lines of Context:
1890
1890
        self.apply_inventory_delta(inv_delta)
1891
1891
 
1892
1892
    @needs_tree_write_lock
1893
 
    def revert(self, filenames, old_tree=None, backups=True, 
 
1893
    def revert(self, filenames=None, old_tree=None, backups=True,
1894
1894
               pb=DummyProgress(), report_changes=False):
1895
1895
        from bzrlib.conflicts import resolve
1896
1896
        if old_tree is None:
1897
1897
            old_tree = self.basis_tree()
1898
1898
        conflicts = transform.revert(self, old_tree, filenames, backups, pb,
1899
1899
                                     report_changes)
1900
 
        if not len(filenames):
 
1900
        if filenames is None:
1901
1901
            self.set_parent_ids(self.get_parent_ids()[:1])
1902
1902
            resolve(self)
1903
1903
        else: