chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: quilt linearisation: Stop at debian/source/format changes
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 19b9eb2c733954506716cda110e94d0ad0d57831..8cea07b7af8a16d65016f3c7f68d1625f5768471 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-4016,7
+4016,7
@@
END
sub pseudomerge_make_commit ($$$$ $$) {
my ($clogp, $dgitview, $archive_hash, $i_arch_v,
$msg_cmd, $msg_msg) = @_;
sub pseudomerge_make_commit ($$$$ $$) {
my ($clogp, $dgitview, $archive_hash, $i_arch_v,
$msg_cmd, $msg_msg) = @_;
- progress f_ "Declaring that HEAD inc
i
udes all changes in %s...",
+ progress f_ "Declaring that HEAD inc
l
udes all changes in %s...",
$i_arch_v->[0];
my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
$i_arch_v->[0];
my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
@@
-4072,7
+4072,7
@@
sub splitbrain_pseudomerge ($$$$) {
my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
if (!defined $overwrite_version) {
my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
if (!defined $overwrite_version) {
- progress __ "Checking that HEAD inc
i
udes all changes in archive...";
+ progress __ "Checking that HEAD inc
l
udes all changes in archive...";
}
return $dgitview if is_fast_fwd $archive_hash, $dgitview;
}
return $dgitview if is_fast_fwd $archive_hash, $dgitview;
@@
-4523,11
+4523,11
@@
ENDT
if ($sourceonlypolicy eq 'ok') {
} elsif ($sourceonlypolicy eq 'always') {
forceable_fail [qw(uploading-binaries)],
if ($sourceonlypolicy eq 'ok') {
} elsif ($sourceonlypolicy eq 'always') {
forceable_fail [qw(uploading-binaries)],
- __ "uploading binaries, although distro
y
policy is source only"
+ __ "uploading binaries, although distro policy is source only"
if $hasdebs;
} elsif ($sourceonlypolicy eq 'never') {
forceable_fail [qw(uploading-source-only)],
if $hasdebs;
} elsif ($sourceonlypolicy eq 'never') {
forceable_fail [qw(uploading-source-only)],
- __ "source-only upload, although distro
y
policy requires .debs"
+ __ "source-only upload, although distro policy requires .debs"
if !$hasdebs;
} elsif ($sourceonlypolicy eq 'not-wholly-new') {
forceable_fail [qw(uploading-source-only)],
if !$hasdebs;
} elsif ($sourceonlypolicy eq 'not-wholly-new') {
forceable_fail [qw(uploading-source-only)],
@@
-5503,7
+5503,8
@@
sub quiltify ($$$$) {
printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
my @cmd= (@git, qw(diff-tree -r --name-only),
printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
my @cmd= (@git, qw(diff-tree -r --name-only),
- $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
+ $p->{Commit},$c->{Commit},
+ qw(-- debian/patches .pc debian/source/format));
my $patchstackchange = cmdoutput @cmd;
if (length $patchstackchange) {
$patchstackchange =~ s/\n/,/g;
my $patchstackchange = cmdoutput @cmd;
if (length $patchstackchange) {
$patchstackchange =~ s/\n/,/g;
@@
-6812,7
+6813,7
@@
sub cmd_import_dsc {
fail f_ <<END, $dsc_hash
.dsc contains Dgit field referring to object %s
Your git tree does not have that object. Try `git fetch' from a
fail f_ <<END, $dsc_hash
.dsc contains Dgit field referring to object %s
Your git tree does not have that object. Try `git fetch' from a
-plausible server (browse.dgit.d.o?
alioth
?), and try the import-dsc again.
+plausible server (browse.dgit.d.o?
salsa
?), and try the import-dsc again.
END
}
if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
END
}
if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
@@
-6899,7
+6900,7
@@
END
import_dsc_result $dstbranch, $newhash,
"dgit import-dsc: $info",
import_dsc_result $dstbranch, $newhash,
"dgit import-dsc: $info",
- f_ "results are in
in
git ref %s", $dstbranch;
+ f_ "results are in git ref %s", $dstbranch;
}
sub pre_archive_api_query () {
}
sub pre_archive_api_query () {
@@
-7249,7
+7250,7
@@
sub check_env_sanity () {
chomp $@;
fail f_ <<END, $@;
On entry to dgit, %s
chomp $@;
fail f_ <<END, $@;
On entry to dgit, %s
-This is a bug produced by something in
in
your execution environment.
+This is a bug produced by something in your execution environment.
Giving up.
END
}
Giving up.
END
}