Skip to content

Repository navigation

[trace2] Record advertised push destination state #147

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

Open
pc-oai wants to merge 1 commit into
base: codex
Choose a base branch
from
Open

[trace2] Record advertised push destination state #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 44 additions & 0 deletions send-pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,49 @@ static int check_to_send_update(const struct ref *ref, const struct send_pack_ar
}
}

static void trace_push_ref_state(struct repository *r,
const struct ref *refs,
const struct send_pack_args *args)
{
enum { REF_ABSENT = 1, REF_EXISTING = 2, REF_OTHER = 4 };
unsigned int state = 0;
const char *value;

if (!trace2_is_enabled())
return;

for (; refs; refs = refs->next) {
if (check_to_send_update(refs, args) == CHECK_REF_NO_PUSH)
continue;
if (refs->deletion || !starts_with(refs->name, "refs/heads/"))
state |= REF_OTHER;
else if (is_null_oid(&refs->old_oid))
state |= REF_ABSENT;
else
state |= REF_EXISTING;
}

switch (state) {
case 0:
value = "unknown";
break;
case REF_ABSENT:
value = server_supports("explicit-haves") ?
"absent_explicit_haves" : "absent";
break;
case REF_EXISTING:
value = "existing";
break;
case REF_OTHER:
value = "other";
break;
default:
value = "mixed";
break;
}
trace2_data_string("send_pack", r, "ref_state", value);
}

/*
* the beginning of the next line, or the end of buffer.
*
Expand Down Expand Up @@ -524,6 +567,7 @@ int send_pack(struct repository *r,
goto out;
}

trace_push_ref_state(r, remote_refs, args);
repo_config_get_bool(r, "push.negotiate", &push_negotiate);
if (push_negotiate) {
trace2_region_enter("send_pack", "push_negotiate", r);
Expand Down
14 changes: 14 additions & 0 deletions t/t5516-fetch-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,20 @@ grep_wrote () {
grep 'write_pack_file/wrote.*"value":"'$1'"' $2
}

test_expect_success 'push Trace2 records selected remote ref state' '
mk_empty testrepo &&
GIT_TRACE2_EVENT="$PWD/testrepo/new.trace" git push \
--receive-pack="git receive-pack --advertise-explicit-haves-for-testing" \
testrepo $the_commit:refs/heads/topic &&
test_grep "\"key\":\"ref_state\",\"value\":\"absent_explicit_haves\"" testrepo/new.trace &&
GIT_TRACE2_EVENT="$PWD/testrepo/force.trace" git push --force testrepo $the_first_commit:refs/heads/topic &&
test_grep "\"key\":\"ref_state\",\"value\":\"existing\"" testrepo/force.trace &&
GIT_TRACE2_EVENT="$PWD/testrepo/noop.trace" git push testrepo $the_first_commit:refs/heads/topic &&
test_grep "\"key\":\"ref_state\",\"value\":\"existing\"" testrepo/noop.trace &&
GIT_TRACE2_EVENT="$PWD/testrepo/mixed.trace" git push testrepo $the_first_commit:refs/heads/topic $the_first_commit:refs/heads/another &&
test_grep "\"key\":\"ref_state\",\"value\":\"mixed\"" testrepo/mixed.trace
'

test_expect_success 'push without negotiation' '
mk_empty testrepo &&
git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
Expand Down
Loading