list-objects.con commit remote-bzr: add support to push merges (f38dfc4)
   1#include "cache.h"
   2#include "tag.h"
   3#include "commit.h"
   4#include "tree.h"
   5#include "blob.h"
   6#include "diff.h"
   7#include "tree-walk.h"
   8#include "revision.h"
   9#include "list-objects.h"
  10
  11static void process_blob(struct rev_info *revs,
  12                         struct blob *blob,
  13                         show_object_fn show,
  14                         struct name_path *path,
  15                         const char *name,
  16                         void *cb_data)
  17{
  18        struct object *obj = &blob->object;
  19
  20        if (!revs->blob_objects)
  21                return;
  22        if (!obj)
  23                die("bad blob object");
  24        if (obj->flags & (UNINTERESTING | SEEN))
  25                return;
  26        obj->flags |= SEEN;
  27        show(obj, path, name, cb_data);
  28}
  29
  30/*
  31 * Processing a gitlink entry currently does nothing, since
  32 * we do not recurse into the subproject.
  33 *
  34 * We *could* eventually add a flag that actually does that,
  35 * which would involve:
  36 *  - is the subproject actually checked out?
  37 *  - if so, see if the subproject has already been added
  38 *    to the alternates list, and add it if not.
  39 *  - process the commit (or tag) the gitlink points to
  40 *    recursively.
  41 *
  42 * However, it's unclear whether there is really ever any
  43 * reason to see superprojects and subprojects as such a
  44 * "unified" object pool (potentially resulting in a totally
  45 * humongous pack - avoiding which was the whole point of
  46 * having gitlinks in the first place!).
  47 *
  48 * So for now, there is just a note that we *could* follow
  49 * the link, and how to do it. Whether it necessarily makes
  50 * any sense what-so-ever to ever do that is another issue.
  51 */
  52static void process_gitlink(struct rev_info *revs,
  53                            const unsigned char *sha1,
  54                            show_object_fn show,
  55                            struct name_path *path,
  56                            const char *name,
  57                            void *cb_data)
  58{
  59        /* Nothing to do */
  60}
  61
  62static void process_tree(struct rev_info *revs,
  63                         struct tree *tree,
  64                         show_object_fn show,
  65                         struct name_path *path,
  66                         struct strbuf *base,
  67                         const char *name,
  68                         void *cb_data)
  69{
  70        struct object *obj = &tree->object;
  71        struct tree_desc desc;
  72        struct name_entry entry;
  73        struct name_path me;
  74        enum interesting match = revs->diffopt.pathspec.nr == 0 ?
  75                all_entries_interesting: entry_not_interesting;
  76        int baselen = base->len;
  77
  78        if (!revs->tree_objects)
  79                return;
  80        if (!obj)
  81                die("bad tree object");
  82        if (obj->flags & (UNINTERESTING | SEEN))
  83                return;
  84        if (parse_tree(tree) < 0)
  85                die("bad tree object %s", sha1_to_hex(obj->sha1));
  86        obj->flags |= SEEN;
  87        show(obj, path, name, cb_data);
  88        me.up = path;
  89        me.elem = name;
  90        me.elem_len = strlen(name);
  91
  92        if (!match) {
  93                strbuf_addstr(base, name);
  94                if (base->len)
  95                        strbuf_addch(base, '/');
  96        }
  97
  98        init_tree_desc(&desc, tree->buffer, tree->size);
  99
 100        while (tree_entry(&desc, &entry)) {
 101                if (match != all_entries_interesting) {
 102                        match = tree_entry_interesting(&entry, base, 0,
 103                                                       &revs->diffopt.pathspec);
 104                        if (match == all_entries_not_interesting)
 105                                break;
 106                        if (match == entry_not_interesting)
 107                                continue;
 108                }
 109
 110                if (S_ISDIR(entry.mode))
 111                        process_tree(revs,
 112                                     lookup_tree(entry.sha1),
 113                                     show, &me, base, entry.path,
 114                                     cb_data);
 115                else if (S_ISGITLINK(entry.mode))
 116                        process_gitlink(revs, entry.sha1,
 117                                        show, &me, entry.path,
 118                                        cb_data);
 119                else
 120                        process_blob(revs,
 121                                     lookup_blob(entry.sha1),
 122                                     show, &me, entry.path,
 123                                     cb_data);
 124        }
 125        strbuf_setlen(base, baselen);
 126        free(tree->buffer);
 127        tree->buffer = NULL;
 128}
 129
 130static void mark_edge_parents_uninteresting(struct commit *commit,
 131                                            struct rev_info *revs,
 132                                            show_edge_fn show_edge)
 133{
 134        struct commit_list *parents;
 135
 136        for (parents = commit->parents; parents; parents = parents->next) {
 137                struct commit *parent = parents->item;
 138                if (!(parent->object.flags & UNINTERESTING))
 139                        continue;
 140                mark_tree_uninteresting(parent->tree);
 141                if (revs->edge_hint && !(parent->object.flags & SHOWN)) {
 142                        parent->object.flags |= SHOWN;
 143                        show_edge(parent);
 144                }
 145        }
 146}
 147
 148void mark_edges_uninteresting(struct commit_list *list,
 149                              struct rev_info *revs,
 150                              show_edge_fn show_edge)
 151{
 152        for ( ; list; list = list->next) {
 153                struct commit *commit = list->item;
 154
 155                if (commit->object.flags & UNINTERESTING) {
 156                        mark_tree_uninteresting(commit->tree);
 157                        continue;
 158                }
 159                mark_edge_parents_uninteresting(commit, revs, show_edge);
 160        }
 161}
 162
 163static void add_pending_tree(struct rev_info *revs, struct tree *tree)
 164{
 165        add_pending_object(revs, &tree->object, "");
 166}
 167
 168void traverse_commit_list(struct rev_info *revs,
 169                          show_commit_fn show_commit,
 170                          show_object_fn show_object,
 171                          void *data)
 172{
 173        int i;
 174        struct commit *commit;
 175        struct strbuf base;
 176
 177        strbuf_init(&base, PATH_MAX);
 178        while ((commit = get_revision(revs)) != NULL) {
 179                /*
 180                 * an uninteresting boundary commit may not have its tree
 181                 * parsed yet, but we are not going to show them anyway
 182                 */
 183                if (commit->tree)
 184                        add_pending_tree(revs, commit->tree);
 185                show_commit(commit, data);
 186        }
 187        for (i = 0; i < revs->pending.nr; i++) {
 188                struct object_array_entry *pending = revs->pending.objects + i;
 189                struct object *obj = pending->item;
 190                const char *name = pending->name;
 191                if (obj->flags & (UNINTERESTING | SEEN))
 192                        continue;
 193                if (obj->type == OBJ_TAG) {
 194                        obj->flags |= SEEN;
 195                        show_object(obj, NULL, name, data);
 196                        continue;
 197                }
 198                if (obj->type == OBJ_TREE) {
 199                        process_tree(revs, (struct tree *)obj, show_object,
 200                                     NULL, &base, name, data);
 201                        continue;
 202                }
 203                if (obj->type == OBJ_BLOB) {
 204                        process_blob(revs, (struct blob *)obj, show_object,
 205                                     NULL, name, data);
 206                        continue;
 207                }
 208                die("unknown pending object %s (%s)",
 209                    sha1_to_hex(obj->sha1), name);
 210        }
 211        if (revs->pending.nr) {
 212                free(revs->pending.objects);
 213                revs->pending.nr = 0;
 214                revs->pending.alloc = 0;
 215                revs->pending.objects = NULL;
 216        }
 217        strbuf_release(&base);
 218}