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

[Daniel Mark Watkins]

On Mon, 28 Apr 2008 16:04:27 +1000
Ian Clatworthy <ian.clatworthy at internode.on.net> wrote:
> Daniel Mark Watkins wrote:
> > One month later...
Another two months on.

> This is really close. My main gripe is that workingtree.check() is
> now a public method and therefore must have a test (so that
> accidentally removing it or changing its signature gets detected) and
> a better docstring. Having said that, I'd be ok with making that
> method private given I think the high level tests arguably cover it
> well enough.
I've made it private, as I don't know a way to test it properly.

> I want the first word in the docstring to be Validate, not Validates.
Done. 

> Given the order of the result tuple, I'd like the docstring to mention
> working tree before branch in its 1st line summary here. (Sorry if
> that seems picky but it's the sort of thing that leads to accidental
> errors.)
Done.

> As Aaron indicated, this needs to be 1.5 now.
I've made it 1.6.

> > +    @needs_read_lock
> > +    def check(self):
> > +        # bit hacky, check the tree parent is accurate
> > +        tree_basis = self.basis_tree()
> 
> The "bit hacky" comment doesn't add much value IMO. Perhaps you need
> to either explain why your approach is hacky or be more explicit
> (TODO: ...) about how it might be improved in the future. Removing it
> altogether is another option. :-)
I've removed it.  That code is not actually mine, I've just shifted it
from it's original location in cmd_check in builtins.py.

Aaron's requests should also be done.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: check.6.patch
Type: text/x-patch
Size: 47073 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080702/4503a158/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/20080702/4503a158/attachment-0001.pgp