Always try to push upstream repos

SunSerega · Aug 19, 2024 · 3fd9cac · 3fd9cac
1 parent 72fd295
commit 3fd9cac
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/DataScraping/Reps/PullReps.pas b/DataScraping/Reps/PullReps.pas
@@ -1,13 +1,15 @@
 uses System.Diagnostics;
 
-uses '../../POCGL_Utils';
 uses '../../Utils/AOtp';
 uses '../../Utils/AQueue';
+uses '../../Utils/CLArgs';
+
+uses '../../POCGL_Utils';
 
 const remote_official = '0_official';
 const remote_own = 'SunSerega';
 
-var disable_push := false;
+var branch_per_repo := new Dictionary<string, string>;
 
 procedure ExecCommands(path, nick: string; kinds: array of string; params commands: array of string);
 begin
@@ -31,15 +33,11 @@ procedure ExecCommands(path, nick: string; kinds: array of string; params comman
   p.BeginErrorReadLine;
 
   foreach var l in p_otp do
-    Otp(l.ConvStr(s->
-    begin
-      if 'https' in s then
-        disable_push := true;
-      Result := s
-        .Replace('github.com:','')
-        .Replace('https://github.com/','')
-        .RegexReplace('\s+', ' ')
-    end));
+    Otp(l.ConvStr(s->s
+      .Replace('github.com:','')
+      .Replace('https://github.com/','')
+      .RegexReplace('\s+', ' ')
+    ));
 
   if p.ExitCode<>0 then
     Halt(p.ExitCode);
@@ -51,6 +49,12 @@ procedure PullRep(name, branch, nick: string);
   var path := GetFullPathRTA(name);
   System.IO.Directory.CreateDirectory(path);
 
+  if branch_per_repo.Get(name) is string(var branch_override) then
+  begin
+    Otp($'Branch override: {branch} => {branch_override}', 'console only');
+    branch := branch_override;
+  end;
+
   if not FileExists(GetFullPath('.git', path)) then
     ExecCommands(path, nick+'+init', |'console only'|
       , $'echo [init] && git submodule update --init "." || cd .'
@@ -67,21 +71,28 @@ procedure PullRep(name, branch, nick: string);
     , $'echo [merge-main] && git merge main'
   );
 
-  if not disable_push then
-    ExecCommands(path, nick, |'console only'|
-      , $'echo [push main] && git push {remote_own} main || cd .'
-      , $'echo [push {branch}] && git push {remote_own} {branch} || cd .'
-    );
+  ExecCommands(path, nick, |'console only'|
+    , $'echo [push main] && git push {remote_own} main || cd .'
+    , $'echo [push {branch}] && git push {remote_own} {branch} || cd .'
+  );
 
   Otp($'Done pulling {nick}');
 end;
 
 begin
   try
+    foreach var arg in GetArgs('BranchOverride') do
+    begin
+      var (repo, branch) := arg.Split(|':'|, 2);
+      branch_per_repo.Add(repo, branch);
+    end;
+
     Seq(
       new class( nick := 'OpenCL', name := 'OpenCL-Docs',     branch := 'custom' ),
       new class( nick := 'OpenGL', name := 'OpenGL-Registry', branch := 'custom' )
     ).ForEach(r->PullRep(r.name, r.branch, r.nick));
+    //TODO Not parallel, because that would break git index
+
   except
     on e: Exception do ErrOtp(e);
   end;

diff --git a/PackAll.pas b/PackAll.pas
@@ -21,14 +21,18 @@
 // === К примеру: "Stages= OpenCLABC + Compile + Test + Release"
 // === Лишние пробелы по краям имён стадий допускаются, но "Stages=" должно быть слитно
 // 
+// - "PullUpstreamBranch=Repo:Branch"
+// === Настраивает стадию PullUpstream, чтобы использовать указанную ветку для указанного репозитория
+// 
 
 uses System.Threading;
 uses System.Threading.Tasks;
 uses System.IO;
 
 uses 'Utils/AOtp';
-uses 'Utils/Timers';
 uses 'Utils/ATask';
+uses 'Utils/CLArgs';
+uses 'Utils/Timers';
 uses 'Utils/PathUtils';
 
 {$region SpecialNames}
@@ -147,11 +151,15 @@
 
       {$region UpdateReps}
 
+      var args := new List<string>;
+      foreach var arg in GetArgs('PullUpstreamBranch') do
+        args += $'BranchOverride={arg}';
+
       var T_UpdateReps :=
         TitleTask('Update Reps', '~')
         +
 
-        ExecTask('DataScraping/Reps/PullReps.pas', 'SubReps Update')
+        ExecTask('DataScraping/Reps/PullReps.pas', 'SubReps Update', args.ToArray)
 
       ;