From: Anand Kumria <wildfire@progsoc.org>
To: git@vger.kernel.org
Cc: simon@lst.de, Anand Kumria <wildfire@progsoc.org>
Subject: [PATCH 04/12] Utilise the new 'p4_system' function.
Date: Sun, 10 Aug 2008 19:26:27 +0100 [thread overview]
Message-ID: <1218392795-4084-5-git-send-email-wildfire@progsoc.org> (raw)
In-Reply-To: <1218392795-4084-4-git-send-email-wildfire@progsoc.org>
Signed-off-by: Anand Kumria <wildfire@progsoc.org>
---
contrib/fast-import/git-p4 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 08acd51..2ed36ec 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -98,7 +98,7 @@ def setP4ExecBit(file, mode):
if p4Type[-1] == "+":
p4Type = p4Type[0:-1]
- system("p4 reopen -t %s %s" % (p4Type, file))
+ p4_system("reopen -t %s %s" % (p4Type, file))
def getP4OpenedType(file):
# Returns the perforce file type for the given file.
@@ -561,7 +561,7 @@ class P4Submit(Command):
modifier = diff['status']
path = diff['src']
if modifier == "M":
- system("p4 edit \"%s\"" % path)
+ p4_system("edit \"%s\"" % path)
if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
filesToChangeExecBit[path] = diff['dst_mode']
editedFiles.add(path)
@@ -576,8 +576,8 @@ class P4Submit(Command):
filesToAdd.remove(path)
elif modifier == "R":
src, dest = diff['src'], diff['dst']
- system("p4 integrate -Dt \"%s\" \"%s\"" % (src, dest))
- system("p4 edit \"%s\"" % (dest))
+ p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest))
+ p4_system("edit \"%s\"" % (dest))
if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
filesToChangeExecBit[dest] = diff['dst_mode']
os.unlink(dest)
@@ -601,7 +601,7 @@ class P4Submit(Command):
if response == "s":
print "Skipping! Good luck with the next patches..."
for f in editedFiles:
- system("p4 revert \"%s\"" % f);
+ p4_system("revert \"%s\"" % f);
for f in filesToAdd:
system("rm %s" %f)
return
@@ -624,10 +624,10 @@ class P4Submit(Command):
system(applyPatchCmd)
for f in filesToAdd:
- system("p4 add \"%s\"" % f)
+ p4_system("add \"%s\"" % f)
for f in filesToDelete:
- system("p4 revert \"%s\"" % f)
- system("p4 delete \"%s\"" % f)
+ p4_system("revert \"%s\"" % f)
+ p4_system("delete \"%s\"" % f)
# Set/clear executable bits
for f in filesToChangeExecBit.keys():
@@ -728,7 +728,7 @@ class P4Submit(Command):
os.chdir(self.clientPath)
print "Syncronizing p4 checkout..."
- system("p4 sync ...")
+ p4_system("sync ...")
self.check()
--
1.5.6.3
next prev parent reply other threads:[~2008-08-10 18:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-10 18:26 [PATCH 00/12] Allow users to access Perforce repositories requiring authentication Anand Kumria
2008-08-10 18:26 ` [PATCH 01/12] Create a specific version of the read_pipe_lines command for p4 invocations Anand Kumria
2008-08-10 18:26 ` [PATCH 02/12] Utilise the new 'p4_read_pipe_lines' command Anand Kumria
2008-08-10 18:26 ` [PATCH 03/12] Have a command that specifically invokes 'p4' (via system) Anand Kumria
2008-08-10 18:26 ` Anand Kumria [this message]
2008-08-10 18:26 ` [PATCH 05/12] Add a single command that will be used to construct the 'p4' command Anand Kumria
2008-08-10 18:26 ` [PATCH 06/12] If we are in verbose mode, output what we are about to run (or return) Anand Kumria
2008-08-10 18:26 ` [PATCH 07/12] Switch to using 'p4_build_cmd' Anand Kumria
2008-08-10 18:26 ` [PATCH 08/12] If the user has configured various parameters, use them Anand Kumria
2008-08-10 18:26 ` [PATCH 09/12] Consistently use 'git-p4' for the configuration entries Anand Kumria
2008-08-10 18:26 ` [PATCH 10/12] Move git-p4.syncFromOrigin into a configuration parameters section Anand Kumria
2008-08-10 18:26 ` [PATCH 11/12] Put some documentation in about the parameters that have been added Anand Kumria
2008-08-10 18:26 ` [PATCH 12/12] Put in the two other configuration elements found in the source Anand Kumria
2008-08-13 19:47 ` [PATCH 00/12] Allow users to access Perforce repositories requiring authentication Simon Hausmann
2008-08-14 17:00 ` Tor Arvid Lund
2008-08-14 22:01 ` Anand Kumria
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1218392795-4084-5-git-send-email-wildfire@progsoc.org \
--to=wildfire@progsoc.org \
--cc=git@vger.kernel.org \
--cc=simon@lst.de \
/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.
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 NNTP newsgroup(s).