2007-09-11 07:03:15 +04:00
|
|
|
#include "cache.h"
|
2014-10-01 14:28:42 +04:00
|
|
|
#include "lockfile.h"
|
2007-09-11 07:03:15 +04:00
|
|
|
#include "bundle.h"
|
|
|
|
#include "object.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "list-objects.h"
|
|
|
|
#include "run-command.h"
|
2007-11-23 03:51:18 +03:00
|
|
|
#include "refs.h"
|
2013-11-13 01:32:11 +04:00
|
|
|
#include "argv-array.h"
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
static const char bundle_signature[] = "# v2 git bundle\n";
|
|
|
|
|
2017-05-01 05:28:59 +03:00
|
|
|
static void add_to_ref_list(const struct object_id *oid, const char *name,
|
2007-09-11 07:03:15 +04:00
|
|
|
struct ref_list *list)
|
|
|
|
{
|
2014-03-04 02:31:50 +04:00
|
|
|
ALLOC_GROW(list->list, list->nr + 1, list->alloc);
|
2017-05-01 05:28:59 +03:00
|
|
|
oidcpy(&list->list[list->nr].oid, oid);
|
2007-09-11 07:03:15 +04:00
|
|
|
list->list[list->nr].name = xstrdup(name);
|
|
|
|
list->nr++;
|
|
|
|
}
|
|
|
|
|
2011-10-14 02:19:31 +04:00
|
|
|
static int parse_bundle_header(int fd, struct bundle_header *header,
|
|
|
|
const char *report_path)
|
2007-11-09 02:35:32 +03:00
|
|
|
{
|
2011-10-14 02:12:02 +04:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int status = 0;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
2011-10-14 02:12:02 +04:00
|
|
|
/* The bundle header begins with the signature */
|
2012-02-22 23:34:22 +04:00
|
|
|
if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
|
2011-10-14 02:12:02 +04:00
|
|
|
strcmp(buf.buf, bundle_signature)) {
|
2011-10-14 02:19:31 +04:00
|
|
|
if (report_path)
|
2012-04-23 16:30:30 +04:00
|
|
|
error(_("'%s' does not look like a v2 bundle file"),
|
2011-10-14 02:19:31 +04:00
|
|
|
report_path);
|
2011-10-14 02:12:02 +04:00
|
|
|
status = -1;
|
|
|
|
goto abort;
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
2011-10-14 02:12:02 +04:00
|
|
|
|
|
|
|
/* The bundle header ends with an empty line */
|
2012-02-22 23:34:22 +04:00
|
|
|
while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
|
2011-10-14 02:12:02 +04:00
|
|
|
buf.len && buf.buf[0] != '\n') {
|
2017-05-01 05:28:59 +03:00
|
|
|
struct object_id oid;
|
2011-10-14 02:12:02 +04:00
|
|
|
int is_prereq = 0;
|
2017-05-01 05:28:59 +03:00
|
|
|
const char *p;
|
2011-10-14 02:12:02 +04:00
|
|
|
|
|
|
|
if (*buf.buf == '-') {
|
|
|
|
is_prereq = 1;
|
|
|
|
strbuf_remove(&buf, 0, 1);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
2011-10-14 02:12:02 +04:00
|
|
|
strbuf_rtrim(&buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
|
2011-10-14 02:12:02 +04:00
|
|
|
/*
|
|
|
|
* Tip lines have object name, SP, and refname.
|
|
|
|
* Prerequisites have object name that is optionally
|
|
|
|
* followed by SP and subject line.
|
|
|
|
*/
|
2017-05-01 05:28:59 +03:00
|
|
|
if (parse_oid_hex(buf.buf, &oid, &p) ||
|
|
|
|
(*p && !isspace(*p)) ||
|
|
|
|
(!is_prereq && !*p)) {
|
2011-10-14 02:19:31 +04:00
|
|
|
if (report_path)
|
2012-04-23 16:30:30 +04:00
|
|
|
error(_("unrecognized header: %s%s (%d)"),
|
2011-10-14 02:19:31 +04:00
|
|
|
(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
|
2011-10-14 02:12:02 +04:00
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
if (is_prereq)
|
2017-05-01 05:28:59 +03:00
|
|
|
add_to_ref_list(&oid, "", &header->prerequisites);
|
2011-10-14 02:12:02 +04:00
|
|
|
else
|
2017-05-01 05:28:59 +03:00
|
|
|
add_to_ref_list(&oid, p + 1, &header->references);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
}
|
2011-10-14 02:12:02 +04:00
|
|
|
|
|
|
|
abort:
|
|
|
|
if (status) {
|
|
|
|
close(fd);
|
|
|
|
fd = -1;
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
2011-10-14 02:12:02 +04:00
|
|
|
strbuf_release(&buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
2011-10-14 02:19:31 +04:00
|
|
|
int read_bundle_header(const char *path, struct bundle_header *header)
|
|
|
|
{
|
|
|
|
int fd = open(path, O_RDONLY);
|
|
|
|
|
2007-09-11 07:03:15 +04:00
|
|
|
if (fd < 0)
|
2012-04-23 16:30:30 +04:00
|
|
|
return error(_("could not open '%s'"), path);
|
2011-10-14 02:19:31 +04:00
|
|
|
return parse_bundle_header(fd, header, path);
|
|
|
|
}
|
|
|
|
|
|
|
|
int is_bundle(const char *path, int quiet)
|
|
|
|
{
|
|
|
|
struct bundle_header header;
|
|
|
|
int fd = open(path, O_RDONLY);
|
|
|
|
|
|
|
|
if (fd < 0)
|
|
|
|
return 0;
|
|
|
|
memset(&header, 0, sizeof(header));
|
|
|
|
fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
|
|
|
|
if (fd >= 0)
|
|
|
|
close(fd);
|
|
|
|
return (fd >= 0);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int list_refs(struct ref_list *r, int argc, const char **argv)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < r->nr; i++) {
|
|
|
|
if (argc > 1) {
|
|
|
|
int j;
|
|
|
|
for (j = 1; j < argc; j++)
|
|
|
|
if (!strcmp(r->list[i].name, argv[j]))
|
|
|
|
break;
|
|
|
|
if (j == argc)
|
|
|
|
continue;
|
|
|
|
}
|
2017-05-01 05:28:59 +03:00
|
|
|
printf("%s %s\n", oid_to_hex(&r->list[i].oid),
|
2007-09-11 07:03:15 +04:00
|
|
|
r->list[i].name);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-25 17:23:26 +04:00
|
|
|
/* Remember to update object flag allocation in object.h */
|
2007-09-11 07:03:15 +04:00
|
|
|
#define PREREQ_MARK (1u<<16)
|
|
|
|
|
|
|
|
int verify_bundle(struct bundle_header *header, int verbose)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Do fast check, then if any prereqs are missing then go line by line
|
|
|
|
* to be verbose about the errors
|
|
|
|
*/
|
|
|
|
struct ref_list *p = &header->prerequisites;
|
|
|
|
struct rev_info revs;
|
2009-05-21 13:32:44 +04:00
|
|
|
const char *argv[] = {NULL, "--all", NULL};
|
2007-09-11 07:03:15 +04:00
|
|
|
struct object_array refs;
|
|
|
|
struct commit *commit;
|
|
|
|
int i, ret = 0, req_nr;
|
2012-04-23 16:30:30 +04:00
|
|
|
const char *message = _("Repository lacks these prerequisite commits:");
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
init_revisions(&revs, NULL);
|
|
|
|
for (i = 0; i < p->nr; i++) {
|
|
|
|
struct ref_list_entry *e = p->list + i;
|
object: convert parse_object* to take struct object_id
Make parse_object, parse_object_or_die, and parse_object_buffer take a
pointer to struct object_id. Remove the temporary variables inserted
earlier, since they are no longer necessary. Transform all of the
callers using the following semantic patch:
@@
expression E1;
@@
- parse_object(E1.hash)
+ parse_object(&E1)
@@
expression E1;
@@
- parse_object(E1->hash)
+ parse_object(E1)
@@
expression E1, E2;
@@
- parse_object_or_die(E1.hash, E2)
+ parse_object_or_die(&E1, E2)
@@
expression E1, E2;
@@
- parse_object_or_die(E1->hash, E2)
+ parse_object_or_die(E1, E2)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1.hash, E2, E3, E4, E5)
+ parse_object_buffer(&E1, E2, E3, E4, E5)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1->hash, E2, E3, E4, E5)
+ parse_object_buffer(E1, E2, E3, E4, E5)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 01:10:38 +03:00
|
|
|
struct object *o = parse_object(&e->oid);
|
2007-09-11 07:03:15 +04:00
|
|
|
if (o) {
|
|
|
|
o->flags |= PREREQ_MARK;
|
|
|
|
add_pending_object(&revs, o, e->name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (++ret == 1)
|
2008-11-11 00:07:52 +03:00
|
|
|
error("%s", message);
|
2017-05-01 05:28:59 +03:00
|
|
|
error("%s %s", oid_to_hex(&e->oid), e->name);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
if (revs.pending.nr != p->nr)
|
|
|
|
return ret;
|
|
|
|
req_nr = revs.pending.nr;
|
|
|
|
setup_revisions(2, argv, &revs, NULL);
|
|
|
|
|
2017-09-23 02:34:51 +03:00
|
|
|
/* Save pending objects, so they can be cleaned up later. */
|
2011-10-01 20:02:36 +04:00
|
|
|
refs = revs.pending;
|
|
|
|
revs.leak_pending = 1;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
2017-09-23 02:34:51 +03:00
|
|
|
/*
|
|
|
|
* prepare_revision_walk (together with .leak_pending = 1) makes us
|
|
|
|
* the sole owner of the list of pending objects.
|
|
|
|
*/
|
2008-02-18 10:31:56 +03:00
|
|
|
if (prepare_revision_walk(&revs))
|
2012-04-23 16:30:30 +04:00
|
|
|
die(_("revision walk setup failed"));
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
i = req_nr;
|
|
|
|
while (i && (commit = get_revision(&revs)))
|
|
|
|
if (commit->object.flags & PREREQ_MARK)
|
|
|
|
i--;
|
|
|
|
|
|
|
|
for (i = 0; i < req_nr; i++)
|
|
|
|
if (!(refs.objects[i].item->flags & SHOWN)) {
|
|
|
|
if (++ret == 1)
|
2008-11-11 00:07:52 +03:00
|
|
|
error("%s", message);
|
2015-11-10 05:22:28 +03:00
|
|
|
error("%s %s", oid_to_hex(&refs.objects[i].item->oid),
|
2007-09-11 07:03:15 +04:00
|
|
|
refs.objects[i].name);
|
|
|
|
}
|
|
|
|
|
2017-09-23 02:34:51 +03:00
|
|
|
/* Clean up objects used, as they will be reused. */
|
2011-10-01 20:16:08 +04:00
|
|
|
clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
|
2017-09-23 02:34:51 +03:00
|
|
|
|
|
|
|
object_array_clear(&refs);
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
struct ref_list *r;
|
|
|
|
|
|
|
|
r = &header->references;
|
2013-03-08 22:01:26 +04:00
|
|
|
printf_ln(Q_("The bundle contains this ref:",
|
|
|
|
"The bundle contains these %d refs:",
|
2012-04-23 16:30:30 +04:00
|
|
|
r->nr),
|
|
|
|
r->nr);
|
2007-09-11 07:03:15 +04:00
|
|
|
list_refs(r, 0, NULL);
|
2013-03-07 04:56:35 +04:00
|
|
|
r = &header->prerequisites;
|
2012-06-04 22:51:13 +04:00
|
|
|
if (!r->nr) {
|
|
|
|
printf_ln(_("The bundle records a complete history."));
|
|
|
|
} else {
|
2013-03-08 22:01:26 +04:00
|
|
|
printf_ln(Q_("The bundle requires this ref:",
|
|
|
|
"The bundle requires these %d refs:",
|
2012-06-04 22:51:13 +04:00
|
|
|
r->nr),
|
|
|
|
r->nr);
|
|
|
|
list_refs(r, 0, NULL);
|
|
|
|
}
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int list_bundle_refs(struct bundle_header *header, int argc, const char **argv)
|
|
|
|
{
|
|
|
|
return list_refs(&header->references, argc, argv);
|
|
|
|
}
|
|
|
|
|
2009-01-02 21:08:46 +03:00
|
|
|
static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
|
|
|
|
{
|
|
|
|
unsigned long size;
|
|
|
|
enum object_type type;
|
2014-10-04 02:40:24 +04:00
|
|
|
char *buf = NULL, *line, *lineend;
|
2017-04-26 22:29:31 +03:00
|
|
|
timestamp_t date;
|
2014-10-04 02:40:24 +04:00
|
|
|
int result = 1;
|
2009-01-02 21:08:46 +03:00
|
|
|
|
|
|
|
if (revs->max_age == -1 && revs->min_age == -1)
|
2014-10-04 02:40:24 +04:00
|
|
|
goto out;
|
2009-01-02 21:08:46 +03:00
|
|
|
|
2015-11-10 05:22:29 +03:00
|
|
|
buf = read_sha1_file(tag->oid.hash, &type, &size);
|
2009-01-02 21:08:46 +03:00
|
|
|
if (!buf)
|
2014-10-04 02:40:24 +04:00
|
|
|
goto out;
|
2009-01-02 21:08:46 +03:00
|
|
|
line = memmem(buf, size, "\ntagger ", 8);
|
|
|
|
if (!line++)
|
2014-10-04 02:40:24 +04:00
|
|
|
goto out;
|
2014-08-02 12:39:06 +04:00
|
|
|
lineend = memchr(line, '\n', buf + size - line);
|
|
|
|
line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
|
2009-01-02 21:08:46 +03:00
|
|
|
if (!line++)
|
2014-10-04 02:40:24 +04:00
|
|
|
goto out;
|
2017-04-21 13:45:44 +03:00
|
|
|
date = parse_timestamp(line, NULL, 10);
|
2014-10-04 02:40:24 +04:00
|
|
|
result = (revs->max_age == -1 || revs->max_age < date) &&
|
2009-01-02 21:08:46 +03:00
|
|
|
(revs->min_age == -1 || revs->min_age > date);
|
2014-10-04 02:40:24 +04:00
|
|
|
out:
|
|
|
|
free(buf);
|
|
|
|
return result;
|
2009-01-02 21:08:46 +03:00
|
|
|
}
|
|
|
|
|
2015-08-10 12:47:37 +03:00
|
|
|
|
|
|
|
/* Write the pack data to bundle_fd, then close it if it is > 1. */
|
|
|
|
static int write_pack_data(int bundle_fd, struct rev_info *revs)
|
2014-10-30 20:45:41 +03:00
|
|
|
{
|
|
|
|
struct child_process pack_objects = CHILD_PROCESS_INIT;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
argv_array_pushl(&pack_objects.args,
|
|
|
|
"pack-objects", "--all-progress-implied",
|
|
|
|
"--stdout", "--thin", "--delta-base-offset",
|
|
|
|
NULL);
|
|
|
|
pack_objects.in = -1;
|
|
|
|
pack_objects.out = bundle_fd;
|
|
|
|
pack_objects.git_cmd = 1;
|
|
|
|
if (start_command(&pack_objects))
|
|
|
|
return error(_("Could not spawn pack-objects"));
|
|
|
|
|
|
|
|
for (i = 0; i < revs->pending.nr; i++) {
|
|
|
|
struct object *object = revs->pending.objects[i].item;
|
|
|
|
if (object->flags & UNINTERESTING)
|
|
|
|
write_or_die(pack_objects.in, "^", 1);
|
2015-11-10 05:22:28 +03:00
|
|
|
write_or_die(pack_objects.in, oid_to_hex(&object->oid), GIT_SHA1_HEXSZ);
|
2014-10-30 20:45:41 +03:00
|
|
|
write_or_die(pack_objects.in, "\n", 1);
|
|
|
|
}
|
|
|
|
close(pack_objects.in);
|
|
|
|
if (finish_command(&pack_objects))
|
|
|
|
return error(_("pack-objects died"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-30 21:01:37 +03:00
|
|
|
static int compute_and_write_prerequisites(int bundle_fd,
|
|
|
|
struct rev_info *revs,
|
|
|
|
int argc, const char **argv)
|
2007-09-11 07:03:15 +04:00
|
|
|
{
|
2014-08-19 23:09:35 +04:00
|
|
|
struct child_process rls = CHILD_PROCESS_INIT;
|
2014-10-30 21:01:37 +03:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2007-09-11 07:03:15 +04:00
|
|
|
FILE *rls_fout;
|
2014-10-30 21:01:37 +03:00
|
|
|
int i;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
2014-07-18 03:27:41 +04:00
|
|
|
argv_array_pushl(&rls.args,
|
2013-11-13 01:32:11 +04:00
|
|
|
"rev-list", "--boundary", "--pretty=oneline",
|
|
|
|
NULL);
|
|
|
|
for (i = 1; i < argc; i++)
|
2014-07-18 03:27:41 +04:00
|
|
|
argv_array_push(&rls.args, argv[i]);
|
2007-09-11 07:03:15 +04:00
|
|
|
rls.out = -1;
|
|
|
|
rls.git_cmd = 1;
|
|
|
|
if (start_command(&rls))
|
|
|
|
return -1;
|
2009-09-12 12:43:27 +04:00
|
|
|
rls_fout = xfdopen(rls.out, "r");
|
2012-02-22 23:34:23 +04:00
|
|
|
while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
|
2017-05-01 05:28:59 +03:00
|
|
|
struct object_id oid;
|
2012-02-22 23:34:23 +04:00
|
|
|
if (buf.len > 0 && buf.buf[0] == '-') {
|
|
|
|
write_or_die(bundle_fd, buf.buf, buf.len);
|
2017-05-01 05:28:59 +03:00
|
|
|
if (!get_oid_hex(buf.buf + 1, &oid)) {
|
object: convert parse_object* to take struct object_id
Make parse_object, parse_object_or_die, and parse_object_buffer take a
pointer to struct object_id. Remove the temporary variables inserted
earlier, since they are no longer necessary. Transform all of the
callers using the following semantic patch:
@@
expression E1;
@@
- parse_object(E1.hash)
+ parse_object(&E1)
@@
expression E1;
@@
- parse_object(E1->hash)
+ parse_object(E1)
@@
expression E1, E2;
@@
- parse_object_or_die(E1.hash, E2)
+ parse_object_or_die(&E1, E2)
@@
expression E1, E2;
@@
- parse_object_or_die(E1->hash, E2)
+ parse_object_or_die(E1, E2)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1.hash, E2, E3, E4, E5)
+ parse_object_buffer(&E1, E2, E3, E4, E5)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1->hash, E2, E3, E4, E5)
+ parse_object_buffer(E1, E2, E3, E4, E5)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 01:10:38 +03:00
|
|
|
struct object *object = parse_object_or_die(&oid,
|
|
|
|
buf.buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
object->flags |= UNINTERESTING;
|
2014-10-30 21:01:37 +03:00
|
|
|
add_pending_object(revs, object, buf.buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
2017-05-01 05:28:59 +03:00
|
|
|
} else if (!get_oid_hex(buf.buf, &oid)) {
|
object: convert parse_object* to take struct object_id
Make parse_object, parse_object_or_die, and parse_object_buffer take a
pointer to struct object_id. Remove the temporary variables inserted
earlier, since they are no longer necessary. Transform all of the
callers using the following semantic patch:
@@
expression E1;
@@
- parse_object(E1.hash)
+ parse_object(&E1)
@@
expression E1;
@@
- parse_object(E1->hash)
+ parse_object(E1)
@@
expression E1, E2;
@@
- parse_object_or_die(E1.hash, E2)
+ parse_object_or_die(&E1, E2)
@@
expression E1, E2;
@@
- parse_object_or_die(E1->hash, E2)
+ parse_object_or_die(E1, E2)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1.hash, E2, E3, E4, E5)
+ parse_object_buffer(&E1, E2, E3, E4, E5)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1->hash, E2, E3, E4, E5)
+ parse_object_buffer(E1, E2, E3, E4, E5)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 01:10:38 +03:00
|
|
|
struct object *object = parse_object_or_die(&oid,
|
|
|
|
buf.buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
object->flags |= SHOWN;
|
|
|
|
}
|
|
|
|
}
|
2012-02-22 23:34:23 +04:00
|
|
|
strbuf_release(&buf);
|
2007-09-11 07:03:15 +04:00
|
|
|
fclose(rls_fout);
|
|
|
|
if (finish_command(&rls))
|
2012-04-23 16:30:30 +04:00
|
|
|
return error(_("rev-list died"));
|
2014-10-30 21:01:37 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-31 00:35:24 +03:00
|
|
|
/*
|
|
|
|
* Write out bundle refs based on the tips already
|
|
|
|
* parsed into revs.pending. As a side effect, may
|
|
|
|
* manipulate revs.pending to include additional
|
|
|
|
* necessary objects (like tags).
|
|
|
|
*
|
|
|
|
* Returns the number of refs written, or negative
|
|
|
|
* on error.
|
|
|
|
*/
|
|
|
|
static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
|
2014-10-30 21:01:37 +03:00
|
|
|
{
|
2014-10-31 00:35:24 +03:00
|
|
|
int i;
|
|
|
|
int ref_count = 0;
|
2009-01-18 09:27:08 +03:00
|
|
|
|
2014-10-31 00:35:24 +03:00
|
|
|
for (i = 0; i < revs->pending.nr; i++) {
|
|
|
|
struct object_array_entry *e = revs->pending.objects + i;
|
2015-11-10 05:22:28 +03:00
|
|
|
struct object_id oid;
|
2007-09-11 07:03:15 +04:00
|
|
|
char *ref;
|
2007-11-23 03:51:18 +03:00
|
|
|
const char *display_ref;
|
|
|
|
int flag;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
if (e->item->flags & UNINTERESTING)
|
|
|
|
continue;
|
2017-10-16 01:06:57 +03:00
|
|
|
if (dwim_ref(e->name, strlen(e->name), &oid, &ref) != 1)
|
2015-03-11 02:51:48 +03:00
|
|
|
goto skip_write_ref;
|
2017-10-16 01:06:56 +03:00
|
|
|
if (read_ref_full(e->name, RESOLVE_REF_READING, &oid, &flag))
|
2007-11-23 03:51:18 +03:00
|
|
|
flag = 0;
|
|
|
|
display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
|
|
|
|
|
2009-01-02 21:08:46 +03:00
|
|
|
if (e->item->type == OBJ_TAG &&
|
2014-10-31 00:35:24 +03:00
|
|
|
!is_tag_in_date_range(e->item, revs)) {
|
2009-01-02 21:08:46 +03:00
|
|
|
e->item->flags |= UNINTERESTING;
|
2015-03-11 02:51:48 +03:00
|
|
|
goto skip_write_ref;
|
2009-01-02 21:08:46 +03:00
|
|
|
}
|
|
|
|
|
2007-09-11 07:03:15 +04:00
|
|
|
/*
|
|
|
|
* Make sure the refs we wrote out is correct; --max-count and
|
|
|
|
* other limiting options could have prevented all the tips
|
|
|
|
* from getting output.
|
|
|
|
*
|
|
|
|
* Non commit objects such as tags and blobs do not have
|
|
|
|
* this issue as they are not affected by those extra
|
|
|
|
* constraints.
|
|
|
|
*/
|
|
|
|
if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
|
2012-04-23 16:30:30 +04:00
|
|
|
warning(_("ref '%s' is excluded by the rev-list options"),
|
2007-09-11 07:03:15 +04:00
|
|
|
e->name);
|
2015-03-11 02:51:48 +03:00
|
|
|
goto skip_write_ref;
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If you run "git bundle create bndl v1.0..v2.0", the
|
|
|
|
* name of the positive ref is "v2.0" but that is the
|
|
|
|
* commit that is referenced by the tag, and not the tag
|
|
|
|
* itself.
|
|
|
|
*/
|
2015-11-10 05:22:28 +03:00
|
|
|
if (oidcmp(&oid, &e->item->oid)) {
|
2007-09-11 07:03:15 +04:00
|
|
|
/*
|
|
|
|
* Is this the positive end of a range expressed
|
|
|
|
* in terms of a tag (e.g. v2.0 from the range
|
|
|
|
* "v1.0..v2.0")?
|
|
|
|
*/
|
Convert lookup_commit* to struct object_id
Convert lookup_commit, lookup_commit_or_die,
lookup_commit_reference, and lookup_commit_reference_gently to take
struct object_id arguments.
Introduce a temporary in parse_object buffer in order to convert this
function. This is required since in order to convert parse_object and
parse_object_buffer, lookup_commit_reference_gently and
lookup_commit_or_die would need to be converted. Not introducing a
temporary would therefore require that lookup_commit_or_die take a
struct object_id *, but lookup_commit would take unsigned char *,
leaving a confusing and hard-to-use interface.
parse_object_buffer will lose this temporary in a later patch.
This commit was created with manual changes to commit.c, commit.h, and
object.c, plus the following semantic patch:
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1.hash, E2)
+ lookup_commit_reference_gently(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_reference_gently(E1->hash, E2)
+ lookup_commit_reference_gently(E1, E2)
@@
expression E1;
@@
- lookup_commit_reference(E1.hash)
+ lookup_commit_reference(&E1)
@@
expression E1;
@@
- lookup_commit_reference(E1->hash)
+ lookup_commit_reference(E1)
@@
expression E1;
@@
- lookup_commit(E1.hash)
+ lookup_commit(&E1)
@@
expression E1;
@@
- lookup_commit(E1->hash)
+ lookup_commit(E1)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1.hash, E2)
+ lookup_commit_or_die(&E1, E2)
@@
expression E1, E2;
@@
- lookup_commit_or_die(E1->hash, E2)
+ lookup_commit_or_die(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 01:10:10 +03:00
|
|
|
struct commit *one = lookup_commit_reference(&oid);
|
2007-09-11 07:03:15 +04:00
|
|
|
struct object *obj;
|
|
|
|
|
|
|
|
if (e->item == &(one->object)) {
|
|
|
|
/*
|
|
|
|
* Need to include e->name as an
|
|
|
|
* independent ref to the pack-objects
|
|
|
|
* input, so that the tag is included
|
|
|
|
* in the output; otherwise we would
|
|
|
|
* end up triggering "empty bundle"
|
|
|
|
* error.
|
|
|
|
*/
|
object: convert parse_object* to take struct object_id
Make parse_object, parse_object_or_die, and parse_object_buffer take a
pointer to struct object_id. Remove the temporary variables inserted
earlier, since they are no longer necessary. Transform all of the
callers using the following semantic patch:
@@
expression E1;
@@
- parse_object(E1.hash)
+ parse_object(&E1)
@@
expression E1;
@@
- parse_object(E1->hash)
+ parse_object(E1)
@@
expression E1, E2;
@@
- parse_object_or_die(E1.hash, E2)
+ parse_object_or_die(&E1, E2)
@@
expression E1, E2;
@@
- parse_object_or_die(E1->hash, E2)
+ parse_object_or_die(E1, E2)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1.hash, E2, E3, E4, E5)
+ parse_object_buffer(&E1, E2, E3, E4, E5)
@@
expression E1, E2, E3, E4, E5;
@@
- parse_object_buffer(E1->hash, E2, E3, E4, E5)
+ parse_object_buffer(E1, E2, E3, E4, E5)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-07 01:10:38 +03:00
|
|
|
obj = parse_object_or_die(&oid, e->name);
|
2007-09-11 07:03:15 +04:00
|
|
|
obj->flags |= SHOWN;
|
2014-10-31 00:35:24 +03:00
|
|
|
add_pending_object(revs, obj, e->name);
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
2015-03-11 02:51:48 +03:00
|
|
|
goto skip_write_ref;
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
ref_count++;
|
2015-11-10 05:22:28 +03:00
|
|
|
write_or_die(bundle_fd, oid_to_hex(&e->item->oid), 40);
|
2007-09-11 07:03:15 +04:00
|
|
|
write_or_die(bundle_fd, " ", 1);
|
2007-11-23 03:51:18 +03:00
|
|
|
write_or_die(bundle_fd, display_ref, strlen(display_ref));
|
2007-09-11 07:03:15 +04:00
|
|
|
write_or_die(bundle_fd, "\n", 1);
|
2015-03-11 02:51:48 +03:00
|
|
|
skip_write_ref:
|
2007-09-11 07:03:15 +04:00
|
|
|
free(ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* end header */
|
|
|
|
write_or_die(bundle_fd, "\n", 1);
|
2014-10-31 00:35:24 +03:00
|
|
|
return ref_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
int create_bundle(struct bundle_header *header, const char *path,
|
|
|
|
int argc, const char **argv)
|
|
|
|
{
|
|
|
|
static struct lock_file lock;
|
|
|
|
int bundle_fd = -1;
|
|
|
|
int bundle_to_stdout;
|
|
|
|
int ref_count = 0;
|
|
|
|
struct rev_info revs;
|
|
|
|
|
|
|
|
bundle_to_stdout = !strcmp(path, "-");
|
|
|
|
if (bundle_to_stdout)
|
|
|
|
bundle_fd = 1;
|
2015-08-10 12:47:37 +03:00
|
|
|
else {
|
2014-10-31 00:35:24 +03:00
|
|
|
bundle_fd = hold_lock_file_for_update(&lock, path,
|
|
|
|
LOCK_DIE_ON_ERROR);
|
|
|
|
|
2015-08-10 12:47:37 +03:00
|
|
|
/*
|
|
|
|
* write_pack_data() will close the fd passed to it,
|
|
|
|
* but commit_lock_file() will also try to close the
|
|
|
|
* lockfile's fd. So make a copy of the file
|
|
|
|
* descriptor to avoid trying to close it twice.
|
|
|
|
*/
|
|
|
|
bundle_fd = dup(bundle_fd);
|
|
|
|
if (bundle_fd < 0)
|
|
|
|
die_errno("unable to dup file descriptor");
|
|
|
|
}
|
|
|
|
|
2014-10-31 00:35:24 +03:00
|
|
|
/* write signature */
|
|
|
|
write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
|
|
|
|
|
|
|
|
/* init revs to list objects for pack-objects later */
|
|
|
|
save_commit_buffer = 0;
|
|
|
|
init_revisions(&revs, NULL);
|
|
|
|
|
|
|
|
/* write prerequisites */
|
|
|
|
if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
|
2016-04-01 03:35:45 +03:00
|
|
|
goto err;
|
2014-10-31 00:35:24 +03:00
|
|
|
|
|
|
|
argc = setup_revisions(argc, argv, &revs, NULL);
|
|
|
|
|
2016-04-01 03:35:45 +03:00
|
|
|
if (argc > 1) {
|
|
|
|
error(_("unrecognized argument: %s"), argv[1]);
|
|
|
|
goto err;
|
|
|
|
}
|
2014-10-31 00:35:24 +03:00
|
|
|
|
|
|
|
object_array_remove_duplicates(&revs.pending);
|
|
|
|
|
|
|
|
ref_count = write_bundle_refs(bundle_fd, &revs);
|
|
|
|
if (!ref_count)
|
|
|
|
die(_("Refusing to create empty bundle."));
|
|
|
|
else if (ref_count < 0)
|
2016-04-01 03:35:45 +03:00
|
|
|
goto err;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
|
|
|
/* write pack */
|
2016-04-01 03:35:45 +03:00
|
|
|
if (write_pack_data(bundle_fd, &revs)) {
|
|
|
|
bundle_fd = -1; /* already closed by the above call */
|
|
|
|
goto err;
|
|
|
|
}
|
2008-01-16 22:12:46 +03:00
|
|
|
|
2010-08-28 00:31:47 +04:00
|
|
|
if (!bundle_to_stdout) {
|
|
|
|
if (commit_lock_file(&lock))
|
2012-04-23 16:30:30 +04:00
|
|
|
die_errno(_("cannot create '%s'"), path);
|
2010-08-28 00:31:47 +04:00
|
|
|
}
|
2008-02-22 01:42:56 +03:00
|
|
|
return 0;
|
2016-04-01 03:35:45 +03:00
|
|
|
err:
|
|
|
|
if (!bundle_to_stdout) {
|
|
|
|
if (0 <= bundle_fd)
|
|
|
|
close(bundle_fd);
|
|
|
|
rollback_lock_file(&lock);
|
|
|
|
}
|
|
|
|
return -1;
|
2007-09-11 07:03:15 +04:00
|
|
|
}
|
|
|
|
|
2011-09-19 03:52:32 +04:00
|
|
|
int unbundle(struct bundle_header *header, int bundle_fd, int flags)
|
2007-09-11 07:03:15 +04:00
|
|
|
{
|
|
|
|
const char *argv_index_pack[] = {"index-pack",
|
2011-09-19 03:52:32 +04:00
|
|
|
"--fix-thin", "--stdin", NULL, NULL};
|
2014-08-19 23:09:35 +04:00
|
|
|
struct child_process ip = CHILD_PROCESS_INIT;
|
2007-09-11 07:03:15 +04:00
|
|
|
|
2011-09-19 03:52:32 +04:00
|
|
|
if (flags & BUNDLE_VERBOSE)
|
|
|
|
argv_index_pack[3] = "-v";
|
|
|
|
|
2007-09-11 07:03:15 +04:00
|
|
|
if (verify_bundle(header, 0))
|
|
|
|
return -1;
|
|
|
|
ip.argv = argv_index_pack;
|
|
|
|
ip.in = bundle_fd;
|
|
|
|
ip.no_stdout = 1;
|
|
|
|
ip.git_cmd = 1;
|
|
|
|
if (run_command(&ip))
|
2012-04-23 16:30:30 +04:00
|
|
|
return error(_("index-pack died"));
|
2007-09-11 07:03:15 +04:00
|
|
|
return 0;
|
|
|
|
}
|