1
=== modified file 'NEWS'
2
--- NEWS	2010-04-30 08:13:34 +0000
3
+++ NEWS	2010-05-05 01:45:38 +0000
4
@@ -13,6 +13,10 @@
5
13
Bug Fixes
13
Bug Fixes
6
14
*********
14
*********
7
15
15
8
16
* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
9
17
  support of bzr-externals and scmproj plugins.
10
18
  (Alexander Belchenko, bug #572098)
11
19
12
16
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
20
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
13
17
  (Aaron Bentley, #559436)
21
  (Aaron Bentley, #559436)
14
18
22
15
19
23
16
=== modified file 'bzrlib/clean_tree.py'
17
--- bzrlib/clean_tree.py	2009-03-23 14:59:43 +0000
18
+++ bzrlib/clean_tree.py	2010-05-05 01:45:38 +0000
19
@@ -20,6 +20,7 @@
20
20
import shutil
20
import shutil
21
21
import sys
21
import sys
22
22
22
23
23
from bzrlib import bzrdir, errors
24
23
from bzrlib.osutils import has_symlinks, isdir
24
from bzrlib.osutils import has_symlinks, isdir
25
24
from bzrlib.trace import note
25
from bzrlib.trace import note
26
25
from bzrlib.workingtree import WorkingTree
26
from bzrlib.workingtree import WorkingTree
27
@@ -53,11 +54,14 @@
28
53
    try:
54
    try:
29
54
        deletables = list(iter_deletables(tree, unknown=unknown,
55
        deletables = list(iter_deletables(tree, unknown=unknown,
30
55
            ignored=ignored, detritus=detritus))
56
            ignored=ignored, detritus=detritus))
31
57
        deletables = _filter_out_nested_bzrdirs(deletables)
32
56
        if len(deletables) == 0:
58
        if len(deletables) == 0:
33
57
            note('Nothing to delete.')
59
            note('Nothing to delete.')
34
58
            return 0
60
            return 0
35
59
        if not no_prompt:
61
        if not no_prompt:
36
60
            for path, subp in deletables:
62
            for path, subp in deletables:
37
63
                # FIXME using print is very bad idea
38
64
                # clean_tree should accept to_file argument to write the output
39
61
                print subp
65
                print subp
40
62
            val = raw_input('Are you sure you wish to delete these [y/N]?')
66
            val = raw_input('Are you sure you wish to delete these [y/N]?')
41
63
            if val.lower() not in ('y', 'yes'):
67
            if val.lower() not in ('y', 'yes'):
42
@@ -68,6 +72,27 @@
43
68
        tree.unlock()
72
        tree.unlock()
44
69
73
45
70
74
46
75
def _filter_out_nested_bzrdirs(deletables):
47
76
    result = []
48
77
    for path, subp in deletables:
49
78
        # bzr won't recurse into unknowns/ignored directories by default
50
79
        # so we don't pay a penalty for checking subdirs of path for nested
51
80
        # bzrdir.
52
81
        # That said we won't detect the branch in the subdir of non-branch
53
82
        # directory and therefore delete it. (worth to FIXME?)
54
83
        if isdir(path):
55
84
            try:
56
85
                bzrdir.BzrDir.open(path)
57
86
            except errors.NotBranchError:
58
87
                result.append((path,subp))
59
88
            else:
60
89
                # TODO may be we need to notify user about skipped directories?
61
90
                pass
62
91
        else:
63
92
            result.append((path,subp))
64
93
    return result
65
94
66
95
67
71
def delete_items(deletables, dry_run=False):
96
def delete_items(deletables, dry_run=False):
68
72
    """Delete files in the deletables iterable"""
97
    """Delete files in the deletables iterable"""
69
73
    has_deleted = False
98
    has_deleted = False
70
74
99
71
=== modified file 'bzrlib/tests/blackbox/test_clean_tree.py'
72
--- bzrlib/tests/blackbox/test_clean_tree.py	2009-03-23 14:59:43 +0000
73
+++ bzrlib/tests/blackbox/test_clean_tree.py	2010-05-05 01:45:38 +0000
74
@@ -21,6 +21,7 @@
75
21
21
76
22
import os
22
import os
77
23
23
78
24
from bzrlib import ignores
79
24
from bzrlib.tests import TestCaseWithTransport
25
from bzrlib.tests import TestCaseWithTransport
80
25
26
81
26
27
82
@@ -62,3 +63,18 @@
83
62
        self.failIfExists('name')
63
        self.failIfExists('name')
84
63
        self.failIfExists('name~')
64
        self.failIfExists('name~')
85
64
        self.failIfExists('name.pyc')
65
        self.failIfExists('name.pyc')
86
66
87
67
    def test_clean_tree_nested_bzrdir(self):
88
68
        # clean-tree should not blindly delete nested bzrdirs (branches)
89
69
        # bug https://bugs.launchpad.net/bzr/+bug/572098
90
70
        # so it will play well with scmproj/bzr-externals plugins.
91
71
        wt1 = self.make_branch_and_tree('.')
92
72
        wt2 = self.make_branch_and_tree('foo')
93
73
        wt3 = self.make_branch_and_tree('bar')
94
74
        ignores.tree_ignores_add_patterns(wt1, ['./foo'])
95
75
        self.run_bzr(['clean-tree', '--unknown', '--force'])
96
76
        self.failUnlessExists('foo')
97
77
        self.failUnlessExists('bar')
98
78
        self.run_bzr(['clean-tree', '--ignored', '--force'])
99
79
        self.failUnlessExists('foo')
100
80
        self.failUnlessExists('bar')
Reviewer	Review Type	Date Requested	Status
Vincent Ladeuil		2010-05-04	Approve on 2010-05-05
Review via email: mp+24669@code.launchpad.net
1	=== modified file 'NEWS'
2	--- NEWS 2010-04-30 08:13:34 +0000
3	+++ NEWS 2010-05-05 01:45:38 +0000
4	@@ -13,6 +13,10 @@
5	13	Bug Fixes	13	Bug Fixes
6	14	*********	14	*********
7	15		15
8			16	* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
9			17	support of bzr-externals and scmproj plugins.
10			18	(Alexander Belchenko, bug #572098)
11			19
12	16	* ``bzr switch`` does not die if a ConfigurableFileMerger is used.	20	* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
13	17	(Aaron Bentley, #559436)	21	(Aaron Bentley, #559436)
14	18		22
15	19		23
16	=== modified file 'bzrlib/clean_tree.py'
17	--- bzrlib/clean_tree.py 2009-03-23 14:59:43 +0000
18	+++ bzrlib/clean_tree.py 2010-05-05 01:45:38 +0000
19	@@ -20,6 +20,7 @@
20	20	import shutil	20	import shutil
21	21	import sys	21	import sys
22	22		22
23			23	from bzrlib import bzrdir, errors
24	23	from bzrlib.osutils import has_symlinks, isdir	24	from bzrlib.osutils import has_symlinks, isdir
25	24	from bzrlib.trace import note	25	from bzrlib.trace import note
26	25	from bzrlib.workingtree import WorkingTree	26	from bzrlib.workingtree import WorkingTree
27	@@ -53,11 +54,14 @@
28	53	try:	54	try:
29	54	deletables = list(iter_deletables(tree, unknown=unknown,	55	deletables = list(iter_deletables(tree, unknown=unknown,
30	55	ignored=ignored, detritus=detritus))	56	ignored=ignored, detritus=detritus))
31			57	deletables = _filter_out_nested_bzrdirs(deletables)
32	56	if len(deletables) == 0:	58	if len(deletables) == 0:
33	57	note('Nothing to delete.')	59	note('Nothing to delete.')
34	58	return 0	60	return 0
35	59	if not no_prompt:	61	if not no_prompt:
36	60	for path, subp in deletables:	62	for path, subp in deletables:
37			63	# FIXME using print is very bad idea
38			64	# clean_tree should accept to_file argument to write the output
39	61	print subp	65	print subp
40	62	val = raw_input('Are you sure you wish to delete these [y/N]?')	66	val = raw_input('Are you sure you wish to delete these [y/N]?')
41	63	if val.lower() not in ('y', 'yes'):	67	if val.lower() not in ('y', 'yes'):
42	@@ -68,6 +72,27 @@
43	68	tree.unlock()	72	tree.unlock()
44	69		73
45	70		74
46			75	def _filter_out_nested_bzrdirs(deletables):
47			76	result = []
48			77	for path, subp in deletables:
49			78	# bzr won't recurse into unknowns/ignored directories by default
50			79	# so we don't pay a penalty for checking subdirs of path for nested
51			80	# bzrdir.
52			81	# That said we won't detect the branch in the subdir of non-branch
53			82	# directory and therefore delete it. (worth to FIXME?)
54			83	if isdir(path):
55			84	try:
56			85	bzrdir.BzrDir.open(path)
57			86	except errors.NotBranchError:
58			87	result.append((path,subp))
59			88	else:
60			89	# TODO may be we need to notify user about skipped directories?
61			90	pass
62			91	else:
63			92	result.append((path,subp))
64			93	return result
65			94
66			95
67	71	def delete_items(deletables, dry_run=False):	96	def delete_items(deletables, dry_run=False):
68	72	"""Delete files in the deletables iterable"""	97	"""Delete files in the deletables iterable"""
69	73	has_deleted = False	98	has_deleted = False
70	74		99
71	=== modified file 'bzrlib/tests/blackbox/test_clean_tree.py'
72	--- bzrlib/tests/blackbox/test_clean_tree.py 2009-03-23 14:59:43 +0000
73	+++ bzrlib/tests/blackbox/test_clean_tree.py 2010-05-05 01:45:38 +0000
74	@@ -21,6 +21,7 @@
75	21		21
76	22	import os	22	import os
77	23		23
78			24	from bzrlib import ignores
79	24	from bzrlib.tests import TestCaseWithTransport	25	from bzrlib.tests import TestCaseWithTransport
80	25		26
81	26		27
82	@@ -62,3 +63,18 @@
83	62	self.failIfExists('name')	63	self.failIfExists('name')
84	63	self.failIfExists('name~')	64	self.failIfExists('name~')
85	64	self.failIfExists('name.pyc')	65	self.failIfExists('name.pyc')
86			66
87			67	def test_clean_tree_nested_bzrdir(self):
88			68	# clean-tree should not blindly delete nested bzrdirs (branches)
89			69	# bug https://bugs.launchpad.net/bzr/+bug/572098
90			70	# so it will play well with scmproj/bzr-externals plugins.
91			71	wt1 = self.make_branch_and_tree('.')
92			72	wt2 = self.make_branch_and_tree('foo')
93			73	wt3 = self.make_branch_and_tree('bar')
94			74	ignores.tree_ignores_add_patterns(wt1, ['./foo'])
95			75	self.run_bzr(['clean-tree', '--unknown', '--force'])
96			76	self.failUnlessExists('foo')
97			77	self.failUnlessExists('bar')
98			78	self.run_bzr(['clean-tree', '--ignored', '--force'])
99			79	self.failUnlessExists('foo')
100			80	self.failUnlessExists('bar')