Merge lp:~jelmer/bzrtools/no-more-branches into lp:bzrtools

[Jelmer Vernooij]

Remove the implementation of the 'bzr branches' command, which should
be available as 'bzr branches --scan' in bzr 2.5.

[Jonathan Riddell (jr)]

Looks fine

review: Approve

[Aaron Bentley (abentley)]

Jonathan, I actually have misgivings about removing the command entirely, which is why I haven't gone ahead and merged it. Bzrtools is mostly backwards-compatible with older bzrs and I don't know if I want to remove a command that they could use and have traditionally had.

[Jelmer Vernooij (jelmer)]

Hmm, I can't seem to mark my own MPs as rejected.

[Aaron Bentley (abentley)]

What's the deal with --scan? I don't want to mask the bzr version of 'branches', but I don't want to remove the bzrtools version if there's no reasonable alternative.

[Jelmer Vernooij (jelmer)]

"bzr branches --recursive" (renamed from --scan) has now landed on bzr.dev, and provides similar functionality to "bzr branches" from bzrtools.

[Aaron Bentley (abentley)]

Okay, so I think the strategy should be for "list-branches" to recomment "branches --recursive" in bzrs that have it.

[Aaron Bentley (abentley)]

recommend, not recomment.

Unmerged revisions

779. By Jelmer Vernooij on 2011-08-29

Remove implementation of branches command, which now is "bzr branches --scan".

778. By Jelmer Vernooij on 2011-08-29

Merge fix-bzr.dev-compat.

=== modified file '__init__.py'
--- __init__.py	2011-05-10 01:53:58 +0000
+++ __init__.py	2011-08-29 18:43:22 +0000
@@ -27,7 +27,6 @@
 
 
 commands = {
-    'cmd_branches': [],
     'cmd_branch_history': [],
     'cmd_cbranch': [],
     'cmd_cdiff': [],

=== removed file 'branches.py'
--- branches.py	2007-12-22 02:01:03 +0000
+++ branches.py	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-from bzrlib import errors
-from bzrlib.bzrdir import BzrDir
-from bzrlib.transport import get_transport
-from bzrtools import list_branches
-
-
-def branches(location=None):
-    if location is None:
-        location = '.'
-    t = get_transport(location)
-    for branch in list_branches(t):
-        print branch.base[len(t.base):].rstrip('/')

=== modified file 'bzrtools.py'
--- bzrtools.py	2009-03-11 01:19:53 +0000
+++ bzrtools.py	2011-08-29 18:43:22 +0000
@@ -25,19 +25,13 @@
 
 import bzrlib
 from bzrlib import revision as _mod_revision, trace, urlutils
-import bzrlib.errors
 from bzrlib.errors import (
     BzrCommandError,
     BzrError,
-    ConnectionError,
     NotBranchError,
     NoSuchFile,
-    NoWorkingTree,
-    PermissionDenied,
-    UnsupportedFormatError,
-    TransportError,
     )
-from bzrlib.bzrdir import BzrDir, BzrDirFormat
+from bzrlib.bzrdir import BzrDir
 from bzrlib.transport import get_transport
 
 def temp_tree():
@@ -303,7 +297,7 @@
         if working_tree:
             clean, non_source = is_clean(tree)
             if not clean:
-                raise bzrlib.errors.BzrCommandError(
+                raise BzrCommandError(
                     'This tree has uncommitted changes or unknown'
                     ' (?) files.  Use "bzr status" to list them.')
                 sys.exit(1)
@@ -319,16 +313,16 @@
             try:
                 if not history_subset(push_location, tree.branch,
                                       _rsync=my_rsync):
-                    raise bzrlib.errors.BzrCommandError(
+                    raise BzrCommandError(
                         "Local branch is not a newer version of remote"
                         " branch.")
             except RsyncNoFile:
                 if not empty_or_absent(push_location):
-                    raise bzrlib.errors.BzrCommandError(
+                    raise BzrCommandError(
                         "Remote location is not a bzr branch (or empty"
                         " directory)")
             except RsyncStreamIO:
-                raise bzrlib.errors.BzrCommandError("Rsync could not use the"
+                raise BzrCommandError("Rsync could not use the"
                     " specified location.  Please ensure that"
                     ' "%s" is of the form "machine:/path".' % push_location)
         trace.note("Pushing to %s", push_location)
@@ -355,7 +349,7 @@
     t._remote_path = lambda x: t.base
     try:
         lines = t.get('')
-    except bzrlib.errors.NoSuchFile:
+    except NoSuchFile:
         return
     expr = re.compile('<a[^>]*href="([^>]*)\/"[^>]*>', flags=re.I)
     for line in lines:
@@ -370,27 +364,6 @@
         yield url.rstrip('/')
 
 
-def list_branches(t):
-    def is_inside(branch):
-        return bool(branch.base.startswith(t.base))
-
-    if t.base.startswith('http://'):
-        def evaluate(bzrdir):
-            try:
-                branch = bzrdir.open_branch()
-                if is_inside(branch):
-                    return True, branch
-                else:
-                    return True, None
-            except NotBranchError:
-                return True, None
-        return [b for b in BzrDir.find_bzrdirs(t, list_current=apache_ls,
-                evaluate=evaluate) if b is not None]
-    elif not t.listable():
-        raise BzrCommandError("Can't list this type of location.")
-    return [b for b in BzrDir.find_branches(t) if is_inside(b)]
-
-
 def evaluate_branch_tree(bzrdir):
     try:
         tree, branch = bzrdir._get_tree_branch()

=== modified file 'cbranch.py'
--- cbranch.py	2008-03-20 15:36:35 +0000
+++ cbranch.py	2011-08-29 18:43:22 +0000
@@ -17,7 +17,6 @@
 
 from bzrlib import ui
 from bzrlib.bzrdir import BzrDir
-from bzrlib.branch import Branch
 from bzrlib.config import LocationConfig
 from bzrlib.errors import BzrCommandError, NoSuchFile
 from bzrlib.osutils import pathjoin, basename, abspath

=== modified file 'command_classes.py'
--- command_classes.py	2011-04-12 04:51:37 +0000
+++ command_classes.py	2011-08-29 18:43:22 +0000
@@ -16,8 +16,6 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import errno
-
 import bzrlib
 
 from bzrlib.lazy_import import lazy_import
@@ -29,21 +27,12 @@
 from command import BzrToolsCommand
 from errors import CommandError
 from patchsource import BzrPatchSource
-import sys
-import os.path
 
-import bzrlib.builtins
 import bzrlib.commands
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
 from bzrlib.commands import get_cmd_object
 from bzrlib.errors import BzrCommandError
-import bzrlib.ignores
-from bzrlib.trace import note
 from bzrlib.option import Option, RegistryOption
-from bzrlib.workingtree import WorkingTree
-
-from command import BzrToolsCommand
 
 
 class cmd_graph_ancestry(BzrToolsCommand):
@@ -448,13 +437,6 @@
                        hardlink=hardlink)
 
 
-class cmd_branches(BzrToolsCommand):
-    """Scan a location for branches"""
-    takes_args = ["location?"]
-    def run(self, location=None):
-        from branches import branches
-        return branches(location)
-
 class cmd_trees(BzrToolsCommand):
     """Scan a location for trees"""
     takes_args = ['location?']

=== modified file 'heads.py'
--- heads.py	2008-05-12 04:14:21 +0000
+++ heads.py	2011-08-29 18:43:22 +0000
@@ -18,11 +18,10 @@
 """Show all 'heads' in a repository"""
 
 
-import os
 import time
 
 import bzrlib
-from bzrlib.commands import Command, display_command, register_command
+from bzrlib.commands import Command, display_command
 from bzrlib import errors
 from bzrlib.option import Option
 from bzrlib.urlutils import unescape_for_display

=== modified file 'hunk_selector.py'
--- hunk_selector.py	2007-04-04 18:12:00 +0000
+++ hunk_selector.py	2011-08-29 18:43:22 +0000
@@ -1,7 +1,7 @@
 import sys
 
 from userinteractor import UserInteractor, UserOption
-from errors import NoColor
+from errors import NoColor, NoBzrtoolsColor
 import copy
 
 class HunkSelector:

=== modified file 'patch.py'
--- patch.py	2008-10-06 23:24:16 +0000
+++ patch.py	2011-08-29 18:43:22 +0000
@@ -17,11 +17,10 @@
 import sys
 import subprocess
 
-from bzrlib.workingtree import WorkingTree
 import bzrlib.add
 
 from bzrlib.plugins.bzrtools.bzrtools import open_from_url
-from errors import CommandError, PatchFailed, PatchInvokeError
+from errors import PatchFailed, PatchInvokeError
 
 def patch(tree, location, strip, quiet=False):
     """Apply a patch to a branch, using patch(1).  URLs may be used."""

=== modified file 'progress.py'
--- progress.py	2008-02-13 04:58:32 +0000
+++ progress.py	2011-08-29 18:43:22 +0000
@@ -16,8 +16,6 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import sys
-import datetime
-from bzrlib.progress import ProgressBar
 
 class Progress(object):
     def __init__(self, units, current, total=None):

=== modified file 'rspush.py'
--- rspush.py	2007-08-14 16:04:32 +0000
+++ rspush.py	2011-08-29 18:43:22 +0000
@@ -15,8 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 from bzrlib.option import Option
 from bzrlib.workingtree import WorkingTree
-import sys
-import os
 import bzrtools
 
 from command import BzrToolsCommand

=== modified file 'shelf.py'
--- shelf.py	2008-02-13 04:15:48 +0000
+++ shelf.py	2011-08-29 18:43:22 +0000
@@ -1,11 +1,10 @@
 import os
 import sys
-import subprocess
 from datetime import datetime
-from errors import CommandError, PatchFailed, PatchInvokeError
+from errors import CommandError, PatchFailed
 from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
 from patch import run_patch
-from patchsource import PatchSource, FilePatchSource
+from patchsource import FilePatchSource
 from bzrlib.osutils import rename
 
 class Shelf(object):

=== modified file 'tests/blackbox.py'
--- tests/blackbox.py	2011-06-24 13:35:53 +0000
+++ tests/blackbox.py	2011-08-29 18:43:22 +0000
@@ -112,19 +112,6 @@
         self.assertIs(False, os.path.exists('checkout2'))
         self.assertIs(False, os.path.exists('source2'))
 
-    def test_branches(self):
-        self.run_bzr('init source')
-        self.run_bzr('init source/subsource')
-        self.run_bzr('checkout --lightweight source checkout')
-        self.run_bzr('init checkout/subcheckout')
-        self.run_bzr('init checkout/.bzr/subcheckout')
-        out = self.run_bzr('branches')[0]
-        lines = out.split('\n')
-        self.assertIs(True, 'source' in lines)
-        self.assertIs(True, 'source/subsource' in lines)
-        self.assertIs(True, 'checkout/subcheckout' in lines)
-        self.assertIs(True, 'checkout' not in lines)
-
     def test_import_upstream(self):
         self.run_bzr('init source')
         os.mkdir('source/src')

=== modified file 'tests/test_link_tree.py'
--- tests/test_link_tree.py	2010-02-25 04:15:18 +0000
+++ tests/test_link_tree.py	2011-08-29 18:43:22 +0000
@@ -17,7 +17,12 @@
 import os
 
 from bzrlib.transform import TreeTransform
-from bzrlib.tests import TestCaseWithTransport, HardlinkFeature
+from bzrlib.tests import TestCaseWithTransport
+
+try:
+    from bzrlib.tests.features import HardlinkFeature
+except ImportError: # bzr < 2.5
+    from bzrlib.tests import HardlinkFeature
 
 from bzrlib.plugins.bzrtools import command
 from bzrlib.plugins.bzrtools.link_tree import link_tree