On Tue, Dec 10, 2019 at 03:22:54PM +0000, Ben Keene via GitGitGadget wrote:
> From: Ben Keene <seraphire@xxxxxxxxx>
>
> When applying a commit fails because of RCS keywords, Git
> will fail the P4 submit. It would help the user if Git suggested that
> the user set git-p4.attemptRCSCleanup to true.
>
> Change the applyCommit() method that when applying a commit fails
> becasue of the P4 RCS Keywords, the user should consider setting
> git-p4.attemptRCSCleanup to true.
>
> Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
> ---
> git-p4.py | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/git-p4.py b/git-p4.py
> index 174200bb6c..cb594baeef 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -1959,6 +1959,14 @@ def applyCommit(self, id):
> for f in editedFiles:
> p4_revert(f)
> raise
> + else:
> + # They do not have attemptRCSCleanup set, this might be the fail point
> + # Check to see if the file has RCS keywords and suggest setting the property.
> + for file in editedFiles | filesToDelete:
> + if p4_keywords_regexp_for_file(file) != None:
small nit: we should use `is not None` here.
> + print("At least one file in this commit has RCS Keywords that may be causing problems. ")
> + print("Consider:\ngit config git-p4.attemptRCSCleanup true")
> + break
>
> if fixed_rcs_keywords:
> print("Retrying the patch with RCS keywords cleaned up")
> --
> gitgitgadget
