Implement git repository handling transition (phase 0)

1 files changed, 20 insertions, 57 deletions

diff --git a/tests/rep-fetch-git-commit.test b/tests/rep-fetch-git-commit.test
index 3169904..da08718 100644
--- a/tests/rep-fetch-git-commit.test
+++ b/tests/rep-fetch-git-commit.test
@@ -2,12 +2,6 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-reason_dumb  = ' (dumb HTTP)'
-reason_unadv = ' (unadvertised commit)'
-
-warn_dumb='
-warning: fetching over dumb HTTP, no progress will be shown'
-
 +git clone "$rep_git/state0/style-basic.git" 2>! &style-basic/***
 
 : unadvertised
@@ -16,35 +10,22 @@ warning: fetching over dumb HTTP, no progress will be shown'
   +git -C ../style-basic log '--pretty=format:%H' --all --grep='README' | \
    set commit
 
-  +git -C ../style-basic log '--pretty=format:%h' --all --grep='README' \
-       --abbrev=16 | \
-   set abbr_commit
-
   : no-branch
   :
   {
     $clone_root_cfg && $rep_add "$rep/state0/style-basic.git#@$commit";
 
-    if ($git_protocol == 'https-smart-unadv')
-      warn  = '%.{0}'
-      fetch = "%fetching in '.+$abbr_commit'.+%"
-    else
-      warn  = "warning: fetching whole repository history"
-
-      if ($git_protocol == 'https-dumb')
-        warn = "$warn$reason_dumb$warn_dumb"
-      else
-        warn = "$warn$reason_unadv"
-      end
-
-      fetch = '%.{0}'
+    if ($git_protocol == 'https-dumb')
+      warn = "$warn_repo_hist$reason_dumb$warn_dumb"
+    elif ($git_protocol != 'https-smart-unadv')
+      warn = "$warn_repo_hist$reason_unadv"
     end;
 
     $* 2>>~"%EOE%"
       %fetching git:.+style-basic#@$commit%
+      %querying .+style-basic\.git%?
       $warn
-      %Cloning into '.+$abbr_commit'.+%
-      $fetch
+      %fetching from .+style-basic\.git%
       1 package\(s\) in 1 repository\(s\)
       EOE
   }
@@ -54,26 +35,17 @@ warning: fetching over dumb HTTP, no progress will be shown'
   {
     $clone_root_cfg && $rep_add "$rep/state0/style-basic.git#stable@$commit";
 
-    if ($git_protocol == 'https-smart-unadv')
-      warn  = '%.{0}'
-      fetch = "%fetching in '.+$abbr_commit'.+%"
-    else
-      warn  = "warning: fetching whole branch history"
-
-      if ($git_protocol == 'https-dumb')
-        warn = "$warn$reason_dumb$warn_dumb"
-      else
-        warn = "$warn$reason_unadv"
-      end
-
-      fetch = '%.{0}'
+    if ($git_protocol == 'https-dumb')
+      warn = "$warn_ref_hist$reason_dumb$warn_dumb"
+    elif ($git_protocol != 'https-smart-unadv')
+      warn = "$warn_ref_hist$reason_unadv"
     end;
 
     $* 2>>~"%EOE%"
       %fetching git:.+style-basic#stable@$commit%
+      %querying .+style-basic\.git%?
       $warn
-      %Cloning into '.+$abbr_commit'.+%
-      $fetch
+      %fetching from .+style-basic\.git%
       1 package\(s\) in 1 repository\(s\)
       EOE
   }
@@ -85,24 +57,20 @@ warning: fetching over dumb HTTP, no progress will be shown'
   +git -C ../style-basic log '--pretty=format:%H' --all --grep='INSTALL' | \
    set commit
 
+  +if ($git_protocol == 'https-dumb')
+     warn = "$warn_ref_hist$reason_dumb$warn_dumb"
+   end
+
   : no-branch
   :
   {
     $clone_root_cfg && $rep_add "$rep/state0/style-basic.git#@$commit";
 
-    if ($git_protocol == 'https-dumb')
-      warn  = "warning: fetching whole repository history$reason_dumb$warn_dumb"
-      fetch = '%.{0}'
-    else
-      warn  = '%.{0}'
-      fetch = "%fetching in '.+$abbr_commit'.+%"
-    end;
-
     $* 2>>~"%EOE%"
       %fetching git:.+style-basic#@$commit%
+      %querying .+style-basic\.git%?
       $warn
-      %Cloning into '.+$abbr_commit'.+%
-      $fetch
+      %fetching from .+style-basic.\git%
       1 package\(s\) in 1 repository\(s\)
       EOE
   }
@@ -112,16 +80,11 @@ warning: fetching over dumb HTTP, no progress will be shown'
   {
     $clone_root_cfg && $rep_add "$rep/state0/style-basic.git#stable@$commit";
 
-    if ($git_protocol == 'https-dumb')
-      warn  ="warning: fetching whole branch history$reason_dumb$warn_dumb"
-    else
-      warn  = '%.{0}'
-    end;
-
     $* 2>>~"%EOE%"
       %fetching git:.+style-basic#stable@$commit%
+      %querying .+style-basic\.git%?
       $warn
-      %Cloning into '.+$abbr_commit'.+%
+      %fetching from .+style-basic\.git%
       1 package\(s\) in 1 repository\(s\)
       EOE
   }