Rev 3592: do not export things in the .bzr* namespace including .bzrrules (Ian in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jul 30 02:01:06 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3592
revision-id:pqm at pqm.ubuntu.com-20080730010050-yt2pf2kmm4x4c033
parent: pqm at pqm.ubuntu.com-20080729235304-ivi3yeqr6xxwtmem
parent: ian.clatworthy at canonical.com-20080730002638-oi59syl3uhh8d6s9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-30 02:00:50 +0100
message:
do not export things in the .bzr* namespace including .bzrrules (Ian
Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 3591.1.1
revision-id:ian.clatworthy at canonical.com-20080730002638-oi59syl3uhh8d6s9
parent: pqm at pqm.ubuntu.com-20080729235304-ivi3yeqr6xxwtmem
parent: ian.clatworthy at canonical.com-20080730002233-xnzznwx6mpvuj3p4
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2008-07-30 10:26:38 +1000
message:
do not export things in the .bzr* namespace including .bzrrules (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 3577.3.2
revision-id:ian.clatworthy at canonical.com-20080730002233-xnzznwx6mpvuj3p4
parent: ian.clatworthy at canonical.com-20080725011216-32kxigt1w60jovc7
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.export-masking
timestamp: Wed 2008-07-30 10:22:33 +1000
message:
tweaks following jam's review
modified:
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 3577.3.1
revision-id:ian.clatworthy at canonical.com-20080725011216-32kxigt1w60jovc7
parent: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.export-masking
timestamp: Fri 2008-07-25 11:12:16 +1000
message:
do not export .bzrrules
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
=== modified file 'NEWS'
--- a/NEWS 2008-07-29 23:22:00 +0000
+++ b/NEWS 2008-07-30 00:26:38 +0000
@@ -44,6 +44,9 @@
support stacking, even if the origin does not.
(Martin Pool)
+ * ``bzr export`` no longer exports ``.bzrrules``.
+ (Ian Clatworthy)
+
* Fix a test case that was failing if encoding wasn't UTF-8.
(John Arbash Meinel, #247585)
=== modified file 'bzrlib/export/dir_exporter.py'
--- a/bzrlib/export/dir_exporter.py 2008-07-25 02:39:08 +0000
+++ b/bzrlib/export/dir_exporter.py 2008-07-30 00:26:38 +0000
@@ -42,9 +42,9 @@
entries = inv.iter_entries()
entries.next() # skip root
for dp, ie in entries:
- # .bzrignore has no meaning outside of a working tree
- # so do not export it
- if dp == ".bzrignore":
+ # The .bzr* namespace is reserved for "magic" files like
+ # .bzrignore and .bzrrules - do not export these
+ if dp.startswith(".bzr"):
continue
fullpath = osutils.pathjoin(dest, dp)
=== modified file 'bzrlib/export/tar_exporter.py'
--- a/bzrlib/export/tar_exporter.py 2008-07-25 02:39:08 +0000
+++ b/bzrlib/export/tar_exporter.py 2008-07-30 00:26:38 +0000
@@ -47,9 +47,9 @@
entries = inv.iter_entries()
entries.next() # skip root
for dp, ie in entries:
- # .bzrignore has no meaning outside of a working tree
- # so do not export it
- if dp == ".bzrignore":
+ # The .bzr* namespace is reserved for "magic" files like
+ # .bzrignore and .bzrrules - do not export these
+ if dp.startswith(".bzr"):
continue
filename = osutils.pathjoin(root, dp).encode('utf8')
=== modified file 'bzrlib/export/zip_exporter.py'
--- a/bzrlib/export/zip_exporter.py 2006-10-04 01:56:39 +0000
+++ b/bzrlib/export/zip_exporter.py 2008-07-25 01:12:16 +0000
@@ -55,9 +55,9 @@
entries = inv.iter_entries()
entries.next() # skip root
for dp, ie in entries:
- # .bzrignore has no meaning outside of a working tree
- # so do not export it
- if dp == ".bzrignore":
+ # The .bzr* namespace is reserved for "magic" files like
+ # .bzrignore and .bzrrules - do not export these
+ if dp.startswith(".bzr"):
continue
file_id = ie.file_id
=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- a/bzrlib/tests/blackbox/test_export.py 2008-05-29 06:53:31 +0000
+++ b/bzrlib/tests/blackbox/test_export.py 2008-07-30 00:22:33 +0000
@@ -38,12 +38,19 @@
tree = self.make_branch_and_tree('tar')
self.build_tree(['tar/a'])
tree.add('a')
+ self.build_tree_contents([('tar/.bzrrules', '')])
+ tree.add('.bzrrules')
+ self.build_tree(['tar/.bzr-adir/', 'tar/.bzr-adir/afile'])
+ tree.add(['.bzr-adir/', '.bzr-adir/afile'])
os.chdir('tar')
self.run_bzr('ignore something')
tree.commit('1')
self.failUnless(tree.has_filename('.bzrignore'))
+ self.failUnless(tree.has_filename('.bzrrules'))
+ self.failUnless(tree.has_filename('.bzr-adir'))
+ self.failUnless(tree.has_filename('.bzr-adir/afile'))
self.run_bzr('export test.tar.gz')
ball = tarfile.open('test.tar.gz')
# Make sure the tarball contains 'a', but does not contain
@@ -75,12 +82,19 @@
tree = self.make_branch_and_tree('zip')
self.build_tree(['zip/a'])
tree.add('a')
+ self.build_tree_contents([('zip/.bzrrules', '')])
+ tree.add('.bzrrules')
+ self.build_tree(['zip/.bzr-adir/', 'zip/.bzr-adir/afile'])
+ tree.add(['.bzr-adir/', '.bzr-adir/afile'])
os.chdir('zip')
self.run_bzr('ignore something')
tree.commit('1')
self.failUnless(tree.has_filename('.bzrignore'))
+ self.failUnless(tree.has_filename('.bzrrules'))
+ self.failUnless(tree.has_filename('.bzr-adir'))
+ self.failUnless(tree.has_filename('.bzr-adir/afile'))
self.run_bzr('export test.zip')
zfile = zipfile.ZipFile('test.zip')
@@ -139,12 +153,19 @@
tree = self.make_branch_and_tree('dir')
self.build_tree(['dir/a'])
tree.add('a')
+ self.build_tree_contents([('dir/.bzrrules', '')])
+ tree.add('.bzrrules')
+ self.build_tree(['dir/.bzr-adir/', 'dir/.bzr-adir/afile'])
+ tree.add(['.bzr-adir/', '.bzr-adir/afile'])
os.chdir('dir')
self.run_bzr('ignore something')
tree.commit('1')
self.failUnless(tree.has_filename('.bzrignore'))
+ self.failUnless(tree.has_filename('.bzrrules'))
+ self.failUnless(tree.has_filename('.bzr-adir'))
+ self.failUnless(tree.has_filename('.bzr-adir/afile'))
self.run_bzr('export direxport')
files = sorted(os.listdir('direxport'))
More information about the bazaar-commits
mailing list