2007-09-11 11:03:15 +08:00
|
|
|
#include "cache.h"
|
2014-10-01 18:28:42 +08:00
|
|
|
#include "lockfile.h"
|
2007-09-11 11:03:15 +08: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 08:51:18 +08:00
|
|
|
#include "refs.h"
|
2013-11-13 05:32:11 +08:00
|
|
|
#include "argv-array.h"
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
static const char bundle_signature[] = "# v2 git bundle\n";
|
|
|
|
|
|
|
|
static void add_to_ref_list(const unsigned char *sha1, const char *name,
|
|
|
|
struct ref_list *list)
|
|
|
|
{
|
2014-03-04 06:31:50 +08:00
|
|
|
ALLOC_GROW(list->list, list->nr + 1, list->alloc);
|
2014-03-03 17:39:59 +08:00
|
|
|
hashcpy(list->list[list->nr].sha1, sha1);
|
2007-09-11 11:03:15 +08:00
|
|
|
list->list[list->nr].name = xstrdup(name);
|
|
|
|
list->nr++;
|
|
|
|
}
|
|
|
|
|
2011-10-14 06:19:31 +08:00
|
|
|
static int parse_bundle_header(int fd, struct bundle_header *header,
|
|
|
|
const char *report_path)
|
2007-11-09 07:35:32 +08:00
|
|
|
{
|
2011-10-14 06:12:02 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int status = 0;
|
2007-09-11 11:03:15 +08:00
|
|
|
|
2011-10-14 06:12:02 +08:00
|
|
|
/* The bundle header begins with the signature */
|
2012-02-23 03:34:22 +08:00
|
|
|
if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
|
2011-10-14 06:12:02 +08:00
|
|
|
strcmp(buf.buf, bundle_signature)) {
|
2011-10-14 06:19:31 +08:00
|
|
|
if (report_path)
|
2012-04-23 20:30:30 +08:00
|
|
|
error(_("'%s' does not look like a v2 bundle file"),
|
2011-10-14 06:19:31 +08:00
|
|
|
report_path);
|
2011-10-14 06:12:02 +08:00
|
|
|
status = -1;
|
|
|
|
goto abort;
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
2011-10-14 06:12:02 +08:00
|
|
|
|
|
|
|
/* The bundle header ends with an empty line */
|
2012-02-23 03:34:22 +08:00
|
|
|
while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
|
2011-10-14 06:12:02 +08:00
|
|
|
buf.len && buf.buf[0] != '\n') {
|
2007-09-11 11:03:15 +08:00
|
|
|
unsigned char sha1[20];
|
2011-10-14 06:12:02 +08:00
|
|
|
int is_prereq = 0;
|
|
|
|
|
|
|
|
if (*buf.buf == '-') {
|
|
|
|
is_prereq = 1;
|
|
|
|
strbuf_remove(&buf, 0, 1);
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
2011-10-14 06:12:02 +08:00
|
|
|
strbuf_rtrim(&buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
|
2011-10-14 06:12:02 +08:00
|
|
|
/*
|
|
|
|
* Tip lines have object name, SP, and refname.
|
|
|
|
* Prerequisites have object name that is optionally
|
|
|
|
* followed by SP and subject line.
|
|
|
|
*/
|
|
|
|
if (get_sha1_hex(buf.buf, sha1) ||
|
2013-04-07 19:53:15 +08:00
|
|
|
(buf.len > 40 && !isspace(buf.buf[40])) ||
|
2011-10-14 06:12:02 +08:00
|
|
|
(!is_prereq && buf.len <= 40)) {
|
2011-10-14 06:19:31 +08:00
|
|
|
if (report_path)
|
2012-04-23 20:30:30 +08:00
|
|
|
error(_("unrecognized header: %s%s (%d)"),
|
2011-10-14 06:19:31 +08:00
|
|
|
(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
|
2011-10-14 06:12:02 +08:00
|
|
|
status = -1;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
if (is_prereq)
|
|
|
|
add_to_ref_list(sha1, "", &header->prerequisites);
|
|
|
|
else
|
|
|
|
add_to_ref_list(sha1, buf.buf + 41, &header->references);
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
|
|
|
}
|
2011-10-14 06:12:02 +08:00
|
|
|
|
|
|
|
abort:
|
|
|
|
if (status) {
|
|
|
|
close(fd);
|
|
|
|
fd = -1;
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
2011-10-14 06:12:02 +08:00
|
|
|
strbuf_release(&buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
2011-10-14 06:19:31 +08:00
|
|
|
int read_bundle_header(const char *path, struct bundle_header *header)
|
|
|
|
{
|
|
|
|
int fd = open(path, O_RDONLY);
|
|
|
|
|
2007-09-11 11:03:15 +08:00
|
|
|
if (fd < 0)
|
2012-04-23 20:30:30 +08:00
|
|
|
return error(_("could not open '%s'"), path);
|
2011-10-14 06:19:31 +08: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 11:03:15 +08: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;
|
|
|
|
}
|
|
|
|
printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
|
|
|
|
r->list[i].name);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-25 21:23:26 +08:00
|
|
|
/* Remember to update object flag allocation in object.h */
|
2007-09-11 11:03:15 +08: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 17:32:44 +08:00
|
|
|
const char *argv[] = {NULL, "--all", NULL};
|
2007-09-11 11:03:15 +08:00
|
|
|
struct object_array refs;
|
|
|
|
struct commit *commit;
|
|
|
|
int i, ret = 0, req_nr;
|
2012-04-23 20:30:30 +08:00
|
|
|
const char *message = _("Repository lacks these prerequisite commits:");
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
init_revisions(&revs, NULL);
|
|
|
|
for (i = 0; i < p->nr; i++) {
|
|
|
|
struct ref_list_entry *e = p->list + i;
|
|
|
|
struct object *o = parse_object(e->sha1);
|
|
|
|
if (o) {
|
|
|
|
o->flags |= PREREQ_MARK;
|
|
|
|
add_pending_object(&revs, o, e->name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (++ret == 1)
|
2008-11-11 05:07:52 +08:00
|
|
|
error("%s", message);
|
2007-09-11 11:03:15 +08:00
|
|
|
error("%s %s", sha1_to_hex(e->sha1), e->name);
|
|
|
|
}
|
|
|
|
if (revs.pending.nr != p->nr)
|
|
|
|
return ret;
|
|
|
|
req_nr = revs.pending.nr;
|
|
|
|
setup_revisions(2, argv, &revs, NULL);
|
|
|
|
|
2011-10-02 00:02:36 +08:00
|
|
|
refs = revs.pending;
|
|
|
|
revs.leak_pending = 1;
|
2007-09-11 11:03:15 +08:00
|
|
|
|
2008-02-18 15:31:56 +08:00
|
|
|
if (prepare_revision_walk(&revs))
|
2012-04-23 20:30:30 +08:00
|
|
|
die(_("revision walk setup failed"));
|
2007-09-11 11:03:15 +08: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 05:07:52 +08:00
|
|
|
error("%s", message);
|
2007-09-11 11:03:15 +08:00
|
|
|
error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
|
|
|
|
refs.objects[i].name);
|
|
|
|
}
|
|
|
|
|
2011-10-02 00:16:08 +08:00
|
|
|
clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
|
2011-10-02 00:02:36 +08:00
|
|
|
free(refs.objects);
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
struct ref_list *r;
|
|
|
|
|
|
|
|
r = &header->references;
|
2013-03-09 02:01:26 +08:00
|
|
|
printf_ln(Q_("The bundle contains this ref:",
|
|
|
|
"The bundle contains these %d refs:",
|
2012-04-23 20:30:30 +08:00
|
|
|
r->nr),
|
|
|
|
r->nr);
|
2007-09-11 11:03:15 +08:00
|
|
|
list_refs(r, 0, NULL);
|
2013-03-07 08:56:35 +08:00
|
|
|
r = &header->prerequisites;
|
2012-06-05 02:51:13 +08:00
|
|
|
if (!r->nr) {
|
|
|
|
printf_ln(_("The bundle records a complete history."));
|
|
|
|
} else {
|
2013-03-09 02:01:26 +08:00
|
|
|
printf_ln(Q_("The bundle requires this ref:",
|
|
|
|
"The bundle requires these %d refs:",
|
2012-06-05 02:51:13 +08:00
|
|
|
r->nr),
|
|
|
|
r->nr);
|
|
|
|
list_refs(r, 0, NULL);
|
|
|
|
}
|
2007-09-11 11:03:15 +08: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-03 02:08:46 +08: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 06:40:24 +08:00
|
|
|
char *buf = NULL, *line, *lineend;
|
2009-01-03 02:08:46 +08:00
|
|
|
unsigned long date;
|
2014-10-04 06:40:24 +08:00
|
|
|
int result = 1;
|
2009-01-03 02:08:46 +08:00
|
|
|
|
|
|
|
if (revs->max_age == -1 && revs->min_age == -1)
|
2014-10-04 06:40:24 +08:00
|
|
|
goto out;
|
2009-01-03 02:08:46 +08:00
|
|
|
|
|
|
|
buf = read_sha1_file(tag->sha1, &type, &size);
|
|
|
|
if (!buf)
|
2014-10-04 06:40:24 +08:00
|
|
|
goto out;
|
2009-01-03 02:08:46 +08:00
|
|
|
line = memmem(buf, size, "\ntagger ", 8);
|
|
|
|
if (!line++)
|
2014-10-04 06:40:24 +08:00
|
|
|
goto out;
|
2014-08-02 16:39:06 +08:00
|
|
|
lineend = memchr(line, '\n', buf + size - line);
|
|
|
|
line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
|
2009-01-03 02:08:46 +08:00
|
|
|
if (!line++)
|
2014-10-04 06:40:24 +08:00
|
|
|
goto out;
|
2009-01-03 02:08:46 +08:00
|
|
|
date = strtoul(line, NULL, 10);
|
2014-10-04 06:40:24 +08:00
|
|
|
result = (revs->max_age == -1 || revs->max_age < date) &&
|
2009-01-03 02:08:46 +08:00
|
|
|
(revs->min_age == -1 || revs->min_age > date);
|
2014-10-04 06:40:24 +08:00
|
|
|
out:
|
|
|
|
free(buf);
|
|
|
|
return result;
|
2009-01-03 02:08:46 +08:00
|
|
|
}
|
|
|
|
|
2007-09-11 11:03:15 +08:00
|
|
|
int create_bundle(struct bundle_header *header, const char *path,
|
2013-11-13 05:32:11 +08:00
|
|
|
int argc, const char **argv)
|
2007-09-11 11:03:15 +08:00
|
|
|
{
|
|
|
|
static struct lock_file lock;
|
|
|
|
int bundle_fd = -1;
|
|
|
|
int bundle_to_stdout;
|
|
|
|
int i, ref_count = 0;
|
2012-02-23 03:34:23 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2007-09-11 11:03:15 +08:00
|
|
|
struct rev_info revs;
|
2014-08-20 03:09:35 +08:00
|
|
|
struct child_process rls = CHILD_PROCESS_INIT;
|
2007-09-11 11:03:15 +08:00
|
|
|
FILE *rls_fout;
|
|
|
|
|
|
|
|
bundle_to_stdout = !strcmp(path, "-");
|
|
|
|
if (bundle_to_stdout)
|
|
|
|
bundle_fd = 1;
|
|
|
|
else
|
2008-10-18 06:44:39 +08:00
|
|
|
bundle_fd = hold_lock_file_for_update(&lock, path,
|
|
|
|
LOCK_DIE_ON_ERROR);
|
2007-09-11 11:03:15 +08: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 */
|
2014-07-18 07:27:41 +08:00
|
|
|
argv_array_pushl(&rls.args,
|
2013-11-13 05:32:11 +08:00
|
|
|
"rev-list", "--boundary", "--pretty=oneline",
|
|
|
|
NULL);
|
|
|
|
for (i = 1; i < argc; i++)
|
2014-07-18 07:27:41 +08:00
|
|
|
argv_array_push(&rls.args, argv[i]);
|
2007-09-11 11:03:15 +08:00
|
|
|
rls.out = -1;
|
|
|
|
rls.git_cmd = 1;
|
|
|
|
if (start_command(&rls))
|
|
|
|
return -1;
|
2009-09-12 16:43:27 +08:00
|
|
|
rls_fout = xfdopen(rls.out, "r");
|
2012-02-23 03:34:23 +08:00
|
|
|
while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
|
2007-09-11 11:03:15 +08:00
|
|
|
unsigned char sha1[20];
|
2012-02-23 03:34:23 +08:00
|
|
|
if (buf.len > 0 && buf.buf[0] == '-') {
|
|
|
|
write_or_die(bundle_fd, buf.buf, buf.len);
|
|
|
|
if (!get_sha1_hex(buf.buf + 1, sha1)) {
|
2013-03-17 16:22:36 +08:00
|
|
|
struct object *object = parse_object_or_die(sha1, buf.buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
object->flags |= UNINTERESTING;
|
object_array_entry: fix memory handling of the name field
Previously, the memory management of the object_array_entry::name
field was inconsistent and undocumented. object_array_entries are
ultimately created by a single function, add_object_array_with_mode(),
which has an argument "const char *name". This function used to
simply set the name field to reference the string pointed to by the
name parameter, and nobody on the object_array side ever freed the
memory. Thus, it assumed that the memory for the name field would be
managed by the caller, and that the lifetime of that string would be
at least as long as the lifetime of the object_array_entry. But
callers were inconsistent:
* Some passed pointers to constant strings or argv entries, which was
OK.
* Some passed pointers to newly-allocated memory, but didn't arrange
for the memory ever to be freed.
* Some passed the return value of sha1_to_hex(), which is a pointer to
a statically-allocated buffer that can be overwritten at any time.
* Some passed pointers to refnames that they received from a
for_each_ref()-type iteration, but the lifetimes of such refnames is
not guaranteed by the refs API.
Bring consistency to this mess by changing object_array to make its
own copy for the object_array_entry::name field and free this memory
when an object_array_entry is deleted from the array.
Many callers were passing the empty string as the name parameter, so
as a performance optimization, treat the empty string specially.
Instead of making a copy, store a pointer to a statically-allocated
empty string to object_array_entry::name. When deleting such an
entry, skip the free().
Change the callers that were already passing copies to
add_object_array_with_mode() to either skip the copy, or (if the
memory needed to be allocated anyway) freeing the memory itself.
A part of this commit effectively reverts
70d26c6e76 read_revisions_from_stdin: make copies for handle_revision_arg
because the copying introduced by that commit (which is still
necessary) is now done at a deeper level.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-05-25 17:08:14 +08:00
|
|
|
add_pending_object(&revs, object, buf.buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
2012-02-23 03:34:23 +08:00
|
|
|
} else if (!get_sha1_hex(buf.buf, sha1)) {
|
2013-03-17 16:22:36 +08:00
|
|
|
struct object *object = parse_object_or_die(sha1, buf.buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
object->flags |= SHOWN;
|
|
|
|
}
|
|
|
|
}
|
2012-02-23 03:34:23 +08:00
|
|
|
strbuf_release(&buf);
|
2007-09-11 11:03:15 +08:00
|
|
|
fclose(rls_fout);
|
|
|
|
if (finish_command(&rls))
|
2012-04-23 20:30:30 +08:00
|
|
|
return error(_("rev-list died"));
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
/* write references */
|
|
|
|
argc = setup_revisions(argc, argv, &revs, NULL);
|
2008-07-06 05:26:40 +08:00
|
|
|
|
2009-11-03 22:59:18 +08:00
|
|
|
if (argc > 1)
|
2012-05-03 04:51:35 +08:00
|
|
|
return error(_("unrecognized argument: %s"), argv[1]);
|
2007-09-11 11:03:15 +08:00
|
|
|
|
2009-01-18 14:27:08 +08:00
|
|
|
object_array_remove_duplicates(&revs.pending);
|
|
|
|
|
2007-09-11 11:03:15 +08:00
|
|
|
for (i = 0; i < revs.pending.nr; i++) {
|
|
|
|
struct object_array_entry *e = revs.pending.objects + i;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
char *ref;
|
2007-11-23 08:51:18 +08:00
|
|
|
const char *display_ref;
|
|
|
|
int flag;
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
if (e->item->flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
|
|
|
|
continue;
|
2014-07-16 03:59:36 +08:00
|
|
|
if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag))
|
2007-11-23 08:51:18 +08:00
|
|
|
flag = 0;
|
|
|
|
display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
|
|
|
|
|
2009-01-03 02:08:46 +08:00
|
|
|
if (e->item->type == OBJ_TAG &&
|
|
|
|
!is_tag_in_date_range(e->item, &revs)) {
|
|
|
|
e->item->flags |= UNINTERESTING;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-09-11 11:03:15 +08: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 20:30:30 +08:00
|
|
|
warning(_("ref '%s' is excluded by the rev-list options"),
|
2007-09-11 11:03:15 +08:00
|
|
|
e->name);
|
|
|
|
free(ref);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
if (hashcmp(sha1, e->item->sha1)) {
|
|
|
|
/*
|
|
|
|
* 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")?
|
|
|
|
*/
|
|
|
|
struct commit *one = lookup_commit_reference(sha1);
|
|
|
|
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.
|
|
|
|
*/
|
2013-03-17 16:22:36 +08:00
|
|
|
obj = parse_object_or_die(sha1, e->name);
|
2007-09-11 11:03:15 +08:00
|
|
|
obj->flags |= SHOWN;
|
|
|
|
add_pending_object(&revs, obj, e->name);
|
|
|
|
}
|
|
|
|
free(ref);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ref_count++;
|
|
|
|
write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
|
|
|
|
write_or_die(bundle_fd, " ", 1);
|
2007-11-23 08:51:18 +08:00
|
|
|
write_or_die(bundle_fd, display_ref, strlen(display_ref));
|
2007-09-11 11:03:15 +08:00
|
|
|
write_or_die(bundle_fd, "\n", 1);
|
|
|
|
free(ref);
|
|
|
|
}
|
|
|
|
if (!ref_count)
|
2012-04-23 20:30:30 +08:00
|
|
|
die(_("Refusing to create empty bundle."));
|
2007-09-11 11:03:15 +08:00
|
|
|
|
|
|
|
/* end header */
|
|
|
|
write_or_die(bundle_fd, "\n", 1);
|
|
|
|
|
|
|
|
/* write pack */
|
2014-10-29 04:52:34 +08:00
|
|
|
child_process_init(&rls);
|
2014-07-18 07:27:41 +08:00
|
|
|
argv_array_pushl(&rls.args,
|
2013-11-13 05:32:11 +08:00
|
|
|
"pack-objects", "--all-progress-implied",
|
|
|
|
"--stdout", "--thin", "--delta-base-offset",
|
|
|
|
NULL);
|
2007-09-11 11:03:15 +08:00
|
|
|
rls.in = -1;
|
|
|
|
rls.out = bundle_fd;
|
|
|
|
rls.git_cmd = 1;
|
|
|
|
if (start_command(&rls))
|
2012-04-23 20:30:30 +08:00
|
|
|
return error(_("Could not spawn pack-objects"));
|
2008-01-17 03:12:46 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* start_command closed bundle_fd if it was > 1
|
|
|
|
* so set the lock fd to -1 so commit_lock_file()
|
|
|
|
* won't fail trying to close it.
|
|
|
|
*/
|
|
|
|
lock.fd = -1;
|
|
|
|
|
2007-09-11 11:03:15 +08:00
|
|
|
for (i = 0; i < revs.pending.nr; i++) {
|
|
|
|
struct object *object = revs.pending.objects[i].item;
|
|
|
|
if (object->flags & UNINTERESTING)
|
2008-01-10 16:54:25 +08:00
|
|
|
write_or_die(rls.in, "^", 1);
|
|
|
|
write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
|
|
|
|
write_or_die(rls.in, "\n", 1);
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
2008-02-17 01:36:38 +08:00
|
|
|
close(rls.in);
|
2007-09-11 11:03:15 +08:00
|
|
|
if (finish_command(&rls))
|
2012-04-23 20:30:30 +08:00
|
|
|
return error(_("pack-objects died"));
|
2010-08-28 04:31:47 +08:00
|
|
|
if (!bundle_to_stdout) {
|
|
|
|
if (commit_lock_file(&lock))
|
2012-04-23 20:30:30 +08:00
|
|
|
die_errno(_("cannot create '%s'"), path);
|
2010-08-28 04:31:47 +08:00
|
|
|
}
|
2008-02-22 06:42:56 +08:00
|
|
|
return 0;
|
2007-09-11 11:03:15 +08:00
|
|
|
}
|
|
|
|
|
2011-09-19 07:52:32 +08:00
|
|
|
int unbundle(struct bundle_header *header, int bundle_fd, int flags)
|
2007-09-11 11:03:15 +08:00
|
|
|
{
|
|
|
|
const char *argv_index_pack[] = {"index-pack",
|
2011-09-19 07:52:32 +08:00
|
|
|
"--fix-thin", "--stdin", NULL, NULL};
|
2014-08-20 03:09:35 +08:00
|
|
|
struct child_process ip = CHILD_PROCESS_INIT;
|
2007-09-11 11:03:15 +08:00
|
|
|
|
2011-09-19 07:52:32 +08:00
|
|
|
if (flags & BUNDLE_VERBOSE)
|
|
|
|
argv_index_pack[3] = "-v";
|
|
|
|
|
2007-09-11 11:03:15 +08: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 20:30:30 +08:00
|
|
|
return error(_("index-pack died"));
|
2007-09-11 11:03:15 +08:00
|
|
|
return 0;
|
|
|
|
}
|