[merge] Make merge internals private

[John Arbash Meinel]

Aaron Bentley wrote:
> Could I get a review please?
> 
> Same old place:
> http://panoramicfeedback.com/opensource/bzr/bzr.ab/
> 

For some reason, merging your branch takes *way* too long. On my fast
machine it takes 10 minutes to do the merge. On my older machine, I
killed it after about 15 minutes, but I'll run again to see how long it
takes. (It seems to spend its time in Weave._extract() considering what
happened when I canceled it)


> Martin Pool wrote:
> 
> 
>>>>>Perhaps if this is meant to
>>>>>be a bzrlib-internal class it would be better called
>>>>>_MergeConflictHandler.  (In which case it could go back in merge.py if
>>>>>you wanted :-)
> 
> 
> This is done.
> 
> I have moved merge.merge into builtins so that we don't open branches
> outside the UI level, as John Meinel suggested.
> 
> I have reduced the PEP8 violations.
> 
> get_tree and get_revid_tree are now private.
> 
> I have removed file_exists.
> 
> I have not removed build_working_dir, but I have explained why I think
> it should not be removed.
> 
> I have not made merge_inner or Merge private, but I have explained why I
> think they should be public.
> 
> I have not made MergeConflictHandler public, but I have explained why I
> think it should not be public.
> 
> Aaron

On to the review:
You have this at the top:
from bzrlib import _changeset
from _changeset import ...

Shouldn't the second line be:
from bzrlib._changeset import ...

I don't think you import from an object, only a path, and I thought we
were avoiding local paths (see the xml.py issue)

Similar thing inside 'bzrlib/merge.py' you have:

'from _changeset import get_contents'

Other than these nitpicky things, everything looks good. I'll +1 it,
which means that if you ask, I'll merge it into jam-integration.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060124/150aac3f/attachment.pgp