The following commit has been merged in the master branch:
commit d23520bf08e8ccea249ee53ce2381c760f3c4fe7
Author: Benjamin Drung <[email protected]>
Date: Fri Mar 30 15:43:15 2012 +0200
debcommit: Support .hg in parent directories.
Thanks: Simon Olofsson
Closes: #652967
diff --git a/debian/changelog b/debian/changelog
index 063846a..8317353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,13 @@ devscripts (2.11.6) UNRELEASED; urgency=low
* cowpoke.1, deb-reversion.dbk, dscextract.1: Fix typos "occured",
"transfered", and "addtional". Thanks to A. Costa for the patches.
(Closes: #655681)
- * debcommit: Subversion 1.7 has only one .svn folder per working copy.
- Thanks to Simon Olofsson for the patch. (Closes: #645106)
+ * debcommit:
+ + Subversion 1.7 has only one .svn folder per working copy.
+ Thanks to Simon Olofsson for the patch. (Closes: #645106)
+ + Support .hg in parent directories.
+ Thanks to Simon Olofsson for the patch. (Closes: #652967)
- -- Benjamin Drung <[email protected]> Fri, 30 Mar 2012 15:27:53 +0200
+ -- Benjamin Drung <[email protected]> Fri, 30 Mar 2012 15:39:52 +0200
devscripts (2.11.5) unstable; urgency=low
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 36dae5c..8fd8b92 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -452,8 +452,8 @@ sub getprog {
}
}
- # .bzr, .git, or .svn may be in a parent directory, rather than the current
- # directory, if multiple packages are kept in one repository.
+ # .bzr, .git, .hg, or .svn may be in a parent directory, rather than the
+ # current directory, if multiple packages are kept in one repository.
my $dir=getcwd();
while ($dir=~s/[^\/]*\/?$// && length $dir) {
if (-d "$dir/.bzr") {
@@ -462,6 +462,9 @@ sub getprog {
if (-d "$dir/.git") {
return "git";
}
+ if (-d "$dir/.hg") {
+ return "hg";
+ }
if (-d "$dir/.svn") {
return "svn";
}
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
