git-p4: add RCS keyword status message

During the p4 submit process, git-p4 will attempt to apply a patch to the files found in the p4 workspace. However, if P4 uses RCS keyword expansion, this patch may fail. When the patch fails, the user is alerted to the failure and that git-p4 will attempt to clear the expanded text from the files and re-apply the patch. The current version of git-p4 does not tell the user the result of the re-apply attempt after the RCS expansion has been removed which can be confusing. Add a new print statement after the git patch has been successfully applied when the RCS keywords have been cleansed. Signed-off-by: Ben Keene <seraphire@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ben Keene committed Feb 14, 2020 at 14:44 UTC 1ec4a0a356f73ef0ab57d3903bd6667942a7052c

1 file changed +4

git-p4.py

@@ -2025,6 +2025,9 @@ class P4Submit(Command, P4UserMap):

2025 applyPatchCmd = patchcmd + "--check --apply -"

2026 patch_succeeded = True

2027

2028 + if verbose:

2029 + print("TryPatch: %s" % tryPatchCmd)

2030 +

2031 if os.system(tryPatchCmd) != 0:

2032 fixed_rcs_keywords = False

2033 patch_succeeded = False

@@ -2064,6 +2067,7 @@ class P4Submit(Command, P4UserMap):

2067 print("Retrying the patch with RCS keywords cleaned up")

2068 if os.system(tryPatchCmd) == 0:

2069 patch_succeeded = True

2070 + print("Patch succeesed this time with RCS keywords cleaned")

2071

2072 if not patch_succeeded:

2073 for f in editedFiles: