git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Joey Hess <joey@kitenet.net>
Cc: git@vger.kernel.org, 554682@bugs.debian.org,
	Adam Brewster <adambrewster@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 3/8] bundle: give list_prerequisites() loop body its own function
Date: Sat, 26 Jun 2010 01:20:47 -0500	[thread overview]
Message-ID: <20100626062047.GD15881@burratino> (raw)
In-Reply-To: <20100626061735.GA15881@burratino>

No functional change intended.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 bundle.c |   57 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/bundle.c b/bundle.c
index 0dd2acb..e90b5c5 100644
--- a/bundle.c
+++ b/bundle.c
@@ -193,6 +193,33 @@ static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
 		(revs->min_age == -1 || revs->min_age > date);
 }
 
+static void list_prerequisite(int bundle_fd, struct rev_info *revs,
+		struct commit *rev)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct pretty_print_context ctx = {0};
+	enum object_type type;
+	unsigned long size;
+
+	/*
+	 * The commit buffer is needed
+	 * to pretty-print boundary commits.
+	 */
+	rev->buffer = read_sha1_file(rev->object.sha1, &type, &size);
+
+	strbuf_addch(&buf, '-');
+	strbuf_add(&buf, sha1_to_hex(rev->object.sha1), 40);
+	strbuf_addch(&buf, ' ');
+	pretty_print_commit(CMIT_FMT_ONELINE, rev, &buf, &ctx);
+	strbuf_addch(&buf, '\n');
+
+	write_or_die(bundle_fd, buf.buf, buf.len);
+
+	rev->object.flags |= UNINTERESTING;
+	add_pending_object(revs, &rev->object, buf.buf);
+	strbuf_release(&buf);
+}
+
 static int list_prerequisites(int bundle_fd, struct rev_info *revs,
 		int argc, const char * const *argv)
 {
@@ -209,33 +236,11 @@ static int list_prerequisites(int bundle_fd, struct rev_info *revs,
 	if (prepare_revision_walk(&boundary_revs))
 		return error("revision walk setup failed");
 
-	while ((rev = get_revision(&boundary_revs))) {
-		if (rev->object.flags & BOUNDARY) {
-			struct strbuf buf = STRBUF_INIT;
-			struct pretty_print_context ctx = {0};
-			enum object_type type;
-			unsigned long size;
-
-			/*
-			 * The commit buffer is needed
-			 * to pretty-print boundary commits.
-			 */
-			rev->buffer = read_sha1_file(rev->object.sha1,
-							&type, &size);
-
-			strbuf_addch(&buf, '-');
-			strbuf_add(&buf, sha1_to_hex(rev->object.sha1), 40);
-			strbuf_addch(&buf, ' ');
-			pretty_print_commit(CMIT_FMT_ONELINE, rev, &buf, &ctx);
-			strbuf_addch(&buf, '\n');
-			write_or_die(bundle_fd, buf.buf, buf.len);
-
-			rev->object.flags |= UNINTERESTING;
-			add_pending_object(revs, &rev->object, buf.buf);
-			strbuf_release(&buf);
-		} else {
+	while ((rev = get_revision(revs))) {
+		if (rev->object.flags & BOUNDARY)
+			list_prerequisite(bundle_fd, revs, rev);
+		else
 			rev->object.flags |= SHOWN;
-		}
 	}
 	return 0;
 }
-- 
1.7.1.198.g8d802

  parent reply	other threads:[~2010-06-26  6:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-19  0:26 bug: git-bundle create foo --stdin -> segfault Joey Hess
2010-01-19 23:52 ` Johannes Schindelin
2010-04-19  7:14 ` [PATCH 0/2] test bundle --stdin, fix objects_array_remove_duplicates() Jonathan Nieder
2010-04-19  8:03   ` [PATCH 1/2] t5704 (bundle): add tests for bundle --stdin Jonathan Nieder
2010-04-19  8:03   ` [PATCH 2/2] fix "bundle --stdin" segfault Jonathan Nieder
2010-04-20  5:16   ` [PATCH 0/2] test bundle --stdin, fix objects_array_remove_duplicates() Junio C Hamano
2010-06-26  6:17 ` [RFC/PATCH 0/8] Re: bug: git-bundle create foo --stdin -> segfault Jonathan Nieder
2010-06-26  6:19   ` [PATCH 1/8] bundle: split basis discovery into its own function Jonathan Nieder
2010-06-26  6:20   ` [PATCH 2/8] bundle: use libified rev-list --boundary Jonathan Nieder
2010-06-30 17:57     ` Junio C Hamano
2010-06-30 20:34       ` Jonathan Nieder
2010-06-26  6:20   ` Jonathan Nieder [this message]
2010-06-30 18:04     ` [PATCH 3/8] bundle: give list_prerequisites() loop body its own function Junio C Hamano
2010-06-30 20:37       ` Jonathan Nieder
2010-06-26  6:21   ` [PATCH 4/8] bundle: split table of contents output into " Jonathan Nieder
2010-06-26  6:22   ` [PATCH 5/8] bundle: reuse setup_revisions result Jonathan Nieder
2010-06-26  6:28   ` [PATCH 6/8] Fix bundle --stdin Jonathan Nieder
2010-06-26  6:29   ` [RFC/PATCH 7/8] bundle: Keep names of basis refs after discovery Jonathan Nieder
2010-06-26  6:31   ` [PATCH 8/8] bundle_create: Do not exit when given no revs to bundle Jonathan Nieder

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=20100626062047.GD15881@burratino \
    --to=jrnieder@gmail.com \
    --cc=554682@bugs.debian.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=adambrewster@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=joey@kitenet.net \
    /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).