summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b4195a2)
This variable is not technnically necessary any more. But tracking
this means if we introduce bugs which mean that we didn't do the split
brain work, we will get much saner misbehaviour: a crash.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
autoflush STDOUT 1;
our $supplementary_message = '';
autoflush STDOUT 1;
our $supplementary_message = '';
+our $made_split_brain = 0;
our $do_split_brain = 0;
# Interactions between quilt mode and split brain
our $do_split_brain = 0;
# Interactions between quilt mode and split brain
}
}
if ($do_split_brain) {
}
}
if ($do_split_brain) {
$dgithead = splitbrain_pseudomerge($clogp,
$actualhead, $dgithead,
$archive_hash);
$dgithead = splitbrain_pseudomerge($clogp,
$actualhead, $dgithead,
$archive_hash);
my $r = system @diffcmd;
if ($r) {
if ($r==256) {
my $r = system @diffcmd;
if ($r) {
if ($r==256) {
- confess unless !!$split_brain == !!$do_split_brain;
- my $referent = $split_brain ? $dgithead : 'HEAD';
+ confess unless !!$made_split_brain == !!$do_split_brain;
+ my $referent = $made_split_brain ? $dgithead : 'HEAD';
my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
my @mode_changes;
my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
my @mode_changes;
# remain dgit-view, rather than master, so subsequent calls to
# unpack_playtree_need_cd_work
# will DTRT, resetting dgit-view.
# remain dgit-view, rather than master, so subsequent calls to
# unpack_playtree_need_cd_work
# will DTRT, resetting dgit-view.
- die if $split_brain;
- $split_brain = 1;
+ die if $made_split_brain;
+ $made_split_brain = 1;
if ($cachehit ne $headref) {
progress f_ "dgit view: found cached (%s)", $saved;
runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
if ($cachehit ne $headref) {
progress f_ "dgit view: found cached (%s)", $saved;
runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
return ($cachehit, $splitbrain_cachekey);
}
progress __ "dgit view: found cached, no changes required";
return ($cachehit, $splitbrain_cachekey);
}
progress __ "dgit view: found cached, no changes required";
#
# Note that if we are building a source package in split brain
# mode we do not support including uncommitted changes, because
#
# Note that if we are building a source package in split brain
# mode we do not support including uncommitted changes, because
- # that makes quilt fixup too hard. I.e. ($split_brain && (dgit is
+ # that makes quilt fixup too hard. I.e. ($made_split_brain && (dgit is
# building a source package)) => !$includedirty
return !$includedirty;
}
# building a source package)) => !$includedirty
return !$includedirty;
}
# If we are in split brain, there is already a playtree with
# the thing we should package into a .dsc (thanks to quilt
# fixup). If not, make a playtree
# If we are in split brain, there is already a playtree with
# the thing we should package into a .dsc (thanks to quilt
# fixup). If not, make a playtree
- confess unless !!$split_brain == !!$do_split_brain;
- prep_ud() unless $split_brain;
+ confess unless !!$made_split_brain == !!$do_split_brain;
+ prep_ud() unless $made_split_brain;
- unless ($split_brain) {
+ unless ($made_split_brain) {
my $upstreamversion = upstreamversion $version;
unpack_playtree_linkorigs($upstreamversion, sub { });
unpack_playtree_need_cd_work($headref);
my $upstreamversion = upstreamversion $version;
unpack_playtree_linkorigs($upstreamversion, sub { });
unpack_playtree_need_cd_work($headref);