[PATCH v3 3/4] git-p4: wrap patchRCSKeywords test to revert changes on failure

From: Ben Keene via GitGitGadget <gitgitgadget@gmail.com>
Date: Dec 12, 2019, 19:46 UTC
Message-ID: <c466e79148028364873189eb6fe4a1db97fb100f.1576179987.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.675.v3.git.git.1576179987.gitgitgadget@gmail.com>

From: Ben Keene <seraphire@gmail.com>

The patchRCSKeywords function has the potentional of throwing an exception and this would leave files checked out in P4 and partially modified.

Add a try-catch block around the patchRCSKeywords call and revert the edited files in P4 before leaving the method.

Signed-off-by: Ben Keene <seraphire@gmail.com>
---
 git-p4.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/git-p4.py b/git-p4.py
index 45c0175a68..97fad8d3f0 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1953,8 +1953,15 @@ def applyCommit(self, id):
                     # disable the read-only bit on windows.
                     if self.isWindows and file not in editedFiles:
                         os.chmod(file, stat.S_IWRITE)
-                    self.patchRCSKeywords(file, kwfiles[file])
-                    fixed_rcs_keywords = True
+                    
+                    try:
+                        self.patchRCSKeywords(file, kwfiles[file])
+                        fixed_rcs_keywords = True
+                    except:
+                        # We are throwing an exception, undo all open edits
+                        for f in editedFiles:
+                            p4_revert(f)
+                        raise
 
             if fixed_rcs_keywords:
                 print("Retrying the patch with RCS keywords cleaned up")

-- 
gitgitgadget