/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/tests/blackbox/test_remove.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove.py
18
18
import os
19
19
import sys
20
20
 
21
 
from breezy.tests import (
 
21
from bzrlib.tests import (
22
22
    script,
23
23
    features,
24
24
    TestCaseWithTransport,
25
25
    TestSkipped,
26
26
    )
27
 
from breezy.workingtree import WorkingTree
28
 
from breezy import osutils
 
27
from bzrlib.workingtree import WorkingTree
 
28
from bzrlib import osutils
29
29
 
30
30
_id='-id'
31
31
a='a'
71
71
 
72
72
    def test_remove_new_no_files_specified(self):
73
73
        tree = self.make_branch_and_tree('.')
74
 
        self.run_bzr_error(["brz: ERROR: No matching files."], 'remove --new')
75
 
        self.run_bzr_error(["brz: ERROR: No matching files."], 'remove --new .')
 
74
        self.run_bzr_error(["bzr: ERROR: No matching files."], 'remove --new')
 
75
        self.run_bzr_error(["bzr: ERROR: No matching files."], 'remove --new .')
76
76
 
77
77
    def test_remove_no_files_specified(self):
78
78
        tree = self._make_tree_and_add(['foo'])
106
106
        tree.commit('save foo and bar')
107
107
        os.unlink('bar')
108
108
        self.run_bzr(['rm'])
109
 
        self.assertFalse(tree.is_versioned('bar'))
 
109
        self.assertEqual(None, tree.path2id('bar'))
110
110
        # Running rm with a deleted file does not error.
111
111
        out, err = self.run_bzr(['rm'])
112
112
        self.assertEqual('', out)
208
208
        self.build_tree(files)
209
209
        tree = self.make_branch_and_tree('.')
210
210
        script.ScriptRunner().run_script(self, '''
211
 
        $ brz remove --no-backup a b/ b/c d/
 
211
        $ bzr remove --no-backup a b/ b/c d/
212
212
        2>deleted d
213
213
        2>removed b/c (but kept a copy: b/c.~1~)
214
214
        2>deleted b
266
266
        tree = WorkingTree.open('.')
267
267
        self.assertInWorkingTree(a)
268
268
        self.assertEqual(tree.path2id(a), a + _id)
269
 
        self.assertFilesUnversioned([b, c])
 
269
        self.assertFilesUnversioned([b,c])
270
270
 
271
271
    def test_remove_with_new_in_dir2(self):
272
272
        tree = self._make_tree_and_add(files)