t3600: Use test prerequisite tags

diff --git a/transport.c b/transport.c
index b3e3e61f9dddec8230532f7d248beba801a38123..9ae92cd39c3f45cb2a58a24801a790ce6622d22c 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -50,9 +50,7 @@ static int read_loose_refs(struct strbuf *path, int name_offset,
        memset (&list, 0, sizeof(list));
 
        while ((de = readdir(dir))) {
-               if (de->d_name[0] == '.' && (de->d_name[1] == '\0' ||
-                               (de->d_name[1] == '.' &&
-                                de->d_name[2] == '\0')))
+               if (is_dot_or_dotdot(de->d_name))
                        continue;
                ALLOC_GROW(list.entries, list.nr + 1, list.alloc);
                list.entries[list.nr++] = xstrdup(de->d_name);
@@ -75,7 +73,7 @@ static int read_loose_refs(struct strbuf *path, int name_offset,
 
                        if (fd < 0)
                                continue;
-                       next = alloc_ref(path->len - name_offset + 1);
+                       next = alloc_ref(path->buf + name_offset);
                        if (read_in_full(fd, buffer, 40) != 40 ||
                                        get_sha1_hex(buffer, next->old_sha1)) {
                                close(fd);
@@ -83,7 +81,6 @@ static int read_loose_refs(struct strbuf *path, int name_offset,
                                continue;
                        }
                        close(fd);
-                       strcpy(next->name, path->buf + name_offset);
                        (*tail)->next = next;
                        *tail = next;
                }
@@ -127,14 +124,13 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list)
                                      (*list)->next->name)) > 0)
                        list = &(*list)->next;
                if (!(*list)->next || cmp < 0) {
-                       struct ref *next = alloc_ref(len - 40);
+                       struct ref *next = alloc_ref(buffer + 41);
                        buffer[40] = '\0';
                        if (get_sha1_hex(buffer, next->old_sha1)) {
                                warning ("invalid SHA-1: %s", buffer);
                                free(next);
                                continue;
                        }
-                       strcpy(next->name, buffer + 41);
                        next->next = (*list)->next;
                        (*list)->next = next;
                        list = &(*list)->next;
@@ -142,6 +138,11 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list)
        }
 }
 
+static const char *rsync_url(const char *url)
+{
+       return prefixcmp(url, "rsync://") ? skip_prefix(url, "rsync:") : url;
+}
+
 static struct ref *get_refs_via_rsync(struct transport *transport)
 {
        struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT;
@@ -157,7 +158,7 @@ static struct ref *get_refs_via_rsync(struct transport *transport)
                die ("Could not make temporary directory");
        temp_dir_len = temp_dir.len;
 
-       strbuf_addstr(&buf, transport->url);
+       strbuf_addstr(&buf, rsync_url(transport->url));
        strbuf_addstr(&buf, "/refs");
 
        memset(&rsync, 0, sizeof(rsync));
@@ -173,7 +174,7 @@ static struct ref *get_refs_via_rsync(struct transport *transport)
                die ("Could not run rsync to get refs");
 
        strbuf_reset(&buf);
-       strbuf_addstr(&buf, transport->url);
+       strbuf_addstr(&buf, rsync_url(transport->url));
        strbuf_addstr(&buf, "/packed-refs");
 
        args[2] = buf.buf;
@@ -210,7 +211,7 @@ static int fetch_objs_via_rsync(struct transport *transport,
        const char *args[8];
        int result;
 
-       strbuf_addstr(&buf, transport->url);
+       strbuf_addstr(&buf, rsync_url(transport->url));
        strbuf_addstr(&buf, "/objects/");
 
        memset(&rsync, 0, sizeof(rsync));
@@ -289,7 +290,7 @@ static int rsync_transport_push(struct transport *transport,
 
        /* first push the objects */
 
-       strbuf_addstr(&buf, transport->url);
+       strbuf_addstr(&buf, rsync_url(transport->url));
        strbuf_addch(&buf, '/');
 
        memset(&rsync, 0, sizeof(rsync));
@@ -310,7 +311,8 @@ static int rsync_transport_push(struct transport *transport,
        args[i++] = NULL;
 
        if (run_command(&rsync))
-               return error("Could not push objects to %s", transport->url);
+               return error("Could not push objects to %s",
+                               rsync_url(transport->url));
 
        /* copy the refs to the temporary directory; they could be packed. */
 
@@ -331,10 +333,11 @@ static int rsync_transport_push(struct transport *transport,
        if (!(flags & TRANSPORT_PUSH_FORCE))
                args[i++] = "--ignore-existing";
        args[i++] = temp_dir.buf;
-       args[i++] = transport->url;
+       args[i++] = rsync_url(transport->url);
        args[i++] = NULL;
        if (run_command(&rsync))
-               result = error("Could not push to %s", transport->url);
+               result = error("Could not push to %s",
+                               rsync_url(transport->url));
 
        if (remove_dir_recursively(&temp_dir, 0))
                warning ("Could not remove temporary directory %s.",
@@ -501,7 +504,7 @@ static struct ref *get_refs_via_curl(struct transport *transport)
 
        strbuf_release(&buffer);
 
-       ref = alloc_ref_from_str("HEAD");
+       ref = alloc_ref("HEAD");
        if (!walker->fetch_ref(walker, ref) &&
            !resolve_remote_symref(ref, refs)) {
                ref->next = refs;
@@ -542,7 +545,7 @@ static struct ref *get_refs_from_bundle(struct transport *transport)
                die ("Could not read bundle '%s'.", transport->url);
        for (i = 0; i < data->header.references.nr; i++) {
                struct ref_list_entry *e = data->header.references.list + i;
-               struct ref *ref = alloc_ref_from_str(e->name);
+               struct ref *ref = alloc_ref(e->name);
                hashcpy(ref->old_sha1, e->sha1);
                ref->next = result;
                result = ref;
@@ -619,7 +622,7 @@ static struct ref *get_refs_via_connect(struct transport *transport)
        struct ref *refs;
 
        connect_setup(transport);
-       get_remote_heads(data->fd[0], &refs, 0, NULL, 0);
+       get_remote_heads(data->fd[0], &refs, 0, NULL, 0, NULL);
 
        return refs;
 }
@@ -643,8 +646,8 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.use_thin_pack = data->thin;
        args.include_tag = data->followtags;
        args.verbose = (transport->verbose > 0);
-       args.quiet = args.no_progress = (transport->verbose < 0);
-       args.no_progress = !isatty(1);
+       args.quiet = (transport->verbose < 0);
+       args.no_progress = args.quiet || (!transport->progress && !isatty(1));
        args.depth = data->depth;
 
        for (i = 0; i < nr_heads; i++)
@@ -652,7 +655,7 @@ static int fetch_refs_via_pack(struct transport *transport,
 
        if (!data->conn) {
                connect_setup(transport);
-               get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0);
+               get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL);
        }
 
        refs = fetch_pack(&args, data->fd, data->conn,
@@ -708,7 +711,8 @@ static int is_local(const char *url)
 {
        const char *colon = strchr(url, ':');
        const char *slash = strchr(url, '/');
-       return !colon || (slash && slash < colon);
+       return !colon || (slash && slash < colon) ||
+               has_dos_drive_prefix(url);
 }
 
 static int is_file(const char *url)
@@ -726,7 +730,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
        ret->remote = remote;
        ret->url = url;
 
-       if (!prefixcmp(url, "rsync://")) {
+       if (!prefixcmp(url, "rsync:")) {
                ret->get_refs_list = get_refs_via_rsync;
                ret->fetch = fetch_objs_via_rsync;
                ret->push = rsync_transport_push;