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

Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

Browse Source 
* 'git-p4' of git://repo.or.cz/git/git-p4:
  git-p4: Use P4EDITOR environment variable when set
  git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
  git-p4: Optimize the fetching of data from perforce.
This commit is contained in:
Junio C Hamano 2008-03-23 00:02:06 -07:00
commit dc96bdb946
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/fast-import/git-p4
View File

@ -627,6 +627,8 @@ class P4Submit(Command):
if self.interactive: if self.interactive:
submitTemplate = self.prepareLogMessage(template, logMessage) submitTemplate = self.prepareLogMessage(template, logMessage)
if os.environ.has_key("P4DIFF"):
del(os.environ["P4DIFF"])
diff = read_pipe("p4 diff -du ...") diff = read_pipe("p4 diff -du ...")
for newFile in filesToAdd: for newFile in filesToAdd:
@ -650,7 +652,10 @@ class P4Submit(Command):
defaultEditor = "vi" defaultEditor = "vi"
if platform.system() == "Windows": if platform.system() == "Windows":
defaultEditor = "notepad" defaultEditor = "notepad"
editor = os.environ.get("EDITOR", defaultEditor); if os.environ.has_key("P4EDITOR"):
editor = os.environ.get("P4EDITOR")
else:
editor = os.environ.get("EDITOR", defaultEditor);
system(editor + " " + fileName) system(editor + " " + fileName)
tmpFile = open(fileName, "rb") tmpFile = open(fileName, "rb")
message = tmpFile.read() message = tmpFile.read()
@ -882,21 +887,21 @@ class P4Sync(Command):
while j < len(filedata): while j < len(filedata):
stat = filedata[j] stat = filedata[j]
j += 1 j += 1
text = '' text = [];
while j < len(filedata) and filedata[j]['code'] in ('text', 'unicode', 'binary'): while j < len(filedata) and filedata[j]['code'] in ('text', 'unicode', 'binary'):
tmp = filedata[j]['data'] text.append(filedata[j]['data'])
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
tmp = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', tmp)
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
tmp = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', tmp)
text += tmp
j += 1 j += 1
text = ''.join(text)
if not stat.has_key('depotFile'): if not stat.has_key('depotFile'):
sys.stderr.write("p4 print fails with: %s\n" % repr(stat)) sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
continue continue
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
text = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text)
contents[stat['depotFile']] = text contents[stat['depotFile']] = text
for f in filesForCommit: for f in filesForCommit: