dgit: Move canonicalise_suite into fetch()

[dgit.git] / dgit

diff --git a/dgit b/dgit
index cdc7c167198522bb4a077dd7890257c5f3d1ee6b..9a28d81d75387edfcef84207c680817367ea0b2a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2650,6 +2650,24 @@ sub mergeinfo_version ($) {
     return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
 }
 
     return getfield( (mergeinfo_getclogp $_[0]), 'Version' );
 }
 

+sub fetch_from_archive_record_1 ($) {
+    my ($hash) = @_;
+    runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
+           'DGIT_ARCHIVE', $hash;
+    cmdoutput @git, qw(log -n2), $hash;
+    # ... gives git a chance to complain if our commit is malformed
+}
+
+sub fetch_from_archive_record_2 ($) {
+    my ($hash) = @_;
+    my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
+    if (act_local()) {
+       cmdoutput @upd_cmd;
+    } else {
+       dryrun_report @upd_cmd;
+    }
+}
+

 sub fetch_from_archive () {
     ensure_setup_existing_tree();
 
 sub fetch_from_archive () {
     ensure_setup_existing_tree();
 


@@ -2963,10 +2981,7 @@ END
        if $lastpush_hash;
     $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
 
        if $lastpush_hash;
     $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
 

-    runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
-           'DGIT_ARCHIVE', $hash;
-    cmdoutput @git, qw(log -n2), $hash;
-    # ... gives git a chance to complain if our commit is malformed
+    fetch_from_archive_record_1($hash);

 
     if (defined $skew_warning_vsn) {
        mkpath '.git/dgit';
 
     if (defined $skew_warning_vsn) {
        mkpath '.git/dgit';


@@ -2986,12 +3001,7 @@ END
     }
 
     if ($lastfetch_hash ne $hash) {
     }
 
     if ($lastfetch_hash ne $hash) {

-       my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
-       if (act_local()) {
-           cmdoutput @upd_cmd;
-       } else {
-           dryrun_report @upd_cmd;
-       }
+       fetch_from_archive_record_2($hash);

     }
 
     lrfetchref_used lrfetchref();
     }
 
     lrfetchref_used lrfetchref();


@@ -3062,19 +3072,33 @@ sub setup_new_tree () {
     setup_useremail();
 }
 
     setup_useremail();
 }
 

+sub clone_set_head () {
+    open H, "> .git/HEAD" or die $!;
+    print H "ref: ".lref()."\n" or die $!;
+    close H or die $!;
+}
+sub clone_finish ($) {
+    my ($dstdir) = @_;
+    runcmd @git, qw(reset --hard), lrref();
+    runcmd qw(bash -ec), <<'END';
+        set -o pipefail
+        git ls-tree -r --name-only -z HEAD | \
+        xargs -0r touch -r . --
+END
+    printdone "ready for work in $dstdir";
+}
+

 sub clone ($) {
     my ($dstdir) = @_;
 sub clone ($) {
     my ($dstdir) = @_;

-    canonicalise_suite();

     badusage "dry run makes no sense with clone" unless act_local();
     badusage "dry run makes no sense with clone" unless act_local();

+    canonicalise_suite();

     my $hasgit = check_for_git();
     mkdir $dstdir or fail "create \`$dstdir': $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
     my $hasgit = check_for_git();
     mkdir $dstdir or fail "create \`$dstdir': $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);

+    clone_set_head();

     my $giturl = access_giturl(1);
     if (defined $giturl) {
     my $giturl = access_giturl(1);
     if (defined $giturl) {

-       open H, "> .git/HEAD" or die $!;
-       print H "ref: ".lref()."\n" or die $!;
-       close H or die $!;

        runcmd @git, qw(remote add), 'origin', $giturl;
     }
     if ($hasgit) {
        runcmd @git, qw(remote add), 'origin', $giturl;
     }
     if ($hasgit) {


@@ -3091,16 +3115,11 @@ sub clone ($) {
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
     setup_new_tree();
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
     setup_new_tree();

-    runcmd @git, qw(reset --hard), lrref();
-    runcmd qw(bash -ec), <<'END';
-        set -o pipefail
-        git ls-tree -r --name-only -z HEAD | \
-        xargs -0r touch -r . --
-END
-    printdone "ready for work in $dstdir";
+    clone_finish($dstdir);

 }
 
 sub fetch () {
 }
 
 sub fetch () {

+    canonicalise_suite();

     if (check_for_git()) {
        git_fetch_us();
     }
     if (check_for_git()) {
        git_fetch_us();
     }


@@ -3884,11 +3903,8 @@ sub fetchpullargs () {
            my $clogp = parsechangelog();
            $isuite = getfield $clogp, 'Distribution';
        }
            my $clogp = parsechangelog();
            $isuite = getfield $clogp, 'Distribution';
        }

-       canonicalise_suite();
-       progress "fetching from suite $csuite";

     } elsif (@ARGV==1) {
        ($isuite) = @ARGV;
     } elsif (@ARGV==1) {
        ($isuite) = @ARGV;

-       canonicalise_suite();

     } else {
        badusage "incorrect arguments to dgit fetch or dgit pull";
     }
     } else {
        badusage "incorrect arguments to dgit fetch or dgit pull";
     }