>>> if args.out == "stdout":
>>> file_out = sys.stdout
>>> else:
>>> @@ -63,11 +90,35 @@ def main(argv):
>>> new_rep.parse()
>>> debug.debug_print_parsed_report(new_rep)
>>> log_info(" [OK]")
>>> - except ReportError as e:
>>> + diff_source = None
>>> + if args.patch:
>>> + diff_source = os.path.realpath(args.patch)
>>> + elif args.baseline_rev:
>>> + git_diff = invoke_command(
>>> + "git diff --git-dir={} -C -C {}..{}".format(repo_dir,
>>> +
>>> args.baseline_rev,
>>> +
>>> args.report_rev),
>>> + True, "Error occured invoking:\n{}\n\n{}"
>>> + )
>>
>> I’ve noticed now an issue here, when using --baseline-rev/--report-rev, the
>> fix is this one:
>>
>> diff --git a/xen/scripts/diff-report.py b/xen/scripts/diff-report.py
>> index d608e3a05aa1..636f98f5eebe 100755
>> --- a/xen/scripts/diff-report.py
>> +++ b/xen/scripts/diff-report.py
>> @@ -95,9 +95,8 @@ def main(argv):
>> diff_source = os.path.realpath(args.patch)
>> elif args.baseline_rev:
>> git_diff = invoke_command(
>> - "git diff --git-dir={} -C -C {}..{}".format(repo_dir,
>> -
>> args.baseline_rev,
>> -
>> args.report_rev),
>> + "git --git-dir={}/.git diff -C -C {}..{}"
>> + .format(repo_dir, args.baseline_rev, args.report_rev),
>> True, "Error occured invoking:\n{}\n\n{}"
>> )
>> diff_source = git_diff.splitlines(keepends=True)
>>
>> I’ll wait for other feedback on the patch before sending it again.
>
> With this change:
>
> Acked-by: Stefano Stabellini <[email protected]>
> Tested-by: Stefano Stabellini <[email protected]>
Thank you Stefano,
I will push the serie with the fix and your tags
