vitor.hda@xxxxxxxxx wrote on Sun, 30 Jan 2011 23:19 +0000:
> Add new config options:
> git-p4.detectCopies - Enable copy detection.
> git-p4.detectCopiesHarder - Find copies harder.
> The detectCopies option should be set to a true/false value.
> The detectCopiesHarder option should be set to true/false value.
> P4Submit can now process diff-tree C status and integrate files accordingly.
> ---
[..]
> + detectCopies = gitConfig("git-p4.detectCopies")
> + if len(detectCopies) and detectCopies.lower() != "false" > 0:
> + diffOpts += " -C"
> +
> + detectCopiesHarder = gitConfig("git-p4.detectCopiesHarder")
> + if len(detectCopiesHarder) > 0 and detectCopiesHarder.lower() != "false":
> + diffOpts += " --find-copies-harder"
> +
I like it, but same weirdness with != > 0.
> + 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']):
> + filesToChangeExecBit[dest] = diff['dst_mode']
> + os.unlink(dest)
> + editedFiles.add(dest)
You can use integrate -t to force the filetype even if the file
already existed, and skip the whole execbit change.
-- Pete
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html