Commit db0f96a6aff33612d88ab5d9263bcad9daf6b11a
2012-04-13T23:37:55
examples: port 'fetch' to the new API
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
diff --git a/examples/network/fetch.c b/examples/network/fetch.c
index cdd4a46..3bba169 100644
--- a/examples/network/fetch.c
+++ b/examples/network/fetch.c
@@ -4,94 +4,45 @@
#include <stdlib.h>
#include <string.h>
-static int rename_packfile(char *packname, git_indexer *idx)
-{
- char path[GIT_PATH_MAX], oid[GIT_OID_HEXSZ + 1], *slash;
- int ret;
-
- strcpy(path, packname);
- slash = strrchr(path, '/');
-
- if (!slash)
- return GIT_EINVALIDARGS;
-
- memset(oid, 0x0, sizeof(oid));
- // The name of the packfile is given by it's hash which you can get
- // with git_indexer_hash after the index has been written out to
- // disk. Rename the packfile to its "real" name in the same
- // directory as it was originally (libgit2 stores it in the folder
- // where the packs go, so a rename in place is the right thing to do here
- git_oid_fmt(oid, git_indexer_hash(idx));
- ret = sprintf(slash + 1, "pack-%s.pack", oid);
- if(ret < 0)
- return GIT_EOSERR;
-
- printf("Renaming pack to %s\n", path);
- return rename(packname, path);
-}
-
int fetch(git_repository *repo, int argc, char **argv)
{
git_remote *remote = NULL;
- git_indexer *idx = NULL;
+ git_off_t bytes = 0;
git_indexer_stats stats;
- int error;
char *packname = NULL;
// Get the remote and connect to it
printf("Fetching %s\n", argv[1]);
- error = git_remote_new(&remote, repo, argv[1], NULL);
- if (error < GIT_SUCCESS)
- return error;
-
- error = git_remote_connect(remote, GIT_DIR_FETCH);
- if (error < GIT_SUCCESS)
- return error;
-
- // Download the packfile from the server. As we don't know its hash
- // yet, it will get a temporary filename
- error = git_remote_download(&packname, remote);
- if (error < GIT_SUCCESS)
- return error;
-
- // No error and a NULL packname means no packfile was needed
- if (packname != NULL) {
- printf("The packname is %s\n", packname);
-
- // Create a new instance indexer
- error = git_indexer_new(&idx, packname);
- if (error < GIT_SUCCESS)
- return error;
-
- // This should be run in paralel, but it'd be too complicated for the example
- error = git_indexer_run(idx, &stats);
- if (error < GIT_SUCCESS)
- return error;
-
- printf("Received %d objects\n", stats.total);
+ if (git_remote_load(&remote, repo, argv[1]) == GIT_ENOTFOUND) {
+ if (git_remote_new(&remote, repo, argv[1], NULL) < 0)
+ return -1;
+ }
- // Write the index file. The index will be stored with the
- // correct filename
- error = git_indexer_write(idx);
- if (error < GIT_SUCCESS)
- return error;
+ if (git_remote_connect(remote, GIT_DIR_FETCH) < 0)
+ return -1;
- error = rename_packfile(packname, idx);
- if (error < GIT_SUCCESS)
- return error;
+ // Download the packfile and index it
+ // Doing this in a background thread and printing out what bytes
+ // and stats.{processed,total} say would make the UI friendlier
+ if (git_remote_download(remote, &bytes, &stats) < 0) {
+ git_remote_free(remote);
+ return -1;
}
+ printf("Received %d objects in %d bytes\n", stats.total, bytes);
+
// Update the references in the remote's namespace to point to the
// right commits. This may be needed even if there was no packfile
// to download, which can happen e.g. when the branches have been
// changed but all the neede objects are available locally.
- error = git_remote_update_tips(remote);
- if (error < GIT_SUCCESS)
- return error;
+ if (git_remote_update_tips(remote) < 0)
+ return -1;
- free(packname);
- git_indexer_free(idx);
git_remote_free(remote);
- return GIT_SUCCESS;
+ return 0;
+
+on_error:
+ git_remote_free(remote);
+ return -1;
}