diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-22 19:42:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-23 01:29:41 +0300 |
commit | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (patch) | |
tree | 7e86bb81e83c9fad73dcbdaa0ef33038137b4274 /builtin-push.c | |
parent | 241b9254e1c8ff071d8054f8b6fbe1883b389d69 (diff) |
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<tab>
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<tab>
builtin-shortlog.c builtin-shortlog.o
[torvalds@nehalem git]$ em builtin-shortlog.c
you get
[torvalds@nehalem git]$ em buil<tab> [type]
builtin/ builtin.h
[torvalds@nehalem git]$ em builtin [auto-completes to]
[torvalds@nehalem git]$ em builtin/sh<tab> [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<tab> [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 <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-push.c')
-rw-r--r-- | builtin-push.c | 247 |
1 files changed, 0 insertions, 247 deletions
diff --git a/builtin-push.c b/builtin-push.c deleted file mode 100644 index 5633f0ade4..0000000000 --- a/builtin-push.c +++ /dev/null @@ -1,247 +0,0 @@ -/* - * "git push" - */ -#include "cache.h" -#include "refs.h" -#include "run-command.h" -#include "builtin.h" -#include "remote.h" -#include "transport.h" -#include "parse-options.h" - -static const char * const push_usage[] = { - "git push [<options>] [<repository> <refspec>...]", - NULL, -}; - -static int thin; -static int deleterefs; -static const char *receivepack; - -static const char **refspec; -static int refspec_nr; - -static void add_refspec(const char *ref) -{ - int nr = refspec_nr + 1; - refspec = xrealloc(refspec, nr * sizeof(char *)); - refspec[nr-1] = ref; - refspec_nr = nr; -} - -static void set_refspecs(const char **refs, int nr) -{ - int i; - for (i = 0; i < nr; i++) { - const char *ref = refs[i]; - if (!strcmp("tag", ref)) { - char *tag; - int len; - if (nr <= ++i) - die("tag shorthand without <tag>"); - len = strlen(refs[i]) + 11; - if (deleterefs) { - tag = xmalloc(len+1); - strcpy(tag, ":refs/tags/"); - } else { - tag = xmalloc(len); - strcpy(tag, "refs/tags/"); - } - strcat(tag, refs[i]); - ref = tag; - } else if (deleterefs && !strchr(ref, ':')) { - char *delref; - int len = strlen(ref)+1; - delref = xmalloc(len+1); - strcpy(delref, ":"); - strcat(delref, ref); - ref = delref; - } else if (deleterefs) - die("--delete only accepts plain target ref names"); - add_refspec(ref); - } -} - -static void setup_push_tracking(void) -{ - struct strbuf refspec = STRBUF_INIT; - struct branch *branch = branch_get(NULL); - if (!branch) - die("You are not currently on a branch."); - if (!branch->merge_nr) - die("The current branch %s is not tracking anything.", - branch->name); - if (branch->merge_nr != 1) - die("The current branch %s is tracking multiple branches, " - "refusing to push.", branch->name); - strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); - add_refspec(refspec.buf); -} - -static void setup_default_push_refspecs(void) -{ - switch (push_default) { - default: - case PUSH_DEFAULT_MATCHING: - add_refspec(":"); - break; - - case PUSH_DEFAULT_TRACKING: - setup_push_tracking(); - break; - - case PUSH_DEFAULT_CURRENT: - add_refspec("HEAD"); - break; - - case PUSH_DEFAULT_NOTHING: - die("You didn't specify any refspecs to push, and " - "push.default is \"nothing\"."); - break; - } -} - -static int push_with_options(struct transport *transport, int flags) -{ - int err; - int nonfastforward; - if (receivepack) - transport_set_option(transport, - TRANS_OPT_RECEIVEPACK, receivepack); - if (thin) - transport_set_option(transport, TRANS_OPT_THIN, "yes"); - - if (flags & TRANSPORT_PUSH_VERBOSE) - fprintf(stderr, "Pushing to %s\n", transport->url); - err = transport_push(transport, refspec_nr, refspec, flags, - &nonfastforward); - if (err != 0) - error("failed to push some refs to '%s'", transport->url); - - err |= transport_disconnect(transport); - - if (!err) - return 0; - - if (nonfastforward && advice_push_nonfastforward) { - printf("To prevent you from losing history, non-fast-forward updates were rejected\n" - "Merge the remote changes before pushing again. See the 'Note about\n" - "fast-forwards' section of 'git push --help' for details.\n"); - } - - return 1; -} - -static int do_push(const char *repo, int flags) -{ - int i, errs; - struct remote *remote = remote_get(repo); - const char **url; - int url_nr; - - if (!remote) { - if (repo) - die("bad repository '%s'", repo); - die("No destination configured to push to."); - } - - if (remote->mirror) - flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE); - - if ((flags & TRANSPORT_PUSH_ALL) && refspec) { - if (!strcmp(*refspec, "refs/tags/*")) - return error("--all and --tags are incompatible"); - return error("--all can't be combined with refspecs"); - } - - if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) { - if (!strcmp(*refspec, "refs/tags/*")) - return error("--mirror and --tags are incompatible"); - return error("--mirror can't be combined with refspecs"); - } - - if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) == - (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) { - return error("--all and --mirror are incompatible"); - } - - if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) { - if (remote->push_refspec_nr) { - refspec = remote->push_refspec; - refspec_nr = remote->push_refspec_nr; - } else if (!(flags & TRANSPORT_PUSH_MIRROR)) - setup_default_push_refspecs(); - } - errs = 0; - if (remote->pushurl_nr) { - url = remote->pushurl; - url_nr = remote->pushurl_nr; - } else { - url = remote->url; - url_nr = remote->url_nr; - } - if (url_nr) { - for (i = 0; i < url_nr; i++) { - struct transport *transport = - transport_get(remote, url[i]); - if (push_with_options(transport, flags)) - errs++; - } - } else { - struct transport *transport = - transport_get(remote, NULL); - - if (push_with_options(transport, flags)) - errs++; - } - return !!errs; -} - -int cmd_push(int argc, const char **argv, const char *prefix) -{ - int flags = 0; - int tags = 0; - int rc; - const char *repo = NULL; /* default repository */ - struct option options[] = { - OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), - OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE), - OPT_STRING( 0 , "repo", &repo, "repository", "repository"), - OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL), - OPT_BIT( 0 , "mirror", &flags, "mirror all refs", - (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)), - OPT_BOOLEAN( 0, "delete", &deleterefs, "delete refs"), - OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all or --mirror)"), - OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN), - OPT_BIT( 0, "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN), - OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE), - OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"), - OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"), - OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"), - OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status", - TRANSPORT_PUSH_SET_UPSTREAM), - OPT_END() - }; - - git_config(git_default_config, NULL); - argc = parse_options(argc, argv, prefix, options, push_usage, 0); - - if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) - die("--delete is incompatible with --all, --mirror and --tags"); - if (deleterefs && argc < 2) - die("--delete doesn't make sense without any refs"); - - if (tags) - add_refspec("refs/tags/*"); - - if (argc > 0) { - repo = argv[0]; - set_refspecs(argv + 1, argc - 1); - } - - rc = do_push(repo, flags); - if (rc == -1) - usage_with_options(push_usage, options); - else - return rc; -} |