From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 1/6] upload-pack: move shallow deepen code out of receive_needs() Date: Thu, 5 Mar 2015 17:28:10 +0700 Message-ID: <1425551295-28653-2-git-send-email-pclouds@gmail.com> References: <70A3994196D94205B75660D9DEFF0A12@PhilipOakley> <1425551295-28653-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org, =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: philipoakley@iee.org X-From: git-owner@vger.kernel.org Thu Mar 05 11:29:41 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YTT2C-0003yf-8t for gcvg-git-2@plane.gmane.org; Thu, 05 Mar 2015 11:29:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932480AbbCEK3g convert rfc822-to-quoted-printable (ORCPT ); Thu, 5 Mar 2015 05:29:36 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:42180 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755007AbbCEK2n (ORCPT ); Thu, 5 Mar 2015 05:28:43 -0500 Received: by pdbfl12 with SMTP id fl12so34116309pdb.9 for ; Thu, 05 Mar 2015 02:28:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=0S3zQ0fLMtqO/15tFc4uphUhDScUw4M9zf9g+WvOg78=; b=agfyFlIEWMzh70qhpErEkZp7V3pyZBITlul4RyP3dYPAZlPOXkeN7vyKPnmnnSCoEq UPMNvqXnw5DfXn6lBIdY8A7FP+EgygrGDUJt4zcInrq9qSj6XTg3Ob5fukNhGqff3fYX H4wrN9xMxcoit1szmSIeKbqF7xVo2bSqccfcQq5MurHEgnI9suUmHWysDeuzVBTnVa5A GmVqZQ9Rz9PxOyS+1Ov4AdyThdXthSNgvumAzuiVqbh7Gk+wu2L8b7K/cCPrh8FRz5Uo 6MNmwi1d2bBArAzrgIMHIYxl9FERxZXguP/lcYb0dBtAHvLy/oRhjr/kF/mY6dJFjh+n PQ8g== X-Received: by 10.67.5.130 with SMTP id cm2mr14574512pad.110.1425551323291; Thu, 05 Mar 2015 02:28:43 -0800 (PST) Received: from lanh ([115.73.230.115]) by mx.google.com with ESMTPSA id mi9sm6630103pab.3.2015.03.05.02.28.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Mar 2015 02:28:42 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Thu, 05 Mar 2015 17:29:14 +0700 X-Mailer: git-send-email 2.3.0.rc1.137.g477eb31 In-Reply-To: <1425551295-28653-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is a prep step for further refactoring. Besides reindentation and s/shallows\./shallows->/g, no other changes are expected. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- upload-pack.c | 99 +++++++++++++++++++++++++++++++--------------------= -------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index b531a32..74f48f9 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -531,6 +531,55 @@ error: } } =20 +static void deepen(int depth, const struct object_array *shallows) +{ + struct commit_list *result =3D NULL, *backup =3D NULL; + int i; + if (depth =3D=3D INFINITE_DEPTH && !is_repository_shallow()) + for (i =3D 0; i < shallows->nr; i++) { + struct object *object =3D shallows->objects[i].item; + object->flags |=3D NOT_SHALLOW; + } + else + backup =3D result =3D + get_shallow_commits(&want_obj, depth, + SHALLOW, NOT_SHALLOW); + while (result) { + struct object *object =3D &result->item->object; + if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { + packet_write(1, "shallow %s", + sha1_to_hex(object->sha1)); + register_shallow(object->sha1); + shallow_nr++; + } + result =3D result->next; + } + free_commit_list(backup); + for (i =3D 0; i < shallows->nr; i++) { + struct object *object =3D shallows->objects[i].item; + if (object->flags & NOT_SHALLOW) { + struct commit_list *parents; + packet_write(1, "unshallow %s", + sha1_to_hex(object->sha1)); + object->flags &=3D ~CLIENT_SHALLOW; + /* make sure the real parents are parsed */ + unregister_shallow(object->sha1); + object->parsed =3D 0; + parse_commit_or_die((struct commit *)object); + parents =3D ((struct commit *)object)->parents; + while (parents) { + add_object_array(&parents->item->object, + NULL, &want_obj); + parents =3D parents->next; + } + add_object_array(object, NULL, &extra_edge_obj); + } + /* make sure commit traversal conforms to client */ + register_shallow(object->sha1); + } + packet_flush(1); +} + static void receive_needs(void) { struct object_array shallows =3D OBJECT_ARRAY_INIT; @@ -623,53 +672,9 @@ static void receive_needs(void) =20 if (depth =3D=3D 0 && shallows.nr =3D=3D 0) return; - if (depth > 0) { - struct commit_list *result =3D NULL, *backup =3D NULL; - int i; - if (depth =3D=3D INFINITE_DEPTH && !is_repository_shallow()) - for (i =3D 0; i < shallows.nr; i++) { - struct object *object =3D shallows.objects[i].item; - object->flags |=3D NOT_SHALLOW; - } - else - backup =3D result =3D - get_shallow_commits(&want_obj, depth, - SHALLOW, NOT_SHALLOW); - while (result) { - struct object *object =3D &result->item->object; - if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { - packet_write(1, "shallow %s", - sha1_to_hex(object->sha1)); - register_shallow(object->sha1); - shallow_nr++; - } - result =3D result->next; - } - free_commit_list(backup); - for (i =3D 0; i < shallows.nr; i++) { - struct object *object =3D shallows.objects[i].item; - if (object->flags & NOT_SHALLOW) { - struct commit_list *parents; - packet_write(1, "unshallow %s", - sha1_to_hex(object->sha1)); - object->flags &=3D ~CLIENT_SHALLOW; - /* make sure the real parents are parsed */ - unregister_shallow(object->sha1); - object->parsed =3D 0; - parse_commit_or_die((struct commit *)object); - parents =3D ((struct commit *)object)->parents; - while (parents) { - add_object_array(&parents->item->object, - NULL, &want_obj); - parents =3D parents->next; - } - add_object_array(object, NULL, &extra_edge_obj); - } - /* make sure commit traversal conforms to client */ - register_shallow(object->sha1); - } - packet_flush(1); - } else + if (depth > 0) + deepen(depth, &shallows); + else if (shallows.nr > 0) { int i; for (i =3D 0; i < shallows.nr; i++) --=20 2.3.0.rc1.137.g477eb31