chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3f747fd
)
Break out quiltify_dpkg_commit (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 15 Nov 2014 18:31:11 +0000
(18:31 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 15 Nov 2014 18:31:11 +0000
(18:31 +0000)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 2056818baa4cb07fa6a4e57b4253151d85cd5c10..fcaf386f6584bfe1ab44cf40fd1ef0b285b9f540 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2039,23
+2039,16
@@
our $dscfn;
our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
our $fakeeditorenv = 'DGIT_FAKE_EDITOR_QUILT';
-sub quiltify
(
$$) {
- my ($
clogp,$headref
) = @_;
+sub quiltify
_dpkg_commit ($$
$$) {
+ my ($
patchname,$title,$author,$msg
) = @_;
- my $author = getfield $clogp, 'Maintainer';
- my $time = time;
- my $ncommits = 3;
- my $patchname = "auto-$version-$headref-$time";
- my $msg = cmdoutput @git, qw(log), "-n$ncommits";
mkpath '.git/dgit';
my $descfn = ".git/dgit/quilt-description.tmp";
open O, '>', $descfn or die "$descfn: $!";
$msg =~ s/\n/\n /g;
$msg =~ s/^\s+$/ ./mg;
print O <<END or die $!;
mkpath '.git/dgit';
my $descfn = ".git/dgit/quilt-description.tmp";
open O, '>', $descfn or die "$descfn: $!";
$msg =~ s/\n/\n /g;
$msg =~ s/^\s+$/ ./mg;
print O <<END or die $!;
-Description: Automatically generated patch ($clogp->{Version})
- Last (up to) $ncommits git changes, FYI:
- .
+Description: $title
$msg
Author: $author
$msg
Author: $author
@@
-2063,6
+2056,7
@@
Author: $author
END
close O or die $!;
END
close O or die $!;
+
{
local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
local $ENV{'VISUAL'} = $ENV{'EDITOR'};
{
local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
local $ENV{'VISUAL'} = $ENV{'EDITOR'};
@@
-2071,6
+2065,19
@@
END
}
}
}
}
+sub quiltify ($$) {
+ my ($clogp,$headref) = @_;
+
+ my $time = time;
+ my $ncommits = 3;
+ my $msg = cmdoutput @git, qw(log), "-n$ncommits";
+
+ quiltify_dpkg_commit "auto-$version-$headref-$time",
+ (getfield $clogp, 'Maintainer'),
+ "Automatically generated patch ($clogp->{Version})",
+ "Last (up to) $ncommits git changes, FYI:\n\n". $msg;
+}
+
sub build_maybe_quilt_fixup () {
my $format=get_source_format;
return unless madformat $format;
sub build_maybe_quilt_fixup () {
my $format=get_source_format;
return unless madformat $format;