Re: [PATCH] git-p4: changelist template with p4 -G change -o
- From
miguel torroja <miguel.torroja@gmail.com>
- Date
- Jun 27, 2017, 09:20 UTC
- Message-ID
- <CAKYtbVY_=aMjcS=r2YyhcxKiUAaJUJA=OELTvXfau4GGz7Lz4Q@mail.gmail.com>
- In-Reply-To
- <CAKYtbVbGekXGAyPd7HeLot_MdZkp7-1Ss-iAi7o8ze2b+sNB6Q@mail.gmail.com>
Hi Lars/Luke,
I tried a first test extending t9807-git-p4-submit.sh. I set this p4 trigger: 'p4test command pre-user-change "echo verbose trigger" '. I'm able to reproduce the issue I wanted to fix. However I found yet another issue, in this case when reading the result from p4_read_pipe_lines (in function p4ChangesForPaths), the pre-user-change is triggered with any "p4 change" and "p4 changes" command (the p4 server we have in production, only shows "extra" messages with p4 change). I'll collapse in one single commit the fix for p4 change/p4 changes and the new test.
Thanks,
Miguel
On Sat, Jun 24, 2017 at 10:37 PM, miguel torroja <miguel.torroja@gmail.com> wrote:
Show 54 quoted lines
> Hi Lars,
>
> I think it's doable to set a custom p4 trigger, created by the test case,
> that outputs "extra info" when requesting a changelist description.
> I'll do a specific test and post it to this thread.
>
>
> Thanks,
>
>
> El 24 jun. 2017 7:36 p. m., "Lars Schneider" <larsxschneider@gmail.com>
> escribió:
>
>
>> On 24 Jun 2017, at 13:49, Luke Diamand <luke@diamand.org> wrote:
>>
>> On 22 June 2017 at 18:32, Junio C Hamano <gitster@pobox.com> wrote:
>>> Miguel Torroja <miguel.torroja@gmail.com> writes:
>>>
>>>> The option -G of p4 (python marshal output) gives more context about the
>>>> data being output. That's useful when using the command "change -o" as
>>>> we can distinguish between warning/error line and real change
>>>> description.
>>>>
>>>> Some p4 plugin/hooks in the server side generates some warnings when
>>>> executed. Unfortunately those messages are mixed with the output of
>>>> "p4 change -o". Those extra warning lines are reported as
>>>> {'code':'info'}
>>>> in python marshal output (-G). The real change output is reported as
>>>> {'code':'stat'}
>>
>> I think this seems like a reasonable thing to do if "p4 change -o" is
>> jumbling up output.
>>
>> One thing I notice trying it out by hand is that we seem to have lost
>> the annotation of the Perforce per-file modification type (is there a
>> proper name for this?).
>>
>> For example, if I add a file called "baz", then the original version
>> creates a template which looks like this:
>>
>> //depot/baz # add
>>
>> But the new one creates a template which looks like:
>>
>> //depot/baz
>
> @Miguel: You wrote that p4 plugins/hooks generate these warnings.
> I wonder if you see a way to replicate that in a test case. Either
> in t9800 or a new t98XX test case file?
>
> - Lars
>
>