From 94ce5629054337ae0468e4584e4e9c22177ac875 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 19 Aug 2013 19:13:53 -0400
Subject: [PATCH] pull: Drop obsoleted "related objects" API

We removed support for writing "related objects" from ostree commits
in ostree git c9b61cbfee5d3cd0433ef14eac9ba9d1b24a0e38 because it just
didn't work out as an idea.  This also removes the API and code from
"ostree pull".

Note there was no test suite coverage.

https://bugzilla.gnome.org/show_bug.cgi?id=706342
---
 src/libostree/ostree-repo-pull.c | 17 -----------------
 src/libostree/ostree-repo.h      |  4 +---
 src/ostree/ot-builtin-pull.c     |  6 ------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 27a36e43..90cdbee2 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -747,23 +747,6 @@ scan_commit_object (OtPullData         *pull_data,
                                  cancellable, error))
     goto out;
   
-  if (pull_data->flags & OSTREE_REPO_PULL_FLAGS_RELATED)
-    {
-      const char *name;
-      gs_unref_variant GVariant *csum_v = NULL;
-
-      related_objects = g_variant_get_child_value (commit, 2);
-      iter = g_variant_iter_new (related_objects);
-
-      while (g_variant_iter_loop (iter, "(&s@ay)", &name, &csum_v))
-        {
-          if (!scan_one_metadata_object (pull_data, ostree_checksum_bytes_peek (csum_v),
-                                         OSTREE_OBJECT_TYPE_COMMIT, recursion_depth + 1,
-                                         cancellable, error))
-            goto out;
-        }
-    }
-
   ret = TRUE;
  out:
   if (iter)
diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index a5ad7413..287975fa 100644
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -411,11 +411,9 @@ gboolean ostree_repo_prune (OstreeRepo        *self,
 /**
  * OstreeRepoPullFlags:
  * @OSTREE_REPO_PULL_FLAGS_NONE: No special options for pull
- * @OSTREE_REPO_PULL_FLAGS_RELATED: Fetch objects referred to by each commit
  */
 typedef enum {
-  OSTREE_REPO_PULL_FLAGS_NONE,
-  OSTREE_REPO_PULL_FLAGS_RELATED
+  OSTREE_REPO_PULL_FLAGS_NONE
 } OstreeRepoPullFlags;
 
 gboolean ostree_repo_pull (OstreeRepo             *self,
diff --git a/src/ostree/ot-builtin-pull.c b/src/ostree/ot-builtin-pull.c
index 1bb76357..797778dd 100644
--- a/src/ostree/ot-builtin-pull.c
+++ b/src/ostree/ot-builtin-pull.c
@@ -26,10 +26,7 @@
 #include "ostree.h"
 #include "otutil.h"
 
-gboolean opt_related;
-
 static GOptionEntry options[] = {
-  { "related", 0, 0, G_OPTION_ARG_NONE, &opt_related, "Download related commits", NULL },
   { NULL }
 };
 
@@ -69,9 +66,6 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GCancellable *canc
       g_ptr_array_add (refs_to_fetch, NULL);
     }
 
-  if (opt_related)
-    pullflags |= OSTREE_REPO_PULL_FLAGS_RELATED;
-
   if (!ostree_repo_pull (repo, remote, refs_to_fetch ? (char**)refs_to_fetch->pdata : NULL,
                     pullflags, cancellable, error))
     goto out;