Re: [PATCH 2/2] git-p4: fix handling of multi-word P4EDITOR

From: Luke Diamand <luke@diamand.org>
Date: May 7, 2015, 22:04 UTC
Message-ID: <554BE15B.3040303@diamand.org>
In-Reply-To: <xmqq3838nl5l.fsf@gitster.dls.corp.google.com>

On 07/05/15 22:16, Junio C Hamano wrote:

Show 8 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
> i.e. the shell at the beginning of system sees "$customEditor"
> (including the double quotes) as a quoted variable, expand the
> environment variable as exported, and treat it as the path to
> the program.  Again untested but I think
>
> 	P4EDITOR="\"\$customEditor\"" &&

Or will this work?

- P4EDITOR="$TRASH_DIRECTORY/ed.sh" && + P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" &&

I'm still a bit worried about what will happen to Windows users with this change though. I think the following avoids breaking Windows clients, but I'm not sure if it's the right way to go:

-	system([editor, template_file])
+       system(shlex.split(editor) + [template_file])

I've not tested it on anything other than Linux so far, so best not to merge yet!

Luke

Show 7 quoted lines

>
> should do the work.
>
>> +		export customEditor P4EDITOR &&
>>   		git p4 submit &&
>>   		p4 changes //depot/... >wc &&
>>   		test_line_count = 5 wc