fix(3p/josh): Temporarily patch instances of master->canon
... until hardcoded references are removed upstream. This is motivated by HEAD-branch related issues when cloning depot via josh and a naive search for places where `master` was used directly. Change-Id: I46709631d6ee5561344fc5f407324bcf69c641e2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3171 Tested-by: BuildkiteCI Reviewed-by: cschilling <christian.schilling.de@gmail.com> Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
parent
00d2af6d7e
commit
e0708cba8d
2 changed files with 51 additions and 0 deletions
47
third_party/josh/0001-replace-mentions-of-master-with-canon.patch
vendored
Normal file
47
third_party/josh/0001-replace-mentions-of-master-with-canon.patch
vendored
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
From 4245dbdcacc3a4d4801a50071ba84379be4e1d2e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Ambo <mail@tazj.in>
|
||||||
|
Date: Tue, 1 Jun 2021 23:27:30 +0200
|
||||||
|
Subject: [PATCH] replace mentions of 'master' with 'canon'
|
||||||
|
|
||||||
|
While there are areas of josh that hardcode `master`, we can override
|
||||||
|
this to make it work for the TVL use-case.
|
||||||
|
---
|
||||||
|
josh-proxy/src/bin/josh-proxy.rs | 2 +-
|
||||||
|
src/housekeeping.rs | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/josh-proxy/src/bin/josh-proxy.rs b/josh-proxy/src/bin/josh-proxy.rs
|
||||||
|
index 6f15566..76f4a5d 100644
|
||||||
|
--- a/josh-proxy/src/bin/josh-proxy.rs
|
||||||
|
+++ b/josh-proxy/src/bin/josh-proxy.rs
|
||||||
|
@@ -374,7 +374,7 @@ async fn call_service(
|
||||||
|
|
||||||
|
let mut headref = parsed_url.headref.trim_start_matches("@").to_owned();
|
||||||
|
if headref == "" {
|
||||||
|
- headref = "refs/heads/master".to_string();
|
||||||
|
+ headref = "refs/heads/canon".to_string();
|
||||||
|
}
|
||||||
|
|
||||||
|
let remote_url = [
|
||||||
|
diff --git a/src/housekeeping.rs b/src/housekeeping.rs
|
||||||
|
index 5d08f81..1d55bc4 100644
|
||||||
|
--- a/src/housekeeping.rs
|
||||||
|
+++ b/src/housekeeping.rs
|
||||||
|
@@ -44,12 +44,12 @@ pub fn memorize_from_to(
|
||||||
|
) -> Vec<(String, String)> {
|
||||||
|
let mut refs = vec![];
|
||||||
|
let glob = format!(
|
||||||
|
- "refs/josh/upstream/{}/refs/heads/master",
|
||||||
|
+ "refs/josh/upstream/{}/refs/heads/canon",
|
||||||
|
&to_ns(upstream_repo)
|
||||||
|
);
|
||||||
|
for refname in repo.references_glob(&glob).unwrap().names() {
|
||||||
|
let refname = refname.unwrap();
|
||||||
|
- let to_ref = format!("refs/{}/heads/master", &namespace);
|
||||||
|
+ let to_ref = format!("refs/{}/heads/canon", &namespace);
|
||||||
|
|
||||||
|
refs.push((refname.to_owned(), to_ref.clone()));
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
4
third_party/josh/default.nix
vendored
4
third_party/josh/default.nix
vendored
|
@ -22,4 +22,8 @@ in depot.third_party.naersk.buildPackage {
|
||||||
"-p" "josh-proxy"
|
"-p" "josh-proxy"
|
||||||
"-p" "josh-ui"
|
"-p" "josh-ui"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
overrideMain = x: {
|
||||||
|
patches = [ ./0001-replace-mentions-of-master-with-canon.patch ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue