chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename $dgit_version to $our_version
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 353c2e5c6a0b1dd64809bb7d6576aee43cd6d215..337d0767154a92ecea37cef82de112b55d8568ef 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-28,6
+28,8
@@
use File::Basename;
use Dpkg::Version;
use POSIX;
use Dpkg::Version;
use POSIX;
+our $our_version = 'UNRELEASED'; ###substituted###
+
our $isuite = 'unstable';
our $idistro;
our $package;
our $isuite = 'unstable';
our $idistro;
our $package;
@@
-230,7
+232,7
@@
sub badusage {
exit 8;
}
exit 8;
}
-sub
helponly
() {
+sub
cmd_help
() {
print $helpmsg or die $!;
exit 0;
}
print $helpmsg or die $!;
exit 0;
}
@@
-922,7
+924,7
@@
sub dopush () {
$keyid = access_cfg('keyid','RETURN-UNDEF');
}
my @tag_cmd = (@git, qw(tag -s -m),
$keyid = access_cfg('keyid','RETURN-UNDEF');
}
my @tag_cmd = (@git, qw(tag -s -m),
- "
R
elease $dversion for $csuite [dgit]");
+ "
$package r
elease $dversion for $csuite [dgit]");
push @tag_cmd, qw(-u),$keyid if defined $keyid;
push @tag_cmd, $tag;
runcmd_ordryrun @tag_cmd;
push @tag_cmd, qw(-u),$keyid if defined $keyid;
push @tag_cmd, $tag;
runcmd_ordryrun @tag_cmd;
@@
-1055,6
+1057,7
@@
sub build_maybe_quilt_fixup () {
my $ncommits = 3;
my $patchname = "auto-$version-$headref-$time";
my $msg = cmdoutput @git, qw(log), "-n$ncommits";
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;
my $descfn = ".git/dgit/quilt-description.tmp";
open O, '>', $descfn or die "$descfn: $!";
$msg =~ s/\n/\n /g;
@@
-1198,6
+1201,10
@@
sub cmd_quilt_fixup {
build_maybe_quilt_fixup();
}
build_maybe_quilt_fixup();
}
+sub cmd_version {
+ print "dgit version $our_version\n";
+}
+
sub parseopts () {
my $om;
while (@ARGV) {
sub parseopts () {
my $om;
while (@ARGV) {
@@
-1210,7
+1217,7
@@
sub parseopts () {
} elsif (m/^--no-sign$/) {
$sign=0;
} elsif (m/^--help$/) {
} elsif (m/^--no-sign$/) {
$sign=0;
} elsif (m/^--help$/) {
-
helponly
();
+
cmd_help
();
} elsif (m/^--new$/) {
$new_package=1;
} elsif (m/^--(\w+)=(.*)/s &&
} elsif (m/^--new$/) {
$new_package=1;
} elsif (m/^--(\w+)=(.*)/s &&
@@
-1240,7
+1247,7
@@
sub parseopts () {
if (s/^-n/-/) {
$dryrun=1;
} elsif (s/^-h/-/) {
if (s/^-n/-/) {
$dryrun=1;
} elsif (s/^-h/-/) {
-
helponly
();
+
cmd_help
();
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
$debug++;
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
$debug++;