1
=== modified file 'NEWS'
2
--- NEWS	2010-03-12 19:59:50 +0000
3
+++ NEWS	2010-03-17 05:39:30 +0000
4
@@ -95,6 +95,10 @@
5
95
  the kept file on content conflicts where one side deleted the file.
95
  the kept file on content conflicts where one side deleted the file.
6
96
  (Vincent Ladeuil, #529968)
96
  (Vincent Ladeuil, #529968)
7
97
97
8
98
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
9
99
  permissions as ``.bzr`` directory on a POSIX OS.
10
100
  (Parth Malwankar, #262450)
11
101
12
98
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
102
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
13
99
  of ``backup.bzr``. This directory is ignored by bzr commands such as
103
  of ``backup.bzr``. This directory is ignored by bzr commands such as
14
100
  ``add``.
104
  ``add``.
15
101
105
16
=== modified file 'bzrlib/bzrdir.py'
17
--- bzrlib/bzrdir.py	2010-03-11 11:07:32 +0000
18
+++ bzrlib/bzrdir.py	2010-03-17 05:39:30 +0000
19
@@ -602,8 +602,6 @@
20
602
            # already exists, but it should instead either remove it or make
602
            # already exists, but it should instead either remove it or make
21
603
            # a new backup directory.
603
            # a new backup directory.
22
604
            #
604
            #
23
605
            # FIXME: bug 262450 -- the backup directory should have the same
24
606
            # permissions as the .bzr directory (probably a bug in copy_tree)
25
607
            old_path = self.root_transport.abspath('.bzr')
605
            old_path = self.root_transport.abspath('.bzr')
26
608
            new_path = self.root_transport.abspath(backup_dir)
606
            new_path = self.root_transport.abspath(backup_dir)
27
609
            ui.ui_factory.note('making backup of %s\n  to %s' % (old_path, new_path,))
607
            ui.ui_factory.note('making backup of %s\n  to %s' % (old_path, new_path,))
28
610
608
29
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
30
--- bzrlib/tests/blackbox/test_upgrade.py	2010-02-15 11:28:35 +0000
31
+++ bzrlib/tests/blackbox/test_upgrade.py	2010-03-17 05:39:30 +0000
32
@@ -15,12 +15,15 @@
33
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
34
16
16
35
17
"""Black box tests for the upgrade ui."""
17
"""Black box tests for the upgrade ui."""
36
18
import os
37
19
import stat
38
18
20
39
19
from bzrlib import (
21
from bzrlib import (
40
20
    bzrdir,
22
    bzrdir,
41
21
    repository,
23
    repository,
42
22
    )
24
    )
43
23
from bzrlib.tests import (
25
from bzrlib.tests import (
44
26
    features,
45
24
    TestCaseInTempDir,
27
    TestCaseInTempDir,
46
25
    TestCaseWithTransport,
28
    TestCaseWithTransport,
47
26
    )
29
    )
48
@@ -146,6 +149,17 @@
49
146
        self.run_bzr('init-repository --format=metaweave repo')
149
        self.run_bzr('init-repository --format=metaweave repo')
50
147
        self.run_bzr('upgrade --format=knit repo')
150
        self.run_bzr('upgrade --format=knit repo')
51
148
151
52
152
    def test_upgrade_permission_check(self):
53
153
        """'backup.bzr' should retain permissions of .bzr. Bug #262450"""
54
154
        self.requireFeature(features.PosixPermissionsFeature)
55
155
        old_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
56
156
        backup_dir = 'backup.bzr.~1~'
57
157
        self.run_bzr('init --format=1.6')
58
158
        os.chmod('.bzr', old_perms)
59
159
        self.run_bzr('upgrade')
60
160
        new_perms = os.stat(backup_dir).st_mode & 0777
61
161
        self.assertTrue(new_perms == old_perms)
62
162
63
149
163
64
150
    def test_upgrade_with_existing_backup_dir(self):
164
    def test_upgrade_with_existing_backup_dir(self):
65
151
        self.make_format_5_branch()
165
        self.make_format_5_branch()
66
152
166
67
=== modified file 'bzrlib/tests/features.py'
68
--- bzrlib/tests/features.py	2010-02-23 07:43:11 +0000
69
+++ bzrlib/tests/features.py	2010-03-17 05:39:30 +0000
70
@@ -14,6 +14,8 @@
71
14
# along with this program; if not, write to the Free Software
14
# along with this program; if not, write to the Free Software
72
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
73
16
16
74
17
import os
75
18
import stat
76
17
19
77
18
from bzrlib import tests
20
from bzrlib import tests
78
19
from bzrlib.symbol_versioning import deprecated_in
21
from bzrlib.symbol_versioning import deprecated_in
79
@@ -23,3 +25,27 @@
80
23
paramiko = tests.ModuleAvailableFeature('paramiko')
25
paramiko = tests.ModuleAvailableFeature('paramiko')
81
24
pycurl = tests.ModuleAvailableFeature('pycurl')
26
pycurl = tests.ModuleAvailableFeature('pycurl')
82
25
subunit = tests.ModuleAvailableFeature('subunit')
27
subunit = tests.ModuleAvailableFeature('subunit')
83
28
84
29
class _PosixPermissionsFeature(tests.Feature):
85
30
86
31
    def _probe(self):
87
32
        def has_perms():
88
33
            # create temporary file and check if specified perms are maintained.
89
34
            import tempfile
90
35
91
36
            write_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
92
37
            f = tempfile.mkstemp(prefix='bzr_perms_chk_')
93
38
            fd, name = f
94
39
            os.close(fd)
95
40
            os.chmod(name, write_perms)
96
41
97
42
            read_perms = os.stat(name).st_mode & 0777
98
43
            os.unlink(name)
99
44
            return (write_perms == read_perms)
100
45
101
46
        return (os.name == 'posix') and has_perms()
102
47
103
48
    def feature_name(self):
104
49
        return 'POSIX permissions support'
105
50
106
51
PosixPermissionsFeature = _PosixPermissionsFeature()
107
26
52
108
=== modified file 'bzrlib/transport/__init__.py'
109
--- bzrlib/transport/__init__.py	2010-03-05 05:30:19 +0000
110
+++ bzrlib/transport/__init__.py	2010-03-17 05:39:30 +0000
111
@@ -1060,7 +1060,12 @@
112
1060
        """
1060
        """
113
1061
        source = self.clone(from_relpath)
1061
        source = self.clone(from_relpath)
114
1062
        target = self.clone(to_relpath)
1062
        target = self.clone(to_relpath)
116
1063
        target.mkdir('.')
1063
117
1064
        # create target directory with the same rwx bits as source.
118
1065
        # use mask to ensure that bits other than rwx are ignored.
119
1066
        stat = self.stat(from_relpath)
120
1067
        target.mkdir('.', stat.st_mode & 0777)
121
1068
122
1064
        source.copy_tree_to_transport(target)
1069
        source.copy_tree_to_transport(target)
123
1065
1070
124
1066
    def copy_tree_to_transport(self, to_transport):
1071
    def copy_tree_to_transport(self, to_transport):
Reviewer	Date Requested	Status
Vincent Ladeuil		Needs Fixing on 2010-03-03
Martin Pool	2010-02-17	Approve on 2010-02-18
Review via email: mp+19483@code.launchpad.net
1	=== modified file 'NEWS'
2	--- NEWS 2010-03-12 19:59:50 +0000
3	+++ NEWS 2010-03-17 05:39:30 +0000
4	@@ -95,6 +95,10 @@
5	95	the kept file on content conflicts where one side deleted the file.	95	the kept file on content conflicts where one side deleted the file.
6	96	(Vincent Ladeuil, #529968)	96	(Vincent Ladeuil, #529968)
7	97		97
8			98	* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
9			99	permissions as ``.bzr`` directory on a POSIX OS.
10			100	(Parth Malwankar, #262450)
11			101
12	98	* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead	102	* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
13	99	of ``backup.bzr``. This directory is ignored by bzr commands such as	103	of ``backup.bzr``. This directory is ignored by bzr commands such as
14	100	``add``.	104	``add``.
15	101		105
16	=== modified file 'bzrlib/bzrdir.py'
17	--- bzrlib/bzrdir.py 2010-03-11 11:07:32 +0000
18	+++ bzrlib/bzrdir.py 2010-03-17 05:39:30 +0000
19	@@ -602,8 +602,6 @@
20	602	# already exists, but it should instead either remove it or make	602	# already exists, but it should instead either remove it or make
21	603	# a new backup directory.	603	# a new backup directory.
22	604	#	604	#
23	605	# FIXME: bug 262450 -- the backup directory should have the same
24	606	# permissions as the .bzr directory (probably a bug in copy_tree)
25	607	old_path = self.root_transport.abspath('.bzr')	605	old_path = self.root_transport.abspath('.bzr')
26	608	new_path = self.root_transport.abspath(backup_dir)	606	new_path = self.root_transport.abspath(backup_dir)
27	609	ui.ui_factory.note('making backup of %s\n to %s' % (old_path, new_path,))	607	ui.ui_factory.note('making backup of %s\n to %s' % (old_path, new_path,))
28	610		608
29	=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
30	--- bzrlib/tests/blackbox/test_upgrade.py 2010-02-15 11:28:35 +0000
31	+++ bzrlib/tests/blackbox/test_upgrade.py 2010-03-17 05:39:30 +0000
32	@@ -15,12 +15,15 @@
33	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
34	16		16
35	17	"""Black box tests for the upgrade ui."""	17	"""Black box tests for the upgrade ui."""
36			18	import os
37			19	import stat
38	18		20
39	19	from bzrlib import (	21	from bzrlib import (
40	20	bzrdir,	22	bzrdir,
41	21	repository,	23	repository,
42	22	)	24	)
43	23	from bzrlib.tests import (	25	from bzrlib.tests import (
44			26	features,
45	24	TestCaseInTempDir,	27	TestCaseInTempDir,
46	25	TestCaseWithTransport,	28	TestCaseWithTransport,
47	26	)	29	)
48	@@ -146,6 +149,17 @@
49	146	self.run_bzr('init-repository --format=metaweave repo')	149	self.run_bzr('init-repository --format=metaweave repo')
50	147	self.run_bzr('upgrade --format=knit repo')	150	self.run_bzr('upgrade --format=knit repo')
51	148		151
52			152	def test_upgrade_permission_check(self):
53			153	"""'backup.bzr' should retain permissions of .bzr. Bug #262450"""
54			154	self.requireFeature(features.PosixPermissionsFeature)
55			155	old_perms = stat.S_IRUSR \| stat.S_IWUSR \| stat.S_IXUSR
56			156	backup_dir = 'backup.bzr.~1~'
57			157	self.run_bzr('init --format=1.6')
58			158	os.chmod('.bzr', old_perms)
59			159	self.run_bzr('upgrade')
60			160	new_perms = os.stat(backup_dir).st_mode & 0777
61			161	self.assertTrue(new_perms == old_perms)
62			162
63	149		163
64	150	def test_upgrade_with_existing_backup_dir(self):	164	def test_upgrade_with_existing_backup_dir(self):
65	151	self.make_format_5_branch()	165	self.make_format_5_branch()
66	152		166
67	=== modified file 'bzrlib/tests/features.py'
68	--- bzrlib/tests/features.py 2010-02-23 07:43:11 +0000
69	+++ bzrlib/tests/features.py 2010-03-17 05:39:30 +0000
70	@@ -14,6 +14,8 @@
71	14	# along with this program; if not, write to the Free Software	14	# along with this program; if not, write to the Free Software
72	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	15	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
73	16		16
74			17	import os
75			18	import stat
76	17		19
77	18	from bzrlib import tests	20	from bzrlib import tests
78	19	from bzrlib.symbol_versioning import deprecated_in	21	from bzrlib.symbol_versioning import deprecated_in
79	@@ -23,3 +25,27 @@
80	23	paramiko = tests.ModuleAvailableFeature('paramiko')	25	paramiko = tests.ModuleAvailableFeature('paramiko')
81	24	pycurl = tests.ModuleAvailableFeature('pycurl')	26	pycurl = tests.ModuleAvailableFeature('pycurl')
82	25	subunit = tests.ModuleAvailableFeature('subunit')	27	subunit = tests.ModuleAvailableFeature('subunit')
83			28
84			29	class _PosixPermissionsFeature(tests.Feature):
85			30
86			31	def _probe(self):
87			32	def has_perms():
88			33	# create temporary file and check if specified perms are maintained.
89			34	import tempfile
90			35
91			36	write_perms = stat.S_IRUSR \| stat.S_IWUSR \| stat.S_IXUSR
92			37	f = tempfile.mkstemp(prefix='bzr_perms_chk_')
93			38	fd, name = f
94			39	os.close(fd)
95			40	os.chmod(name, write_perms)
96			41
97			42	read_perms = os.stat(name).st_mode & 0777
98			43	os.unlink(name)
99			44	return (write_perms == read_perms)
100			45
101			46	return (os.name == 'posix') and has_perms()
102			47
103			48	def feature_name(self):
104			49	return 'POSIX permissions support'
105			50
106			51	PosixPermissionsFeature = _PosixPermissionsFeature()
107	26		52
108	=== modified file 'bzrlib/transport/__init__.py'
109	--- bzrlib/transport/__init__.py 2010-03-05 05:30:19 +0000
110	+++ bzrlib/transport/__init__.py 2010-03-17 05:39:30 +0000
111	@@ -1060,7 +1060,12 @@
112	1060	"""	1060	"""
113	1061	source = self.clone(from_relpath)	1061	source = self.clone(from_relpath)
114	1062	target = self.clone(to_relpath)	1062	target = self.clone(to_relpath)
116	1063	target.mkdir('.')	1063
117			1064	# create target directory with the same rwx bits as source.
118			1065	# use mask to ensure that bits other than rwx are ignored.
119			1066	stat = self.stat(from_relpath)
120			1067	target.mkdir('.', stat.st_mode & 0777)
121			1068
122	1064	source.copy_tree_to_transport(target)	1069	source.copy_tree_to_transport(target)
123	1065		1070
124	1066	def copy_tree_to_transport(self, to_transport):	1071	def copy_tree_to_transport(self, to_transport):