From: Joel Holdsworth <jholdsworth@nvidia.com>
To: git@vger.kernel.org
Cc: Tzadik Vanderhoof <tzadik.vanderhoof@gmail.com>,
Dorgon Chang <dorgonman@hotmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>,
Daniel Levin <dendy.ua@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Luke Diamand <luke@diamand.org>, Ben Keene <seraphire@gmail.com>,
Andrew Oakley <andrew@adoakley.name>,
Joel Holdsworth <jholdsworth@nvidia.com>
Subject: [PATCH v2 4/5] git-p4: open temporary patch file for write only
Date: Thu, 16 Dec 2021 13:46:18 +0000 [thread overview]
Message-ID: <20211216134619.2048348-5-jholdsworth@nvidia.com> (raw)
In-Reply-To: <20211216134619.2048348-1-jholdsworth@nvidia.com>
The patchRCSKeywords method creates a temporary file in which to store
the patched output data. Previously this file was opened in "w+" mode
(write and read), but the code never reads the contents of the file
while open, so it only needs to be opened in "w" mode (write-only).
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 509feac2d8..7845210e69 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1754,7 +1754,7 @@ def patchRCSKeywords(self, file, regexp):
# Attempt to zap the RCS keywords in a p4 controlled file matching the given regex
(handle, outFileName) = tempfile.mkstemp(dir='.')
try:
- with os.fdopen(handle, "w+") as outFile, open(file, "r") as inFile:
+ with os.fdopen(handle, "w") as outFile, open(file, "r") as inFile:
for line in inFile.readlines():
outFile.write(regexp.sub(r'$\1$', line))
# Forcibly overwrite the original file
--
2.34.1
next prev parent reply other threads:[~2021-12-16 13:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 13:46 [PATCH v2 0/5] git-p4: fix RCS keyword processing encoding errors Joel Holdsworth
2021-12-16 13:46 ` [PATCH v2 1/5] git-p4: use with statements to close files after use in patchRCSKeywords Joel Holdsworth
2021-12-16 13:46 ` [PATCH v2 2/5] git-p4: pre-compile RCS keyword regexes Joel Holdsworth
2021-12-16 13:46 ` [PATCH v2 3/5] git-p4: add raw option to read_pipelines Joel Holdsworth
2021-12-16 13:46 ` Joel Holdsworth [this message]
2021-12-16 13:46 ` [PATCH v2 5/5] git-p4: resolve RCS keywords in bytes not utf-8 Joel Holdsworth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211216134619.2048348-5-jholdsworth@nvidia.com \
--to=jholdsworth@nvidia.com \
--cc=andrew@adoakley.name \
--cc=dendy.ua@gmail.com \
--cc=dorgonman@hotmail.com \
--cc=git@vger.kernel.org \
--cc=joachim.kuebart@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=luke@diamand.org \
--cc=seraphire@gmail.com \
--cc=tzadik.vanderhoof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).