Foreign branch infrastructure plans

[Jelmer Vernooij]

On Fri, Mar 13, 2009 at 03:16:13PM +1100, Martin Pool wrote:
> That's a very nice list.
> > ?* Some sort of way to override what upstream revision to use in
> > ? "bzr merge" if none was specified. This would have to pick the
> > ? right mapping to use for foreign branches.
> What do you mean by 'upstream revision'?
The revision in the foreign branch that is merged into the local,
bzr-native branch.

> > ?* Tree should have a .get_ignores() method that can return the
> > ? ignores independent of how they are stored. This is necessary so
> > ? .bzrignore can end up in svn:ignore or .gitignore
> Right, so presumably returning some kind of object that encapsulates
> the rules, rather than just the file contents.
Yeah, indeed. A similar thing would have to be done for rules, since
they should now allow us to support svn:keywords and svn:eol-style. It
might also be easier to support rules, since they are not stored in
the working tree, so we might want to look at those first.

> > ?* Stacking is very focussed around the bzr data formats right now, it
> > ? would be nice if it could optionally not go via VersionedFiles for
> > ? inventories, revisions and signatures if the formats were
> > ? incompatible.

> Yes, I think they're meant to be just part of the implementation and
and ? :-)

> > Anything I'm missing?

> It's only a bit related but I'd like to move more towards having clean
> hierarchies for the main components.  I'm thinking we should have one
> base which only defines the interface and is purely abstract, and then
> a subclass that provides 'reasonable defaults' for methods (like
> "return False" for supports_foo()), or building more complex methods
> on more primitive ones.  At the moment they're a bit mixed up.
That makes sense. We did move to this a little bit for
Branch (where we have Branch, BzrBranch and ForeignBranch).

I should also mention that the fact that the API was well enough abstracted
in the first place was one of the reasons I started working on bzr-svn in
the first place. 

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://jelmer.vernstok.nl/
 00:52:02 up 19 days,  7:05, 10 users,  load average: 1.58, 1.76, 1.80