* [PATCH v2] git-p4: do not pass '-r 0' to p4 commands
@ 2016-12-29 10:22 Igor Kushnir
2017-01-03 20:02 ` Ori Rawlings
0 siblings, 1 reply; 3+ messages in thread
From: Igor Kushnir @ 2016-12-29 10:22 UTC (permalink / raw)
To: git; +Cc: Lars Schneider, Luke Diamand, Ori Rawlings, Igor Kushnir
git-p4 crashes when used with a very old p4 client version
that does not support the '-r <number>' option in its commands.
Allow making git-p4 work with old p4 clients by setting git-p4.retries to 0.
Alternatively git-p4.retries could be made opt-in.
But since only very old, barely maintained p4 versions don't support
the '-r' option, the setting-retries-to-0 workaround would do.
The "-r retries" option is present in Perforce 2012.2 Command Reference,
but absent from Perforce 2012.1 Command Reference.
Signed-off-by: Igor Kushnir <igorkuo@gmail.com>
---
Documentation/git-p4.txt | 2 ++
git-p4.py | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index bae862ddc..7436c64a9 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -479,6 +479,8 @@ git-p4.client::
git-p4.retries::
Specifies the number of times to retry a p4 command (notably,
'p4 sync') if the network times out. The default value is 3.
+ Set the value to 0 to disable retries or if your p4 version
+ does not support retries (pre 2012.2).
Clone and sync variables
~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/git-p4.py b/git-p4.py
index 22e3f57e7..7bda915bd 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -83,7 +83,9 @@ def p4_build_cmd(cmd):
if retries is None:
# Perform 3 retries by default
retries = 3
- real_cmd += ["-r", str(retries)]
+ if retries > 0:
+ # Provide a way to not pass this option by setting git-p4.retries to 0
+ real_cmd += ["-r", str(retries)]
if isinstance(cmd,basestring):
real_cmd = ' '.join(real_cmd) + ' ' + cmd
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] git-p4: do not pass '-r 0' to p4 commands
2016-12-29 10:22 [PATCH v2] git-p4: do not pass '-r 0' to p4 commands Igor Kushnir
@ 2017-01-03 20:02 ` Ori Rawlings
2017-01-04 9:09 ` Luke Diamand
0 siblings, 1 reply; 3+ messages in thread
From: Ori Rawlings @ 2017-01-03 20:02 UTC (permalink / raw)
To: Igor Kushnir; +Cc: Git Users, Lars Schneider, Luke Diamand
Looks good to me.
Ori Rawlings
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] git-p4: do not pass '-r 0' to p4 commands
2017-01-03 20:02 ` Ori Rawlings
@ 2017-01-04 9:09 ` Luke Diamand
0 siblings, 0 replies; 3+ messages in thread
From: Luke Diamand @ 2017-01-04 9:09 UTC (permalink / raw)
To: Ori Rawlings; +Cc: Igor Kushnir, Git Users, Lars Schneider
On 3 January 2017 at 20:02, Ori Rawlings <orirawlings@gmail.com> wrote:
> Looks good to me.
And me.
>
>
> Ori Rawlings
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-04 9:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-29 10:22 [PATCH v2] git-p4: do not pass '-r 0' to p4 commands Igor Kushnir
2017-01-03 20:02 ` Ori Rawlings
2017-01-04 9:09 ` Luke Diamand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.