From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] Make git-*-pull say who wants it for missing objects.
Date: Mon, 02 May 2005 17:13:52 -0700 [thread overview]
Message-ID: <7voebtnp33.fsf@assigned-by-dhcp.cox.net> (raw)
This patch updates pull.c, the engine that decides what object is needed
given a commit to traverse from, to report which commit was calling for
the object that cannot be retrieved from the remote side. This complements
git-fsck-cache in that it checks the consistency of the remote repository
for reachability.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
pull.c | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
--- a/pull.c
+++ b/pull.c
@@ -7,12 +7,31 @@
int get_tree = 0;
int get_history = 0;
int get_all = 0;
+static unsigned char current_commit_sha1[20];
-static int make_sure_we_have_it(unsigned char *sha1)
+static const char commitS[] = "commit";
+static const char treeS[] = "tree";
+static const char blobS[] = "blob";
+
+static void report_missing(const char *what, const unsigned char *missing)
+{
+ char missing_hex[41];
+
+ strcpy(missing_hex, sha1_to_hex(missing));;
+ fprintf(stderr,
+ "Cannot obtain needed %s %s\nwhile processing commit %s.\n",
+ what, missing_hex, sha1_to_hex(current_commit_sha1));
+}
+
+static int make_sure_we_have_it(const char *what, unsigned char *sha1)
{
+ int status;
if (has_sha1_file(sha1))
return 0;
- return fetch(sha1);
+ status = fetch(sha1);
+ if (status && what)
+ report_missing(what, sha1);
+ return status;
}
static int process_tree(unsigned char *sha1)
@@ -24,7 +43,8 @@ static int process_tree(unsigned char *s
return -1;
for (entries = tree->entries; entries; entries = entries->next) {
- if (make_sure_we_have_it(entries->item.tree->object.sha1))
+ const char *what = entries->directory ? treeS : blobS;
+ if (make_sure_we_have_it(what, entries->item.tree->object.sha1))
return -1;
if (entries->directory) {
if (process_tree(entries->item.tree->object.sha1))
@@ -38,14 +58,14 @@ static int process_commit(unsigned char
{
struct commit *obj = lookup_commit(sha1);
- if (make_sure_we_have_it(sha1))
+ if (make_sure_we_have_it(commitS, sha1))
return -1;
if (parse_commit(obj))
return -1;
if (get_tree) {
- if (make_sure_we_have_it(obj->tree->object.sha1))
+ if (make_sure_we_have_it(treeS, obj->tree->object.sha1))
return -1;
if (process_tree(obj->tree->object.sha1))
return -1;
@@ -57,7 +77,8 @@ static int process_commit(unsigned char
for (; parents; parents = parents->next) {
if (has_sha1_file(parents->item->object.sha1))
continue;
- if (make_sure_we_have_it(parents->item->object.sha1)) {
+ if (make_sure_we_have_it(NULL,
+ parents->item->object.sha1)) {
/* The server might not have it, and
* we don't mind.
*/
@@ -65,6 +86,7 @@ static int process_commit(unsigned char
}
if (process_commit(parents->item->object.sha1))
return -1;
+ memcpy(current_commit_sha1, sha1, 20);
}
}
return 0;
@@ -77,8 +99,9 @@ int pull(char *target)
retval = get_sha1_hex(target, sha1);
if (retval)
return retval;
- retval = make_sure_we_have_it(sha1);
+ retval = make_sure_we_have_it(commitS, sha1);
if (retval)
return retval;
+ memcpy(current_commit_sha1, sha1, 20);
return process_commit(sha1);
}
reply other threads:[~2005-05-03 0:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=7voebtnp33.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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).