X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=00da67d7ed6af8988d265ee039bbe0d62cfd45d9;hp=db12d229e2faecffc675658398f366cc02ae9018;hb=53d416f00482f3e004cb81e51de2ee111fee8d9e;hpb=96a93d8f6efbf26925d3644f10520e9320066b16

diff --git a/dgit b/dgit
index db12d229..00da67d7 100755
--- a/dgit
+++ b/dgit
@@ -3557,7 +3557,7 @@ sub fork_for_multisuite ($) {
 	my $csubsuite = multisuite_suite_child($tsuite, \@mergeinputs,
 					       sub {
             @end = ();
-            fetch();
+            fetch_one();
 	    finish 0;
 	});
 	# xxx collecte the ref here
@@ -3715,7 +3715,7 @@ sub clone ($) {
     clone_finish($dstdir);
 }
 
-sub fetch () {
+sub fetch_one () {
     canonicalise_suite();
     if (check_for_git()) {
 	git_fetch_us();
@@ -3738,10 +3738,14 @@ END
     printdone "fetched into ".lrref();
 }
 
-sub pull () {
+sub dofetch () {
     my $multi_fetched = fork_for_multisuite(sub { });
-    fetch() unless $multi_fetched; # parent
-    return if $multi_fetched eq '0'; # child
+    fetch_one() unless $multi_fetched; # parent
+    finish 0 if $multi_fetched eq '0'; # child
+}
+
+sub pull () {
+    dofetch();
     runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
         lrref();
     printdone "fetched to ".lrref()." and merged into HEAD";
@@ -4624,9 +4628,7 @@ sub fetchpullargs () {
 sub cmd_fetch {
     parseopts();
     fetchpullargs();
-    my $multi_fetched = fork_for_multisuite(sub { });
-    finish 0 if $multi_fetched;
-    fetch();
+    dofetch();
 }
 
 sub cmd_pull {
@@ -4641,6 +4643,40 @@ END
     pull();
 }
 
+sub cmd_checkout {
+    parseopts();
+    package_from_d_control();
+    @ARGV==1 or badusage "dgit checkout needs a suite argument";
+    ($isuite) = @ARGV;
+    notpushing();
+
+    foreach my $canon (qw(0 1)) {
+	if (!$canon) {
+	    $csuite= $isuite;
+	} else {
+	    undef $csuite;
+	    canonicalise_suite();
+	}
+	if (length git_get_ref lref()) {
+	    # local branch already exists, yay
+	    last;
+	}
+	if (!length git_get_ref lrref()) {
+	    if (!$canon) {
+		# nope
+		next;
+	    }
+	    dofetch();
+	}
+	# now lrref exists
+	runcmd (@git, qw(update-ref), lref(), lrref(), '');
+	last;
+    }
+    local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
+        "dgit checkout $isuite";
+    runcmd (@git, qw(checkout), lbranch());
+}
+
 sub cmd_update_vcs_git () {
     my $specsuite;
     if (@ARGV==0 || $ARGV[0] =~ m/^-/) {
@@ -4658,11 +4694,10 @@ sub cmd_update_vcs_git () {
 	}
     }
 
-    my $sourcep = parsecontrol 'debian/control', 'debian/control';
-    $package = getfield $sourcep, 'Source';
+    package_from_d_control();
     my $ctrl;
     if ($specsuite eq '.') {
-	$ctrl = $sourcep;
+	$ctrl = parsecontrol 'debian/control', 'debian/control';
     } else {
 	$isuite = $specsuite;
 	get_archive_dsc();