builtin-remote.c: Split out prune_remote as a separate function.

prune_remote will be used in update(), so this function was split
out to avoid code duplication.

Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Finn Arne Gangstad 2009-04-03 11:02:37 +02:00 committed by Junio C Hamano
parent e96f3689ec
commit b92c5f228a
1 changed files with 33 additions and 29 deletions

View File

@ -26,6 +26,7 @@ static const char * const builtin_remote_usage[] = {
static int verbose; static int verbose;


static int show_all(void); static int show_all(void);
static int prune_remote(const char *remote, int dry_run);


static inline int postfixcmp(const char *string, const char *postfix) static inline int postfixcmp(const char *string, const char *postfix)
{ {
@ -1128,26 +1129,31 @@ static int prune(int argc, const char **argv)
OPT__DRY_RUN(&dry_run), OPT__DRY_RUN(&dry_run),
OPT_END() OPT_END()
}; };
struct ref_states states;
const char *dangling_msg;


argc = parse_options(argc, argv, options, builtin_remote_usage, 0); argc = parse_options(argc, argv, options, builtin_remote_usage, 0);


if (argc < 1) if (argc < 1)
usage_with_options(builtin_remote_usage, options); usage_with_options(builtin_remote_usage, options);


dangling_msg = (dry_run for (; argc; argc--, argv++)
result |= prune_remote(*argv, dry_run);

return result;
}

static int prune_remote(const char *remote, int dry_run)
{
int result = 0, i;
struct ref_states states;
const char *dangling_msg = dry_run
? " %s will become dangling!\n" ? " %s will become dangling!\n"
: " %s has become dangling!\n"); : " %s has become dangling!\n";


memset(&states, 0, sizeof(states)); memset(&states, 0, sizeof(states));
for (; argc; argc--, argv++) { get_remote_ref_states(remote, &states, GET_REF_STATES);
int i;

get_remote_ref_states(*argv, &states, GET_REF_STATES);


if (states.stale.nr) { if (states.stale.nr) {
printf("Pruning %s\n", *argv); printf("Pruning %s\n", remote);
printf("URL: %s\n", printf("URL: %s\n",
states.remote->url_nr states.remote->url_nr
? states.remote->url[0] ? states.remote->url[0]
@ -1166,8 +1172,6 @@ static int prune(int argc, const char **argv)
} }


free_remote_ref_states(&states); free_remote_ref_states(&states);
}

return result; return result;
} }