[BZR Tree!] Updated shelf

[John Arbash Meinel]

Michael Ellerman wrote:

>On Fri, 17 Jun 2005 04:15 pm, John Arbash Meinel wrote:
>
>
>>Generally this seems very nice. Thanks for all the good work.
>>
>>
>
>Glad someone likes it!
>
>
>
>>Since I have been working on native plugins (rather than spawning
>>sub-processes) I figured I would give it a shot.
>>
>>
>
>Ah a fork-nazi ;D
>
>
Not really a fork, just an alternative way to go. :)

>I agree in general that extensions aren't great in terms of performance, but
>for something like this it's no biggy. I hadn't bothered making it a plugin
>myself 'cause I was thinking I'd get it right and then try and convice Martin
>to merge it (or something similar) into bzr proper. But this isn't a bad half
>way position, thanks for doing the work.
>
>
Well, a plugin is actually closer to what you would actually use (since
it uses bzrlib rather than execing bzr), so with any luck you'll
actually be *closer* to getting it merged.
That was actually my original thought with plugins. Is they can be dev
code, which can be vetted as a plugin, and then merged into the core.

The one thing that I see needs to be changed, is that right now I am
using the "show_diff_trees" interface, and writing into a StringIO
object. You probably would rather use the compare_trees() interface,
which returns more of a delta object.
Then you could call "internal_diff/external_diff" for each file, rather
than trying to parse the output string to determine when you are on a
new file.
In fact, you might even use a different wrapper around
difflib.unified_diff which returns the line/by/line output, rather than
everything at once.

>I haven't had a chance to look at your patch, I'm flat out trying to get some
>patches out the door tonight. I'll be away this w/e, but I'll check your
>changes out when I get back.
>
>
>
Have a fun weekend.

>cheers
>
>
>
We really need to get a changeset format defined, so that bzr shelve can
create a real changeset which includes renaming files, etc.

I also think it would be nice if bzr shelve had multiple levels of
shelves (.bzr-shelf-1, .bzr-shelf-2) just to keep things separate. But
maybe that is a little silly.

John
=:->

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