reset URL via git remote set-url, update boost

Signed-off-by: Felix Gündling <felix.guendling@gmail.com>

Author: felixguendling

.clang-format

@@ -13,14 +13,14 @@ AlwaysBreakTemplateDeclarations: true
 SpacesBeforeTrailingComments: 2
 IncludeBlocks: Preserve
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<c.*'
-    Priority:        2
-  - Regex:           '^<.*'
-    Priority:        4
-  - Regex:           '.*'
-    Priority:        5
+  - Regex: '^<.*\.h>'
+    Priority: 1
+  - Regex: '^<c.*'
+    Priority: 2
+  - Regex: '^<.*'
+    Priority: 4
+  - Regex: '.*'
+    Priority: 5
 ---
 BasedOnStyle: Google
 ColumnLimit: 80
@@ -37,12 +37,11 @@ AlwaysBreakTemplateDeclarations: true
 SpacesBeforeTrailingComments: 2
 IncludeBlocks: Preserve
 IncludeCategories:
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<c.*'
-    Priority:        2
-    Priority:        3
-  - Regex:           '^<.*'
-    Priority:        4
-  - Regex:           '.*'
-    Priority:        5
+  - Regex: '^<.*\.h>'
+    Priority: 1
+  - Regex: '^<c.*'
+    Priority: 2
+  - Regex: '^<.*'
+    Priority: 4
+  - Regex: '.*'
+    Priority: 5

deps/boost

@@ -18,6 +18,8 @@ struct commit_info {
   branch_commit bc_;
 };
 
+std::string ssh_to_https(std::string url);
+
 std::string git_shorten(dep const*, std::string const& commit);
 
 void git_clone(executor&, dep const*, bool clone_https);

include/pkg/git.h

@@ -41,6 +41,8 @@ void load_deps(fs::path const& repo, fs::path const& deps_root,
             (d->commit_ != bc.commit_ && !commit_exists(d, bc.commit_))) {
           fmt::print("{}: fetch\n", d->name());
           std::cout << std::flush;
+          e.exec(d->path_, "git remote set-url origin {}",
+                 clone_https ? ssh_to_https(d->url_) : d->url_);
           e.exec(d->path_, "git fetch origin");
         }
 
@@ -141,6 +143,7 @@ void load_deps(fs::path const& repo, fs::path const& deps_root,
       } catch (std::exception const& e) {
         fmt::print("Checkout failed for {}: {}\n", d->name(), e.what());
         ex.print_trace();
+        throw;
       }
     }
   } while (repeat);

src/load_deps.cc

@@ -30,14 +30,19 @@ int main(int argc, char** argv) {
     return 0;
   }
 
-  auto const mode = std::string_view{argv[1]};
-  set_verbose(has_flag(argc - 1, argv + 1, "-v"));
-  if (mode == "load" || mode == "-l") {
-    load_deps(fs::path{"."}, fs::path("deps"),  //
-              has_flag(argc - 1, argv + 1, "-h"),  //
-              has_flag(argc - 1, argv + 1, "-f"),  //
-              has_flag(argc - 1, argv + 1, "-r"));
-  } else if (mode == "status" || mode == "-s") {
-    print_status(fs::path{"."}, fs::path("deps"));
+  try {
+    auto const mode = std::string_view{argv[1]};
+    set_verbose(has_flag(argc - 1, argv + 1, "-v"));
+    if (mode == "load" || mode == "-l") {
+      load_deps(fs::path{"."}, fs::path("deps"),  //
+                has_flag(argc - 1, argv + 1, "-h"),  //
+                has_flag(argc - 1, argv + 1, "-f"),  //
+                has_flag(argc - 1, argv + 1, "-r"));
+    } else if (mode == "status" || mode == "-s") {
+      print_status(fs::path{"."}, fs::path("deps"));
+    }
+  } catch (std::exception const& e) {
+    std::cerr << "error: " << e.what() << "\n";
+    return 1;
   }
 }