[MERGE] 4% faster to incremental commit

Robert Collins robertc at robertcollins.net
Thu Sep 20 23:36:05 BST 2007


On Fri, 2007-09-21 at 08:30 +1000, Ian Clatworthy wrote:
> Robert Collins wrote:
> > This is the tweaked patch, with a bug in bzr.dev for pointless commits
> > of nested trees fix (Ian's questions about whether my code had a bug had
> > me look for this, and it was broken in bzr.dev).
> 
> Sweet. Thanks for the bug fix while you were in there.
> 
> bb:tweak
> 
> If you agree with them, I'll make the tweaks as I merge.
> 
> >          self.bound_branch = None
> > +        self.entries_changed = False
> > +        self.entries_deleted = False
> 
> Poolie's suggestion re naming these any_entries_* needs to be applied.
> 
> >      # all clients should supply tree roots.
> >      record_root_entry = True
> > +    # the default CommitBuilder does not manage trees whose root is versioned.
> > +    _versioned_root = False
> [snip]
> >  class RootCommitBuilder(CommitBuilder):
> >      """This commitbuilder actually records the root id"""
> >      
> > +    # the root entry gets versioned properly by this builder.
> > +    _versioned_root = False
> > +
> 
> I believe you meant True here for the RootCommitBuilder case, yes?

Yes. And thus the problem of having it separate is shown :).

Please do make these changes - thank you!

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070921/36993948/attachment.pgp 


More information about the bazaar mailing list