Submitter | Jun Wu |
---|---|
Date | June 15, 2016, 9:04 p.m. |
Message ID | <076ec3f9d8df2453c995.1466024655@x1c> |
Download | mbox | patch |
Permalink | /patch/15525/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@patchwork.serpentine.com Delivered-To: patchwork@patchwork.serpentine.com Received: from mercurial-scm.org (mercurial-scm.org [192.81.134.36]) by bz.selenic.com (Postfix) with ESMTP id DA4603BD2A for <patchwork@patchwork.serpentine.com>; Wed, 15 Jun 2016 17:04:55 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 6AAC82C464; Wed, 15 Jun 2016 17:04:53 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial.selenic.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 53L3vQr2IVIM; Wed, 15 Jun 2016 17:04:52 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id EC6032C15D; Wed, 15 Jun 2016 17:04:51 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 8192F2C14F for <mercurial-devel@mercurial-scm.org>; Wed, 15 Jun 2016 17:04:49 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial.selenic.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id FBC9PpAPuFD9 for <mercurial-devel@mercurial-scm.org>; Wed, 15 Jun 2016 17:04:48 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id E56162C14E for <mercurial-devel@mercurial-scm.org>; Wed, 15 Jun 2016 17:04:48 -0400 (EDT) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5FL2ElJ001719 for <mercurial-devel@mercurial-scm.org>; Wed, 15 Jun 2016 14:04:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : date : from : to; s=facebook; bh=7xzMGtTsVtiVmcGoDiwJvP7rw9/QqMlT035Jif4jNW0=; b=QdBOrbJTKZEgQK3qmir3Ts/huOn4ZQg5V8r127HNUwhjBIKnrd0PgK/MG8scW2kwSJY6 yaIXXdVcLVdq/g7f2lYjVzLZcJUki3kLwHXXgC6tvzr5jYd5jiECu53uKoAPppWXii0T prHSDFF1nZpwWSj9jSFXQNBmMoj4U1Q3Da0= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 23kbd8gvpj-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Wed, 15 Jun 2016 14:04:48 -0700 Received: from na01-bn1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.14) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 15 Jun 2016 14:04:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6Yqg3XjswQNTB9e44e3eOOLV66/3XDuRl9Lvf39Qr/g=; b=BydLbCDoBDDE3nc2Tp52s5fd8L9exkPazEbJqJWcoBmeMR0il1hGG/aeUbawkPBqQpfyR/eSIheuTJadm19dFgxMSEyjFbpXVhHOkufr7nmZSCIDKJzCGMwQ6mKUKk6A335WgAZxiEgXNKUtRI23Zyj9yGETTJEQmK2ZjHJAyVc= Received: from [10.0.2.15] (199.201.66.3) by CY1PR15MB0859.namprd15.prod.outlook.com (10.169.22.137) with Microsoft SMTP Server (TLS) id 15.1.517.8; Wed, 15 Jun 2016 21:04:45 +0000 MIME-Version: 1.0 Subject: [PATCH] chg: change default connect timeout to 60 seconds X-Mercurial-Node: 076ec3f9d8df2453c995b598cf71e996273ad1e4 X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-ID: <076ec3f9d8df2453c995.1466024655@x1c> X-Mercurial-Series-Id: <076ec3f9d8df2453c995.1466024655@x1c> User-Agent: Mercurial-patchbomb/3.8-rc+9-97811ff79647 Date: Wed, 15 Jun 2016 22:04:15 +0100 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.3] X-ClientProxiedBy: BN3PR15CA0002.namprd15.prod.outlook.com (10.165.72.12) To CY1PR15MB0859.namprd15.prod.outlook.com (10.169.22.137) X-MS-Office365-Filtering-Correlation-Id: 7a4dfa9e-b1f5-4f4c-365b-08d39560ae10 X-Microsoft-Exchange-Diagnostics: 1; CY1PR15MB0859; 2:vfiNod6tYkcZCFfHhmX8Ti55vbvp8dQDwiii/PX+6+9W1YvlBphtfWzmUWtriCuPLuibeCai4v7CC29Po0pLR1wUUPdHjY2AJshvCifheqcmKvz2KnaHcsZD/Dddq5WTafCW727jBUeRX7yccRPCUFm/fcB7dTSQg9NgkpWpalqopdRWQHdn6TYHi327Z7wI; 3:gOoOQDYVOPkkjDYTco1S75Q2Tay5c3KzLURl2oEZNH9MjXDsH/1lAp7cNIfTZCXpcD72ySaWPYl9GT9USQgWMLp5veaWP8u8I6EAgRVDDUkDY1Jqhrcd7I3uRdJGargU; 25:0bxcgnXc7GDPdLLhrl1ORBplr/DJMDspoTL+BZ4KFHhghpBc1yaK/AyhukOppfEluDdUj2IUGWIH8AMVxBtw9JUCAH/WqleW7rLuGYVqQXkphag+bLthmaWdYRKHSmkpfB5gscLn44z6vLuAjcggEt26laBCLggILagV2xIBCp3Sus+2Y1BLbhN9vFs7MuJFmzmcjZ7eVmFKiDh9fcQDA60RpJIWUqBRP0Jn9yFFDCER03yMG/eQspNDjepN4gsYscGJSozFvLVbms02nP4JS66WnPQdK6FpjXrMW2WvO8KpbXlz6gX0Nv1fncB0JFMUkKrwzRJlIO8pkdcQcfc+VR746na7H7eUUqpUgo0H0dU4JmEfs2Fu0unqafo5wylgXjSCcC3Xo9gU66BPzovsrOPZVTEORtsCWG5JfZ/OjaY=; 20:QsyeTUPCD92EEzBAW3hXaUDAb/P3p8HmPRjEfj0LbAUfgbdOF7SmJ12Q/wKfZpbDZuBdCr4R7kjMJl2I2nPkH6fm0Wx4JauJgguSMqWFRdqXSgs+o6UnSapFegBnwdepI9MdNqHae2RGv3DDb2AcjXkDM/nSUHoFdmRGeryE17w= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR15MB0859; X-Microsoft-Antispam-PRVS: <CY1PR15MB0859874156C44CB169AD7B18CD550@CY1PR15MB0859.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:CY1PR15MB0859; BCL:0; PCL:0; RULEID:; SRVR:CY1PR15MB0859; X-Microsoft-Exchange-Diagnostics: 1; CY1PR15MB0859; 4:1gjQMJYimv8MrHdJUpYNJtnPah1B7BYchm5YO4e2t/6DTivCqEjj9tk+Pv1u7RkWY7ugKXSHH+8qBTJgnsk9HJ8qSMJ/OUmxIJ/ToiCZ/BMmlkQYYj215oX/QDk0BEqa2s/DpZkQ2MpE87XfcB2FAKLh6ex4JGcxJwRrxJW4DSNa8K8XURscEn60z4Z/FWV6VHJ9GJadKTkUZo5Csbh5b7nTh7MSR5MIlusYKuz5qCEtoiFkgRRds3hbTB2fhqQvFRQE67K34QKsnSxwfvmZvH434IMQXay4PWF2gz9HDM4eOHEefkBeClqjiiLiuU/UwgLG4HTzeNYG5HFiOw/PLrFVR47xL4CLpxh2mQ2haemckxq3IjaINFmrdZjt97Z7ee3wrSD7HgbxBAhC33tX2sgFyiXAO/778hOyGKxLaMF8vLTUy0UxQivzvvRH3Rb/YGpq8C9Har5Yz48tGiLmysNIbbUCWW0qVBbN4E6lnwk= X-Forefront-PRVS: 09749A275C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(6116002)(586003)(3846002)(2351001)(101416001)(23726003)(229853001)(19580395003)(66066001)(8676002)(105586002)(54356999)(5008740100001)(77096005)(68736007)(81156014)(81166006)(50466002)(33716001)(450100001)(47776003)(9686002)(50986999)(106356001)(230700001)(15975445007)(2906002)(189998001)(42186005)(97756001)(110136002)(107886002)(86362001)(46406003)(83506001)(92566002)(4001350100001)(19580405001)(33646002)(5004730100002)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR15MB0859; H:[10.0.2.15]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; CAT:NONE; LANG:en; CAT:NONE; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR15MB0859; 23:7dqMesrmXpbivLYP1u854d63Htz2WYbVt4QShwOPM?= =?us-ascii?Q?LplDAF7IMtH9GHDfDB0R2NNOP0cEGlp4MBkZZuesgnlg1tMm/uhCIp9eQ5Fi?= =?us-ascii?Q?p613Ji43y24+Zw5Cv8qGtcjx7SmvBL4JnrS6gJvfcewcsoGCkQTAdBqS4QcO?= =?us-ascii?Q?OqXV4p4OQuJt4s+3RgSYiXWue6YCv7jUnv2jb/xRrOAPo49UiYSTTSw7oSH6?= =?us-ascii?Q?pXCo+V8XmjsnaGus6rj2IJ/cZKJNc2ual/ZV3WnB7WqQI11STUi7XzQeG1Oq?= =?us-ascii?Q?vpPWVptJi7zqwS2ClU78AKRNRe6VSXgtspt4Q8rdoTG3SWzoRXE/0o92KZf9?= =?us-ascii?Q?bcp3CvrZzMDWt7CmHrsZ1w2YXi7NXUPSMwJdcTIBm6Mzt4ub7xY99Ski0ioh?= =?us-ascii?Q?zE84S67BnnlfwtHLTTJmdJnrJQ3ma7aSWmVHshOP619Jt6X63kZt8LEt/SUM?= =?us-ascii?Q?b8HO8FN+M8yuob1eQKAH5U0YtdihJGebmFG7UqMwGxj74jZHxeuo/2n4P8yR?= =?us-ascii?Q?QWlNXNfByBQVMVuVxysv5Wuh6N525+pHpBT27G8vKcu5EqEaZubi2Y+hGo5V?= =?us-ascii?Q?cHDic8DwX6hBQTaAslF3beJrDdBip9+F69BFPElkdSibOkW/IMGnqMIEIzI1?= =?us-ascii?Q?nsKUWm8V1TaBUAvssgb9+5iXLOF+emn1pGg2kbtBXL6Ia0iWdG0N2ywCquhL?= =?us-ascii?Q?+jXV2kzQ8HujLzc3Nc1wtyXdOCuNAtTASwOUQ0E13DXyCAgyEL3gAISBwE+J?= =?us-ascii?Q?guG9QHskH71LkyDTvkFeS3JQnuTRzbKcajnq2R7UoClt+skbfKWzPZUolFhm?= =?us-ascii?Q?6OV2biZISiVWL3pvVvums47UNtG4agQ07hAUCNk5qaB+WLy/ywcS+PZAncQE?= =?us-ascii?Q?PYSJORN6JJDJlxelfkA6V34HI7vQImVIMGRSWSvvsYgfZNa5nVnQxAtU3vKF?= =?us-ascii?Q?J7Z5RBF7Er3Lm61l22dAADedTYMymFPYDjqvrl+6mUoUkVZ10d9EVude/t3Q?= =?us-ascii?Q?oM8Qbc3ZzAYyHlKmBTUfZve7klQ7ApYgJcPLS8F8qKiuuPodu7yoOCwZ/C4Q?= =?us-ascii?Q?9897EKnQ9Npg9pV6MCkOQQF+qTepW92kntW26p6tPtBnW0i9pZRjqIolrv5Y?= =?us-ascii?Q?UOSixZWQ52XaZcpNS5iozXJU4e3SV00UHvEs4aeAeKK6AJrw7nM4bqX5W3Ta?= =?us-ascii?Q?+h/LyM4R20nDxIRQraLVP7scnYRqVW5xf3t?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR15MB0859; 6:QpUGkuRKfvNgkfIhqn6av8f4zdOjJ9lSeaM0cY0+qIGFMPRR4SAK3KIn43ebFTQJ9YoDq9Y68+bgPZ9uOWFJomn/1dNzt9hePtdtnjOM9YYYi1ub7dVAxjcNTTbJTwKOnUJoshzVM5Ec4FQXHRzSuz2Es4KOOON41S+5OnsG5bgg7XCKCEURBQTPUQsufw1ubmvwGUYUzoLwm2pw4nakGxmlBEqgyxk1yx060EOuZCQEEJdMJbubjWtaQ1VTsddlvovgIvehbRbCa5AoOh22Jg==; 5:EuZm7grB2Byd8VdMyYb1PkAti0ho0eh+3JyMfCbCz7yW8yWRS3GkYwr7ZIG+KaUCXfY4hwn1Iy7zMDhPreAwXYteBOZc7IRmeBZREtUsy7Mvl5+s8+wBBKLhfPHZ2rmPBvaVjB8KlmbhOKy2UECpCA==; 24:d0i2lql2uMm4WDANOdk2oI8acPCYLnIp8okwppHVC85j9KKazntBgH9liIfmf9x6rM9D0Mm5LyFhtcLnqdReulWBBx42NGvZAiN+i1tbPL8=; 7:YvWpRIHzav9nXDq4MZKjQMl6ev0oyC1J7bxT9iFTyEfQC7UpHcyyottt3TsNrajh4YAKiAmNewRKRRLKCU9nO+j7ivrhrvI/JNKsD0b81cnMjp20chEth9+kt7Xkzta33JrCKatLpkquItLIIbdvggpAubgo1zvWIf/g+ZRH0xEtUhPEfNtMckoXRWPTyIZ6VB/6Ji/OotA5rkQXjfGZHQ==; 20:b/+KhZu07c5KhHfQb/79eD1E0hKA0AJkdz1O8vI1nx43cunzF4TPj9w4lcF31tgrZE+AylB7eyTV1OxBxlN7V+jQtCS2DUeWdZaLW8ARBPrMDdZg5AYC03VerRLLoWxRrSP9d20x2R+v9U/OaItHvK9L1ZbCU+N17BpGlf12mfc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2016 21:04:45.1342 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR15MB0859 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-15_13:, , signatures=0 X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Jun Wu - June 15, 2016, 9:04 p.m.
Yuya Nishihara - June 16, 2016, 1:53 p.m.
On Wed, 15 Jun 2016 22:04:15 +0100, Jun Wu wrote: > # HG changeset patch > # User Jun Wu <quark@fb.com> > # Date 1466022991 -3600 > # Wed Jun 15 21:36:31 2016 +0100 > # Node ID 076ec3f9d8df2453c995b598cf71e996273ad1e4 > # Parent 2188f170f5b60eaddd1f1d6539de2ec07d19e1e3 > # Available At https://bitbucket.org/quark-zju/hg-draft > # hg pull https://bitbucket.org/quark-zju/hg-draft -r 076ec3f9d8df > chg: change default connect timeout to 60 seconds Queued, thanks.
Patch
diff --git a/contrib/chg/README b/contrib/chg/README --- a/contrib/chg/README +++ b/contrib/chg/README @@ -29,4 +29,4 @@ * CHGDEBUG enables debug messages. * CHGSOCKNAME specifies the socket path of the background cmdserver. * CHGTIMEOUT specifies how many seconds chg will wait before giving up - connecting to a cmdserver. If it is 0, chg will wait forever. Default: 10 + connecting to a cmdserver. If it is 0, chg will wait forever. Default: 60 diff --git a/contrib/chg/chg.c b/contrib/chg/chg.c --- a/contrib/chg/chg.c +++ b/contrib/chg/chg.c @@ -250,7 +250,7 @@ debugmsg("try connect to %s repeatedly", opts->sockname); - unsigned int timeoutsec = 10; /* default: 10 seconds */ + unsigned int timeoutsec = 60; /* default: 60 seconds */ const char *timeoutenv = getenv("CHGTIMEOUT"); if (timeoutenv) sscanf(timeoutenv, "%u", &timeoutsec);