From: Junio C Hamano <junkio@cox.net>
To: Shawn Pearce <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: [PATCH 2/2] git reflog expire
Date: Tue, 19 Dec 2006 00:25:03 -0800 [thread overview]
Message-ID: <7v64c8thr4.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 7vy7p4u1au.fsf@assigned-by-dhcp.cox.net
This prepares a place to collect reflog management subcommands,
and implements "expire" action.
$ git reflog expire --dry-run \
--expire=4.weeks \
--expire-lost=1.week \
refs/heads/master
The expiration uses two timestamps: --expire and --expire-lost.
Entries older than expire time (defaults to 90 days), and
entries older than expire-lost time (defaults to 30 days) and
talk about a commit that has been rewound and made unreachable
from the current tip of the ref are removed from the reflog.
The parameter handling is still rough, but I think the
core logic for expiration is already sound.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
Makefile | 1 +
builtin-reflog.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
builtin.h | 1 +
git.c | 1 +
4 files changed, 178 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 8919dab..17dabde 100644
--- a/Makefile
+++ b/Makefile
@@ -292,6 +292,7 @@ BUILTIN_OBJS = \
builtin-prune-packed.o \
builtin-push.o \
builtin-read-tree.o \
+ builtin-reflog.o \
builtin-repo-config.o \
builtin-rev-list.o \
builtin-rev-parse.o \
diff --git a/builtin-reflog.c b/builtin-reflog.c
new file mode 100644
index 0000000..aef2fc2
--- /dev/null
+++ b/builtin-reflog.c
@@ -0,0 +1,175 @@
+#include "cache.h"
+#include "builtin.h"
+#include "commit.h"
+#include "refs.h"
+#include "dir.h"
+#include <time.h>
+
+struct expire_reflog_cb {
+ FILE *newlog;
+ const char *ref;
+ struct commit *ref_commit;
+ unsigned long expire_total;
+ unsigned long expire_lost;
+};
+
+static int keep_entry(struct commit **it, unsigned char *sha1)
+{
+ *it = NULL;
+ if (is_null_sha1(sha1))
+ return 1;
+ *it = lookup_commit_reference_gently(sha1, 1);
+ return (*it != NULL);
+}
+
+static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+ char *data, void *cb_data)
+{
+ struct expire_reflog_cb *cb = cb_data;
+ unsigned long timestamp;
+ char *cp, *ep;
+ struct commit *old, *new;
+
+ cp = strchr(data, '>');
+ if (!cp || *++cp != ' ')
+ goto prune;
+ timestamp = strtoul(cp, &ep, 10);
+ if (*ep != ' ')
+ goto prune;
+ if (timestamp < cb->expire_total)
+ goto prune;
+
+ if (!keep_entry(&old, osha1) || !keep_entry(&new, nsha1))
+ goto prune;
+
+ if ((timestamp < cb->expire_lost) &&
+ ((old && !in_merge_bases(old, cb->ref_commit)) ||
+ (new && !in_merge_bases(new, cb->ref_commit))))
+ goto prune;
+
+ if (cb->newlog)
+ fprintf(cb->newlog, "%s %s %s",
+ sha1_to_hex(osha1), sha1_to_hex(nsha1), data);
+ return 0;
+ prune:
+ if (!cb->newlog)
+ fprintf(stderr, "would prune %s", data);
+ return 0;
+}
+
+struct cmd_reflog_expire_cb {
+ int dry_run;
+ unsigned long expire_total;
+ unsigned long expire_lost;
+};
+
+static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, void *cb_data)
+{
+ struct cmd_reflog_expire_cb *cmd = cb_data;
+ struct expire_reflog_cb cb;
+ struct ref_lock *lock;
+ char *newlog_path = NULL;
+ int status = 0;
+
+ if (strncmp(ref, "refs/", 5))
+ return error("not a ref '%s'", ref);
+
+ memset(&cb, 0, sizeof(cb));
+ /* we take the lock for the ref itself to prevent it from
+ * getting updated.
+ */
+ lock = lock_ref_sha1(ref + 5, sha1);
+ if (!lock)
+ return error("cannot lock ref '%s'", ref);
+ if (!file_exists(lock->log_file))
+ goto finish;
+ if (!cmd->dry_run) {
+ newlog_path = xstrdup(git_path("logs/%s.lock", ref));
+ cb.newlog = fopen(newlog_path, "w");
+ }
+
+ cb.ref_commit = lookup_commit_reference_gently(sha1, 1);
+ if (!cb.ref_commit) {
+ status = error("ref '%s' does not point at a commit", ref);
+ goto finish;
+ }
+ cb.ref = ref;
+ cb.expire_total = cmd->expire_total;
+ cb.expire_lost = cmd->expire_lost;
+ for_each_reflog_ent(ref, expire_reflog_ent, &cb);
+ finish:
+ if (cb.newlog) {
+ if (fclose(cb.newlog))
+ status |= error("%s: %s", strerror(errno),
+ newlog_path);
+ if (rename(newlog_path, lock->log_file)) {
+ status |= error("cannot rename %s to %s",
+ newlog_path, lock->log_file);
+ unlink(newlog_path);
+ }
+ }
+ free(newlog_path);
+ unlock_ref(lock);
+ return status;
+}
+
+static const char reflog_expire_usage[] =
+"git-reflog expire [--dry-run] [--expire=<time>] [--expire-lost=<time>] [--all] <refs>...";
+
+static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
+{
+ struct cmd_reflog_expire_cb cb;
+ unsigned long now = time(NULL);
+ int i, status, do_all;
+
+ save_commit_buffer = 0;
+ do_all = status = 0;
+ memset(&cb, 0, sizeof(cb));
+ cb.expire_total = now - 90 * 24 * 3600;
+ cb.expire_lost = now - 30 * 24 * 3600;
+
+ for (i = 1; i < argc; i++) {
+ const char *arg = argv[i];
+ if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
+ cb.dry_run = 1;
+ else if (!strncmp(arg, "--expire=", 9))
+ cb.expire_total = approxidate(arg + 9);
+ else if (!strncmp(arg, "--expire-lost=", 14))
+ cb.expire_lost = approxidate(arg + 14);
+ else if (!strcmp(arg, "--all"))
+ do_all = 1;
+ else if (!strcmp(arg, "--")) {
+ i++;
+ break;
+ }
+ else if (arg[0] == '-')
+ usage(reflog_expire_usage);
+ else
+ break;
+ }
+ if (do_all)
+ status |= for_each_ref(expire_reflog, &cb);
+ while (i < argc) {
+ const char *ref = argv[i++];
+ unsigned char sha1[20];
+ if (!resolve_ref(ref, sha1, 1, NULL)) {
+ status |= error("%s points nowhere!", ref);
+ continue;
+ }
+ status |= expire_reflog(ref, sha1, 0, &cb);
+ }
+ return status;
+}
+
+static const char reflog_usage[] =
+"git-reflog (expire | ...)";
+
+int cmd_reflog(int argc, const char **argv, const char *prefix)
+{
+ if (argc < 2)
+ usage(reflog_usage);
+ else if (!strcmp(argv[1], "expire"))
+ return cmd_reflog_expire(argc - 1, argv + 1, prefix);
+ else
+ usage(reflog_usage);
+}
diff --git a/builtin.h b/builtin.h
index 08519e7..fdc0907 100644
--- a/builtin.h
+++ b/builtin.h
@@ -51,6 +51,7 @@ extern int cmd_prune(int argc, const char **argv, const char *prefix);
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
+extern int cmd_reflog(int argc, const char **argv, const char *prefix);
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 016ee8a..ae4c99f 100644
--- a/git.c
+++ b/git.c
@@ -256,6 +256,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP },
+ { "reflog", cmd_reflog, RUN_SETUP },
{ "repo-config", cmd_repo_config },
{ "rev-list", cmd_rev_list, RUN_SETUP },
{ "rev-parse", cmd_rev_parse, RUN_SETUP },
--
1.4.4.2.g688739
next prev parent reply other threads:[~2006-12-19 8:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-16 23:10 What's cooking in git.git (topics) Junio C Hamano
2006-12-16 23:29 ` Jakub Narebski
2006-12-17 0:19 ` Junio C Hamano
2006-12-17 17:35 ` Yann Dirson
2006-12-17 23:38 ` Josef Weidendorfer
2006-12-17 4:35 ` Brian Gernhardt
2006-12-17 4:42 ` Shawn Pearce
2006-12-17 6:46 ` [PATCH] revision: introduce ref@{N..M} syntax Junio C Hamano
2006-12-17 18:14 ` Linus Torvalds
2006-12-17 19:38 ` Junio C Hamano
2006-12-17 23:41 ` What's cooking in git.git (topics) Andy Parkins
2006-12-18 8:09 ` Junio C Hamano
2006-12-18 9:17 ` Andy Parkins
2006-12-18 9:33 ` Shawn Pearce
2006-12-18 9:40 ` [PATCH 1/2] add for_each_reflog_ent() iterator Junio C Hamano
2006-12-18 9:42 ` [PATCH 2/2] Protect commits recorded in reflog from pruning Junio C Hamano
2006-12-18 14:08 ` Shawn Pearce
2006-12-19 1:22 ` Junio C Hamano
2006-12-19 8:25 ` [PATCH 1/2] Move in_merge_bases() to commit.c Junio C Hamano
2006-12-19 8:25 ` Junio C Hamano [this message]
2006-12-19 9:08 ` [PATCH 2/2] git reflog expire Shawn Pearce
2006-12-19 10:15 ` Junio C Hamano
2006-12-19 10:27 ` Shawn Pearce
2006-12-19 23:29 ` Linus Torvalds
2006-12-20 0:34 ` Junio C Hamano
2006-12-20 0:58 ` Linus Torvalds
2006-12-19 10:40 ` Shawn Pearce
2006-12-19 11:08 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v64c8thr4.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).