xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git/fetch: be more robust

Browse source 
currently, git/fetch prints the refs
to update before it fully fetches the
pack files; this can lead to updates
to the refs before we're 100% certain
that the objects are present.

This change prints the updates after
the packfile has been successfully
indexed.
This commit is contained in:
Ori Bernstein 2021-07-27 15:05:45 +00:00
parent 28f76455d3
commit 70d173bfa4
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/src/cmd/git/fetch.c
View file

@ -181,7 +181,7 @@ int
fetchpack(Conn *c) fetchpack(Conn *c)
{ {
char buf[Pktmax], *sp[3]; char buf[Pktmax], *sp[3];
char *packtmp, *idxtmp; char *packtmp, *idxtmp, **ref;
Hash h, *have, *want; Hash h, *have, *want;
int nref, refsz, first; int nref, refsz, first;
int i, n, req, pfd; int i, n, req, pfd;
@ -193,6 +193,7 @@ fetchpack(Conn *c)
first = 1; first = 1;
have = eamalloc(refsz, sizeof(have[0])); have = eamalloc(refsz, sizeof(have[0]));
want = eamalloc(refsz, sizeof(want[0])); want = eamalloc(refsz, sizeof(want[0]));
ref = eamalloc(refsz, sizeof(ref[0]));
while(1){ while(1){
n = readpkt(c, buf, sizeof(buf)); n = readpkt(c, buf, sizeof(buf));
if(n == -1) if(n == -1)
@ -213,19 +214,20 @@ fetchpack(Conn *c)
continue; continue;
if(refsz == nref + 1){ if(refsz == nref + 1){
refsz *= 2; refsz *= 2;
have = erealloc(have, refsz * sizeof(have[0])); have = earealloc(have, refsz, sizeof(have[0]));
want = erealloc(want, refsz * sizeof(want[0])); want = earealloc(want, refsz, sizeof(want[0]));
ref = earealloc(ref, refsz, sizeof(ref[0]));
} }
if(hparse(&want[nref], sp[0]) == -1) if(hparse(&want[nref], sp[0]) == -1)
sysfatal("invalid hash %s", sp[0]); sysfatal("invalid hash %s", sp[0]);
if (resolveremote(&have[nref], sp[1]) == -1) if (resolveremote(&have[nref], sp[1]) == -1)
memset(&have[nref], 0, sizeof(have[nref])); memset(&have[nref], 0, sizeof(have[nref]));
print("remote %s %H local %H\n", sp[1], want[nref], have[nref]); ref[nref] = estrdup(sp[1]);
nref++; nref++;
} }
if(listonly){ if(listonly){
flushpkt(c); flushpkt(c);
return 0; goto showrefs;
} }
if(writephase(c) == -1) if(writephase(c) == -1)
@ -295,6 +297,15 @@ fetchpack(Conn *c)
fail(packtmp, idxtmp, "could not index fetched pack: %r"); fail(packtmp, idxtmp, "could not index fetched pack: %r");
if(rename(packtmp, idxtmp, h) == -1) if(rename(packtmp, idxtmp, h) == -1)
fail(packtmp, idxtmp, "could not rename indexed pack: %r"); fail(packtmp, idxtmp, "could not rename indexed pack: %r");
showrefs:
for(i = 0; i < nref; i++){
print("remote %s %H local %H\n", ref[i], want[i], have[i]);
free(ref[i]);
}
free(ref);
free(want);
free(have);
return 0; return 0;
} }