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

[Daniel Mark Watkins]

On Thu, 03 Jul 2008 15:48:41 +1000
Ian Clatworthy <ian.clatworthy at canonical.com> wrote:
> > +        If no tree, branch or repository is found, a
> > NotVersionedError is
> > +        raised.
> 
> This docstring is no longer correct - it's NotBranchError now.
Fixed.

> > +        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.
D'oh!  Fixed.

> > + 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))
Done.

> > +    else:
> > +        if repo is not None:
> 
> elif will do here.
Done.


Dan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: check.7.patch
Type: text/x-patch
Size: 47497 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080703/8dfa34c5/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080703/8dfa34c5/attachment-0001.pgp