git-svnimport: -r adds svn revision number to commit messages

New -r flag for prepending the corresponding Subversion revision
number to each commit message.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 63e28b89d5dde9fbaab363b603801e56342e5965..5c543d5d1b40d1d60be27ad784c3917165037055 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -61,6 +61,10 @@ When importing incrementally, you might need to edit the .git/svn2git file.
        the git repository. Use this option if you want to import into a
        different branch.
 
        the git repository. Use this option if you want to import into a
        different branch.
 

+-r::
+       Prepend 'rX: ' to commit messages, where X is the imported
+       subversion revision.
+

 -m::
        Attempt to detect merges based on the commit message. This option
        will enable default regexes that try to capture the name source
 -m::
        Attempt to detect merges based on the commit message. This option
        will enable default regexes that try to capture the name source

diff --git a/git-svnimport.perl b/git-svnimport.perl
index f17d5a27c82a31b82f066540ed40c83fc66cf91b..c536d7026d4c56dbf5ca0ccb1a93c25a956a64ba 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -30,19 +30,19 @@
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 

-our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b,$opt_s,$opt_l,$opt_d,$opt_D);
+our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b,$opt_r,$opt_s,$opt_l,$opt_d,$opt_D);

 
 sub usage() {
        print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from SVN
        [-o branch-for-HEAD] [-h] [-v] [-l max_rev]
        [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
 
 sub usage() {
        print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from SVN
        [-o branch-for-HEAD] [-h] [-v] [-l max_rev]
        [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]

-       [-d|-D] [-i] [-u] [-s start_chg] [-m] [-M regex] [SVN_URL]
+       [-d|-D] [-i] [-u] [-r] [-s start_chg] [-m] [-M regex] [SVN_URL]

 END
        exit(1);
 }
 
 END
        exit(1);
 }
 

-getopts("b:C:dDhil:mM:o:s:t:T:uv") or usage();
+getopts("b:C:dDhil:mM:o:rs:t:T:uv") or usage();

 usage if $opt_h;
 
 my $tag_name = $opt_t || "tags";
 usage if $opt_h;
 
 my $tag_name = $opt_t || "tags";


@@ -650,6 +650,7 @@ sub commit {
                $pr->reader();
 
                $message =~ s/[\s\n]+\z//;
                $pr->reader();
 
                $message =~ s/[\s\n]+\z//;

+               $message = "r$revision: $message" if $opt_r;

 
                print $pw "$message\n"
                        or die "Error writing to git-commit-tree: $!\n";
 
                print $pw "$message\n"
                        or die "Error writing to git-commit-tree: $!\n";