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

Merge branch 'va/p4'

Browse Source 
* va/p4:
  git-p4: Add copy detection support
  git-p4: Improve rename detection support
This commit is contained in:
Junio C Hamano 2011-02-27 21:58:30 -08:00
commit 5e3d39ba8a
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,13 +543,13 @@ class P4Submit(Command):
self.options = [ self.options = [
optparse.make_option("--verbose", dest="verbose", action="store_true"), optparse.make_option("--verbose", dest="verbose", action="store_true"),
optparse.make_option("--origin", dest="origin"), optparse.make_option("--origin", dest="origin"),
optparse.make_option("-M", dest="detectRename", action="store_true"), optparse.make_option("-M", dest="detectRenames", action="store_true"),
] ]
self.description = "Submit changes from git to the perforce depot." self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]" self.usage += " [name of git branch to submit into perforce depot]"
self.interactive = True self.interactive = True
self.origin = "" self.origin = ""
self.detectRename = False self.detectRenames = False
self.verbose = False self.verbose = False
self.isWindows = (platform.system() == "Windows") self.isWindows = (platform.system() == "Windows")
@ -613,7 +613,22 @@ class P4Submit(Command):
def applyCommit(self, id): def applyCommit(self, id):
print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id)) print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id))
diffOpts = ("", "-M")[self.detectRename]
if not self.detectRenames:
# If not explicitly set check the config variable
self.detectRenames = gitConfig("git-p4.detectRenames").lower() == "true"
if self.detectRenames:
diffOpts = "-M"
else:
diffOpts = ""
if gitConfig("git-p4.detectCopies").lower() == "true":
diffOpts += " -C"
if gitConfig("git-p4.detectCopiesHarder").lower() == "true":
diffOpts += " --find-copies-harder"
diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (diffOpts, id, id)) diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (diffOpts, id, id))
filesToAdd = set() filesToAdd = set()
filesToDelete = set() filesToDelete = set()
@ -637,11 +652,23 @@ class P4Submit(Command):
filesToDelete.add(path) filesToDelete.add(path)
if path in filesToAdd: if path in filesToAdd:
filesToAdd.remove(path) filesToAdd.remove(path)
elif modifier == "C":
src, dest = diff['src'], diff['dst']
p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest))
if diff['src_sha1'] != diff['dst_sha1']:
p4_system("edit \"%s\"" % (dest))
if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
p4_system("edit \"%s\"" % (dest))
filesToChangeExecBit[dest] = diff['dst_mode']
os.unlink(dest)
editedFiles.add(dest)
elif modifier == "R": elif modifier == "R":
src, dest = diff['src'], diff['dst'] src, dest = diff['src'], diff['dst']
p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest)) p4_system("integrate -Dt \"%s\" \"%s\"" % (src, dest))
if diff['src_sha1'] != diff['dst_sha1']:
p4_system("edit \"%s\"" % (dest)) p4_system("edit \"%s\"" % (dest))
if isModeExecChanged(diff['src_mode'], diff['dst_mode']): if isModeExecChanged(diff['src_mode'], diff['dst_mode']):
p4_system("edit \"%s\"" % (dest))
filesToChangeExecBit[dest] = diff['dst_mode'] filesToChangeExecBit[dest] = diff['dst_mode']
os.unlink(dest) os.unlink(dest)
editedFiles.add(dest) editedFiles.add(dest)