mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
8aade107dd
We used to expose the full power of the delayed progress API to the callers, so that they can specify, not just the message to show and expected total amount of work that is used to compute the percentage of work performed so far, the percent-threshold parameter P and the delay-seconds parameter N. The progress meter starts to show at N seconds into the operation only if we have not yet completed P per-cent of the total work. Most callers used either (0%, 2s) or (50%, 1s) as (P, N), but there are oddballs that chose more random-looking values like 95%. For a smoother workload, (50%, 1s) would allow us to start showing the progress meter earlier than (0%, 2s), while keeping the chance of not showing progress meter for long running operation the same as the latter. For a task that would take 2s or more to complete, it is likely that less than half of it would complete within the first second, if the workload is smooth. But for a spiky workload whose earlier part is easier, such a setting is likely to fail to show the progress meter entirely and (0%, 2s) is more appropriate. But that is merely a theory. Realistically, it is of dubious value to ask each codepath to carefully consider smoothness of their workload and specify their own setting by passing two extra parameters. Let's simplify the API by dropping both parameters and have everybody use (0%, 2s). Oh, by the way, the percent-threshold parameter and the structure member were consistently misspelled, which also is now fixed ;-) Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
159 lines
3.8 KiB
C
159 lines
3.8 KiB
C
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "diff.h"
|
|
#include "revision.h"
|
|
#include "builtin.h"
|
|
#include "reachable.h"
|
|
#include "parse-options.h"
|
|
#include "progress.h"
|
|
|
|
static const char * const prune_usage[] = {
|
|
N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
|
|
NULL
|
|
};
|
|
static int show_only;
|
|
static int verbose;
|
|
static timestamp_t expire;
|
|
static int show_progress = -1;
|
|
|
|
static int prune_tmp_file(const char *fullpath)
|
|
{
|
|
struct stat st;
|
|
if (lstat(fullpath, &st))
|
|
return error("Could not stat '%s'", fullpath);
|
|
if (st.st_mtime > expire)
|
|
return 0;
|
|
if (show_only || verbose)
|
|
printf("Removing stale temporary file %s\n", fullpath);
|
|
if (!show_only)
|
|
unlink_or_warn(fullpath);
|
|
return 0;
|
|
}
|
|
|
|
static int prune_object(const struct object_id *oid, const char *fullpath,
|
|
void *data)
|
|
{
|
|
struct stat st;
|
|
|
|
/*
|
|
* Do we know about this object?
|
|
* It must have been reachable
|
|
*/
|
|
if (lookup_object(oid->hash))
|
|
return 0;
|
|
|
|
if (lstat(fullpath, &st)) {
|
|
/* report errors, but do not stop pruning */
|
|
error("Could not stat '%s'", fullpath);
|
|
return 0;
|
|
}
|
|
if (st.st_mtime > expire)
|
|
return 0;
|
|
if (show_only || verbose) {
|
|
enum object_type type = sha1_object_info(oid->hash, NULL);
|
|
printf("%s %s\n", oid_to_hex(oid),
|
|
(type > 0) ? typename(type) : "unknown");
|
|
}
|
|
if (!show_only)
|
|
unlink_or_warn(fullpath);
|
|
return 0;
|
|
}
|
|
|
|
static int prune_cruft(const char *basename, const char *path, void *data)
|
|
{
|
|
if (starts_with(basename, "tmp_obj_"))
|
|
prune_tmp_file(path);
|
|
else
|
|
fprintf(stderr, "bad sha1 file: %s\n", path);
|
|
return 0;
|
|
}
|
|
|
|
static int prune_subdir(unsigned int nr, const char *path, void *data)
|
|
{
|
|
if (!show_only)
|
|
rmdir(path);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Write errors (particularly out of space) can result in
|
|
* failed temporary packs (and more rarely indexes and other
|
|
* files beginning with "tmp_") accumulating in the object
|
|
* and the pack directories.
|
|
*/
|
|
static void remove_temporary_files(const char *path)
|
|
{
|
|
DIR *dir;
|
|
struct dirent *de;
|
|
|
|
dir = opendir(path);
|
|
if (!dir) {
|
|
fprintf(stderr, "Unable to open directory %s\n", path);
|
|
return;
|
|
}
|
|
while ((de = readdir(dir)) != NULL)
|
|
if (starts_with(de->d_name, "tmp_"))
|
|
prune_tmp_file(mkpath("%s/%s", path, de->d_name));
|
|
closedir(dir);
|
|
}
|
|
|
|
int cmd_prune(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct rev_info revs;
|
|
struct progress *progress = NULL;
|
|
const struct option options[] = {
|
|
OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
|
|
OPT__VERBOSE(&verbose, N_("report pruned objects")),
|
|
OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
|
|
OPT_EXPIRY_DATE(0, "expire", &expire,
|
|
N_("expire objects older than <time>")),
|
|
OPT_END()
|
|
};
|
|
char *s;
|
|
|
|
expire = TIME_MAX;
|
|
save_commit_buffer = 0;
|
|
check_replace_refs = 0;
|
|
ref_paranoia = 1;
|
|
init_revisions(&revs, prefix);
|
|
|
|
argc = parse_options(argc, argv, prefix, options, prune_usage, 0);
|
|
|
|
if (repository_format_precious_objects)
|
|
die(_("cannot prune in a precious-objects repo"));
|
|
|
|
while (argc--) {
|
|
struct object_id oid;
|
|
const char *name = *argv++;
|
|
|
|
if (!get_oid(name, &oid)) {
|
|
struct object *object = parse_object_or_die(&oid,
|
|
name);
|
|
add_pending_object(&revs, object, "");
|
|
}
|
|
else
|
|
die("unrecognized argument: %s", name);
|
|
}
|
|
|
|
if (show_progress == -1)
|
|
show_progress = isatty(2);
|
|
if (show_progress)
|
|
progress = start_delayed_progress(_("Checking connectivity"), 0);
|
|
|
|
mark_reachable_objects(&revs, 1, expire, progress);
|
|
stop_progress(&progress);
|
|
for_each_loose_file_in_objdir(get_object_directory(), prune_object,
|
|
prune_cruft, prune_subdir, NULL);
|
|
|
|
prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
|
|
remove_temporary_files(get_object_directory());
|
|
s = mkpathdup("%s/pack", get_object_directory());
|
|
remove_temporary_files(s);
|
|
free(s);
|
|
|
|
if (is_repository_shallow())
|
|
prune_shallow(show_only);
|
|
|
|
return 0;
|
|
}
|