diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -2561,7 +2561,7 @@ sub quiltify_tree_sentinelfiles ($) { sub quiltify_splitbrain_needed () { if (!$split_brain) { - progress "creating dgit view"; + progress "dgit view: changes are required..."; runcmd @git, qw(checkout -q -b dgit-view); $split_brain = 1; } @@ -2595,7 +2595,7 @@ sub quiltify_splitbrain ($$$$$$) { if ($quilt_mode =~ m/gbp|unapplied/ && ($diffbits->{O2A} & 01)) { # some patches quiltify_splitbrain_needed(); - progress "creating patches-applied version using gbp pq"; + progress "dgit view: creating patches-applied version using gbp pq"; runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import); # gbp pq import creates a fresh branch; push back to dgit-view runcmd @git, qw(update-ref refs/heads/dgit-view HEAD); @@ -2604,7 +2604,7 @@ sub quiltify_splitbrain ($$$$$$) { if (($diffbits->{H2O} & 02) && # user has modified .gitignore !($diffbits->{O2A} & 02)) { # patches do not change .gitignore quiltify_splitbrain_needed(); - progress "creating patch to represent .gitignore changes"; + progress "dgit view: creating patch to represent .gitignore changes"; ensuredir "debian/patches"; my $gipatch = "debian/patches/auto-gitignore"; open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!"; @@ -2644,7 +2644,7 @@ END runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache", $dgitview; - progress "created dgit view (commit id $dgitview)"; + progress "dgit view: created (commit id $dgitview)"; changedir '.git/dgit/unpack/work'; } @@ -2950,7 +2950,7 @@ sub quilt_fixup_singlepatch ($$$) { sub quilt_fixup_multipatch ($$$) { my ($clogp, $headref, $upstreamversion) = @_; - progress "starting quiltify (multiple patches, $quilt_mode mode)"; + progress "examining quilt state (multiple patches, $quilt_mode mode)"; # Our objective is: # - honour any existing .pc in case it has any strangeness @@ -3062,6 +3062,8 @@ END my $splitbrain_cachekey; if (quiltmode_splitbrain()) { + progress + "dgit: split brain (separate dgit view) may needed (--quilt=$quilt_mode)."; # we look in the reflog of dgit-intern/quilt-cache # we look for an entry whose message is the key for the cache lookup my @cachekey = (qw(dgit), $our_version); @@ -3103,13 +3105,12 @@ END my $cachehit = $1; quilt_fixup_mkwork($headref); if ($cachehit ne $headref) { - progress "quilt fixup ($quilt_mode mode) found cached tree"; + progress "dgit view: found cached (commit id $cachehit)"; runcmd @git, qw(checkout -q -b dgit-view), $cachehit; $split_brain = 1; return; } - progress "quilt fixup ($quilt_mode mode)". - " found cached indication that no changes needed"; + progress "dgit view: found cached, no changes required"; return; } die $! if GC->error; @@ -3204,6 +3205,7 @@ END return; } + progress "starting quiltify (multiple patches, $quilt_mode mode)"; quiltify($clogp,$headref,$oldtiptree,\@failsuggestion); if (!open P, '>>', ".pc/applied-patches") { |