Rev 6548: (gz) Remove deprecated --force option from remove (Martin Packman) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 31 08:46:40 UTC 2012
At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 6548 [merge]
revision-id: pqm at pqm.ubuntu.com-20120731084640-jvn3gs7ldyoc3rc3
parent: pqm at pqm.ubuntu.com-20120728202038-cl923dptn267ve1x
parent: martin.packman at canonical.com-20120727173851-a13fcdq92bnw66sy
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-07-31 08:46:40 +0000
message:
(gz) Remove deprecated --force option from remove (Martin Packman)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
doc/en/_static/en/bzr-en-quick-reference.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/es/_static/es/bzr-es-quick-reference.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
doc/ru/_static/ru/bzr-ru-quick-reference.svg quickstartsummary.sv-20080818031309-t3nyctvfbvfh4h2u-8
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2012-07-28 20:20:38 +0000
+++ b/bzrlib/builtins.py 2012-07-31 08:46:40 +0000
@@ -1871,19 +1871,13 @@
title='Deletion Strategy', value_switches=True, enum_switch=False,
safe='Backup changed files (default).',
keep='Delete from bzr but leave the working copy.',
- no_backup='Don\'t backup changed files.',
- force='Delete all the specified files, even if they can not be '
- 'recovered and even if they are non-empty directories. '
- '(deprecated, use no-backup)')]
+ no_backup='Don\'t backup changed files.'),
+ ]
aliases = ['rm', 'del']
encoding_type = 'replace'
def run(self, file_list, verbose=False, new=False,
file_deletion_strategy='safe'):
- if file_deletion_strategy == 'force':
- note(gettext("(The --force option is deprecated, rather use --no-backup "
- "in future.)"))
- file_deletion_strategy = 'no-backup'
tree, file_list = WorkingTree.open_containing_paths(file_list)
=== modified file 'bzrlib/tests/blackbox/test_remove.py'
--- a/bzrlib/tests/blackbox/test_remove.py 2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/blackbox/test_remove.py 2012-07-27 13:55:53 +0000
@@ -216,19 +216,6 @@
''')
self.assertFilesDeleted(files)
- def test_remove_force_unversioned_files(self):
- self.build_tree(files)
- tree = self.make_branch_and_tree('.')
- script.ScriptRunner().run_script(self, '''
- $ bzr remove --force a b/ b/c d/
- 2>(The --force option is deprecated, rather use --no-backup in future.)
- 2>deleted d
- 2>removed b/c (but kept a copy: b/c.~1~)
- 2>deleted b
- 2>deleted a
- ''')
- self.assertFilesDeleted(files)
-
def test_remove_deleted_files(self):
tree = self._make_tree_and_add(files)
self.run_bzr("commit -m 'added files'")
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py 2012-02-23 23:41:51 +0000
+++ b/bzrlib/tests/test_conflicts.py 2012-07-27 17:38:51 +0000
@@ -756,7 +756,7 @@
def test_take_this(self):
self.run_script("""
-$ bzr rm -q dir --force
+$ bzr rm -q dir --no-backup
$ bzr resolve dir
2>2 conflicts resolved, 0 remaining
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
@@ -785,7 +785,7 @@
$ bzr commit -q -m 'Add dir/file2 in branch'
$ bzr branch -q . -r 1 ../branch
$ cd ../branch
-$ bzr rm -q dir/file --force
+$ bzr rm -q dir/file --no-backup
$ bzr rm -q dir
$ bzr commit -q -m 'Remove dir/file'
$ bzr merge ../trunk
@@ -806,7 +806,7 @@
def test_adopt_child(self):
self.run_script("""
$ bzr mv -q dir/file2 file2
-$ bzr rm -q dir --force
+$ bzr rm -q dir --no-backup
$ bzr resolve dir
2>2 conflicts resolved, 0 remaining
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
@@ -814,7 +814,7 @@
def test_kill_them_all(self):
self.run_script("""
-$ bzr rm -q dir --force
+$ bzr rm -q dir --no-backup
$ bzr resolve dir
2>2 conflicts resolved, 0 remaining
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
@@ -845,8 +845,8 @@
$ echo 'trunk content' >dir/file
$ bzr add -q
$ bzr commit -m 'Create trunk' -q
-$ bzr rm -q dir/file --force
-$ bzr rm -q dir --force
+$ bzr rm -q dir/file --no-backup
+$ bzr rm -q dir --no-backup
$ bzr commit -q -m 'Remove dir/file'
$ bzr branch -q . -r 1 ../branch
$ cd ../branch
@@ -870,7 +870,7 @@
def test_adopt_child(self):
self.run_script("""
$ bzr mv -q dir/file2 file2
-$ bzr rm -q dir --force
+$ bzr rm -q dir --no-backup
$ bzr resolve dir
2>2 conflicts resolved, 0 remaining
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
@@ -878,7 +878,7 @@
def test_kill_them_all(self):
self.run_script("""
-$ bzr rm -q dir --force
+$ bzr rm -q dir --no-backup
$ bzr resolve dir
2>2 conflicts resolved, 0 remaining
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
@@ -1021,7 +1021,7 @@
def test_take_this(self):
self.run_script("""
-$ bzr rm -q foo.new --force
+$ bzr rm -q foo.new --no-backup
# FIXME: Isn't it weird that foo is now unkown even if foo.new has been put
# aside ? -- vila 090916
$ bzr add -q foo
@@ -1032,7 +1032,7 @@
def test_take_other(self):
self.run_script("""
-$ bzr rm -q foo --force
+$ bzr rm -q foo --no-backup
$ bzr mv -q foo.new foo
$ bzr resolve foo
2>1 conflict resolved, 0 remaining
=== modified file 'doc/en/_static/en/bzr-en-quick-reference.svg'
--- a/doc/en/_static/en/bzr-en-quick-reference.svg 2011-04-20 10:25:40 +0000
+++ b/doc/en/_static/en/bzr-en-quick-reference.svg 2012-07-27 13:56:46 +0000
@@ -531,7 +531,7 @@
sodipodi:role="line"
x="331.81714"
y="264.08142"
- id="tspan3634">bzr remove --force foo.py</tspan></text>
+ id="tspan3634">bzr remove --no-backup foo.py</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans"
=== modified file 'doc/es/_static/es/bzr-es-quick-reference.svg'
--- a/doc/es/_static/es/bzr-es-quick-reference.svg 2010-01-29 10:36:23 +0000
+++ b/doc/es/_static/es/bzr-es-quick-reference.svg 2012-07-27 13:56:46 +0000
@@ -634,7 +634,7 @@
sodipodi:role="line"
x="331.81714"
y="264.08142"
- id="tspan3634">bzr remove --force foo.py</tspan></text>
+ id="tspan3634">bzr remove --no-backup foo.py</tspan></text>
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:30.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans"
=== modified file 'doc/ru/_static/ru/bzr-ru-quick-reference.svg'
--- a/doc/ru/_static/ru/bzr-ru-quick-reference.svg 2010-01-29 10:36:23 +0000
+++ b/doc/ru/_static/ru/bzr-ru-quick-reference.svg 2012-07-27 13:56:46 +0000
@@ -621,7 +621,7 @@
id="tspan3634"
y="266.08142"
x="331.81714"
- sodipodi:role="line">bzr remove --force foo.py</tspan></text>
+ sodipodi:role="line">bzr remove --no-backup foo.py</tspan></text>
<text
sodipodi:linespacing="100%"
id="text3636"
More information about the bazaar-commits
mailing list