Submitter | Jun Wu |
---|---|
Date | May 9, 2017, 1:07 a.m. |
Message ID | <b9a58a643dcc103d122e.1494292048@x1c> |
Download | mbox | patch |
Permalink | /patch/20535/ |
State | Superseded |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 9159D2C1EE; Mon, 8 May 2017 21:07:52 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 6xHXAvuvDby8; Mon, 8 May 2017 21:07:52 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 07CCC2C211; Mon, 8 May 2017 21:07:44 -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 8ABFB2C1EE for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:42 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id ghet6bT0KbmQ for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:42 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id C796A2C211 for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 21:07:38 -0400 (EDT) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v490sSZi017740 for <mercurial-devel@mercurial-scm.org>; Mon, 8 May 2017 18:07:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=MYw5B3O9jfCDvmmq6g6PEqmTZGnSLPdcX89ps5mzS7w=; b=C8YTu9tNbvAnLdptnt82Leh5h97MAAcg02i4dq2P0nUtSl0xxwJM8xSlh1W+7PKj75mb buG0FgamaBuhDgEqJWAqtgxTbyexR3ZakBve1WHEca51pQh9HY3ZNkK6jtSfsQIMViSS PXDtCUKVCddf1DK/k128UxVDE93xqsx5i+E= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2ab302g48u-3 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Mon, 08 May 2017 18:07:38 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.16) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 8 May 2017 18:07:38 -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=MYw5B3O9jfCDvmmq6g6PEqmTZGnSLPdcX89ps5mzS7w=; b=iViruoQXyDrgcI27KcV7M6zQzPbpuNgejaTGs1ZLzE9P+HZtFbKyf1WKTYHAQ6T29F6WMcN7vmwkzUjSE9g4+4BI9m+PJAC574fbVPMNTItUbHxeDWJTHS0jecq/sQZHdCngEwsH7eoWEjqcnk+CGHdi+Yds0KYg6i4R/af3dos= Authentication-Results: mercurial-scm.org; dkim=none (message not signed) header.d=none; mercurial-scm.org; dmarc=none action=none header.from=fb.com; Received: from [127.0.0.1] (199.201.64.130) by BN6PR15MB1508.namprd15.prod.outlook.com (10.172.151.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Tue, 9 May 2017 01:07:36 +0000 MIME-Version: 1.0 Subject: [PATCH 7 of 7] parsers: use PYMODULEINIT X-Mercurial-Node: b9a58a643dcc103d122e02c66a4545820fa60807 X-Mercurial-Series-Index: 7 X-Mercurial-Series-Total: 7 Message-ID: <b9a58a643dcc103d122e.1494292048@x1c> X-Mercurial-Series-Id: <a2c5e183cafca6d58a0d.1494292042@x1c> In-Reply-To: <a2c5e183cafca6d58a0d.1494292042@x1c> References: <a2c5e183cafca6d58a0d.1494292042@x1c> User-Agent: Mercurial-patchbomb/4.2+13-7d3535d27798 Date: Mon, 8 May 2017 18:07:28 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.64.130] X-ClientProxiedBy: DM5PR1101CA0008.namprd11.prod.outlook.com (10.174.246.18) To BN6PR15MB1508.namprd15.prod.outlook.com (10.172.151.148) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e52471a-c741-4fc8-5929-08d49677c832 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:BN6PR15MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 3:229XcH+Fy/YijyU2nFz7STa74RgAHJ9md2cViPQNMqzrDWQUCpVBYgjshPXfdacIAlwRza5Y/6Jd2yu8Is53+Eu9J57vqTefVaDfLzHqZuOUE7JZdiXAXiaLCgRVUBNpOpD8aTLui5x3LJJZ6V+81YP9VCvs+a0y7VYO4JJFAb+JU/9MzhLEBfegn2tA/4neoTdqwUsU+AQ+m43YHPnUUKKDrp6HMtGbuZijHgtTGexIwQSudWAi5u18VF5AvjSqwUpqfzm+KHMDlMoXKbrnjPXA+GQ2kL9iq8//i82XP8/iPtHSSlaV7NOuGEgCI5uH/tsM6sGQ13DaEFn8sd5uMg==; 25:mc3EbeZxRWcCSvEgZW0k4h/mbq5iuu14i3oYakGyPawNR/R2yvxwCV/ITjL1uzXRHGIbBW0HVmKXYXcZmpVkpWtcCfFqk47H56Flwg1p1wKnXsIRg4mt4XXm/8sBp1OQUaPud2vbCKG4iIIG7PPrvCHc4Nj0/jN+K3zx583AsqOpx87dLx4fnjysExQG3BOKKfP0bCQqkwp4ZxrMzrCJalqUW5krv5dsihGVPhCK8CL+4zVlm7B9gT4lTJ3GdsGr+nqFKI+JW0DZwGEkmWh37if8YvHW33rdOU1DaU6UBe929KXQhXp2KXnZnY8grJeQlxhcvgrqKDRxxf1bkVtB40ffJFdXxUkKkJrblGKn0loep38q9O+lrALbQvTzjnl4rIVmeGHOl4AYvrUaQzyxaZdC0g2XRyw2kIE037Ug9zAVlV6AAu8jgSJZjU7HUKpeDKa9snn1BJ+jItLDubFrBg== X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 31:m7FBUlrULSKsGQHy8Sk0eBf6Ez5HMb4UUAhBPtWxsd1fG5YsIh/iDfWTdM4HRO1eZdY42ulkJOi54hgpjVUXmeJsHHcWQnnb9VpqwkronZ8rQ/PDz3+Ne4UvAGCozOZx/5QxqBF3a6eZFJxa8yPbxJbNoQoqgWWhounYFFmcVVZ7grwfNhENxAamYtVZ8Gf/k0r4Zjm3sH21ECfMymWe6idxeiKOgDBBi7mgWAzqjG0PNekX84Yurj0UsdCkaRQMM5eSXoQwq1twldixQCLYCQ==; 20:qGdZyyBrPFT530TT18zWUK90WTiYGqdNC7dW5VzE8ZZaGe+R/M8noQpqZMN30+Fwdgdfr9hjrOu16niVwqqlIraCu1HTVJBS2bSCLp8bHoYV1Mofg6DQ5LDbip37GKVPL2DI2wlLj4pfQg1FDzwWdDOo0tPU9ZzSjicdDdWLL4PkEaDoLb8cKzj5+d0cWXPtRXta3svD09Y9v6+ajYRcV9wFRPEZ/1En714ZUpLALDF0yW8ZKW5d16Hek1sjQRg8YZSH9Nppk/zQL9DQ044/qz+WfG4u/55QYof+anmYDe6y9Kb+BQ7HaQ7crX/VMCO8RcG9IjFCybdqiOHFgcoZBWFEPF9hOdtctKHWTmE/pI7GrjDNVcivV+eb6YK5t3dnUAihmR/RWY3Vo9HqSoSaDq4M0j3QWiRZKzd7CdFzb5AvhbB+zgxFDFxKq9PeWaMsTE76prdq4MI9hBrg3gVmUgFperuRsLrg9e+kmx47TIKrhWVvcTNgO9UO9HXcDT2V X-Microsoft-Antispam-PRVS: <BN6PR15MB15086A264594B470ED8E8207CDEF0@BN6PR15MB1508.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(6072148); SRVR:BN6PR15MB1508; BCL:0; PCL:0; RULEID:; SRVR:BN6PR15MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 4:TqH3P/7/Zlw5CyIf2an2hOfVGd5KvDkkoAPzaLeRcEuTlYw2tDa1jYkNyVdGhFKW+9TFa+g+yYGUygS655oltPm3aDKGkYM7aQVpnyu4TKQ5qAlpOsSRlwTB8HmN4LqDH/nrJUjtJb30H6MVI0GoUrRPPpFaSeaHlaFF38/lpz4UecBV2LWAWoQ+I63BE1u3Ywwt8NDYhk2oyiUd2MEhb73NgkeN+UBOlkuuItOzWwyC+4WgrImSwGB/Gfpy8Twtbqj/sWWc9wxpF76jKggSLSG7qzT5UVSmIlT7V3xCUdt7XfGpH66vnfSQWYyfcCKFvs2ZMSn+pkLjyDcrDUeuuozaxLz/eNUiWs3NqzdZ8gBItHTaKWFD4/A/mzw6Xfh1TEdvW1Iwv+xx4Jt0FFeEn+676/yw3q5Kn/Ixz7aOTFlwUY4JJIC9/1cFlgQ37tIdiD6QpQ8dywLRWaV8WzWlduCll94hm7eEDVLASoPfPxnNo5Obf4u8CnZaAQjkjyvgFPQH665dfu64Jb0MHqTzEaofHITnqZocyz9UOO4cFc1vBsV8vyNuamhaBaJAkcaoEHS1vPPg8TDDRB17omDMnvh3sx6YKxq4Sx0Dpxa2gddBYWSEPBnAPFHbCN9jyq8ZCqd4V8d7VoG7vzxyG+xCyy9E44WseVg6aUlSpNWe9WVgIF8Tt6p7QnRFW/zNYKYFoK8XEWPjsS8URTtYTRpubpUHG/dhnuZYBf3T8uH2vzpmqA4aoKraQ8QFKUEdGMC+gbdCxISZMEsEXg1El9k2rnFWOGZ55d4w29VlpNt7eTo4uR2luGQ79X/4K4hBJjxf7wdkAZKzFmW+umqKnNlN/jAzX6J5OzOII/7XAgqtsTI= X-Forefront-PRVS: 0302D4F392 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(39840400002)(39400400002)(39410400002)(39850400002)(39450400003)(2351001)(86362001)(189998001)(110136004)(42186005)(33646002)(9686003)(2906002)(230700001)(7736002)(50986999)(97756001)(305945005)(6306002)(50466002)(33716001)(54356999)(76176999)(4001350100001)(46406003)(6666003)(5660300001)(53936002)(47776003)(66066001)(77096006)(6486002)(90366009)(6116002)(8676002)(3846002)(23726003)(38730400002)(2950100002)(81166006)(83506001)(478600001)(25786009)(6916009); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR15MB1508; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR15MB1508; 23:KwxE07/GaC2E57MJ1fbWiUT2JX9u6mriiGgyDV4PH?= =?us-ascii?Q?vfV3lrHJYEYU6HR2Fq8L7/XBQYl5GVeOwuTYGllVofzshMpvwLSPHuAlDv4A?= =?us-ascii?Q?qynd126MY/QSPhTqRNwEA8TZBU8J764YXyNitOAWgrrhKkXq3ldC4qUNH0de?= =?us-ascii?Q?e/IUhpq6SgkuMcB+1dNy+xP1+azt7gRgRO+cmTgxadhAoGI8L8ZUOCIT81iL?= =?us-ascii?Q?YUdd08Ourluo2t8VE9bwjOX5jCABqUtl0ZvkpUNopVAz14J4MKry8ZktnV3n?= =?us-ascii?Q?y453IGmvZWUwG7LZSZWJkYKD2RGlqZcvhjuMVxJjD7S+oqtbFuNTf8xEXtbI?= =?us-ascii?Q?D1qSWzPjYr+gRoj+LR3UYNpaxxbsDjkCadxQGYc3M3Ruvp4OoJQ2O2pFrFoR?= =?us-ascii?Q?CO6l5xVSxMkjGnLMMFoIIGECuN3a3D94lL1/KUMObkjNuCc6a0A/+TIFsbRv?= =?us-ascii?Q?rVUy0vtiGSbit1hnbeam/kt1fa9CwalSPPSM5X0S5OWL61jqnUcdb9ojuxQS?= =?us-ascii?Q?ODY6Xlw/hOqEQ8y9x/r3/AoNQoezqnAvdihtqHCNfNEwdnSVP8EfxYyTmgnv?= =?us-ascii?Q?MtCFdB2Zn6A2BnXtK2OFXzadkdNCc1TU9Ryf9YnpKASQLCBrNZNWxXmf0AKv?= =?us-ascii?Q?RDX34dXNPxuVpB9A2IO7O8mhUO0yvxpf16Oq4hc6SXFdUstqqjmNICES6yGW?= =?us-ascii?Q?Mv9nBLDkBx2W5tUQoZ9Ha8V+/C3g0df+0I0DWxaWwAiAwrocx5TLfDALPLfw?= =?us-ascii?Q?w6tK+ipSMbeQ5Fn8ppEbTwB0BMjbT5s6+fmzvRFXXGLEQ1yY6Sxr0ROBgHuk?= =?us-ascii?Q?wXKgenpCC83Co/p+o2rFjcAYaSzj7wW7icHQsy2pvUtUxfFzIcTMaXIVo2ln?= =?us-ascii?Q?VzqXMXHr0QY17dnqsavnnSH72CY9nN6FnBm6eboTVfbym4kFvrNkofnZsVbN?= =?us-ascii?Q?zglqucbXltUqpEln9WWJuMKDooMvohoRmUsBuAG/kVBN0lYFD5fXgmGYwBkh?= =?us-ascii?Q?4bA4YixvoYzwJizJEi4veu6qcTTpFWmNLb8+/ZMMJhDGKPsQHxI4hOa54Uml?= =?us-ascii?Q?x9CxW6aBk3FyCz/ImOfPLKUH1Cx7h81N4/zrbDnBKxuUq1X0QYXVfWukLr1x?= =?us-ascii?Q?K72GJ/g75ElbLFRILa+bsUeC4zR/vzZ42uJL8sELJ9qlC2WtoqAS2t88i1E5?= =?us-ascii?Q?gkIuJe1dYF+iRo=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 6:vq4+DvEP/XBrpaelJMIMhucpII6eWaizAQ90KSknEAXEOcOxNA4yA6izYOxnPsN2uWbs4BF+fu8b1pbUZYcB4e2K/aIZkgjyFiY5M3Z31+e6ThHrk5B6ddFFfXgP/AtaJU1B7hUTJWYwjD3KXR7/ncIT0GEAA2ZUZ1nVT1XWJnf4+5h7FMWojPkyBQVRfYAtIXDL/X2IT/CZw9hOwy91WuF3JCn0Bn9mNP3Hre9w9Vf6+SvfmO9dwB6fW3+4k/Q0Bzo7oAQy1WRvNZe2qjn6jsKoxK7P1rn8Xpb8QlqmERkqbpmX64QI1bPZZdgJvPUp8V9lGTE2JObDe7+I1MwmLt4toP65i7xQOoXaEKTD/xvcPyM3SYBvNahFzRQ775EI4UlwJzdr1mm+V7o+k1FMGXmHAooKgRe8HM2k3QAjPX6FSd1ouKpLe814ELtGV40aN2DtAidskE6iwd+XgFYRLFPPN9NnDwuwW7ArMDopNvtsnYAaeVhF+Tm6dBZPZNmUvLkKRZHB1IG7Gs5lprg52w==; 5:E6YOq+dfN87dQSSHJT4izpDexDiJ8E4vj3W8UiQBHpFr1TxmtcjKqpMzNWaZ+HDoYuoT16zPEk4oyzpPB5gakPeMQqhTNhG2x5V/6CW5jytiBCb5Rcvsjr9f1DgatGwfNQe/g/gTWsuv3YJgo2Cmgg==; 24:vmpwYDb95Aoz+h/yXgWy7oLLPh+3fhsDUiXygwrYo8sSfgK5NEq1Jjem5ql8nlxQbdqPLI5Ubzl+nvRsHHIpYY4ZZi9l1QnMbNekaYz9lVs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR15MB1508; 7:gyKlHmi6BbJnbgJ+Ysn5DhQWmAxsavvszkM1sazClnfkuT8Q3uveYCkKPKNnTUa+/A5jlcRqkCpV0QCW+MvwYsYkaDyNqt0rsTTOMud89qtgFHcBTA+x7lKWEGdyrEKpaN+ZV741or8DSKSK6NZ1lSihlP6niUlrbYcD28OYoO+X+qyhTW/Shr3nWnvv68IbVZm/B5uGHNEvutBMhqldP00r3nDzR72OagEEa8os9d3dJpgHfWcZv9LoXzea77ljy5c8krpxjU4I8F7c9vGIDD6sMqkDqxRBbF4dp+LnZShg9kbrKeaJd5e/gerphSOSwGHplGLortr/0wTEte/wzg==; 20:Pz0aagQLmnYF16uA8BsBCVMHDkGugSb0KezuNNgHOh4tpEz5ucpvvrhurPtjGoMlf0sJwzU4ZbBme8qLkdt/mJhHp0MMWrUJrWBSzUbjwMtp3/mvg803OzbHYcBgd9HLSYGXSvcGHkTDxRJQAwg1mIJo7vL6asT29ceAnMoMZNI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2017 01:07:36.5796 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1508 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-08_17:, , 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 - May 9, 2017, 1:07 a.m.
Patch
diff --git a/mercurial/parsers.c b/mercurial/parsers.c --- a/mercurial/parsers.c +++ b/mercurial/parsers.c @@ -2855,5 +2855,5 @@ void dirs_module_init(PyObject *mod); void manifest_module_init(PyObject *mod); -static void module_init(PyObject *mod) +static int module_init(PyObject *mod) { /* This module constant has two purposes. First, it lets us unit test @@ -2873,5 +2873,5 @@ static void module_init(PyObject *mod) if (PyType_Ready(&indexType) < 0 || PyType_Ready(&dirstateTupleType) < 0) - return; + return -1; Py_INCREF(&indexType); PyModule_AddObject(mod, "index", (PyObject *)&indexType); @@ -2884,4 +2884,5 @@ static void module_init(PyObject *mod) if (nullentry) PyObject_GC_UnTrack(nullentry); + return 0; } @@ -2912,32 +2913,4 @@ static int check_python_version(void) } -#ifdef IS_PY3K -static struct PyModuleDef parsers_module = { - PyModuleDef_HEAD_INIT, - "parsers", - parsers_doc, - -1, - methods -}; - -PyMODINIT_FUNC PyInit_parsers(void) -{ - PyObject *mod; - - if (check_python_version() == -1) - return NULL; - mod = PyModule_Create(&parsers_module); - module_init(mod); - return mod; -} -#else -PyMODINIT_FUNC initparsers(void) -{ - PyObject *mod; - - if (check_python_version() == -1) - return; - mod = Py_InitModule3("parsers", methods, parsers_doc); - module_init(mod); -} -#endif +PYMODULEINIT(parsers, methods, parsers_doc, 1, check_python_version, + module_init);