[MERGE][Bug #64783] Fixing check to understand the split-up .bzr format

[Ian Clatworthy]

Daniel Mark Watkins wrote:

> Aaron's requests should also be done.

Well almost. :-) You missed one bit. Some other tweaks
suggested as well.

bb:tweak

> +        If no tree, branch or repository is found, a NotVersionedError is
> +        raised.

This docstring is no longer correct - it's NotBranchError now.

> +        bzrdir, relpath = klass.open_containing(location)
> +        try:
> +            tree, branch = bzrdir._get_tree_branch()
> +        except errors.NotBranchError:
> +            try:
> +                repo = klass.open_containing(location)[0].find_repository()

You're still calling open_containing twice. You want ...

  repo = bzrdir.find_repository()

> + at deprecated_function(one_six)
>  def check(branch, verbose):

poolie has changed this now so we don't need to introduce new
symbols every release. The code above will work but the below
form is now preferred:

@deprecated_function((1,6,0))

> +    else:
> +        if repo is not None:

elif will do here.

Ian C.