[PATCH 16/21] git p4: disable read-only attribute before deleting
From: Pete Wyckoff <hidden>
Date: 2016-06-15 22:54:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
On windows, p4 marks un-edited files as read-only. Not only are they read-only, but also they cannot be deleted. Remove the read-only attribute before deleting in both the copy and rename cases. This also happens in the RCS cleanup code, where a file is marked to be deleted, but must first be edited to remove adjust the keyword lines. Make sure it is editable before patching. Signed-off-by: Pete Wyckoff <redacted> --- git-p4.py | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/git-p4.py b/git-p4.py
index 5b2f73d..a6806bc 100755
--- a/git-p4.py
+++ b/git-p4.py@@ -17,6 +17,7 @@ import time import platform import re import shutil +import stat verbose = False
@@ -1163,6 +1164,9 @@ class P4Submit(Command, P4UserMap): p4_edit(dest) pureRenameCopy.discard(dest) filesToChangeExecBit[dest] = diff['dst_mode'] + if self.isWindows: + # turn off read-only attribute + os.chmod(dest, stat.S_IWRITE) os.unlink(dest) editedFiles.add(dest) elif modifier == "R":
@@ -1181,6 +1185,8 @@ class P4Submit(Command, P4UserMap): p4_edit(dest) # with move: already open, writable filesToChangeExecBit[dest] = diff['dst_mode'] if not self.p4HasMoveCommand: + if self.isWindows: + os.chmod(dest, stat.S_IWRITE) os.unlink(dest) filesToDelete.add(src) editedFiles.add(dest)
@@ -1221,6 +1227,10 @@ class P4Submit(Command, P4UserMap): for file in kwfiles: if verbose: print "zapping %s with %s" % (line,pattern) + # File is being deleted, so not open in p4. Must + # 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
--
1.7.12.1.403.g28165e1