Package: svn-buildpackage
Version: 0.8.0~svn+nmu1
Severity: wishlist
File: /usr/bin/svn-inject
Tags: patch
Hi,
the attached patch brings the following changes:
1. a --tag option to create a tag (debVersion) directly after importing
2. increase verbosity of commit messages by adding (upsVersion) or
(debVersion) where appropriate
I hope you like these features and include them in svn-inject.
Andreas
-- System Information:
Debian Release: squeeze/sid
APT prefers stable
APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (130,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages svn-buildpackage depends on:
ii devscripts 2.10.61 scripts to make the life of a Debi
ii file 5.04-1 Determines file type using magic
ii libcapture-tiny-perl 0.07-1 module to capture STDOUT and STDER
ii libfile-libmagic-perl0.91-2 Perl interface to libmagic for det
ii liblocale-gettext-perl 1.05-6 Using libc functions for internati
ii libsvn-perl 1.6.9dfsg-1 Perl bindings for Subversion
ii liburi-perl 1.52-1 module to manipulate and access UR
ii perl 5.10.1-11 Larry Wall's Practical Extraction
ii subversion 1.6.9dfsg-1 Advanced version control system
ii unp 1.0.15 unpack (almost) everything with on
ii wget 1.12-1.1retrieves files from the web
Versions of packages svn-buildpackage recommends:
ii debhelper 7.4.15 helper programs for debian/rules
svn-buildpackage suggests no packages.
-- no debconf information
Index: b/svn-inject
===
--- a/svn-inject 2010-03-27 19:05:57.004032077 +0100
+++ b/svn-inject 2010-03-27 19:12:25.576024279 +0100
@@ -91,6 +91,7 @@
-sSave the detected layout configuration (has effect only if a
checkout is done after the inject)
--setpropsSet svn-bp props after injecting
+ --tag Create a tag after importing
If the base repository URL is omitted, svn-inject tries to get it from
the current directory. In this case, -c becomes ineffective.
@@ -120,6 +121,7 @@
my $opt_savecfg;
#my $opt_trackmode;
my $opt_setprops;
+my $opt_tag;
# parse Command line
my %options = (
@@ -136,6 +138,7 @@
O|no-branches = \$opt_nobranches,
s = \$opt_savecfg,
set-props|setprops = \$opt_setprops,
+ tag = \$opt_tag,
);
my %supported_formats = (
@@ -487,12 +490,12 @@
# for non-native packages the source is in uptream/current
if ($dscOrig) {
- my $msg = sprintf(_g(Installing original source of %s),$package);
+my $msg = sprintf(_g(Installing original source of %s (%s)), $package, $upsVersion);
withecho (svn, $opt_svnquiet, import, -m, $scriptname $msg,
$subupsTags, $SDCommon::c{upsTagUrl} );
}
else {
- my $msg = sprintf(_g(Installing original source of %s),$package);
+my $msg = sprintf(_g(Installing original source of %s (%s)), $package, $debVersion);
withecho (svn, $opt_svnquiet, import, -m, $scriptname $msg,
$subtrunk, $opt_svnurl/$subtrunk );
} ;
@@ -507,7 +510,7 @@
if($changed_non_debian0 || !$opt_onlychanged) {
- my $msg = sprintf(_g(Tagging upstream source version of %s),$package);
+ my $msg = sprintf(_g(Tagging upstream source version of %s (%s)), $package, $upsVersion);
withecho(svn, -m, $scriptname $msg, copy,
$opt_svnurl/$subupsCurrent,
$opt_svnurl/$subupsVersion, $opt_svnquiet);
@@ -541,7 +544,7 @@
}
printImportDetails;
- my $msg = _g(Applying Debian modifications to trunk);
+ my $msg = sprintf(_g(Applying Debian modifications (%s) to trunk), $debVersion);
withecho(svn, commit, -m, $scriptname $msg, $tempdir/trunk);
if($opt_setprops) {
@@ -554,6 +557,12 @@
}
}
+if ($opt_tag) {
+ my $msg = _g(Tagging);
+ withecho(svn, $opt_svnquiet, copy, -m, $scriptname $msg $package ($debVersion),
+$SDCommon::c{trunkUrl}, $SDCommon::c{tagsUrl}./.$debVersion);
+}
+
chdir $basedir;
my $trunkdir;
