* [PATCH] git-svn: don't output git commits in quiet mode
@ 2009-03-29 19:34 Simon Arlott
2009-03-29 22:43 ` Eric Wong
0 siblings, 1 reply; 6+ messages in thread
From: Simon Arlott @ 2009-03-29 19:34 UTC (permalink / raw)
To: gitster; +Cc: git
Ideally only errors should be output in this mode so fetch
can be run from cron and normally produce no output. Without
this change it would output a single line on each git commit,
e.g.
r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch)
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
git-svn.perl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 8be6be0..e100b69 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2331,13 +2331,13 @@ sub do_git_commit {
$self->{last_rev} = $log_entry->{revision};
$self->{last_commit} = $commit;
- print "r$log_entry->{revision}";
+ print "r$log_entry->{revision}" unless $::_q;
if (defined $log_entry->{svm_revision}) {
- print " (\@$log_entry->{svm_revision})";
+ print " (\@$log_entry->{svm_revision})" unless $::_q;
$self->rev_map_set($log_entry->{svm_revision}, $commit,
0, $self->svm_uuid);
}
- print " = $commit ($self->{ref_id})\n";
+ print " = $commit ($self->{ref_id})\n" unless $::_q;
if (--$_gc_nr == 0) {
$_gc_nr = $_gc_period;
gc();
--
1.6.2
--
Simon Arlott
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-svn: don't output git commits in quiet mode
2009-03-29 19:34 [PATCH] git-svn: don't output git commits in quiet mode Simon Arlott
@ 2009-03-29 22:43 ` Eric Wong
2009-03-30 6:44 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Eric Wong @ 2009-03-29 22:43 UTC (permalink / raw)
To: Simon Arlott; +Cc: gitster, git
Simon Arlott <simon@fire.lp0.eu> wrote:
> Ideally only errors should be output in this mode so fetch
> can be run from cron and normally produce no output. Without
> this change it would output a single line on each git commit,
> e.g.
> r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch)
>
> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Thanks Simon,
Acked-by: Eric Wong <normalperson@yhbt.net>
and pushed to git://git.bogomips.org/git-svn
> ---
> git-svn.perl | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 8be6be0..e100b69 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -2331,13 +2331,13 @@ sub do_git_commit {
>
> $self->{last_rev} = $log_entry->{revision};
> $self->{last_commit} = $commit;
> - print "r$log_entry->{revision}";
> + print "r$log_entry->{revision}" unless $::_q;
> if (defined $log_entry->{svm_revision}) {
> - print " (\@$log_entry->{svm_revision})";
> + print " (\@$log_entry->{svm_revision})" unless $::_q;
> $self->rev_map_set($log_entry->{svm_revision}, $commit,
> 0, $self->svm_uuid);
> }
> - print " = $commit ($self->{ref_id})\n";
> + print " = $commit ($self->{ref_id})\n" unless $::_q;
> if (--$_gc_nr == 0) {
> $_gc_nr = $_gc_period;
> gc();
> --
> 1.6.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-svn: don't output git commits in quiet mode
2009-03-29 22:43 ` Eric Wong
@ 2009-03-30 6:44 ` Junio C Hamano
2009-03-30 18:31 ` [PATCH] git-svn: add a double quiet option to hide git commits Simon Arlott
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2009-03-30 6:44 UTC (permalink / raw)
To: Eric Wong; +Cc: Simon Arlott, gitster, git
Eric Wong <normalperson@yhbt.net> writes:
> Simon Arlott <simon@fire.lp0.eu> wrote:
>> Ideally only errors should be output in this mode so fetch
>> can be run from cron and normally produce no output. Without
>> this change it would output a single line on each git commit,
>> e.g.
>> r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch)
>>
>> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
>
> Thanks Simon,
>
> Acked-by: Eric Wong <normalperson@yhbt.net>
>
> and pushed to git://git.bogomips.org/git-svn
... and pulled from there. Thanks, both.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] git-svn: add a double quiet option to hide git commits
2009-03-30 6:44 ` Junio C Hamano
@ 2009-03-30 18:31 ` Simon Arlott
2009-03-31 6:52 ` Eric Wong
0 siblings, 1 reply; 6+ messages in thread
From: Simon Arlott @ 2009-03-30 18:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Eric Wong, git, mdpoole
People may expect/prefer -q to still show git commits,
so this change allows a second -q to hide them.
Signed-off-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
---
On 30/03/09 07:44, Junio C Hamano wrote:
> Eric Wong <normalperson@yhbt.net> writes:
>> Simon Arlott <simon@fire.lp0.eu> wrote:
>>> Ideally only errors should be output in this mode so fetch
>>> can be run from cron and normally produce no output. Without
>>> this change it would output a single line on each git commit,
>>> e.g.
>>> r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch)
Documentation/git-svn.txt | 3 ++-
git-svn.perl | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index cda3389..8163a19 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -385,7 +385,8 @@ config key: svn.authorsfile
-q::
--quiet::
- Make 'git-svn' less verbose.
+ Make 'git-svn' less verbose. Specify a second time to make it
+ even less verbose.
--repack[=<n>]::
--repack-flags=<flags>::
diff --git a/git-svn.perl b/git-svn.perl
index e5c3dfe..d919798 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -68,6 +68,7 @@ my ($_stdin, $_help, $_edit,
$_prefix, $_no_checkout, $_url, $_verbose,
$_git_format, $_commit_url, $_tag);
$Git::SVN::_follow_parent = 1;
+$_q ||= 0;
my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
'config-dir=s' => \$Git::SVN::Ra::config_dir,
'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
@@ -80,7 +81,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
'no-checkout' => \$_no_checkout,
- 'quiet|q' => \$_q,
+ 'quiet|q+' => \$_q,
'repack-flags|repack-args|repack-opts=s' =>
\$Git::SVN::_repack_flags,
'use-log-author' => \$Git::SVN::_use_log_author,
@@ -2331,13 +2332,13 @@ sub do_git_commit {
$self->{last_rev} = $log_entry->{revision};
$self->{last_commit} = $commit;
- print "r$log_entry->{revision}" unless $::_q;
+ print "r$log_entry->{revision}" unless $::_q > 1;
if (defined $log_entry->{svm_revision}) {
- print " (\@$log_entry->{svm_revision})" unless $::_q;
+ print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
$self->rev_map_set($log_entry->{svm_revision}, $commit,
0, $self->svm_uuid);
}
- print " = $commit ($self->{ref_id})\n" unless $::_q;
+ print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
if (--$_gc_nr == 0) {
$_gc_nr = $_gc_period;
gc();
--
1.6.2
--
Simon Arlott
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-svn: add a double quiet option to hide git commits
2009-03-30 18:31 ` [PATCH] git-svn: add a double quiet option to hide git commits Simon Arlott
@ 2009-03-31 6:52 ` Eric Wong
2009-04-02 5:24 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Eric Wong @ 2009-03-31 6:52 UTC (permalink / raw)
To: Simon Arlott; +Cc: Junio C Hamano, git, mdpoole
Simon Arlott <simon@fire.lp0.eu> wrote:
> People may expect/prefer -q to still show git commits,
> so this change allows a second -q to hide them.
>
> Signed-off-by: Michael Poole <mdpoole@troilus.org>
> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Thanks,
Acked-by: Eric Wong <normalperson@yhbt.net>
and pushed out to git://git.bogomips.org/git-svn
> ---
> On 30/03/09 07:44, Junio C Hamano wrote:
> > Eric Wong <normalperson@yhbt.net> writes:
> >> Simon Arlott <simon@fire.lp0.eu> wrote:
> >>> Ideally only errors should be output in this mode so fetch
> >>> can be run from cron and normally produce no output. Without
> >>> this change it would output a single line on each git commit,
> >>> e.g.
> >>> r1909 = 32ef87860662526d4a62f903949ed21e0341079e (u2_10_12_branch)
>
> Documentation/git-svn.txt | 3 ++-
> git-svn.perl | 9 +++++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index cda3389..8163a19 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -385,7 +385,8 @@ config key: svn.authorsfile
>
> -q::
> --quiet::
> - Make 'git-svn' less verbose.
> + Make 'git-svn' less verbose. Specify a second time to make it
> + even less verbose.
>
> --repack[=<n>]::
> --repack-flags=<flags>::
> diff --git a/git-svn.perl b/git-svn.perl
> index e5c3dfe..d919798 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -68,6 +68,7 @@ my ($_stdin, $_help, $_edit,
> $_prefix, $_no_checkout, $_url, $_verbose,
> $_git_format, $_commit_url, $_tag);
> $Git::SVN::_follow_parent = 1;
> +$_q ||= 0;
> my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
> 'config-dir=s' => \$Git::SVN::Ra::config_dir,
> 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache,
> @@ -80,7 +81,7 @@ my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent,
> 'useSvnsyncProps' => \$Git::SVN::_use_svnsync_props,
> 'log-window-size=i' => \$Git::SVN::Ra::_log_window_size,
> 'no-checkout' => \$_no_checkout,
> - 'quiet|q' => \$_q,
> + 'quiet|q+' => \$_q,
> 'repack-flags|repack-args|repack-opts=s' =>
> \$Git::SVN::_repack_flags,
> 'use-log-author' => \$Git::SVN::_use_log_author,
> @@ -2331,13 +2332,13 @@ sub do_git_commit {
>
> $self->{last_rev} = $log_entry->{revision};
> $self->{last_commit} = $commit;
> - print "r$log_entry->{revision}" unless $::_q;
> + print "r$log_entry->{revision}" unless $::_q > 1;
> if (defined $log_entry->{svm_revision}) {
> - print " (\@$log_entry->{svm_revision})" unless $::_q;
> + print " (\@$log_entry->{svm_revision})" unless $::_q > 1;
> $self->rev_map_set($log_entry->{svm_revision}, $commit,
> 0, $self->svm_uuid);
> }
> - print " = $commit ($self->{ref_id})\n" unless $::_q;
> + print " = $commit ($self->{ref_id})\n" unless $::_q > 1;
> if (--$_gc_nr == 0) {
> $_gc_nr = $_gc_period;
> gc();
> --
> 1.6.2
> --
> Simon Arlott
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-svn: add a double quiet option to hide git commits
2009-03-31 6:52 ` Eric Wong
@ 2009-04-02 5:24 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2009-04-02 5:24 UTC (permalink / raw)
To: Eric Wong; +Cc: Simon Arlott, git, mdpoole
Eric Wong <normalperson@yhbt.net> writes:
> Simon Arlott <simon@fire.lp0.eu> wrote:
>> People may expect/prefer -q to still show git commits,
>> so this change allows a second -q to hide them.
>>
>> Signed-off-by: Michael Poole <mdpoole@troilus.org>
>> Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
>
> Thanks,
> Acked-by: Eric Wong <normalperson@yhbt.net>
> and pushed out to git://git.bogomips.org/git-svn
Thanks, and pulled.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-04-02 5:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-29 19:34 [PATCH] git-svn: don't output git commits in quiet mode Simon Arlott
2009-03-29 22:43 ` Eric Wong
2009-03-30 6:44 ` Junio C Hamano
2009-03-30 18:31 ` [PATCH] git-svn: add a double quiet option to hide git commits Simon Arlott
2009-03-31 6:52 ` Eric Wong
2009-04-02 5:24 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).