From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 13/24] backup-log: add prune command
Date: Sun, 9 Dec 2018 11:44:08 +0100 [thread overview]
Message-ID: <20181209104419.12639-14-pclouds@gmail.com> (raw)
In-Reply-To: <20181209104419.12639-1-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
backup-log.c | 71 ++++++++++++++++++++++++++++++++++++++++++++
backup-log.h | 3 ++
builtin/backup-log.c | 17 +++++++++++
3 files changed, 91 insertions(+)
diff --git a/backup-log.c b/backup-log.c
index 49f2ce68fe..5e38725981 100644
--- a/backup-log.c
+++ b/backup-log.c
@@ -1,6 +1,8 @@
#include "cache.h"
#include "backup-log.h"
+#include "blob.h"
#include "lockfile.h"
+#include "object-store.h"
#include "strbuf.h"
void bkl_append(struct strbuf *output, const char *path,
@@ -217,3 +219,72 @@ int bkl_parse_file(const char *path,
strbuf_release(&sb);
return ret;
}
+
+struct prune_options {
+ struct repository *repo;
+ FILE *fp;
+ timestamp_t expire;
+ struct strbuf copy;
+};
+
+static int good_oid(struct repository *r, const struct object_id *oid)
+{
+ if (is_null_oid(oid))
+ return 1;
+
+ return oid_object_info(r, oid, NULL) == OBJ_BLOB;
+}
+
+static int prune_parse(struct strbuf *line, void *data)
+{
+ struct prune_options *opts = data;
+ struct bkl_entry entry;
+
+ strbuf_reset(&opts->copy);
+ strbuf_addbuf(&opts->copy, line);
+
+ if (bkl_parse_entry(line, &entry))
+ return -1;
+
+ if (entry.timestamp < opts->expire)
+ return 0;
+
+ if (oideq(&entry.old_oid, &entry.new_oid))
+ return 0;
+
+ if (!good_oid(opts->repo, &entry.old_oid) ||
+ !good_oid(opts->repo, &entry.new_oid))
+ return 0;
+
+ if (!opts->fp)
+ return -1;
+
+ fputs(opts->copy.buf, opts->fp);
+ return 0;
+}
+
+int bkl_prune(struct repository *r, const char *path, timestamp_t expire)
+{
+ struct lock_file lk;
+ struct prune_options opts;
+ int ret;
+
+ ret = hold_lock_file_for_update(&lk, path, 0);
+ if (ret == -1) {
+ if (errno == ENOTDIR || errno == ENOENT)
+ return 0;
+ return error(_("failed to lock '%s'"), path);
+ }
+ opts.repo = r;
+ opts.expire = expire;
+ opts.fp = fdopen_lock_file(&lk, "w");
+ strbuf_init(&opts.copy, 0);
+
+ ret = bkl_parse_file(path, prune_parse, &opts);
+ if (ret < 0)
+ rollback_lock_file(&lk);
+ else
+ ret = commit_lock_file(&lk);
+ strbuf_release(&opts.copy);
+ return ret;
+}
diff --git a/backup-log.h b/backup-log.h
index c9de9c687c..06fe706f81 100644
--- a/backup-log.h
+++ b/backup-log.h
@@ -3,6 +3,7 @@
#include "cache.h"
+struct repository;
struct strbuf;
struct bkl_entry
@@ -29,4 +30,6 @@ int bkl_parse_file(const char *path,
int (*parse)(struct strbuf *line, void *data),
void *data);
+int bkl_prune(struct repository *r, const char *id, timestamp_t expire);
+
#endif
diff --git a/builtin/backup-log.c b/builtin/backup-log.c
index 2496d73ba5..2291124c38 100644
--- a/builtin/backup-log.c
+++ b/builtin/backup-log.c
@@ -301,6 +301,21 @@ static int log_(int argc, const char **argv,
return ret;
}
+static int prune(int argc, const char **argv,
+ const char *prefix, const char *log_path)
+{
+ timestamp_t expire = time(NULL) - 90 * 24 * 3600;
+ struct option options[] = {
+ OPT_EXPIRY_DATE(0, "expire", &expire,
+ N_("expire objects older than <time>")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options, backup_log_usage, 0);
+
+ return bkl_prune(the_repository, log_path, expire);
+}
+
static char *log_id_to_path(const char *id)
{
if (!strcmp(id, "index"))
@@ -346,6 +361,8 @@ int cmd_backup_log(int argc, const char **argv, const char *prefix)
return diff(argc, argv, prefix, log_path);
else if (!strcmp(argv[0], "log"))
return log_(argc, argv, prefix, log_path);
+ else if (!strcmp(argv[0], "prune"))
+ return prune(argc, argv, prefix, log_path);
else
die(_("unknown subcommand: %s"), argv[0]);
--
2.20.0.rc2.486.g9832c05c3d
next prev parent reply other threads:[~2018-12-09 10:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-09 10:43 [RFC PATCH 00/24] Add backup log Nguyễn Thái Ngọc Duy
2018-12-09 10:43 ` [PATCH 01/24] doc: introduce new "backup log" concept Nguyễn Thái Ngọc Duy
2018-12-09 10:43 ` [PATCH 02/24] backup-log: add "update" subcommand Nguyễn Thái Ngọc Duy
2018-12-09 10:43 ` [PATCH 03/24] read-cache.c: new flag for add_index_entry() to write to backup log Nguyễn Thái Ngọc Duy
2018-12-09 10:43 ` [PATCH 04/24] add: support " Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 05/24] update-index: support backup log with --keep-backup Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 06/24] commit: support backup log Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 07/24] apply: support backup log with --keep-backup Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 08/24] add--interactive: support backup log Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 09/24] backup-log.c: add API for walking " Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 10/24] backup-log: add cat command Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 11/24] backup-log: add diff command Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 12/24] backup-log: add log command Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` Nguyễn Thái Ngọc Duy [this message]
2018-12-09 10:44 ` [PATCH 14/24] gc: prune backup logs Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 15/24] backup-log: keep all blob references around Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 16/24] sha1-file.c: let index_path() accept NULL istate Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 17/24] config --edit: support backup log Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 18/24] refs: keep backup of deleted reflog Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 19/24] unpack-trees.c: keep backup of ignored files being overwritten Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 20/24] reset --hard: keep backup of overwritten files Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 21/24] checkout -f: " Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 22/24] am: keep backup of overwritten files on --skip or --abort Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 23/24] rebase: " Nguyễn Thái Ngọc Duy
2018-12-09 10:44 ` [PATCH 24/24] FIXME Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181209104419.12639-14-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).