Commit bb64b79860632effc06224a66e840f56e41f6ac6
2020-03-18T16:11:26
have got_fetch() require an open got_repository to be passed in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/got/got.c b/got/got.c
index 2aa285a..b5bed4a 100644
--- a/got/got.c
+++ b/got/got.c
@@ -974,6 +974,9 @@ cmd_clone(int argc, char *argv[])
const struct got_error *err = NULL;
const char *uri, *branch_filter, *dirname;
char *proto, *host, *port, *repo_name, *server_path;
+ char *default_destdir = NULL;
+ const char *repo_path;
+ struct got_repository *repo = NULL;
int ch;
while ((ch = getopt(argc, argv, "b:")) != -1) {
@@ -1001,14 +1004,38 @@ cmd_clone(int argc, char *argv[])
if (err)
goto done;
+ if (dirname == NULL) {
+ if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
+ }
+ repo_path = default_destdir;
+ } else
+ repo_path = dirname;
+
+ err = got_path_mkdir(repo_path);
+ if (err)
+ goto done;
+
+ err = got_repo_init(repo_path);
+ if (err != NULL)
+ goto done;
+
+ err = got_repo_open(&repo, repo_path, NULL);
+ if (err)
+ goto done;
+
err = got_fetch(proto, host, port, server_path, repo_name,
- branch_filter, dirname);
+ branch_filter, repo);
done:
+ if (repo)
+ got_repo_close(repo);
free(proto);
free(host);
free(port);
free(server_path);
free(repo_name);
+ free(default_destdir);
return err;
}
diff --git a/include/got_fetch.h b/include/got_fetch.h
index 3af0abb..76bf04d 100644
--- a/include/got_fetch.h
+++ b/include/got_fetch.h
@@ -22,4 +22,4 @@ const struct got_error *got_fetch_parse_uri(char **, char **, char **,
char **, char **, const char *);
const struct got_error *got_fetch(const char *, const char *,
const char *, const char *, const char *, const char *,
- const char *);
+ struct got_repository *);
diff --git a/lib/fetch.c b/lib/fetch.c
index ff27135..4b57d05 100644
--- a/lib/fetch.c
+++ b/lib/fetch.c
@@ -281,7 +281,7 @@ done:
const struct got_error*
got_fetch(const char *proto, const char *host, const char *port,
const char *server_path, const char *repo_name,
- const char *branch_filter, const char *destdir)
+ const char *branch_filter, struct got_repository *repo)
{
int imsg_fetchfds[2], imsg_idxfds[2], fetchfd = -1;
int packfd = -1, npackfd = -1, idxfd = -1, nidxfd = -1;
@@ -290,26 +290,17 @@ got_fetch(const char *proto, const char *host, const char *port,
const struct got_error *err;
struct imsgbuf ibuf;
pid_t pid;
- char *tmppackpath = NULL, *tmpidxpath = NULL, *default_destdir = NULL;
+ char *tmppackpath = NULL, *tmpidxpath = NULL;
char *packpath = NULL, *idxpath = NULL, *id_str = NULL;
- const char *repo_path;
+ const char *repo_path = got_repo_get_path(repo);
struct got_pathlist_head symrefs;
struct got_pathlist_entry *pe;
- struct got_repository *repo = NULL;
char *path;
TAILQ_INIT(&symrefs);
fetchfd = -1;
- if (destdir == NULL) {
- if (asprintf(&default_destdir, "%s.git", repo_name) == -1)
- return got_error_from_errno("asprintf");
- repo_path = default_destdir;
- } else
- repo_path = destdir;
- err = got_repo_init(repo_path);
- if (err != NULL)
- goto done;
+
if (asprintf(&path, "%s/objects/path", repo_path) == -1) {
err = got_error_from_errno("asprintf");
goto done;
@@ -388,10 +379,6 @@ got_fetch(const char *proto, const char *host, const char *port,
goto done;
}
- err = got_repo_open(&repo, repo_path, NULL);
- if (err)
- goto done;
-
while (!done) {
struct got_object_id *id;
char *refname;
@@ -536,13 +523,10 @@ done:
err = got_error_from_errno("close");
if (idxfd != -1 && close(idxfd) == -1 && err == NULL)
err = got_error_from_errno("close");
- if (repo)
- got_repo_close(repo);
free(tmppackpath);
free(tmpidxpath);
free(idxpath);
free(packpath);
- free(default_destdir);
free(packhash);
TAILQ_FOREACH(pe, &symrefs, entry) {
free((void *)pe->path);