From 89a6ecc55b55ae87c39c5d9edb115731550fba95 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Sun, 4 Dec 2016 15:03:11 +0100 Subject: git-p4: add config to retry p4 commands; retry 3 times by default P4 commands can fail due to random network issues. P4 users can counter these issues by using a retry flag supported by all p4 commands [1]. Add an integer Git config value `git-p4.retries` to define the number of retries for all p4 invocations. If the config is not defined then set the default retry count to 3. [1] https://www.perforce.com/perforce/doc.current/manuals/cmdref/global.options.html Signed-off-by: Lars Schneider Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano --- git-p4.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'git-p4.py') diff --git a/git-p4.py b/git-p4.py index fd5ca52462..2422178210 100755 --- a/git-p4.py +++ b/git-p4.py @@ -78,6 +78,11 @@ def p4_build_cmd(cmd): if len(client) > 0: real_cmd += ["-c", client] + retries = gitConfigInt("git-p4.retries") + if retries is None: + # Perform 3 retries by default + retries = 3 + real_cmd += ["-r", str(retries)] if isinstance(cmd,basestring): real_cmd = ' '.join(real_cmd) + ' ' + cmd -- cgit v1.2.1