fix branch usage

diff --git a/TODO b/TODO
index c82759d19573d42d48be42a7cb1070991a2b8e42..495b7a9c4ae79017141bf2169ef36a3751aec329 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+abolish fetch dry run
+

 config for repo locations
 
 push should push to dgit remote (other branches)
 config for repo locations
 
 push should push to dgit remote (other branches)

diff --git a/dgit b/dgit
index 2c4d1bb8bbaabee2aa89740624cc8435f90b890d..0fb928906f06833c553a8d7fc2c9b47d64f484cc 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -57,11 +57,18 @@ our $remotename = 'dgit';
 our $ourdscfield = 'Vcs-Git-Master';
 our $branchprefix = 'dgit';
 
 our $ourdscfield = 'Vcs-Git-Master';
 our $branchprefix = 'dgit';
 

-sub uploadbranch () { return "$branchprefix/$suite"; }
-sub lref ($) { return "refs/heads/$_[0]"; }
-sub rref ($) { return "refs/remotes/$remotename/$_[0]"; }
+sub lbranch () { return "$branchprefix/$suite"; }
+my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
+sub lref () { return "refs/heads/".lbranch(); }
+sub lrref () { return "refs/remotes/$remotename/$suite"; }
+sub rrref () { return "refs/$branchprefix/$suite"; }

 sub debiantag ($) { return "debian/$_[0]"; }
 
 sub debiantag ($) { return "debian/$_[0]"; }
 

+sub fetchspec () {
+    local $suite = '*';
+    return  "+".rrref().":".lrref();
+}
+

 our $ua;
 
 sub url_get {
 our $ua;
 
 sub url_get {


@@ -69,7 +76,7 @@ sub url_get {
        $ua = LWP::UserAgent->new();
        $ua->env_proxy;
     }
        $ua = LWP::UserAgent->new();
        $ua->env_proxy;
     }

-    print "fetching @_...\n";
+    print "downloading @_...\n";

     my $r = $ua->get(@_) or die $!;
     die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
     return $r->decoded_content();
     my $r = $ua->get(@_) or die $!;
     die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
     return $r->decoded_content();


@@ -275,8 +282,8 @@ $clogp->{Changes}
 # imported by dgit from the archive
 END
     close C or die $!;
 # imported by dgit from the archive
 END
     close C or die $!;

-    print "synthesised git commit from .dsc $clogp->{Version}\n";

     my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);
     my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);

+    print "synthesised git commit from .dsc $clogp->{Version}\n";

     chdir '../../../..' or die $!;
     cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}",
               'DGIT_ARCHIVE', $commithash;
     chdir '../../../..' or die $!;
     cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}",
               'DGIT_ARCHIVE', $commithash;


@@ -338,12 +345,25 @@ sub is_fast_fwd ($$) {
     return rev_parse($mb) eq rev_parse($ancestor);
 }
 
     return rev_parse($mb) eq rev_parse($ancestor);
 }
 

+sub git_fetch_us () {
+    runcmd_ordryrun @git, qw(fetch),$remotename,fetchspec();
+}
+

 sub fetch_from_archive () {
 sub fetch_from_archive () {

-    # ensures that rref(uploadbranch()) is what is actually in the archive,
+    # ensures that lrref() is what is actually in the archive,

     #  one way or another
     #  one way or another

-    my $upload_ref = rref(uploadbranch());
+    get_archive_dsc();
+    $dsc_hash = $dsc->{$ourdscfield};
+    if (defined $dsc_hash) {
+       $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
+       $dsc_hash = $&;
+       print "last upload to archive specified git hash\n";
+    } else {
+       print "last upload to archive has NO git hash\n";
+    }
+

     $!=0; $upload_hash =
     $!=0; $upload_hash =

-       cmdoutput_errok @git, qw(show-ref --heads), $upload_ref;
+       cmdoutput_errok @git, qw(show-ref --heads), lrref();

     die $! if $!;
     die $? unless ($?==0 && chomp $upload_hash) 
        or ($?==256 && !length $upload_hash);
     die $! if $!;
     die $? unless ($?==0 && chomp $upload_hash) 
        or ($?==256 && !length $upload_hash);


@@ -363,7 +383,7 @@ sub fetch_from_archive () {
            unless is_fast_fwd($dsc_hash, $upload_hash);
     }
     if ($upload_hash ne $hash) {
            unless is_fast_fwd($dsc_hash, $upload_hash);
     }
     if ($upload_hash ne $hash) {

-       my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', $upload_ref, $hash);
+       my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);

        if (!$dryrun) {
            cmdoutput @upd_cmd;
        } else {
        if (!$dryrun) {
            cmdoutput @upd_cmd;
        } else {


@@ -375,45 +395,29 @@ sub fetch_from_archive () {
 sub clone ($) {
     my ($dstdir) = @_;
     die "dry run makes no sense with clone" if $dryrun;
 sub clone ($) {
     my ($dstdir) = @_;
     die "dry run makes no sense with clone" if $dryrun;

-    get_archive_dsc();
-    $dsc_hash = $dsc->{$ourdscfield};
-    if (defined $dsc_hash) {
-       $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
-       $dsc_hash = $&;
-       print "last upload to archive specified git hash\n";
-    } else {
-       print "last upload to archive has NO git hash\n";
-    }
-    my $branch = uploadbranch();
+    mkdir $dstdir or die "$dstdir $!";
+    chdir "$dstdir" or die "$dstdir $!";
+    runcmd @git, qw(init -q);
+    runcmd @git, qw(config), "remote.$remotename.fetch", fetchspec();
+    open H, "> .git/HEAD" or die $!;
+    print H "ref: ".lref()."\n" or die $!;
+    close H or die $!;
+    runcmd @git, qw(remote add), 'origin', "$alioth_git/$package.git";

     if (check_for_git()) {
     if (check_for_git()) {

-       print "cloning existing git history\n";
-       runcmd @git, qw(clone --origin),$remotename, qw(-b), $branch, '--',
-           "$alioth_git/$package.git", $dstdir;
-       chdir "$dstdir" or die "$dstdir $!";
-       fetch_from_archive();
-       runcmd @git, qw(reset --hard), rref(uploadbranch());
+       print "fetching existing git history\n";
+       git_fetch_us();
+       runcmd @git, qw(fetch origin);

     } else {
        print "starting new git history\n";
     } else {
        print "starting new git history\n";

-       mkdir $dstdir or die "$dstdir $!";
-       chdir "$dstdir" or die "$dstdir $!";
-       runcmd @git, qw(init -q);
-       open H, "> .git/HEAD" or die $!;
-       print H "ref: ".lref(uploadbranch())."\n" or die $!;
-       close H or die $!;
-       runcmd @git, qw(remote add), $remotename, "$alioth_git/$package.git";
-       runcmd "git config branch.$branch.remote $remotename";
-       runcmd "git config branch.$branch.merge ".lref(uploadbranch());
-       my $newhash = generate_commit_from_dsc();
-       runcmd @git, qw(reset --hard), $newhash;

     }
     }

+    fetch_from_archive();
+    runcmd @git, qw(reset --hard), lrref();

     print "ready for work in $dstdir\n";
 }
 
 sub fetch () {
     print "ready for work in $dstdir\n";
 }
 
 sub fetch () {

-    get_archive_dsc();

     if (check_for_git()) {
     if (check_for_git()) {

-       runcmd_ordryrun @git, qw(fetch -p),$remotename,
-           '+refs/heads/*:refs/remotes/origin/*';
+       git_fetch_us();

     }
     fetch_from_archive();
 }
     }
     fetch_from_archive();
 }


@@ -421,7 +425,7 @@ sub fetch () {
 sub pull () {
     fetch();
     runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
 sub pull () {
     fetch();
     runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",

-        lref(uploadbranch());
+        lrref();

 }
 
 sub dopush () {
 }
 
 sub dopush () {


@@ -465,7 +469,7 @@ sub dopush () {
            " cd $package.git;".
            " if ! test -d objects; then git init --bare; fi";
     }
            " cd $package.git;".
            " if ! test -d objects; then git init --bare; fi";
     }

-    runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
+    runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".rrref();

     if ($sign) {
        my @tag_cmd = (@git, qw(tag -s -m),
                       "Release $dsc->{Version} for $suite [dgit]");
     if ($sign) {
        my @tag_cmd = (@git, qw(tag -s -m),
                       "Release $dsc->{Version} for $suite [dgit]");


@@ -501,7 +505,7 @@ sub cmd_clone {
 sub branchsuite () {
     my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
     chomp $branch;
 sub branchsuite () {
     my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
     chomp $branch;

-    if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) {
+    if ($branch =~ m#$lbranch_re#o) {

        return $1;
     } else {
        return undef;
        return $1;
     } else {
        return undef;


@@ -553,7 +557,7 @@ sub cmd_build {
     canonicalise_suite();
     runcmd_ordryrun
        qw(git-buildpackage -us -uc --git-no-sign-tags),
     canonicalise_suite();
     runcmd_ordryrun
        qw(git-buildpackage -us -uc --git-no-sign-tags),

-            "--git-debian-branch=".uploadbranch(),
+            "--git-debian-branch=".lbranch(),

             @ARGV;
 }
 
             @ARGV;
 }
 

diff --git a/dgit.1 b/dgit.1
index 78e0a320dac5b0e049e057b86421b8b475985edc..4cb9f45c5cb507469cc694e076f3ff21d5a9ffbc 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -33,7 +33,9 @@ and
 .B dgit fetch
 consult the archive and dgit-repos and fetch and/or construct the
 git view of the history.  With clone, the destination directory (by
 .B dgit fetch
 consult the archive and dgit-repos and fetch and/or construct the
 git view of the history.  With clone, the destination directory (by

-default, the package name in the current directory) will be created.
+default, the package name in the current directory) will be created,
+and the new directory's `origin' remote will be set up to point to
+the package's dgit-repos tree.

 
 .B dgit build
 runs
 
 .B dgit build
 runs


@@ -54,13 +56,22 @@ archive.
 You may use any suitable git workflow with dgit, provided you
 satisfy dgit's requirements:
 
 You may use any suitable git workflow with dgit, provided you
 satisfy dgit's requirements:
 

+dgit maintains what looks a bit like a remote called
+.BR dgit ,
+with one branch per suite.  This remote cannot be used with
+plain git.
+

 The
 .B dgit-repos
 The
 .B dgit-repos

-repository for each package contains one branch per suite named
-\fBdgit/\fR\fIsuite\fR.  These should be pushed to only by
+repository for each package contains one ref per suite named
+\fBdrefs/git/\fR\fIsuite\fR.  These should be pushed to only by

 dgit.  They are fast forwarding.  Each push on this branch
 corresponds to an upload (or attempted upload).
 
 dgit.  They are fast forwarding.  Each push on this branch
 corresponds to an upload (or attempted upload).
 

+However, it is perfectly fine to have other branches in dgit-repos;
+normally the dgit-repos repo for the package will be accessible via
+the remote name `origin'.
+

 dgit push can operate on any commit which is a descendant of the
 current dgit/suite tip in dgit-repos.
 
 dgit push can operate on any commit which is a descendant of the
 current dgit/suite tip in dgit-repos.