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 12/24] backup-log: add log command
Date: Sun, 9 Dec 2018 11:44:07 +0100 [thread overview]
Message-ID: <20181209104419.12639-13-pclouds@gmail.com> (raw)
In-Reply-To: <20181209104419.12639-1-pclouds@gmail.com>
One note about the default relative mode. Since this is mostly used
after a panic moment "oops I did it again!". The user would most
likely look for latest changes of a certain path and relative dates
make it easier to spot if the change is within a time frame.
Default to --patch too because the output is pretty useless otherwise.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/backup-log.c | 90 +++++++++++++++++++++++++++++++++++++++++++
t/t2080-backup-log.sh | 34 ++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/builtin/backup-log.c b/builtin/backup-log.c
index f8029e0011..2496d73ba5 100644
--- a/builtin/backup-log.c
+++ b/builtin/backup-log.c
@@ -6,11 +6,13 @@
#include "dir.h"
#include "object-store.h"
#include "parse-options.h"
+#include "revision.h"
static char const * const backup_log_usage[] = {
N_("git backup-log [--path=<path> | --id=<id>] update <path> <old-hash> <new-hash>"),
N_("git backup-log [--path=<path> | --id=<id>] cat [<options>] <change-id> <path>"),
N_("git backup-log [--path=<path> | --id=<id>] diff [<diff-options>] <change-id>"),
+ N_("git backup-log [--path=<path> | --id=<id>] log [<options>] [--] [<path>]"),
NULL
};
@@ -213,6 +215,92 @@ static int diff(int argc, const char **argv,
return ret - 1;
}
+struct log_options {
+ struct rev_info revs;
+ timestamp_t last_time;
+ int last_tz;
+};
+
+static void dump(struct bkl_entry *entry, struct log_options *opts)
+{
+ timestamp_t last_time = opts->last_time;
+ int last_tz = opts->last_tz;
+
+ if (entry) {
+ opts->last_time = entry->timestamp;
+ opts->last_tz = entry->tz;
+ }
+
+ if (last_time != -1 &&
+ ((!entry && diff_queued_diff.nr) ||
+ (entry && last_time != entry->timestamp))) {
+ printf("Change-Id: %"PRItime"\n", last_time);
+ printf("Date: %s\n", show_date(last_time, last_tz, &opts->revs.date_mode));
+ printf("\n--\n");
+ diffcore_std(&opts->revs.diffopt);
+ diff_flush(&opts->revs.diffopt);
+ printf("\n");
+ }
+}
+
+static int log_parse(struct strbuf *line, void *data)
+{
+ struct log_options *opts = data;
+ struct bkl_entry entry;
+
+ if (bkl_parse_entry(line, &entry))
+ return -1;
+
+ if (opts->revs.max_age != -1 && entry.timestamp < opts->revs.max_age)
+ return 1;
+
+ if (!match_pathspec(the_repository->index, &opts->revs.prune_data,
+ entry.path, strlen(entry.path),
+ 0, NULL, 0))
+ return 0;
+
+ dump(&entry, opts);
+
+ queue_blk_entry_for_diff(&entry);
+
+ return 0;
+}
+
+static int log_(int argc, const char **argv,
+ const char *prefix, const char *log_path)
+{
+ struct log_options opts;
+ int ret;
+
+ memset(&opts, 0, sizeof(opts));
+ opts.last_time = -1;
+ opts.last_tz = -1;
+
+ repo_init_revisions(the_repository, &opts.revs, prefix);
+ opts.revs.date_mode.type = DATE_RELATIVE;
+ argc = setup_revisions(argc, argv, &opts.revs, NULL);
+ if (!opts.revs.diffopt.output_format) {
+ opts.revs.diffopt.output_format = DIFF_FORMAT_PATCH;
+ diff_setup_done(&opts.revs.diffopt);
+ }
+
+ setup_pager();
+ if (opts.revs.reverse) {
+ /*
+ * Default order is reading file from the bottom. --reverse
+ * makes it read from the top instead (i.e. forward)
+ */
+ ret = bkl_parse_file(log_path, log_parse, &opts);
+ } else {
+ ret = bkl_parse_file_reverse(log_path, log_parse, &opts);
+ }
+ if (ret < 0)
+ die(_("failed to parse '%s'"), log_path);
+ dump(NULL, &opts); /* flush */
+
+ return ret;
+}
+
static char *log_id_to_path(const char *id)
{
if (!strcmp(id, "index"))
@@ -256,6 +344,8 @@ int cmd_backup_log(int argc, const char **argv, const char *prefix)
return cat(argc, argv, prefix, log_path);
else if (!strcmp(argv[0], "diff"))
return diff(argc, argv, prefix, log_path);
+ else if (!strcmp(argv[0], "log"))
+ return log_(argc, argv, prefix, log_path);
else
die(_("unknown subcommand: %s"), argv[0]);
diff --git a/t/t2080-backup-log.sh b/t/t2080-backup-log.sh
index cd4288d386..3cdabc2ba2 100755
--- a/t/t2080-backup-log.sh
+++ b/t/t2080-backup-log.sh
@@ -130,4 +130,38 @@ test_expect_success 'backup-log diff' '
test_cmp stat.expected stat.actual
'
+test_expect_success 'backup-log log' '
+ rm -f .git/index.bkl &&
+ echo first >initial.t &&
+ git add initial.t &&
+ echo second >initial.t &&
+ test_tick &&
+ git -c core.backupLog=true add initial.t &&
+ echo third >initial.t &&
+ # note, same tick!
+ git -c core.backupLog=true add initial.t &&
+ test_tick &&
+ echo forth >initial.t &&
+ git -c core.backupLog=true add initial.t &&
+ git backup-log --id=index log --stat --date=iso >actual &&
+ cat >expected <<-\EOF &&
+ Change-Id: 1112912593
+ Date: 2005-04-07 15:23:13 -0700
+
+ --
+ initial.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+ Change-Id: 1112912533
+ Date: 2005-04-07 15:22:13 -0700
+
+ --
+ initial.t | 2 +-
+ initial.t | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+ EOF
+ test_cmp expected actual
+'
+
test_done
--
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 ` Nguyễn Thái Ngọc Duy [this message]
2018-12-09 10:44 ` [PATCH 13/24] backup-log: add prune command Nguyễn Thái Ngọc Duy
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
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=20181209104419.12639-13-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.
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).