From: Vitor Antunes <vitor.hda@gmail.com>
To: git@vger.kernel.org
Cc: Pete Wyckoff <pw@padd.com>, Tor Arvid Lund <torarvid@gmail.com>,
Vitor Antunes <vitor.hda@gmail.com>
Subject: [PATCH 1/4] git-p4: Allow setting rename/copy detection threshold.
Date: Thu, 18 Aug 2011 02:04:16 +0100 [thread overview]
Message-ID: <1313629459-22937-2-git-send-email-vitor.hda@gmail.com> (raw)
In-Reply-To: <1313629459-22937-1-git-send-email-vitor.hda@gmail.com>
Copy and rename detection arguments (-C and -M) allow setting a threshold value
for the similarity ratio. If the similarity is below this threshold the rename
or copy is ignored and the file is added as new.
This patch allows setting git-p4.detectRenames and git-p4.detectCopies options
to an integer value to set the respective threshold.
Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
---
contrib/fast-import/git-p4 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6b9de9e..cf719be 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -774,15 +774,23 @@ class P4Submit(Command, P4UserMap):
if not self.detectRenames:
# If not explicitly set check the config variable
- self.detectRenames = gitConfig("git-p4.detectRenames").lower() == "true"
+ self.detectRenames = gitConfig("git-p4.detectRenames")
- if self.detectRenames:
+ diffOpts = ""
+ if self.detectRenames.lower() == "true":
diffOpts = "-M"
- else:
- diffOpts = ""
+ elif self.detectRenames != "":
+ self.detectRenames = int(self.detectRenames)
+ if self.detectRenames >= 0 and self.detectRenames <= 100:
+ diffOpts = "-M%d" % self.detectRenames
- if gitConfig("git-p4.detectCopies").lower() == "true":
+ detectCopies = gitConfig("git-p4.detectCopies")
+ if detectCopies.lower() == "true":
diffOpts += " -C"
+ elif detectCopies != "":
+ detectCopies = int(detectCopies)
+ if detectCopies >= 0 and detectCopies <= 100:
+ diffOpts += " -C%d" % detectCopies
if gitConfig("git-p4.detectCopiesHarder").lower() == "true":
diffOpts += " --find-copies-harder"
--
1.7.5.4
next prev parent reply other threads:[~2011-08-18 1:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 1:04 [PATCH 0/4] Support threshold in copy/rename detection Vitor Antunes
2011-08-18 1:04 ` Vitor Antunes [this message]
2011-08-18 15:18 ` [PATCH 1/4] git-p4: Allow setting rename/copy detection threshold Pete Wyckoff
2011-08-18 21:50 ` Vitor Antunes
2011-08-18 1:04 ` [PATCH 2/4] git-p4: Add description of rename/copy detection options Vitor Antunes
2011-08-18 1:04 ` [PATCH 3/4] git-p4: Add test case for rename detection Vitor Antunes
2011-08-18 1:04 ` [PATCH 4/4] git-p4: Add test case for copy detection Vitor Antunes
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=1313629459-22937-2-git-send-email-vitor.hda@gmail.com \
--to=vitor.hda@gmail.com \
--cc=git@vger.kernel.org \
--cc=pw@padd.com \
--cc=torarvid@gmail.com \
/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).