Merge lp:~jelmer/brz/remove-dpush into lp:brz

[Jelmer Vernooij]

Remove the dpush command, in favor of 'brz push --lossy'.

Remove the dpush command, in favor of 'brz push --lossy'.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/121/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-05-05 01:50:26 +0000
+++ breezy/builtins.py	2018-05-07 11:30:00 +0000
@@ -6785,7 +6785,6 @@
         ('cmd_bundle_info', [], 'breezy.bundle.commands'),
         ('cmd_config', [], 'breezy.config'),
         ('cmd_dump_btree', [], 'breezy.bzr.debug_commands'),
-        ('cmd_dpush', [], 'breezy.foreign'),
         ('cmd_version_info', [], 'breezy.cmd_version_info'),
         ('cmd_resolve', ['resolved'], 'breezy.conflicts'),
         ('cmd_conflicts', [], 'breezy.conflicts'),

=== modified file 'breezy/foreign.py'
--- breezy/foreign.py	2017-08-26 14:03:58 +0000
+++ breezy/foreign.py	2018-05-07 11:30:00 +0000
@@ -236,110 +236,3 @@
         self.mapping = mapping
         super(ForeignBranch, self).__init__()
 
-
-def update_workingtree_fileids(wt, target_tree):
-    """Update the file ids in a working tree based on another tree.
-
-    :param wt: Working tree in which to update file ids
-    :param target_tree: Tree to retrieve new file ids from, based on path
-    """
-    tt = transform.TreeTransform(wt)
-    try:
-        for f, p, c, v, d, n, k, e in target_tree.iter_changes(wt):
-            if v == (True, False):
-                trans_id = tt.trans_id_tree_path(p[0])
-                tt.unversion_file(trans_id)
-            elif v == (False, True):
-                trans_id = tt.trans_id_tree_path(p[1])
-                tt.version_file(f, trans_id)
-        tt.apply()
-    finally:
-        tt.finalize()
-    if len(wt.get_parent_ids()) == 1:
-        wt.set_parent_trees([(target_tree.get_revision_id(), target_tree)])
-    else:
-        wt.set_last_revision(target_tree.get_revision_id())
-
-
-class cmd_dpush(Command):
-    __doc__ = """Push into a different VCS without any custom bzr metadata.
-
-    This will afterwards rebase the local branch on the remote
-    branch unless the --no-rebase option is used, in which case 
-    the two branches will be out of sync after the push. 
-    """
-    takes_args = ['location?']
-    takes_options = [
-        'remember',
-        Option('directory',
-               help='Branch to push from, '
-               'rather than the one containing the working directory.',
-               short_name='d',
-               type=text_type,
-               ),
-        Option('no-rebase', help="Do not rebase after push."),
-        Option('strict',
-               help='Refuse to push if there are uncommitted changes in'
-               ' the working tree, --no-strict disables the check.'),
-        ]
-
-    def run(self, location=None, remember=False, directory=None,
-            no_rebase=False, strict=None):
-        from breezy import urlutils
-        from breezy.controldir import ControlDir
-        from breezy.errors import BzrCommandError, NoWorkingTree
-        from breezy.workingtree import WorkingTree
-
-        if directory is None:
-            directory = "."
-        try:
-            source_wt = WorkingTree.open_containing(directory)[0]
-            source_branch = source_wt.branch
-        except NoWorkingTree:
-            source_branch = Branch.open(directory)
-            source_wt = None
-        if source_wt is not None:
-            source_wt.check_changed_or_out_of_date(
-                strict, 'dpush_strict',
-                more_error='Use --no-strict to force the push.',
-                more_warning='Uncommitted changes will not be pushed.')
-        stored_loc = source_branch.get_push_location()
-        if location is None:
-            if stored_loc is None:
-                raise BzrCommandError(gettext("No push location known or specified."))
-            else:
-                display_url = urlutils.unescape_for_display(stored_loc,
-                        self.outf.encoding)
-                self.outf.write(
-                       gettext("Using saved location: %s\n") % display_url)
-                location = stored_loc
-
-        controldir = ControlDir.open(location)
-        target_branch = controldir.open_branch()
-        target_branch.lock_write()
-        try:
-            try:
-                push_result = source_branch.push(target_branch, lossy=True)
-            except errors.LossyPushToSameVCS:
-                raise BzrCommandError(gettext("{0!r} and {1!r} are in the same VCS, lossy "
-                    "push not necessary. Please use regular push.").format(
-                    source_branch, target_branch))
-            # We successfully created the target, remember it
-            if source_branch.get_push_location() is None or remember:
-                # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
-                source_branch.set_push_location(target_branch.base)
-            if not no_rebase:
-                old_last_revid = source_branch.last_revision()
-                source_branch.pull(target_branch, overwrite=True)
-                new_last_revid = source_branch.last_revision()
-                if source_wt is not None and old_last_revid != new_last_revid:
-                    source_wt.lock_write()
-                    try:
-                        target = source_wt.branch.repository.revision_tree(
-                            new_last_revid)
-                        update_workingtree_fileids(source_wt, target)
-                    finally:
-                        source_wt.unlock()
-            push_result.report(self.outf)
-        finally:
-            target_branch.unlock()

=== modified file 'breezy/tests/blackbox/__init__.py'
--- breezy/tests/blackbox/__init__.py	2017-12-19 15:55:48 +0000
+++ breezy/tests/blackbox/__init__.py	2018-05-07 11:30:00 +0000
@@ -59,7 +59,6 @@
                      'test_deleted',
                      'test_diff',
                      'test_dump_btree',
-                     'test_dpush',
                      'test_exceptions',
                      'test_export',
                      'test_export_pot',

=== removed file 'breezy/tests/blackbox/test_dpush.py'
--- breezy/tests/blackbox/test_dpush.py	2018-03-26 00:54:10 +0000
+++ breezy/tests/blackbox/test_dpush.py	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-# Copyright (C) 2009-2012, 2016 Canonical Ltd
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-"""Black-box tests for brz dpush."""
-
-
-from breezy import (
-    branch,
-    tests,
-    )
-from breezy.tests import (
-    script,
-    test_foreign,
-    )
-from breezy.tests.blackbox import test_push
-from breezy.tests.scenarios import (
-    load_tests_apply_scenarios,
-    )
-
-
-load_tests = load_tests_apply_scenarios
-
-
-class TestDpush(tests.TestCaseWithTransport):
-
-    def setUp(self):
-        super(TestDpush, self).setUp()
-        test_foreign.register_dummy_foreign_for_test(self)
-
-    def make_dummy_builder(self, relpath):
-        builder = self.make_branch_builder(
-            relpath, format=test_foreign.DummyForeignVcsDirFormat())
-        builder.build_snapshot(None,
-            [('add', ('', 'TREE_ROOT', 'directory', None)),
-             ('add', ('foo', 'fooid', 'file', 'bar'))],
-            revision_id=b'revid')
-        return builder
-
-    def test_dpush_native(self):
-        target_tree = self.make_branch_and_tree("dp")
-        source_tree = self.make_branch_and_tree("dc")
-        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
-        self.assertEqual("", output)
-        self.assertContainsRe(error,
-            'in the same VCS, lossy push not necessary. Please use regular '
-            'push.')
-
-    def test_dpush(self):
-        branch = self.make_dummy_builder('d').get_branch()
-
-        dc = branch.controldir.sprout('dc', force_new_repo=True)
-        self.build_tree(("dc/foo", "blaaaa"))
-        dc.open_workingtree().commit('msg')
-
-        script.run_script(self, """
-            $ brz dpush -d dc d
-            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
-            2>This may take some time. Upgrade the repositories to the same format for better performance.
-            2>Pushed up to revision 2.
-            $ brz status dc
-            """)
-
-    def test_dpush_new(self):
-        b = self.make_dummy_builder('d').get_branch()
-
-        dc = b.controldir.sprout('dc', force_new_repo=True)
-        self.build_tree_contents([("dc/foofile", b"blaaaa")])
-        dc_tree = dc.open_workingtree()
-        dc_tree.add("foofile")
-        dc_tree.commit("msg")
-
-        script.run_script(self, '''
-            $ brz dpush -d dc d
-            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
-            2>This may take some time. Upgrade the repositories to the same format for better performance.
-            2>Pushed up to revision 2.
-            $ brz revno dc
-            2
-            $ brz status dc
-            ''')
-
-    def test_dpush_wt_diff(self):
-        b = self.make_dummy_builder('d').get_branch()
-
-        dc = b.controldir.sprout('dc', force_new_repo=True)
-        self.build_tree_contents([("dc/foofile", b"blaaaa")])
-        dc_tree = dc.open_workingtree()
-        dc_tree.add("foofile")
-        newrevid = dc_tree.commit('msg')
-
-        self.build_tree_contents([("dc/foofile", b"blaaaal")])
-        script.run_script(self, '''
-            $ brz dpush -d dc d --no-strict
-            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
-            2>This may take some time. Upgrade the repositories to the same format for better performance.
-            2>Pushed up to revision 2.
-            ''')
-        self.assertFileEqual("blaaaal", "dc/foofile")
-        # if the dummy vcs wasn't that dummy we could uncomment the line below
-        # self.assertFileEqual("blaaaa", "d/foofile")
-        script.run_script(self, '''
-            $ brz status dc
-            modified:
-              foofile
-            ''')
-
-    def test_diverged(self):
-        builder = self.make_dummy_builder('d')
-
-        b = builder.get_branch()
-
-        dc = b.controldir.sprout('dc', force_new_repo=True)
-        dc_tree = dc.open_workingtree()
-
-        self.build_tree_contents([("dc/foo", b"bar")])
-        dc_tree.commit('msg1')
-
-        builder.build_snapshot(None,
-          [('modify', ('foo', b'blie'))], revision_id=b'revid2')
-
-        output, error = self.run_bzr("dpush -d dc d", retcode=3)
-        self.assertEqual(output, "")
-        self.assertContainsRe(error, "have diverged")
-
-
-class TestDpushStrictMixin(object):
-
-    def setUp(self):
-        test_foreign.register_dummy_foreign_for_test(self)
-        # Create an empty branch where we will be able to push
-        self.foreign = self.make_branch(
-            'to', format=test_foreign.DummyForeignVcsDirFormat())
-
-    def set_config_push_strict(self, value):
-        br = branch.Branch.open('local')
-        br.get_config_stack().set('dpush_strict', value)
-
-    _default_command = ['dpush', '../to']
-
-
-class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
-                                    test_push.TestPushStrictWithoutChanges):
-
-    def setUp(self):
-        test_push.TestPushStrictWithoutChanges.setUp(self)
-        TestDpushStrictMixin.setUp(self)
-
-
-class TestDpushStrictWithChanges(TestDpushStrictMixin,
-                                 test_push.TestPushStrictWithChanges):
-
-    scenarios = test_push.strict_push_change_scenarios
-
-    _changes_type = None # Set by load_tests
-
-    def setUp(self):
-        test_push.TestPushStrictWithChanges.setUp(self)
-        TestDpushStrictMixin.setUp(self)
-
-    def test_push_with_revision(self):
-        raise tests.TestNotApplicable('dpush does not handle --revision')

=== modified file 'breezy/tests/test_foreign.py'
--- breezy/tests/test_foreign.py	2018-02-18 15:21:06 +0000
+++ breezy/tests/test_foreign.py	2018-05-07 11:30:00 +0000
@@ -413,30 +413,6 @@
         self.assertEqual(mapp, rev.mapping)
 
 
-class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
-    """Tests for update_workingtree_fileids()."""
-
-    def test_update_workingtree(self):
-        wt = self.make_branch_and_tree('br1')
-        self.build_tree_contents([('br1/bla', b'original contents\n')])
-        wt.add('bla', 'bla-a')
-        wt.commit('bla-a')
-        root_id = wt.get_root_id()
-        target = wt.controldir.sprout('br2').open_workingtree()
-        target.unversion(['bla'])
-        target.add('bla', 'bla-b')
-        target.commit('bla-b')
-        target_basis = target.basis_tree()
-        target_basis.lock_read()
-        self.addCleanup(target_basis.unlock)
-        foreign.update_workingtree_fileids(wt, target_basis)
-        wt.lock_read()
-        try:
-            self.assertEqual({'', "bla"}, set(wt.all_versioned_paths()))
-        finally:
-            wt.unlock()
-
-
 class DummyForeignVcsTests(tests.TestCaseWithTransport):
     """Very basic test for DummyForeignVcs."""