8000 [WIP] Shallow smart transport support by tiennou · Pull Request #4747 · libgit2/libgit2 · GitHub
[go: up one dir, main page]
Skip to content

[WIP] Shallow smart transport support #4747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed

[WIP] Shallow smart transport support #4747

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8e89f25
commit: generic parse mechanism
tiennou Oct 25, 2018
2bb3111
commit_list: unify commit information parsing
tiennou Dec 15, 2017
3f62047
repo: basic graft API
tiennou Aug 2, 2018
39d6069
repo: load grafts on open
tiennou Aug 2, 2018
72dac4c
commit: apply grafts when parsing
tiennou Aug 2, 2018
6f58306
tests: graft commits
tiennou Aug 2, 2018
6354a2c
repo: load shallow roots
tiennou Aug 2, 2018
94947d8
repo: graft shallow roots on open
tiennou Aug 2, 2018
819ecd2
tests: check that revwalk applies shallow parents
tiennou Aug 2, 2018
a165a6f
tests: shallow objects have no parents
tiennou Aug 2, 2018
2d8e0f1
WIP object: separate the object initialization from pa 10000 rsing
tiennou Dec 15, 2017
efa9633
fixup! commit_list: setup our parsed objects correctly when quick-par…
tiennou Dec 15, 2017
0b34b8c
EXTRACT array: typedef our comparison function
tiennou Dec 15, 2017
754c7c7
fetch: pass negotiation data around as a struct
tiennou Aug 22, 2017
a888aaa
smart: support shallow capability in smart transport
tiennou Nov 24, 2017
44307ea
WIP smart: negotiate server capabilities
tiennou Nov 24, 2017
29c2e6d
WIP: write shallow file back
tiennou Dec 15, 2017
69a9d6c
WIP: fetch: store our negotiation info inside the remote
tiennou Oct 25, 2018
b8e8735
tests: test shallow cloning
tiennou Nov 24, 2017
bb5ef67
WIP: debug
tiennou Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fetch: pass negotiation data around as a struct 
We will need to pass some options to the negotiation step (like depth level for shallow clones)
  • Loading branch information
@tiennou
tiennou committed Feb 3, 2019
commit 754c7c7eafd0435fb6359e8be71707055d686344
8 changes: 6 additions & 2 deletions include/git2/sys/transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ typedef enum {
GIT_TRANSPORTFLAGS_NONE = 0,
} git_transport_flags_t;

typedef struct {
const git_remote_head * const *refs;
size_t count;
} git_fetch_negotiation;

struct git_transport {
unsigned int version; /**< The struct version */

Expand Down Expand Up @@ -86,8 +91,7 @@ struct git_transport {
int GIT_CALLBACK(negotiate_fetch)(
git_transport *transport,
git_repository *repo,
const git_remote_head * const *refs,
size_t count);
const git_fetch_negotiation *fetch_data);

/**
* Start downloading the packfile from the remote repository.
Expand Down
6 changes: 4 additions & 2 deletions src/fetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ static int filter_wants(git_remote *remote, const git_fetch_options *opts)
int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts)
{
git_transport *t = remote->transport;
git_fetch_negotiation nego;

remote->need_pack = 0;

Expand All @@ -125,10 +126,11 @@ int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts)
* Now we have everything set up so we can start tell the
* server what we want and what we have.
*/
nego.refs = (const git_remote_head * const *)remote->refs.contents;
nego.count = remote->refs.length;
return t->negotiate_fetch(t,
remote->repo,
(const git_remote_head * const *)remote->refs.contents,
remote->refs.length);
&nego);
}

int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks)
Expand Down
6 changes: 2 additions & 4 deletions src/transports/local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,13 @@ static int local_ls(const git_remote_head ***out, size_t *size, git_transport *t
static int local_negotiate_fetch(
git_transport *transport,
git_repository *repo,
const git_remote_head * const *refs,
size_t count)
const git_fetch_negotiation *wants)
{
transport_local *t = (transport_local*)transport;
git_remote_head *rhead;
unsigned int i;

GIT_UNUSED(refs);
GIT_UNUSED(count);
GIT_UNUSED(wants);

/* Fill in the loids */
git_vector_foreach(&t->refs, i, rhead) {
Expand Down
5 changes: 2 additions & 3 deletions src/transports/smart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ int git_smart__push(git_transport *transport, git_push *push, const git_remote_c
int git_smart__negotiate_fetch(
git_transport *transport,
git_repository *repo,
const git_remote_head * const *refs,
size_t count);
const git_fetch_negotiation *wants);

int git_smart__download_pack(
git_transport *transport,
Expand All @@ -192,7 +191,7 @@ int git_pkt_parse_line(git_pkt **head, const char **endptr, const char *line, si
int git_pkt_buffer_flush(git_buf *buf);
int git_pkt_send_flush(GIT_SOCKET s);
int git_pkt_buffer_done(git_buf *buf);
int git_pkt_buffer_wants(const git_remote_head * const *refs, size_t count, transport_smart_caps *caps, git_buf *buf);
int git_pkt_buffer_wants(const git_fetch_negotiation *wants, transport_smart_caps *caps, git_buf *buf);
int git_pkt_buffer_have(git_oid *oid, git_buf *buf);
void git_pkt_free(git_pkt *pkt);

Expand Down
13 changes: 6 additions & 7 deletions src/transports/smart_pkt.c
View file 8000
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,31 +583,30 @@ static int buffer_want_with_caps(const git_remote_head *head, transport_smart_ca
*/

int git_pkt_buffer_wants(
const git_remote_head * const *refs,
size_t count,
const git_fetch_negotiation *wants,
transport_smart_caps *caps,
git_buf *buf)
{
size_t i = 0;
const git_remote_head *head;

if (caps->common) {
for (; i < count; ++i) {
head = refs[i];
for (; i < wants->count; ++i) {
head = wants->refs[i];
if (!head->local)
break;
}

if (buffer_want_with_caps(refs[i], caps, buf) < 0)
if (buffer_want_with_caps(wants->refs[i], caps, buf) < 0)
return -1;

i++;
}

for (; i < count; ++i) {
for (; i < wants->count; ++i) {
char oid[GIT_OID_HEXSZ];

head = refs[i];
head = wants->refs[i];
if (head->local)
continue;

Expand Down
8 changes: 4 additions & 4 deletions src/transports/smart_protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int wait_while_ack(gitno_buffer *buf)
return 0;
}

int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, const git_remote_head * const *wants, size_t count)
int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, const git_fetch_negotiation *wants)
{
transport_smart *t = (transport_smart *)transport;
gitno_buffer *buf = &t->buffer;
Expand All @@ -355,7 +355,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
unsigned int i;
git_oid oid;

if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0)
if ((error = git_pkt_buffer_wants(wants, &t->caps, &data)) < 0)
return error;

if ((error = fetch_setup_walk(&walk, repo)) < 0)
Expand Down Expand Up @@ -423,7 +423,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
git_pkt_ack *pkt;
unsigned int j;

if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0)
if ((error = git_pkt_buffer_wants(wants, &t->caps, &data)) < 0)
goto on_error;

git_vector_foreach(&t->common, j, pkt) {
Expand All @@ -443,7 +443,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
git_pkt_ack *pkt;
unsigned int j;

if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0)
if ((error = git_pkt_buffer_wants(wants, &t->caps, &data)) < 0)
goto on_error;

git_vector_foreach(&t->common, j, pkt) {
Expand Down
0