[PATCH/RFC] git-svn: remove auto_abbrev (Getopt::Long option)

Piotr Krukowiecki· Aug 13, 2011, 20:33 UTC · lore

RFC because this changes user interface (no option abbreviation), but I know no other good way to fix the --author problem.

The --author option would be useful, because I usually use
  git svn log --oneline
and paste the changes with svn revision numbers to bugzilla etc.

All tests pass with this change.

--------8<--------
From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
Date: Sat, 13 Aug 2011 21:00:56 +0200
Subject: [PATCH] git-svn: remove auto_abbrev (Getopt::Long option)

auto_abbrev allows to specify shortest unique option prefix. For example '--authors-file' can be written also as '--author' given there is no other option which begins with '--author'.

'git-svn log' passes all unrecognized options to 'git log'. It should also pass '--author' but due to auto_abbrev it recognizes it as '--authors-file'. In result it's not possible to use this option.

Fix this by removing auto_abbrev. No other perl script seems to use it, also other git commands seems to have no option abbreviation feature. The side effect is that you can not abbreviate options to git-svn, obviously.

In fact only log and blame requires no option abbreviation, because only they use pass_through option (pass unrecognized options), but I think it would not be natural if some git-svn commands had options abbreviations and some didn't.

Alternative would be to handle all conflicting blame/log options, but maintaing it would be a nightmare...

Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-svn.perl +1 −1

diff --git a/git-svn.perl b/git-svn.perl
index 89f83fd..3e2e276 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -56,7 +56,7 @@ use File::Basename qw/dirname basename/;
 use File::Path qw/mkpath/;
 use File::Spec;
 use File::Find;
-use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
+use Getopt::Long qw/:config gnu_getopt no_ignore_case/;
 use IPC::Open3;
 use Git;
 use Memoize;  # core since 5.8.0, Jul 2002

-- 
1.7.6.GIT

-- 
Piotr Krukowiecki

Eric Wong· Aug 17, 2011, 01:02 UTC · re: Piotr Krukowiecki · lore

Re: [PATCH/RFC] git-svn: remove auto_abbrev (Getopt::Long option)

Piotr Krukowiecki <piotr.krukowiecki@gmail.com> wrote:

Show 8 quoted lines

> RFC because this changes user interface (no option abbreviation),
> but I know no other good way to fix the --author problem.
> 
> The --author option would be useful, because I usually use
>   git svn log --oneline
> and paste the changes with svn revision numbers to bugzilla etc.
> 
> All tests pass with this change.

How about minimizing the impact and potential breakage with this?

(I'm not sure if "blame" benefits/hurts from this, I almost never use any form of it)

Show changes to git-svn.perl +3 −0

diff --git a/git-svn.perl b/git-svn.perl
index 96f373f..ba382eb 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -298,6 +298,9 @@ my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
 read_git_config(\%opts);
 if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) {
 	Getopt::Long::Configure('pass_through');
+	if ($cmd eq 'log') {
+		Getopt::Long::Configure('no_auto_abbrev');
+	}
 }
 my $rv = GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version,
                     'minimize-connections' => \$Git::SVN::Migration::_minimize,

-- 
Eric Wong

RFC patchgit-svn: remove auto_abbrev (Getopt::Long option)