[MERGE] support non '.bzr' control directories better.

Robert Collins robertc at robertcollins.net
Wed Jun 7 16:34:21 BST 2006


On Sun, 2006-06-04 at 12:58 +0100, Martin Pool wrote:
> On  1 Jun 2006, Robert Collins <robertc at robertcollins.net> wrote:
> > This should be useful for jelmer's SVN work, and was needed for my hg
> > plugin.
> > 
> > Branch is at
> > http://people.ubuntu.com/~robertc/baz2.0/non-bzr-control-dirs
> 
> About +0.5; you can merge it if you like but I'd like it simplified a
> bit.

Lets aim for that then.

> > === modified file 'bzrlib/bzrdir.py'
> > --- bzrlib/bzrdir.py	
> > +++ bzrlib/bzrdir.py	


> > +
> >      def open(self, transport, _found=False):
> >          """Return an instance of this format for the dir transport points at.
> 
> I think there are too many layers here: do we really need sets of sets?
> I understand it can optimize probing a little (read .bzr/branch-format
> once, then compare to various strings) but we can deal with that later.

Well, on remote connections reading these files is extremely expensive.
I'm sure we *can* deal with it later, I'm not sure we want to do so.


> 
> > @@ -847,6 +858,8 @@
> >          #if root_id is None:
> >          #    root_id = bzrlib.branch.gen_file_id('TREE_ROOT')
> >          self.root = RootEntry(root_id)
> > +        # FIXME: this isn't ever used, changin it to self.revision may break
> > +        # things. TODO make everything one or the other.
> >          self.revision_id = revision_id
> >          self._byid = {self.root.file_id: self.root}
> 
> Let's make it revision_id everywhere.

Can I add this as a TODO or would you like it done pre-merge.

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: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060608/d6cea106/attachment.pgp 


More information about the bazaar mailing list