Lots of bugfixes to p4-git-sync.
Added interactive and dry-run mode. Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Mar 13, 2007 at 16:36 UTC
09a14fb52410cfda029b51832316616b44348505
1 file changed
+73
-17
contrib/fast-import/p4-git-sync.py
+73
-17
@@ -3,11 +3,13 @@
3
# p4-git-sync.py
4
#
5
# Author: Simon Hausmann <hausmann@kde.org>
6
+# Copyright: 2007 Simon Hausmann <hausmann@kde.org>
7
+# 2007 Trolltech ASA
8
# License: MIT <http://www.opensource.org/licenses/mit-license.php>
9
#
10
11
import os, string, shelve, stat
10
-import getopt, sys, marshal
12
+import getopt, sys, marshal, tempfile
13
14
def p4CmdList(cmd):
15
cmd = "p4 -G %s" % cmd
@@ -33,7 +35,8 @@ def p4Cmd(cmd):
35
36
try:
37
opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=",
36
- "submit-log-subst=", "log-substitutions=" ])
38
+ "submit-log-subst=", "log-substitutions=", "interactive",
39
+ "dry-run" ])
40
except getopt.GetoptError:
41
print "fixme, syntax error"
42
sys.exit(1)
@@ -46,6 +49,8 @@ origin = "origin"
49
master = "master"
50
firstTime = True
51
reset = False
52
+interactive = False
53
+dryRun = False
54
55
for o, a in opts:
56
if o == "--git-dir":
@@ -67,6 +72,10 @@ for o, a in opts:
72
for line in open(a, "r").readlines():
73
tokens = line[:-1].split("=")
74
logSubstitutions[tokens[0]] = tokens[1]
75
+ elif o == "--interactive":
76
+ interactive = True
77
+ elif o == "--dry-run":
78
+ dryRun = True
79
80
if len(gitdir) == 0:
81
gitdir = ".git"
@@ -112,19 +121,16 @@ def start(config):
121
def prepareLogMessage(template, message):
122
result = ""
123
115
- substs = logSubstitutions
116
- for k in substs.keys():
117
- substs[k] = substs[k].replace("%log%", message)
118
-
124
for line in template.split("\n"):
125
if line.startswith("#"):
126
result += line + "\n"
127
continue
128
129
substituted = False
125
- for key in substs.keys():
130
+ for key in logSubstitutions.keys():
131
if line.find(key) != -1:
127
- value = substs[key]
132
+ value = logSubstitutions[key]
133
+ value = value.replace("%log%", message)
134
if value != "@remove@":
135
result += line.replace(key, value) + "\n"
136
substituted = True
@@ -136,6 +142,7 @@ def prepareLogMessage(template, message):
142
return result
143
144
def apply(id):
145
+ global interactive
146
print "Applying %s" % (os.popen("git-log --max-count=1 --pretty=oneline %s" % id).read())
147
diff = os.popen("git diff-tree -r --name-status \"%s^\" \"%s\"" % (id, id)).readlines()
148
filesToAdd = set()
@@ -158,6 +165,9 @@ def apply(id):
165
166
system("git-diff-files --name-only -z | git-update-index --remove -z --stdin")
167
system("git cherry-pick --no-commit \"%s\"" % id)
168
+ #system("git format-patch --stdout -k \"%s^\"..\"%s\" | git-am -k" % (id, id))
169
+ #system("git branch -D tmp")
170
+ #system("git checkout -f -b tmp \"%s^\"" % id)
171
172
for f in filesToAdd:
173
system("p4 add %s" % f)
@@ -168,22 +178,66 @@ def apply(id):
178
logMessage = ""
179
foundTitle = False
180
for log in os.popen("git-cat-file commit %s" % id).readlines():
171
- log = log[:-1]
181
if not foundTitle:
173
- if len(log) == 0:
182
+ if len(log) == 1:
183
foundTitle = 1
184
continue
185
186
if len(logMessage) > 0:
187
logMessage += "\t"
179
- logMessage += log + "\n"
188
+ logMessage += log
189
190
template = os.popen("p4 change -o").read()
182
- fileName = "submit.txt"
183
- file = open(fileName, "w+")
184
- file.write(prepareLogMessage(template, logMessage))
185
- file.close()
186
- print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
191
+
192
+ if interactive:
193
+ submitTemplate = prepareLogMessage(template, logMessage)
194
+ diff = os.popen("p4 diff -du ...").read()
195
+
196
+ for newFile in filesToAdd:
197
+ diff += "==== new file ====\n"
198
+ diff += "--- /dev/null\n"
199
+ diff += "+++ %s\n" % newFile
200
+ f = open(newFile, "r")
201
+ for line in f.readlines():
202
+ diff += "+" + line
203
+ f.close()
204
+
205
+ pipe = os.popen("less", "w")
206
+ pipe.write(submitTemplate + diff)
207
+ pipe.close()
208
+
209
+ response = "e"
210
+ while response == "e":
211
+ response = raw_input("Do you want to submit this change (y/e/n)? ")
212
+ if response == "e":
213
+ [handle, fileName] = tempfile.mkstemp()
214
+ tmpFile = os.fdopen(handle, "w+")
215
+ tmpFile.write(submitTemplate)
216
+ tmpFile.close()
217
+ editor = os.environ.get("EDITOR", "vi")
218
+ system(editor + " " + fileName)
219
+ tmpFile = open(fileName, "r")
220
+ submitTemplate = tmpFile.read()
221
+ tmpFile.close()
222
+ os.remove(fileName)
223
+
224
+ if response == "y" or response == "yes":
225
+ if dryRun:
226
+ print submitTemplate
227
+ raw_input("Press return to continue...")
228
+ else:
229
+ pipe = os.popen("p4 submit -i", "w")
230
+ pipe.write(submitTemplate)
231
+ pipe.close()
232
+ else:
233
+ print "Not submitting!"
234
+ interactive = False
235
+ else:
236
+ fileName = "submit.txt"
237
+ file = open(fileName, "w+")
238
+ file.write(prepareLogMessage(template, logMessage))
239
+ file.close()
240
+ print "Perforce submit template written as %s. Please review/edit and then use p4 submit -i < %s to submit directly!" % (fileName, fileName)
241
242
check()
243
@@ -194,12 +248,14 @@ if firstTime:
248
249
commits = config.get("commits", [])
250
197
-if len(commits) > 0:
251
+while len(commits) > 0:
252
firstTime = False
253
commit = commits[0]
254
commits = commits[1:]
255
config["commits"] = commits
256
apply(commit)
257
+ if not interactive:
258
+ break
259
260
config.close()
261