From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 3/7] Softrefs: Add git-softref, a builtin command for adding, listing and administering softrefs
Date: Sat, 09 Jun 2007 20:22:46 +0200 [thread overview]
Message-ID: <200706092022.46933.johan@herland.net> (raw)
In-Reply-To: <200706092019.13185.johan@herland.net>
git-softref is meant to be used from shell scripts that need to interact
with the softrefs database. The builtin command provides most of the
functionality present in the softrefs C API.
Documentation to follow in a subsequent patch.
Signed-off-by: Johan Herland <johan@herland.net>
---
builtin-softref.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 167 insertions(+), 0 deletions(-)
create mode 100644 builtin-softref.c
diff --git a/builtin-softref.c b/builtin-softref.c
new file mode 100644
index 0000000..f95db4e
--- /dev/null
+++ b/builtin-softref.c
@@ -0,0 +1,167 @@
+/*
+ * git softref builtin command
+ *
+ * Add, list and administer soft references (softrefs)
+ *
+ * Copyright (c) 2007 Johan Herland
+ */
+
+#include "cache.h"
+#include "tag.h"
+#include "refs.h"
+#include "softrefs.h"
+
+static const char builtin_softref_usage[] =
+ "git-softref [ --list [<from-object>]"
+ " | --has <from-object> <to-object>"
+ " | --add <from-object> <to-object>"
+ " | --rebuild-tags"
+ " | --merge-unsorted [<softrefs-file>]"
+ " | --merge-sorted <softrefs-file> ]";
+
+static int list_helper(
+ const unsigned char *from_sha1,
+ const unsigned char *to_sha1,
+ void *cb_data)
+{
+ printf("%s %s\n", sha1_to_hex(from_sha1), sha1_to_hex(to_sha1));
+ return 0;
+}
+
+int rebuild_tags_helper(
+ const char *refname,
+ const unsigned char *sha1,
+ int flags,
+ void *cb_data)
+{
+ struct object *o = parse_object(sha1);
+ if (o && o->type == OBJ_TAG) {
+ struct tag *t = (struct tag *) o;
+ struct softref_list **prev = (struct softref_list **) cb_data;
+ struct softref_list *current = xmalloc(sizeof(struct softref_list));
+ current->next = *prev;
+ hashcpy(current->from_sha1, t->tagged->sha1);
+ hashcpy(current->to_sha1, t->object.sha1);
+ *prev = current;
+ }
+ return 0;
+}
+
+int cmd_softref(int argc, const char **argv, const char *prefix)
+{
+ int i;
+ int show_usage = 0, list = 0, has = 0, add = 0, rebuild_tags = 0,
+ merge_unsorted = 0, merge_sorted = 0;
+ const char *from_name = NULL, *to_name = NULL, *softrefs_file = NULL;
+ unsigned char from_sha1[20], to_sha1[20];
+
+ git_config(git_default_config);
+
+ for (i = 1; i < argc; i++) {
+ const char *arg = argv[i];
+ if (!strcmp(arg, "--list")) {
+ list = 1;
+ if (i + 1 < argc) /* <from-object> given */
+ from_name = argv[++i];
+ }
+ else if (!strcmp(arg, "--has")) {
+ has = 1;
+ if (i + 2 >= argc)
+ show_usage = error("--has needs two arguments: <from-object> and <to-object>");
+ else {
+ from_name = argv[++i];
+ to_name = argv[++i];
+ }
+ }
+ else if (!strcmp(arg, "--add")) {
+ add = 1;
+ if (i + 2 >= argc)
+ show_usage = error("--add needs two arguments: <from-object> and <to-object>");
+ else {
+ from_name = argv[++i];
+ to_name = argv[++i];
+ }
+ }
+ else if (!strcmp(arg, "--rebuild-tags"))
+ rebuild_tags = 1;
+ else if (!strcmp(arg, "--merge-unsorted")) {
+ merge_unsorted = 1;
+ if (i + 1 < argc) /* <softrefs-file> given */
+ softrefs_file = argv[++i];
+ }
+ else if (!strcmp(arg, "--merge-sorted")) {
+ merge_sorted = 1;
+ if (i + 1 >= argc)
+ show_usage = error("--merge-sorted needs one argument: <softrefs-file>");
+ else
+ softrefs_file = argv[++i];
+ }
+ else
+ show_usage = error("Unknown argument '%s'", arg);
+ }
+
+ /* default to --list if no command given; fail if more than one */
+ switch(list + has + add + rebuild_tags + merge_unsorted + merge_sorted) {
+ case 0: list = 1; break;
+ case 1: break;
+ default: show_usage = 1;
+ }
+ if (show_usage)
+ usage(builtin_softref_usage);
+
+ if (list) {
+ if (from_name) { /* show from_name's softrefs */
+ if (get_sha1(from_name, from_sha1))
+ die("Not a valid object name %s", from_name);
+ if (for_each_softref_with_from(from_sha1, list_helper, 0))
+ die("Error encountered while listing softrefs");
+ }
+ else if (for_each_softref(list_helper, 0)) /* show all softrefs */
+ die("Error encountered while listing softrefs");
+ }
+ else if (has) {
+ if (get_sha1(from_name, from_sha1) || !has_sha1_file(from_sha1))
+ die("Not a valid object name %s", from_name);
+ if (get_sha1(to_name, to_sha1) || !has_sha1_file(to_sha1))
+ die("Not a valid object name %s", to_name);
+ return has_softref(from_sha1, to_sha1);
+ }
+ else if (add) {
+ if (get_sha1(from_name, from_sha1) || !has_sha1_file(from_sha1))
+ die("Not a valid object name %s", from_name);
+ if (get_sha1(to_name, to_sha1) || !has_sha1_file(to_sha1))
+ die("Not a valid object name %s", to_name);
+ if (add_softref(from_sha1, to_sha1) < 0)
+ die("Failed to create softref from %s to %s",
+ from_name, to_name);
+ }
+ else if (rebuild_tags) {
+ /*
+ * Find all tag objects, and add their corresponding softrefs
+ *
+ * For now, we'll have to settle for referenced tag objects as
+ * it seems to be non-trivial to find _all_ the tag objects in
+ * the db (including unreachables).
+ */
+ struct softref_list *to_add = NULL;
+ struct softref_list **p = &to_add;
+ int ret;
+ if (for_each_tag_ref(rebuild_tags_helper, (void *) p)) {
+ delete_softref_list(to_add);
+ die("Failed to find tag objects");
+ }
+ ret = add_softrefs(to_add);
+ delete_softref_list(to_add);
+ if (ret < 0)
+ die("Failed to add softrefs for tag objects");
+ printf("Added %i missing softrefs for tag objects.\n", ret);
+ }
+ else if (merge_unsorted) {
+ return merge_unsorted_softrefs(softrefs_file, 1);
+ }
+ else if (merge_sorted) {
+ return merge_sorted_softrefs(softrefs_file);
+ }
+
+ return 0;
+}
--
1.5.2.1.144.gabc40
next prev parent reply other threads:[~2007-06-09 18:22 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-04 0:51 Refactoring the tag object; Introducing soft references (softrefs); Git 'notes' (take 2) Johan Herland
2007-06-04 0:51 ` [PATCH 0/6] Refactor the tag object Johan Herland
2007-06-04 0:52 ` [PATCH 1/6] Refactor git tag objects; make "tag" header optional; introduce new optional "keywords" header Johan Herland
2007-06-04 6:08 ` Matthias Lederhofer
2007-06-04 7:30 ` Johan Herland
2007-06-04 0:53 ` [PATCH 2/6] git-show: When showing tag objects with no tag name, show tag object's SHA1 instead of an empty string Johan Herland
2007-06-04 0:53 ` [PATCH 3/6] git-fsck: Do thorough verification of tag objects Johan Herland
2007-06-04 5:56 ` Matthias Lederhofer
2007-06-04 7:51 ` Johan Herland
2007-06-06 7:18 ` Junio C Hamano
2007-06-06 8:06 ` Johan Herland
2007-06-06 9:03 ` Junio C Hamano
2007-06-06 9:21 ` Junio C Hamano
2007-06-06 10:26 ` Johan Herland
2007-06-06 10:35 ` Junio C Hamano
2007-06-04 0:54 ` [PATCH 4/6] Documentation/git-mktag: Document the changes in tag object structure Johan Herland
2007-06-04 0:54 ` [PATCH 5/6] git-mktag tests: Fix and expand the mktag tests according to the new " Johan Herland
2007-06-04 0:54 ` [PATCH 6/6] Add fsck_verify_ref_to_tag_object() to verify that refname matches name stored in tag object Johan Herland
2007-06-04 20:32 ` [PATCH 0/6] Refactor the " Junio C Hamano
2007-06-07 22:13 ` [PATCH] Fix bug in tag parsing when thorough verification was in effect Johan Herland
2007-06-09 18:19 ` [PATCH 0/7] Introduce soft references (softrefs) Johan Herland
2007-06-09 18:21 ` [PATCH 1/7] Softrefs: Add softrefs header file with API documentation Johan Herland
2007-06-10 6:58 ` Johannes Schindelin
2007-06-10 7:43 ` Junio C Hamano
2007-06-10 7:54 ` Johannes Schindelin
2007-06-10 14:00 ` Johan Herland
2007-06-10 14:27 ` Jakub Narebski
2007-06-10 14:45 ` [PATCH] Teach git-gc to merge unsorted softrefs Johan Herland
2007-06-09 18:22 ` [PATCH 2/7] Softrefs: Add implementation of softrefs API Johan Herland
2007-06-09 18:22 ` Johan Herland [this message]
2007-06-09 18:23 ` [PATCH 4/7] Softrefs: Add manual page documenting git-softref and softrefs subsystem in general Johan Herland
2007-06-09 18:23 ` [PATCH 5/7] Softrefs: Add testcases for basic softrefs behaviour Johan Herland
2007-06-09 18:24 ` [PATCH 6/7] Softrefs: Administrivia associated with softrefs subsystem and git-softref builtin Johan Herland
2007-06-09 18:24 ` [PATCH 7/7] Teach git-mktag to register softrefs for all tag objects Johan Herland
2007-06-09 18:25 ` [PATCH] Change softrefs file format from text (82 bytes per entry) to binary (40 bytes per entry) Johan Herland
2007-06-10 8:02 ` Johannes Schindelin
2007-06-10 8:30 ` Junio C Hamano
2007-06-10 9:46 ` Johannes Schindelin
2007-06-10 14:03 ` Johan Herland
2007-06-09 23:55 ` Comment on weak refs Junio C Hamano
2007-06-10 1:25 ` Johan Herland
2007-06-10 6:33 ` Johannes Schindelin
2007-06-10 13:41 ` Johan Herland
2007-06-10 14:09 ` Pierre Habouzit
2007-06-10 14:25 ` Pierre Habouzit
2007-06-10 9:03 ` Pierre Habouzit
2007-06-10 15:26 ` Jakub Narebski
2007-06-09 22:57 ` Refactoring the tag object; Introducing soft references (softrefs); Git 'notes' (take 2) Steven Grimm
2007-06-09 23:16 ` Johan Herland
2007-06-10 8:29 ` Pierre Habouzit
2007-06-10 14:31 ` Johan Herland
2007-06-10 19:42 ` Steven Grimm
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=200706092022.46933.johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@linux-foundation.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).