Merge lp:~maxb/bzr-builddeb/bzrtools-code-disentangle into lp:bzr-builddeb

[Max Bowsher]

[Max Bowsher (maxb)]

Currently bzr-builddeb incorporates a copied version of the code for "bzr import", which has diverged from its upstream. The copied code is included in import_dsc.py along with a large amount of not very related code. Furthermore, bzr-builddeb has a vestigial dependency on bzrtools just for 11 lines of code which didn't get copied.

This branch sets out to rectify this by:

1. Performing several tweaks to import_dsc.py to make the code closer to the version in bzrtools.

2. Importing the remaining 11 lines of code from bzrtools, and severing the dependency to bzrtools.

3. Importing a copy of bzrtools' current upstream_import.py into the bzr-builddeb tree as bzrtools_import.py. (The rationale for the rename is that the term "upstream" is already used a lot in bzr-builddeb, and its use here would be confusingly in conflict.)

4. Applying onto the added bzrtools_import.py all the changes to the relevant code, feature by feature.

5. Having attained the situation where the relevant sections of code in import_dsc.py exactly match the relevant sections in bzrtools_import.py by the previous steps, delete the code from import_dsc.py and switch imports to use the new one.

All this should leave us with the relevant code now isolated to a file separate from the rest of bzr-builddeb's code, which is easily diffable against the version in bzrtools. This will (a) make it easy to import any future upstream changes, and (b) make it easy to see what needs pushing back upstream.

Hopefully in the longer term, the modifications can be sent upstream to bzrtools, and in the even longer term, bzr-builddeb could drop the incorporated copy of the code, and depend on bzrtools for it.

[Max Bowsher (maxb)]

Owing to the nature of this change (moving content from one file to another), it is likely to be more practical to review individual changeset diffs, rather than the entire merge diff.

[Jelmer Vernooij (jelmer)]

I haven't done a full review, but it seems like there is still a dependency on bzrtools remaining: open_from_url is imported from bzrtools.

In general, disentangling the dependency on bzrtools seems like a good idea to me.

review: Needs Fixing

[Max Bowsher (maxb)]

Apparently I fail at using grep... I'll fix it up.

[Max Bowsher (maxb)]

OK, sorry for that, I was so focussed on sorting out the congruence with upstream_import.py that I failed to spot the use of another bzrtools file.

This should now be ready for reconsideration, and this time I've taken care to purge bzrtools from my system before running the builddeb tests.

[Jelmer Vernooij (jelmer)]

For what it's worth, this seems ok to me. Eventually, I prefer to see more of this code move into bzrlib.

E.g. open_from_url() could perfectly well live in bzrlib.transport.

The import code seems generic enough to be in bzrlib as well.

There's conflicts in debian/control.

review: Approve

[lp:~maxb/bzr-builddeb/bzrtools-code-disentangle]

416. By Max Bowsher on 2010-02-11

Merge trunk, resolving conflicts.

[Max Bowsher (maxb)]

Conflicts resolved. Ready for merge?

[James Westby (james-w)]

Thanks Max, very helpful to have it split out, I should have done
it from the start.

Merged,

Thanks,

James

=== modified file 'README'
--- README	2009-03-02 22:06:20 +0000
+++ README	2010-02-11 20:48:23 +0000
@@ -18,13 +18,11 @@
 ------------
 
 This plugin requires `python-debian`_ (at least version 0.1.11),
-and a version of bzr at least 1.2. It also requires the
-`bzrtools`_ plugin to be installed. These are available in Debian
+and a version of bzr at least 1.2. These are available in Debian
 (though maybe not at the required versions for a development version
  of builddeb).
 
 .. _python-debian: http://bzr.debian.org/pkg-python-debian/trunk/
-.. _bzrtools: https://launchpad.net/bzrtools
 
 This plugin can be installed in two ways. As you are probably using a Debian
 system you can probably just use the debian packages. The other way is to 
 
=== added file 'bzrtools_bzrtools.py'
--- bzrtools_bzrtools.py	1970-01-01 00:00:00 +0000
+++ bzrtools_bzrtools.py	2010-02-11 20:48:23 +0000
@@ -0,0 +1,30 @@
+# This file is a small part of bzrtools' own bzrtools.py
+# The parts copied last changed in bzrtools 1.13.0.
+
+# Copyright (C) 2005, 2006, 2007 Aaron Bentley <[e-mail]>
+# Copyright (C) 2007 John Arbash Meinel
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from bzrlib import urlutils
+from bzrlib.transport import get_transport
+
+
+def open_from_url(location):
+    location = urlutils.normalize_url(location)
+    dirname, basename = urlutils.split(location)
+    if location.endswith('/') and not basename.endswith('/'):
+        basename += '/'
+    return get_transport(dirname).get(basename)
 
=== added file 'bzrtools_import.py'
--- bzrtools_import.py	1970-01-01 00:00:00 +0000
+++ bzrtools_import.py	2010-02-11 20:48:23 +0000
@@ -0,0 +1,340 @@
+# This file is a modified copy of bzrtools' upstream_import.py, last changed in
+# bzrtools 1.14.0.
+
+"""Import upstream source into a branch"""
+
+from bz2 import BZ2File
+import errno
+import os
+from StringIO import StringIO
+import stat
+import tarfile
+import zipfile
+
+from bzrlib import generate_ids
+from bzrlib.bzrdir import BzrDir
+from bzrlib.errors import NoSuchFile, BzrCommandError, NotBranchError
+from bzrlib.osutils import (pathjoin, isdir, file_iterator, basename,
+                            file_kind, splitpath, normpath)
+from bzrlib.trace import warning
+from bzrlib.transform import TreeTransform, resolve_conflicts, cook_conflicts
+from bzrlib.workingtree import WorkingTree
+from bzrlib.plugins.builddeb.bzrtools_bzrtools import open_from_url
+from bzrlib.plugins.builddeb.errors import UnknownType
+
+class ZipFileWrapper(object):
+
+    def __init__(self, fileobj, mode):
+        self.zipfile = zipfile.ZipFile(fileobj, mode)
+
+    def getmembers(self):
+        for info in self.zipfile.infolist():
+            yield ZipInfoWrapper(self.zipfile, info)
+
+    def extractfile(self, infowrapper):
+        return StringIO(self.zipfile.read(infowrapper.name))
+
+    def add(self, filename):
+        if isdir(filename):
+            self.zipfile.writestr(filename+'/', '')
+        else:
+            self.zipfile.write(filename)
+
+    def close(self):
+        self.zipfile.close()
+
+
+class ZipInfoWrapper(object):
+
+    def __init__(self, zipfile, info):
+        self.info = info
+        self.type = None
+        self.name = info.filename
+        self.zipfile = zipfile
+        self.mode = 0666
+
+    def isdir(self):
+        # Really? Eeeew!
+        return bool(self.name.endswith('/'))
+
+    def isreg(self):
+        # Really? Eeeew!
+        return not self.isdir()
+
+
+files_to_ignore = set(
+    ['.bzrignore', '.shelf', '.bzr', '.bzr.backup', '.bzrtags',
+     '.bzr-builddeb'])
+
+
+class DirWrapper(object):
+    def __init__(self, fileobj, mode='r'):
+        assert mode == 'r', mode
+        self.root = os.path.realpath(fileobj.read())
+
+    def __repr__(self):
+        return 'DirWrapper(%r)' % self.root
+
+    def getmembers(self, subdir=None):
+        if subdir is not None:
+            mydir = pathjoin(self.root, subdir)
+        else:
+            mydir = self.root
+        for child in os.listdir(mydir):
+            if subdir is not None:
+                child = pathjoin(subdir, child)
+            fi = FileInfo(self.root, child)
+            yield fi
+            if fi.isdir():
+                for v in self.getmembers(child):
+                    yield v
+
+    def extractfile(self, member):
+        return open(member.fullpath)
+
+
+class FileInfo(object):
+
+    def __init__(self, root, filepath):
+        self.fullpath = pathjoin(root, filepath)
+        self.root = root
+        if filepath != '':
+            self.name = pathjoin(basename(root), filepath)
+        else:
+            self.name = basename(root)
+        self.type = None
+        stat = os.lstat(self.fullpath)
+        self.mode = stat.st_mode
+        if self.isdir():
+            self.name += '/'
+
+    def __repr__(self):
+        return 'FileInfo(%r)' % self.name
+
+    def isreg(self):
+        return stat.S_ISREG(self.mode)
+
+    def isdir(self):
+        return stat.S_ISDIR(self.mode)
+
+    def issym(self):
+        if stat.S_ISLNK(self.mode):
+            self.linkname = os.readlink(self.fullpath)
+            return True
+        else:
+            return False
+
+
+def top_path(path):
+    """Return the top directory given in a path."""
+    components = splitpath(normpath(path))
+    if len(components) > 0:
+        return components[0]
+    else:
+        return ''
+
+
+def common_directory(names):
+    """Determine a single directory prefix from a list of names"""
+    prefixes = set()
+    prefixes.update(map(top_path, names))
+    if '' in prefixes:
+        prefixes.remove('')
+    if len(prefixes) != 1:
+        return None
+    prefix = prefixes.pop()
+    if prefix == '':
+        return None
+    return prefix
+
+
+def do_directory(tt, trans_id, tree, relative_path, path):
+    if isdir(path) and tree.path2id(relative_path) is not None:
+        tt.cancel_deletion(trans_id)
+    else:
+        tt.create_directory(trans_id)
+
+
+def add_implied_parents(implied_parents, path):
+    """Update the set of implied parents from a path"""
+    parent = os.path.dirname(path)
+    if parent in implied_parents:
+        return
+    implied_parents.add(parent)
+    add_implied_parents(implied_parents, parent)
+
+
+def names_of_files(tar_file):
+    for member in tar_file.getmembers():
+        if member.type != "g":
+            yield member.name
+
+
+def should_ignore(relative_path):
+    parts = splitpath(relative_path)
+    if not parts:
+        return False
+    for part in parts:
+        if part in files_to_ignore:
+            return True
+        if part.endswith(',v'):
+            return True
+
+
+def import_tar(tree, tar_input, file_ids_from=None):
+    """Replace the contents of a working directory with tarfile contents.
+    The tarfile may be a gzipped stream.  File ids will be updated.
+    """
+    tar_file = tarfile.open('lala', 'r', tar_input)
+    import_archive(tree, tar_file, file_ids_from=file_ids_from)
+
+def import_zip(tree, zip_input, file_ids_from=None):
+    zip_file = ZipFileWrapper(zip_input, 'r')
+    import_archive(tree, zip_file, file_ids_from=file_ids_from)
+
+def import_dir(tree, dir, file_ids_from=None):
+    dir_input = StringIO(dir)
+    dir_file = DirWrapper(dir_input)
+    import_archive(tree, dir_file, file_ids_from=file_ids_from)
+
+def import_archive(tree, archive_file, file_ids_from=None):
+    prefix = common_directory(names_of_files(archive_file))
+    tt = TreeTransform(tree)
+
+    if file_ids_from is None:
+        file_ids_from = []
+
+    removed = set()
+    for path, entry in tree.inventory.iter_entries():
+        if entry.parent_id is None:
+            continue
+        trans_id = tt.trans_id_tree_path(path)
+        tt.delete_contents(trans_id)
+        removed.add(path)
+
+    added = set()
+    implied_parents = set()
+    seen = set()
+    for member in archive_file.getmembers():
+        if member.type == 'g':
+            # type 'g' is a header
+            continue
+        relative_path = member.name
+        relative_path = normpath(relative_path)
+        relative_path = relative_path.lstrip('/')
+        if prefix is not None:
+            relative_path = relative_path[len(prefix)+1:]
+            relative_path = relative_path.rstrip('/')
+        if relative_path == '' or relative_path == '.':
+            continue
+        if should_ignore(relative_path):
+            continue
+        add_implied_parents(implied_parents, relative_path)
+        trans_id = tt.trans_id_tree_path(relative_path)
+        added.add(relative_path.rstrip('/'))
+        path = tree.abspath(relative_path)
+        if member.name in seen:
+            if tt.final_kind(trans_id) == 'file':
+                tt.set_executability(None, trans_id)
+            tt.cancel_creation(trans_id)
+        seen.add(member.name)
+        if member.isreg():
+            tt.create_file(file_iterator(archive_file.extractfile(member)),
+                           trans_id)
+            executable = (member.mode & 0111) != 0
+            tt.set_executability(executable, trans_id)
+        elif member.isdir():
+            do_directory(tt, trans_id, tree, relative_path, path)
+        elif member.issym():
+            tt.create_symlink(member.linkname, trans_id)
+        else:
+            raise UnknownType(relative_path)
+        if tt.tree_file_id(trans_id) is None:
+            found = False
+            for other_tree in file_ids_from:
+                other_tree.lock_read()
+                try:
+                    if other_tree.has_filename(relative_path):
+                        file_id = other_tree.path2id(relative_path)
+                        if file_id is not None:
+                            tt.version_file(file_id, trans_id)
+                            found = True
+                            break
+                finally:
+                    other_tree.unlock()
+            if not found:
+                name = basename(member.name.rstrip('/'))
+                file_id = generate_ids.gen_file_id(name)
+                tt.version_file(file_id, trans_id)
+
+    for relative_path in implied_parents.difference(added):
+        if relative_path == "":
+            continue
+        trans_id = tt.trans_id_tree_path(relative_path)
+        path = tree.abspath(relative_path)
+        do_directory(tt, trans_id, tree, relative_path, path)
+        if tt.tree_file_id(trans_id) is None:
+            found = False
+            for other_tree in file_ids_from:
+                other_tree.lock_read()
+                try:
+                    if other_tree.has_filename(relative_path):
+                        file_id = other_tree.path2id(relative_path)
+                        if file_id is not None:
+                            tt.version_file(file_id, trans_id)
+                            found = True
+                            break
+                finally:
+                    other_tree.unlock()
+            if not found:
+                tt.version_file(trans_id, trans_id)
+        added.add(relative_path)
+
+    for path in removed.difference(added):
+        tt.unversion_file(tt.trans_id_tree_path(path))
+
+    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
+        warning(conflict)
+    tt.apply()
+
+
+def do_import(source, tree_directory=None):
+    """Implementation of import command.  Intended for UI only"""
+    if tree_directory is not None:
+        try:
+            tree = WorkingTree.open(tree_directory)
+        except NotBranchError:
+            if not os.path.exists(tree_directory):
+                os.mkdir(tree_directory)
+            branch = BzrDir.create_branch_convenience(tree_directory)
+            tree = branch.bzrdir.open_workingtree()
+    else:
+        tree = WorkingTree.open_containing('.')[0]
+    tree.lock_write()
+    try:
+        if tree.changes_from(tree.basis_tree()).has_changed():
+            raise BzrCommandError("Working tree has uncommitted changes.")
+
+        if (source.endswith('.tar') or source.endswith('.tar.gz') or
+            source.endswith('.tar.bz2')) or source.endswith('.tgz'):
+            try:
+                tar_input = open_from_url(source)
+                if source.endswith('.bz2'):
+                    tar_input = StringIO(tar_input.read().decode('bz2'))
+            except IOError, e:
+                if e.errno == errno.ENOENT:
+                    raise NoSuchFile(source)
+            try:
+                import_tar(tree, tar_input)
+            finally:
+                tar_input.close()
+        elif source.endswith('.zip'):
+            import_zip(tree, open_from_url(source))
+        elif file_kind(source) == 'directory':
+            s = StringIO(source)
+            s.seek(0)
+            import_dir(tree, s)
+        else:
+            raise BzrCommandError('Unhandled import source')
+    finally:
+        tree.unlock()
 
=== modified file 'debian/control'
--- debian/control	2010-02-02 02:44:53 +0000
+++ debian/control	2010-02-11 20:48:23 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Reinhard Tartler <[e-mail]>, James Westby <[e-mail]>, Jelmer Vernooij <[e-mail]>
 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, bzrtools (>= 1.2~), patchutils
+Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
 XS-Python-Version: >= 2.4
@@ -12,7 +12,7 @@
 
 Package: bzr-builddeb
 Architecture: all
-Depends: bzr (>= 2.1~), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 1.2), devscripts, patchutils, pristine-tar
+Depends: bzr (>= 2.1~), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts, patchutils, pristine-tar
 Recommends: python-launchpadlib
 Suggests: bzr-svn (>= 0.4.10)
 Provides: bzr-buildpackage
 
=== modified file 'import_dsc.py'
--- import_dsc.py	2010-02-09 19:52:28 +0000
+++ import_dsc.py	2010-02-11 20:48:23 +0000
@@ -38,7 +38,6 @@
 import shutil
 import stat
 from subprocess import Popen, PIPE, STDOUT
-from StringIO import StringIO
 import tempfile
 
 from debian_bundle import deb822
@@ -46,7 +45,6 @@
 
 from bzrlib import (
                     bzrdir,
-                    generate_ids,
                     osutils,
                     )
 from bzrlib.config import ConfigObj
@@ -57,24 +55,17 @@
         NoWorkingTree,
         )
 from bzrlib.export import export
-from bzrlib.osutils import file_iterator, isdir, basename, splitpath
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import warning, mutter, note
-from bzrlib.transform import TreeTransform, cook_conflicts, resolve_conflicts
 from bzrlib.transport import (
     get_transport,
     )
 
-from bzrlib.plugins.bzrtools.upstream_import import (
-                                                     names_of_files,
-                                                     add_implied_parents,
-                                                     )
-
+from bzrlib.plugins.builddeb.bzrtools_import import import_dir
 from bzrlib.plugins.builddeb.errors import (
                 PristineTarError,
                 TarFailed,
-                UnknownType,
                 UpstreamAlreadyImported,
                 UpstreamBranchAlreadyMerged,
                 )
@@ -87,220 +78,6 @@
     )
 
 
-files_to_ignore = set(
-    ['.bzrignore', '.shelf', '.bzr', '.bzr.backup', '.bzrtags',
-     '.bzr-builddeb'])
-
-
-class DirWrapper(object):
-    def __init__(self, fileobj, mode='r'):
-        assert mode == 'r', mode
-        self.root = os.path.realpath(fileobj.read())
-
-    def __repr__(self):
-        return 'DirWrapper(%r)' % self.root
-
-    def getmembers(self, subdir=None):
-        if subdir is not None:
-            mydir = os.path.join(self.root, subdir)
-        else:
-            mydir = self.root
-        for child in os.listdir(mydir):
-            if subdir is not None:
-                child = os.path.join(subdir, child)
-            fi = FileInfo(self.root, child)
-            yield fi
-            if fi.isdir():
-                for v in self.getmembers(child):
-                    yield v
-
-    def extractfile(self, member):
-        return open(member.fullpath)
-
-
-class FileInfo(object):
-
-    def __init__(self, root, filepath):
-        self.fullpath = os.path.join(root, filepath)
-        self.root = root
-        if filepath != '':
-            self.name = os.path.join(basename(root), filepath)
-        else:
-            self.name = basename(root)
-        self.type = None
-        stat = os.lstat(self.fullpath)
-        self.mode = stat.st_mode
-        if self.isdir():
-            self.name += '/'
-
-    def __repr__(self):
-        return 'FileInfo(%r)' % self.name
-
-    def isreg(self):
-        return stat.S_ISREG(self.mode)
-
-    def isdir(self):
-        return stat.S_ISDIR(self.mode)
-
-    def issym(self):
-        if stat.S_ISLNK(self.mode):
-            self.linkname = os.readlink(self.fullpath)
-            return True
-        else:
-            return False
-
-    def islnk(self):
-        # This could be accurate, but the use below seems like
-        # it wouldn't really care
-        return False
-
-
-def import_dir(tree, dir, file_ids_from=None):
-    dir_input = StringIO(dir)
-    dir_file = DirWrapper(dir_input)
-    import_archive(tree, dir_file, file_ids_from=file_ids_from)
-
-
-def do_directory(tt, trans_id, tree, relative_path, path):
-    if isdir(path) and tree.path2id(relative_path) is not None:
-        tt.cancel_deletion(trans_id)
-    else:
-        tt.create_directory(trans_id)
-
-
-def should_ignore(relative_path):
-    parts = splitpath(relative_path)
-    if not parts:
-        return False
-    for part in parts:
-        if part in files_to_ignore:
-            return True
-        if part.endswith(',v'):
-            return True
-
-
-def top_directory(path):
-    """Return the top directory given in a path."""
-    parts = osutils.splitpath(osutils.normpath(path))
-    if len(parts) > 0:
-        return parts[0]
-    return ''
-
-
-def common_directory(names):
-    """Determine a single directory prefix from a list of names"""
-    prefixes = set()
-    prefixes.update(map(top_directory, names))
-    if '' in prefixes:
-        prefixes.remove('')
-    if len(prefixes) != 1:
-        return None
-    prefix = prefixes.pop()
-    if prefix == '':
-        return None
-    return prefix
-
-
-def import_archive(tree, archive_file, file_ids_from=None):
-    prefix = common_directory(names_of_files(archive_file))
-    tt = TreeTransform(tree)
-
-    if file_ids_from is None:
-        file_ids_from = []
-
-    removed = set()
-    for path, entry in tree.inventory.iter_entries():
-        if entry.parent_id is None:
-            continue
-        trans_id = tt.trans_id_tree_path(path)
-        tt.delete_contents(trans_id)
-        removed.add(path)
-
-    added = set()
-    implied_parents = set()
-    seen = set()
-    for member in archive_file.getmembers():
-        if member.type == 'g':
-            # type 'g' is a header
-            continue
-        relative_path = member.name
-        relative_path = osutils.normpath(relative_path)
-        relative_path = relative_path.lstrip('/')
-        if prefix is not None:
-            relative_path = relative_path[len(prefix)+1:]
-        if relative_path == '' or relative_path == '.':
-            continue
-        if should_ignore(relative_path):
-            continue
-        add_implied_parents(implied_parents, relative_path)
-        trans_id = tt.trans_id_tree_path(relative_path)
-        added.add(relative_path.rstrip('/'))
-        path = tree.abspath(relative_path)
-        if member.name in seen:
-            if tt.final_kind(trans_id) == 'file':
-                tt.set_executability(None, trans_id)
-            tt.cancel_creation(trans_id)
-        seen.add(member.name)
-        if member.isreg() or member.islnk():
-            tt.create_file(file_iterator(archive_file.extractfile(member)),
-                           trans_id)
-            executable = (member.mode & 0111) != 0
-            tt.set_executability(executable, trans_id)
-        elif member.isdir():
-            do_directory(tt, trans_id, tree, relative_path, path)
-        elif member.issym():
-            tt.create_symlink(member.linkname, trans_id)
-        else:
-            raise UnknownType(relative_path)
-        if tt.tree_file_id(trans_id) is None:
-            found = False
-            for other_tree in file_ids_from:
-                other_tree.lock_read()
-                try:
-                    if other_tree.has_filename(relative_path):
-                        file_id = other_tree.path2id(relative_path)
-                        if file_id is not None:
-                            tt.version_file(file_id, trans_id)
-                            found = True
-                            break
-                finally:
-                    other_tree.unlock()
-            if not found:
-                name = basename(member.name.rstrip('/'))
-                file_id = generate_ids.gen_file_id(name)
-                tt.version_file(file_id, trans_id)
-
-    for relative_path in implied_parents.difference(added):
-        if relative_path == "":
-            continue
-        trans_id = tt.trans_id_tree_path(relative_path)
-        path = tree.abspath(relative_path)
-        do_directory(tt, trans_id, tree, relative_path, path)
-        if tt.tree_file_id(trans_id) is None:
-            found = False
-            for other_tree in file_ids_from:
-                other_tree.lock_read()
-                try:
-                    if other_tree.has_filename(relative_path):
-                        file_id = other_tree.path2id(relative_path)
-                        if file_id is not None:
-                            tt.version_file(file_id, trans_id)
-                            found = True
-                            break
-                finally:
-                    other_tree.unlock()
-            if not found:
-                tt.version_file(trans_id, trans_id)
-        added.add(relative_path)
-
-    for path in removed.difference(added):
-        tt.unversion_file(tt.trans_id_tree_path(path))
-
-    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
-        warning(conflict)
-    tt.apply()
-
-
 class DscCache(object):
 
   def __init__(self, transport=None):