git-svn: exclude already merged tips using one rev-list call
[git] / builtin-push.c
1 /*
2  * "git push"
3  */
4 #include "cache.h"
5 #include "refs.h"
6 #include "run-command.h"
7 #include "builtin.h"
8 #include "remote.h"
9 #include "transport.h"
10 #include "parse-options.h"
11
12 static const char * const push_usage[] = {
13         "git push [<options>] [<repository> <refspec>...]",
14         NULL,
15 };
16
17 static int thin;
18 static const char *receivepack;
19
20 static const char **refspec;
21 static int refspec_nr;
22
23 static void add_refspec(const char *ref)
24 {
25         int nr = refspec_nr + 1;
26         refspec = xrealloc(refspec, nr * sizeof(char *));
27         refspec[nr-1] = ref;
28         refspec_nr = nr;
29 }
30
31 static void set_refspecs(const char **refs, int nr)
32 {
33         int i;
34         for (i = 0; i < nr; i++) {
35                 const char *ref = refs[i];
36                 if (!strcmp("tag", ref)) {
37                         char *tag;
38                         int len;
39                         if (nr <= ++i)
40                                 die("tag shorthand without <tag>");
41                         len = strlen(refs[i]) + 11;
42                         tag = xmalloc(len);
43                         strcpy(tag, "refs/tags/");
44                         strcat(tag, refs[i]);
45                         ref = tag;
46                 }
47                 add_refspec(ref);
48         }
49 }
50
51 static void setup_push_tracking(void)
52 {
53         struct strbuf refspec = STRBUF_INIT;
54         struct branch *branch = branch_get(NULL);
55         if (!branch)
56                 die("You are not currently on a branch.");
57         if (!branch->merge_nr)
58                 die("The current branch %s is not tracking anything.",
59                     branch->name);
60         if (branch->merge_nr != 1)
61                 die("The current branch %s is tracking multiple branches, "
62                     "refusing to push.", branch->name);
63         strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);
64         add_refspec(refspec.buf);
65 }
66
67 static void setup_default_push_refspecs(void)
68 {
69         switch (push_default) {
70         default:
71         case PUSH_DEFAULT_MATCHING:
72                 add_refspec(":");
73                 break;
74
75         case PUSH_DEFAULT_TRACKING:
76                 setup_push_tracking();
77                 break;
78
79         case PUSH_DEFAULT_CURRENT:
80                 add_refspec("HEAD");
81                 break;
82
83         case PUSH_DEFAULT_NOTHING:
84                 die("You didn't specify any refspecs to push, and "
85                     "push.default is \"nothing\".");
86                 break;
87         }
88 }
89
90 static int do_push(const char *repo, int flags)
91 {
92         int i, errs;
93         struct remote *remote = remote_get(repo);
94         const char **url;
95         int url_nr;
96
97         if (!remote) {
98                 if (repo)
99                         die("bad repository '%s'", repo);
100                 die("No destination configured to push to.");
101         }
102
103         if (remote->mirror)
104                 flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
105
106         if ((flags & TRANSPORT_PUSH_ALL) && refspec) {
107                 if (!strcmp(*refspec, "refs/tags/*"))
108                         return error("--all and --tags are incompatible");
109                 return error("--all can't be combined with refspecs");
110         }
111
112         if ((flags & TRANSPORT_PUSH_MIRROR) && refspec) {
113                 if (!strcmp(*refspec, "refs/tags/*"))
114                         return error("--mirror and --tags are incompatible");
115                 return error("--mirror can't be combined with refspecs");
116         }
117
118         if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
119                                 (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
120                 return error("--all and --mirror are incompatible");
121         }
122
123         if (!refspec && !(flags & TRANSPORT_PUSH_ALL)) {
124                 if (remote->push_refspec_nr) {
125                         refspec = remote->push_refspec;
126                         refspec_nr = remote->push_refspec_nr;
127                 } else if (!(flags & TRANSPORT_PUSH_MIRROR))
128                         setup_default_push_refspecs();
129         }
130         errs = 0;
131         if (remote->pushurl_nr) {
132                 url = remote->pushurl;
133                 url_nr = remote->pushurl_nr;
134         } else {
135                 url = remote->url;
136                 url_nr = remote->url_nr;
137         }
138         for (i = 0; i < url_nr; i++) {
139                 struct transport *transport =
140                         transport_get(remote, url[i]);
141                 int err;
142                 int nonfastforward;
143                 if (receivepack)
144                         transport_set_option(transport,
145                                              TRANS_OPT_RECEIVEPACK, receivepack);
146                 if (thin)
147                         transport_set_option(transport, TRANS_OPT_THIN, "yes");
148
149                 if (flags & TRANSPORT_PUSH_VERBOSE)
150                         fprintf(stderr, "Pushing to %s\n", url[i]);
151                 err = transport_push(transport, refspec_nr, refspec, flags,
152                                      &nonfastforward);
153                 err |= transport_disconnect(transport);
154
155                 if (!err)
156                         continue;
157
158                 error("failed to push some refs to '%s'", url[i]);
159                 if (nonfastforward && advice_push_nonfastforward) {
160                         printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
161                                "Merge the remote changes before pushing again.  See the 'non-fast-forward'\n"
162                                "section of 'git push --help' for details.\n");
163                 }
164                 errs++;
165         }
166         return !!errs;
167 }
168
169 int cmd_push(int argc, const char **argv, const char *prefix)
170 {
171         int flags = 0;
172         int tags = 0;
173         int rc;
174         const char *repo = NULL;        /* default repository */
175         struct option options[] = {
176                 OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET),
177                 OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
178                 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
179                 OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
180                 OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
181                             (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
182                 OPT_BOOLEAN( 0 , "tags", &tags, "push tags (can't be used with --all or --mirror)"),
183                 OPT_BIT('n' , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
184                 OPT_BIT( 0,  "porcelain", &flags, "machine-readable output", TRANSPORT_PUSH_PORCELAIN),
185                 OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
186                 OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
187                 OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
188                 OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
189                 OPT_END()
190         };
191
192         git_config(git_default_config, NULL);
193         argc = parse_options(argc, argv, prefix, options, push_usage, 0);
194
195         if (tags)
196                 add_refspec("refs/tags/*");
197
198         if (argc > 0) {
199                 repo = argv[0];
200                 set_refspecs(argv + 1, argc - 1);
201         }
202
203         rc = do_push(repo, flags);
204         if (rc == -1)
205                 usage_with_options(push_usage, options);
206         else
207                 return rc;
208 }