[MERGE] get rid of os.spawnvp() usage for external diff
John Arbash Meinel
john at arbash-meinel.com
Sat Jun 17 00:53:20 BST 2006
James Henstridge wrote:
> On 09/06/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
I missed one other fixup when I did the review. You need an extra blank
line before 'external_udiff_lines'. (At the top level all object are
spaced by 2 blank lines.
>> > def udiff_lines(old, new, allow_binary=False):
>> > @@ -30,6 +30,15 @@
>> > output.seek(0, 0)
>> > return output.readlines()
>> >
>> > +def external_udiff_lines(old, new):
>> > + output = TemporaryFile()
>> > + external_diff('old', old, 'new', new, output, diff_opts=['-u'])
>> > + output.seek(0, 0)
>> > + lines = output.readlines()
>> > + output.close()
>> > + return lines
>> > +
>> > +
>> >
>>
I went ahead and merged you and did some cleanup. (I'm trying to get the
pending merges out of the mailing list). I went ahead and implemented
mkstemp.
Can I get a +1 to merge this into mainline?
John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: external-diff.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060616/d2d84334/attachment.diff
More information about the bazaar
mailing list