undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git p4: disable read-only attribute before deleting

Browse Source 
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 <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2013-01-26 22:11:19 -05:00 committed by Junio C Hamano
parent 4cea4d6608
commit d20f0f8e28
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-p4.py
View File

@ -21,6 +21,7 @@ import time
import platform import platform
import re import re
import shutil import shutil
import stat
verbose = False verbose = False
@ -1231,6 +1232,9 @@ class P4Submit(Command, P4UserMap):
p4_edit(dest) p4_edit(dest)
pureRenameCopy.discard(dest) pureRenameCopy.discard(dest)
filesToChangeExecBit[dest] = diff['dst_mode'] filesToChangeExecBit[dest] = diff['dst_mode']
if self.isWindows:
# turn off read-only attribute
os.chmod(dest, stat.S_IWRITE)
os.unlink(dest) os.unlink(dest)
editedFiles.add(dest) editedFiles.add(dest)
elif modifier == "R": elif modifier == "R":
@ -1249,6 +1253,8 @@ class P4Submit(Command, P4UserMap):
p4_edit(dest) # with move: already open, writable p4_edit(dest) # with move: already open, writable
filesToChangeExecBit[dest] = diff['dst_mode'] filesToChangeExecBit[dest] = diff['dst_mode']
if not self.p4HasMoveCommand: if not self.p4HasMoveCommand:
if self.isWindows:
os.chmod(dest, stat.S_IWRITE)
os.unlink(dest) os.unlink(dest)
filesToDelete.add(src) filesToDelete.add(src)
editedFiles.add(dest) editedFiles.add(dest)
@ -1289,6 +1295,10 @@ class P4Submit(Command, P4UserMap):
for file in kwfiles: for file in kwfiles:
if verbose: if verbose:
print "zapping %s with %s" % (line,pattern) 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]) self.patchRCSKeywords(file, kwfiles[file])
fixed_rcs_keywords = True fixed_rcs_keywords = True