Skip to content

Commit 1691c79

Browse files
jeffhostetlerderrickstolee
authored andcommitted
Trace2:gvfs:experiment: capture more 'tracking' details
Update tracing around report_tracking() to use 'tracking' category rather than 'exp' category. Add ahead/behind results from stat_tracking_info(). Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 7903fc4 commit 1691c79

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

builtin/checkout.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -957,12 +957,12 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
957957
(new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) {
958958
unsigned long nr_unpack_entry_at_start;
959959

960-
trace2_region_enter("exp", "report_tracking", the_repository);
960+
trace2_region_enter("tracking", "report_tracking", the_repository);
961961
nr_unpack_entry_at_start = get_nr_unpack_entry();
962962
report_tracking(new_branch_info);
963-
trace2_data_intmax("exp", NULL, "report_tracking/nr_unpack_entries",
963+
trace2_data_intmax("tracking", NULL, "report_tracking/nr_unpack_entries",
964964
(intmax_t)(get_nr_unpack_entry() - nr_unpack_entry_at_start));
965-
trace2_region_leave("exp", "report_tracking", the_repository);
965+
trace2_region_leave("tracking", "report_tracking", the_repository);
966966
}
967967
}
968968

remote.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,16 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
21062106
char *base;
21072107
int upstream_is_gone = 0;
21082108

2109+
trace2_region_enter("tracking", "stat_tracking_info", NULL);
21092110
sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf);
2111+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_flags", abf);
2112+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_result", sti);
2113+
if (sti >= 0 && abf == AHEAD_BEHIND_FULL) {
2114+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_ahead", ours);
2115+
trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_behind", theirs);
2116+
}
2117+
trace2_region_leave("tracking", "stat_tracking_info", NULL);
2118+
21102119
if (sti < 0) {
21112120
if (!full_base)
21122121
return 0;

0 commit comments

Comments
 (0)