From: "Joachim Kuebart via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Joachim Kuebart <joachim.kuebart@gmail.com>,
Joachim Kuebart <joachim.kuebart@gmail.com>
Subject: [PATCH] git-p4: speed up search for branch parent
Date: Wed, 28 Apr 2021 20:06:56 +0000 [thread overview]
Message-ID: <pull.1013.git.git.1619640416533.gitgitgadget@gmail.com> (raw)
From: Joachim Kuebart <joachim.kuebart@gmail.com>
Previously, the code iterated through the parent branch commits and
compared each one to the target tree using diff-tree.
This patch outputs the revision's tree hash along with the commit hash,
thereby saving the diff-tree invocation. This results in a considerable
speed-up, at least on Windows.
Signed-off-by: Joachim Kuebart <joachim.kuebart@gmail.com>
---
git-p4: speed up search for branch parent
Previously, the code iterated through the parent branch commits and
compared each one to the target tree using diff-tree.
This patch outputs the revision's tree hash along with the commit hash,
thereby saving the diff-tree invocation. This results in a considerable
speed-up, at least on Windows.
Signed-off-by: Joachim Kuebart joachim.kuebart@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1013%2Fjkuebart%2Fp4-faster-parent-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1013/jkuebart/p4-faster-parent-v1
Pull-Request: https://github.com/git/git/pull/1013
git-p4.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 09c9e93ac401..dbe94e6fb83b 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3600,19 +3600,19 @@ def importNewBranch(self, branch, maxChange):
return True
def searchParent(self, parent, branch, target):
- parentFound = False
- for blob in read_pipe_lines(["git", "rev-list", "--reverse",
+ for tree in read_pipe_lines(["git", "rev-parse",
+ "{}^{{tree}}".format(target)]):
+ targetTree = tree.strip()
+ for blob in read_pipe_lines(["git", "rev-list", "--format=%H %T",
"--no-merges", parent]):
- blob = blob.strip()
- if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
- parentFound = True
+ if blob[:7] == "commit ":
+ continue
+ blob = blob.strip().split(" ")
+ if blob[1] == targetTree:
if self.verbose:
- print("Found parent of %s in commit %s" % (branch, blob))
- break
- if parentFound:
- return blob
- else:
- return None
+ print("Found parent of %s in commit %s" % (branch, blob[0]))
+ return blob[0]
+ return None
def importChanges(self, changes, origin_revision=0):
cnt = 1
base-commit: 311531c9de557d25ac087c1637818bd2aad6eb3a
--
gitgitgadget
next reply other threads:[~2021-04-28 20:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 20:06 Joachim Kuebart via GitGitGadget [this message]
2021-04-29 2:22 ` [PATCH] git-p4: speed up search for branch parent Junio C Hamano
2021-04-29 7:48 ` Joachim Kuebart
2021-04-29 8:22 ` Luke Diamand
2021-04-29 8:31 ` Junio C Hamano
2021-04-29 19:31 ` Joachim Kuebart
2021-04-29 11:30 ` Joachim Kuebart
2021-05-05 11:56 ` [PATCH v2 0/2] " Joachim Kuebart via GitGitGadget
2021-05-05 11:56 ` [PATCH v2 1/2] git-p4: ensure complex branches are cloned correctly Joachim Kuebart via GitGitGadget
2021-05-05 11:56 ` [PATCH v2 2/2] git-p4: speed up search for branch parent Joachim Kuebart via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1013.git.git.1619640416533.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=joachim.kuebart@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).