From 81b50f3ce40bfdd66e5d967bf82be001039a9a98 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 22 Feb 2010 08:42:18 -0800 Subject: Move 'builtin-*' into a 'builtin/' subdirectory This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- builtin-replace.c | 159 ------------------------------------------------------ 1 file changed, 159 deletions(-) delete mode 100644 builtin-replace.c (limited to 'builtin-replace.c') diff --git a/builtin-replace.c b/builtin-replace.c deleted file mode 100644 index fe3a647a36..0000000000 --- a/builtin-replace.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Builtin "git replace" - * - * Copyright (c) 2008 Christian Couder - * - * Based on builtin-tag.c by Kristian Høgsberg - * and Carlos Rica that was itself based on - * git-tag.sh and mktag.c by Linus Torvalds. - */ - -#include "cache.h" -#include "builtin.h" -#include "refs.h" -#include "parse-options.h" - -static const char * const git_replace_usage[] = { - "git replace [-f] ", - "git replace -d ...", - "git replace -l []", - NULL -}; - -static int show_reference(const char *refname, const unsigned char *sha1, - int flag, void *cb_data) -{ - const char *pattern = cb_data; - - if (!fnmatch(pattern, refname, 0)) - printf("%s\n", refname); - - return 0; -} - -static int list_replace_refs(const char *pattern) -{ - if (pattern == NULL) - pattern = "*"; - - for_each_replace_ref(show_reference, (void *) pattern); - - return 0; -} - -typedef int (*each_replace_name_fn)(const char *name, const char *ref, - const unsigned char *sha1); - -static int for_each_replace_name(const char **argv, each_replace_name_fn fn) -{ - const char **p; - char ref[PATH_MAX]; - int had_error = 0; - unsigned char sha1[20]; - - for (p = argv; *p; p++) { - if (snprintf(ref, sizeof(ref), "refs/replace/%s", *p) - >= sizeof(ref)) { - error("replace ref name too long: %.*s...", 50, *p); - had_error = 1; - continue; - } - if (!resolve_ref(ref, sha1, 1, NULL)) { - error("replace ref '%s' not found.", *p); - had_error = 1; - continue; - } - if (fn(*p, ref, sha1)) - had_error = 1; - } - return had_error; -} - -static int delete_replace_ref(const char *name, const char *ref, - const unsigned char *sha1) -{ - if (delete_ref(ref, sha1, 0)) - return 1; - printf("Deleted replace ref '%s'\n", name); - return 0; -} - -static int replace_object(const char *object_ref, const char *replace_ref, - int force) -{ - unsigned char object[20], prev[20], repl[20]; - char ref[PATH_MAX]; - struct ref_lock *lock; - - if (get_sha1(object_ref, object)) - die("Failed to resolve '%s' as a valid ref.", object_ref); - if (get_sha1(replace_ref, repl)) - die("Failed to resolve '%s' as a valid ref.", replace_ref); - - if (snprintf(ref, sizeof(ref), - "refs/replace/%s", - sha1_to_hex(object)) > sizeof(ref) - 1) - die("replace ref name too long: %.*s...", 50, ref); - if (check_ref_format(ref)) - die("'%s' is not a valid ref name.", ref); - - if (!resolve_ref(ref, prev, 1, NULL)) - hashclr(prev); - else if (!force) - die("replace ref '%s' already exists", ref); - - lock = lock_any_ref_for_update(ref, prev, 0); - if (!lock) - die("%s: cannot lock the ref", ref); - if (write_ref_sha1(lock, repl, NULL) < 0) - die("%s: cannot update the ref", ref); - - return 0; -} - -int cmd_replace(int argc, const char **argv, const char *prefix) -{ - int list = 0, delete = 0, force = 0; - struct option options[] = { - OPT_BOOLEAN('l', NULL, &list, "list replace refs"), - OPT_BOOLEAN('d', NULL, &delete, "delete replace refs"), - OPT_BOOLEAN('f', NULL, &force, "replace the ref if it exists"), - OPT_END() - }; - - argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0); - - if (list && delete) - usage_msg_opt("-l and -d cannot be used together", - git_replace_usage, options); - - if (force && (list || delete)) - usage_msg_opt("-f cannot be used with -d or -l", - git_replace_usage, options); - - /* Delete refs */ - if (delete) { - if (argc < 1) - usage_msg_opt("-d needs at least one argument", - git_replace_usage, options); - return for_each_replace_name(argv, delete_replace_ref); - } - - /* Replace object */ - if (!list && argc) { - if (argc != 2) - usage_msg_opt("bad number of arguments", - git_replace_usage, options); - return replace_object(argv[0], argv[1], force); - } - - /* List refs, even if "list" is not set */ - if (argc > 1) - usage_msg_opt("only one pattern can be given with -l", - git_replace_usage, options); - if (force) - usage_msg_opt("-f needs some arguments", - git_replace_usage, options); - - return list_replace_refs(argv[0]); -} -- cgit v1.2.3