Rev 3586: Deprecate export-related InventoryEntry methods (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 29 06:47:32 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3586
revision-id:pqm at pqm.ubuntu.com-20080729054715-58vtfs0znj9ooang
parent: pqm at pqm.ubuntu.com-20080729005846-o7t0ck17azx0xddl
parent: ian.clatworthy at canonical.com-20080729050929-vmtl30y5wxo7gehy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-29 06:47:15 +0100
message:
Deprecate export-related InventoryEntry methods (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/inventory.py inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3585.1.1
revision-id:ian.clatworthy at canonical.com-20080729050929-vmtl30y5wxo7gehy
parent: pqm at pqm.ubuntu.com-20080729005846-o7t0ck17azx0xddl
parent: ian.clatworthy at canonical.com-20080725023908-4pare2wg4m75iong
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2008-07-29 15:09:29 +1000
message:
Deprecate export-related InventoryEntry methods (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/inventory.py inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3577.2.1
revision-id:ian.clatworthy at canonical.com-20080725023908-4pare2wg4m75iong
parent: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.export-refactor
timestamp: Fri 2008-07-25 12:39:08 +1000
message:
deprecate export-related InventoryEntry methods and refactor export code accordingly
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/inventory.py inventory.py-20050309040759-6648b84ca2005b37
=== modified file 'NEWS'
--- a/NEWS 2008-07-29 00:30:54 +0000
+++ b/NEWS 2008-07-29 05:09:29 +0000
@@ -65,8 +65,15 @@
a reconcile operation is triggered at the end of the fetch.
(Robert Collins)
+ * The ``put_on_disk`` and ``get_tar_item`` methods in
+ ``InventoryEntry`` were deprecated. (Ian Clatworthy)
+
+
INTERNALS:
+ * The code for exporting trees was refactored not to use the
+ deprecated ``InventoryEntry`` methods. (Ian Clatworthy)
+
* RuleSearchers return () instead of [] now when there are no matches.
(Ian Clatworthy)
=== modified file 'bzrlib/export/dir_exporter.py'
--- a/bzrlib/export/dir_exporter.py 2006-07-29 16:04:16 +0000
+++ b/bzrlib/export/dir_exporter.py 2008-07-25 02:39:08 +0000
@@ -17,9 +17,13 @@
"""Export a Tree to a non-versioned directory.
"""
+
import os
+
+from bzrlib import errors, osutils
from bzrlib.trace import mutter
+
def dir_exporter(tree, dest, root):
"""Export this tree to a new directory.
@@ -32,7 +36,6 @@
:note: If the export fails, the destination directory will be
left in a half-assed state.
"""
- import os
os.mkdir(dest)
mutter('export version %r', tree)
inv = tree.inventory
@@ -44,5 +47,21 @@
if dp == ".bzrignore":
continue
- ie.put_on_disk(dest, dp, tree)
-
+ fullpath = osutils.pathjoin(dest, dp)
+ if ie.kind == "file":
+ fileobj = tree.get_file(ie.file_id)
+ osutils.pumpfile(fileobj, file(fullpath, 'wb'))
+ if tree.is_executable(ie.file_id):
+ os.chmod(fullpath, 0755)
+ elif ie.kind == "directory":
+ os.mkdir(fullpath)
+ elif ie.kind == "symlink":
+ try:
+ os.symlink(ie.symlink_target, fullpath)
+ except OSError,e:
+ raise errors.BzrError(
+ "Failed to create symlink %r -> %r, error: %s"
+ % (fullpath, self.symlink_target, e))
+ else:
+ raise errors.BzrError("don't know how to export {%s} of kind %r" %
+ (ie.file_id, ie.kind))
=== modified file 'bzrlib/export/tar_exporter.py'
--- a/bzrlib/export/tar_exporter.py 2008-05-29 06:53:31 +0000
+++ b/bzrlib/export/tar_exporter.py 2008-07-25 02:39:08 +0000
@@ -18,11 +18,11 @@
"""
import os
+import sys
import tarfile
import time
-import sys
-from bzrlib import errors, export
+from bzrlib import errors, export, osutils
from bzrlib.trace import mutter
@@ -51,7 +51,33 @@
# so do not export it
if dp == ".bzrignore":
continue
- item, fileobj = ie.get_tar_item(root, dp, now, tree)
+
+ filename = osutils.pathjoin(root, dp).encode('utf8')
+ item = tarfile.TarInfo(filename)
+ item.mtime = now
+ if ie.kind == "file":
+ item.type = tarfile.REGTYPE
+ if tree.is_executable(ie.file_id):
+ item.mode = 0755
+ else:
+ item.mode = 0644
+ item.size = ie.text_size
+ fileobj = tree.get_file(ie.file_id)
+ elif ie.kind == "directory":
+ item.type = tarfile.DIRTYPE
+ item.name += '/'
+ item.size = 0
+ item.mode = 0755
+ fileobj = None
+ elif ie.kind == "symlink":
+ item.type = tarfile.SYMTYPE
+ item.size = 0
+ item.mode = 0755
+ item.linkname = ie.symlink_target
+ fileobj = None
+ else:
+ raise BzrError("don't know how to export {%s} of kind %r" %
+ (ie.file_id, ie.kind))
ball.addfile(item, fileobj)
ball.close()
@@ -62,4 +88,3 @@
def tbz_exporter(tree, dest, root):
tar_exporter(tree, dest, root, compression='bz2')
-
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2008-06-19 13:14:24 +0000
+++ b/bzrlib/inventory.py 2008-07-25 02:39:08 +0000
@@ -50,7 +50,7 @@
BzrCheckError,
BzrError,
)
-from bzrlib.symbol_versioning import deprecated_method
+from bzrlib.symbol_versioning import deprecated_in, deprecated_method
from bzrlib.trace import mutter
@@ -176,6 +176,7 @@
candidates[ie.revision] = ie
return candidates
+ @deprecated_method(deprecated_in((1, 6, 0)))
def get_tar_item(self, root, dp, now, tree):
"""Get a tarfile item and a file stream for its content."""
item = tarfile.TarInfo(osutils.pathjoin(root, dp).encode('utf8'))
@@ -238,6 +239,7 @@
raise BzrError("don't know how to export {%s} of kind %r" %
(self.file_id, self.kind))
+ @deprecated_method(deprecated_in((1, 6, 0)))
def put_on_disk(self, dest, dp, tree):
"""Create a representation of self on disk in the prefix dest.
More information about the bazaar-commits
mailing list