Submitter | Jun Wu |
---|---|
Date | Nov. 14, 2016, 11:35 p.m. |
Message ID | <9ea33341bb12e2f6a862.1479166556@x1c> |
Download | mbox | patch |
Permalink | /patch/17572/ |
State | Accepted |
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 E9A8F2C2B7; Mon, 14 Nov 2016 18:36:47 -0500 (EST) 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 JcvrTfeYVGL6; Mon, 14 Nov 2016 18:36:47 -0500 (EST) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 925B12C2B8; Mon, 14 Nov 2016 18:36:42 -0500 (EST) 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 AE83C2C2A3 for <mercurial-devel@mercurial-scm.org>; Mon, 14 Nov 2016 18:36:39 -0500 (EST) 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 jKqlr0XFkHaS for <mercurial-devel@mercurial-scm.org>; Mon, 14 Nov 2016 18:36:39 -0500 (EST) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id 06DEA2C1AE for <mercurial-devel@mercurial-scm.org>; Mon, 14 Nov 2016 18:36:39 -0500 (EST) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAENYlhs001476 for <mercurial-devel@mercurial-scm.org>; Mon, 14 Nov 2016 15:36:38 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=JoQvdAVSYu04+q7InFpY79gS9zb14w14vsvnaQonrmc=; b=jrxJAGmdwRofx7JagnEkya6JjLtZJUNhmrUV1Zd3n2rRHN9CF5x9tqfwLDciVY5+aaFV f82ExkTKiFyfMlC5UXsDj3GvVR2CUosb2AAjJ3iRab/PBU73oZMMiXQlK8O6iH5duoOk J1WMKajFNwXAVRH7pg7bh+QEAugDcNNAsz8= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 26qjtr9f14-4 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Mon, 14 Nov 2016 15:36:38 -0800 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.29) with Microsoft SMTP Server (TLS) id 14.3.294.0; Mon, 14 Nov 2016 18:36:36 -0500 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=/H5vrbAGo+ddf/yM47tPZFNgNSuOusdwZsXpD/qsRik=; b=ecvSjo3PHFNGVPeFr3Hhjb/GSZDRTOSjQjaUwUzuct6FsNxB91VTCTNdjgUEFFD/s6TRIOvEx31jk8GbFsDPXWZcfxk7JxmaJlpVugoHA5wgV/Ryx4QPse9SDs4Nha6Ng0i44k2ldT4z97b/fq9eV/eeXCHZQY5a62V9IL4YZIg= Received: from [10.0.2.15] (199.201.66.3) by CO1PR15MB0984.namprd15.prod.outlook.com (10.166.30.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10; Mon, 14 Nov 2016 23:36:20 +0000 MIME-Version: 1.0 Subject: [PATCH 4 of 6] store: migrate to util.iterfile X-Mercurial-Node: 9ea33341bb12e2f6a862c8d3ca1eb6b8036d3602 X-Mercurial-Series-Index: 4 X-Mercurial-Series-Total: 6 Message-ID: <9ea33341bb12e2f6a862.1479166556@x1c> X-Mercurial-Series-Id: <7e3bb7754d338399dee3.1479166553@x1c> In-Reply-To: <7e3bb7754d338399dee3.1479166553@x1c> References: <7e3bb7754d338399dee3.1479166553@x1c> User-Agent: Mercurial-patchbomb/3.8.3+274-8bf84295e59b Date: Mon, 14 Nov 2016 23:35:56 +0000 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.3] X-ClientProxiedBy: YQBPR01CA0071.CANPRD01.PROD.OUTLOOK.COM (10.169.139.39) To CO1PR15MB0984.namprd15.prod.outlook.com (10.166.30.8) X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0984; 2:0z2CwBq4IDirV/MU3E2fgmOVuhlhexpTl0ry7cYYydmd1q3nhRaeADeVp8a5aQt5MAdi6QJ1qAm3Wjxh1YWgzc8I3x8OCciR6S/ysEr2w2TKaDKUDw5q0tuvdGruh/zqDup1NHSO1jDt3X0fDIuR2brycB+8yMltibutboOavjM=; 3:kbIHub8D9WJuqHSgxHboq9G5GBdqSULqEa2wNvugp0O6wuPRJk+CDvU7yYP/wFa1I4mIYz1Igk8mtSfwDwWO5+CI27pZbA7lQEomR3aqna4wZOpld+fQLJ3hitgdWvAHr0CBAVWMUMItjGqH0Gyv2dyQzsjv8T86my8S3WsM5dQ=; 25:EwoDvOfqG9TM53F5Zbdg0uS8+5+IyXc93Q76JVJc1v4hg83ijubpVP3LmpAEf4d8hSpy6gp4NyTFp2m/NB0fnmHhx+lg9AXfm0U6Nz8wBN1CicEQxFKNd22vJMdjUCSgXD2S8DNjTGhItx6wAGBC2PS/dRdlveEntSXhdjLXzKrTEIqWUMewXwkHQSdDhWxQxp3haaenBg8WHRi9q0xomr7gH0hHqganLe4MMFjvUJ/RT4joDXvPhNVtMXsB3df7X4B4mDloAYPOA1aOWPBnV1Yoxq9oziq5t3xyZfBUVECVNFE5tYHFvwMjVt/ZiNsTnS6efKr1HKJ+ThgW5m1lFtf90rUIWIun02+Jr5f+8mbbn5r16kHEkTg3oX3nUnf1ELjGYks0GhF0FGfvdj5DUXvr7fKrM9PS0AnFzNushl5DvzV4prw99RTUHeC964/x X-MS-Office365-Filtering-Correlation-Id: 2892be71-6614-462e-23b1-08d40ce70a01 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CO1PR15MB0984; X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0984; 31:bquzoVdN9kPs6T7tN/nwH6INiR7K7g6QsYaWi2IDKhn9RNI+dH6U5R7gSNBIdo8sXUmrCP/CdHkGN9lDj5iTYoNT0o+gdlRgGBZYDeft1pjKJpOn81CZsDl+Bka4gHo5UcZZJmhorlr+4vi0icpeco7QbZLKzjSQMuuIFQor/y8584fstRoReFwJk8IXl6QUt951z4RFSdc1iTH3iM3AbWvlrpPV8zwBaJNXs41WwOoA0aqQ48wcnalGWjDOEQAkVPUR8CLw9ytP1TSnM4ALeA==; 20:Wh6T9ZzgTDdcySsDaTjWflaOJW9pvz0+l8lvcTx12GtFc2I1557EHIlZ6O2Z0J6Qxq9/krLoHMYJHb3Q8Ud/+zzFuyT92FKK24GwvXWFXmz6wAMCpEVHN/zmZtSTAuWaTUY9fUx6dpB9288rihU0quLgDFjzbLjOks7QvXn20Io5OP8YIlDZkkfVSPTqTwYoypTm0ErNtanG3yX26xaU8G7dx78PjAgS1/aWFN5hRwKqdA8JbCzsOlKFPY1yfcub X-Microsoft-Antispam-PRVS: <CO1PR15MB09841B9DF05672DBAEE4B5D3CDBC0@CO1PR15MB0984.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6060326)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6061324); SRVR:CO1PR15MB0984; BCL:0; PCL:0; RULEID:; SRVR:CO1PR15MB0984; X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0984; 4:ynP/Pvhkq7ABXOna3xHYFHEq2g2Ma3l4zNi9siovCTfuYEB82JgXk3puPYBrLrs0BG3JEovVMfpz1+8HnVtb0Urqd1Fbe3FJsmxelx9HtHWwbHdM0GAecgLgT8+Ybs3ocYqaSHBU9MHDvPvoDy7B46+cBIJqejt2Ip+NhryDp3BJ9jy7f82OH+TjXWLPlelkWYajaLt0N4XB2AginzYf7mYeERtUsVsQiYKJcBN71cKMZjxWQkBLRNO3+bbZeWj6IVIHVFg9UeaKqnBqfjwhvJ0Ue7mjIRpkR/tCT0etIU+5DQX6POpY1ETqaGlVkEUiCPMAoD9eQqSD/JJBKyUAtYilVsBk2G/hMYv7nRcbX/g4Q/1DOip92Xb0azedthKWmIsyjeFCr7cZrx4+AFWGwSD3bjuWE/OJEWLz3ISq4wp2KhguJXPmQhHIEk7bRU4e8EnmG1krVPqVr/2q8CQse8u8+SrJqPuAce4ZniOCEtIpgZLB/H441fDLqEHJ1IOW X-Forefront-PRVS: 0126A32F74 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(199003)(189002)(106356001)(50986999)(97756001)(2351001)(76176999)(86362001)(105586002)(83506001)(7736002)(92566002)(42186005)(23726003)(33646002)(2906002)(6116002)(3846002)(101416001)(81166006)(81156014)(77096005)(7846002)(8676002)(5660300001)(107886002)(68736007)(450100001)(50466002)(189998001)(9686002)(47776003)(230700001)(46406003)(6666003)(6916009)(97736004)(2950100002)(4001350100001)(305945005)(110136003)(33716001)(66066001)(54356999); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR15MB0984; H:[10.0.2.15]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR15MB0984; 23:y0D2oGkyHIdhOesIzh+DdC0x46PQr2/ZFAqLlVYR2?= =?us-ascii?Q?kIT5TiZCDxmVfFl7pNpTtXoYJBYtkVi9uOGyrx2FJ21IKgFh+0g4WMnj8XXG?= =?us-ascii?Q?JXUPIWxmazSBm0cuEZUW/wYU9ZOp7QK3jeqiD8mVgN82s1h3Hn2PRB832lIP?= =?us-ascii?Q?e2dqhOejw3OZzk5RhooULK8SOGie8TMc4BDamzN/ZCy2PbLOBwhf2CopqvPx?= =?us-ascii?Q?iKe+D0eHDZyauMz6/KxhzMqqMDYeQ1j+Nt28Ni37kwmpsX0yYF30jBUcWaAp?= =?us-ascii?Q?QdsWXpahYjeRwhtf0dWwpO0fMg1BqJR2T0uqxm94RI+g+GncZIsvSWpcF1NY?= =?us-ascii?Q?YY6ekEYD8l4Aa36qgmAOxevSAhHus5Z3/RpzdGpW8zfNtId2yK6GApdpwDJO?= =?us-ascii?Q?8nyPT8hjZTLBt8+rWAtPlXNrhpUureOIFXxO2LHn07PmlDOLwBxo9lkJ7O9g?= =?us-ascii?Q?kdI5s7NHc3N5oSU4ig0aOf/HOmOSoMzoHtEFaJzHIP0LPw6bFrfJuuKmSQMo?= =?us-ascii?Q?jKuCWM6QAOJkg+9va6aihjrL85vW7hQSxVD0kdJ/wXxiYjRsSVbwUsAVYDCg?= =?us-ascii?Q?9/M27lAuPy0huvOLNQVPDF0WhpEs00mTXNt0M7fpxpHx+K7OA4qUPHyKO67J?= =?us-ascii?Q?7N0efGJoQXGHpb7r7o1WuDftKRqf5Q3Ffzt4GFioLMgEVlJVuy8FpN+yreje?= =?us-ascii?Q?63+DRmc3vvS5TOPEWBv64OJfRTwcghqIlTbRqLhf1RxBv/FMG2KnN9Kllio/?= =?us-ascii?Q?2T+wMYyZb2fCUCzlysPu/o1GHgpNZQhTziqB5OsDIpd36ecKtj80ppULLD32?= =?us-ascii?Q?nj8rEnasNHKiL7/V+TVpoml+TwgMcJp1lKOWZ6fpXeWOCw5a3ifpAMQGxrrB?= =?us-ascii?Q?QqPoCRKP0HFpAoDcG13mLJpBx43PgzJQEB3ohmh6pEw8CPvTc7wPpXcVrj0o?= =?us-ascii?Q?kA9vLZThNVbLpTyzmJaNXv+WD7xUWS8rESYA/j5QyomOeW6E9+CpzIMk2DV+?= =?us-ascii?Q?dYm7AQbiiiqoO+IDDWpDRu4pi2FxpQ0V4bxlZipHgJm7ybJx4wRvBHmb48fo?= =?us-ascii?Q?ioIWJTWpX12v3xGaRhn8K0rLf6ek4IUrVLcqTHSyBQkwwUZAc655TLzuhcYN?= =?us-ascii?Q?ebI7hs8c+zo/nJb9qZHeg3NmVTttUCMQxa1EWqr06MFewpJKTOTGOmQh8q5Z?= =?us-ascii?Q?hyZv1CK4/i086M=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0984; 6:naLKW6VtHd/Rx33UVbtyJfVd7Z0+c0LPThaK1XI1a8m8LLX/uIvwV83xngTNYJeZoofWqwG8odCtivbgHHQmxx6j1ZHbUGD4kPGKbW3bA0KwT4gym/g8uFReyibqThBsYqj/Xf0Svh89I8fa6UGznMsmoge0gIaFgWl8QJICs08T358gpgGpeIfzVHHzq/enqj/J9lbQ5rCyojJSWbv1uy60ElyE5t7DRyMQx3AJhjHVSkGCEUQYi5OlgVQ1W8GTWaCkXlliIyj4xPszTs7I5Jg8unyIA2qQP0VLKzEEWGC8QmV5o6bip0d7hv71Px8Ly4bWUqzvlE/t8ibqqcOhyifEI/w5C0x2qRaK2VED6Ac=; 5:fgCi10Dw1Rnt1qriSIETC+ohblgDPrcrfrJUeNordvdqfy8EaNOV/AR8pvtcVUWQczkkxiS2MjLLiPZtQWoJI6xWIhcOmQHIW93YZCvawOlT2d9fbBN4fsBjc8XrHZ71lWbfW0C/wfk+KE2L/Rsdv59wThP1vc8S5ALTBucJxIU=; 24:YyFOPAoql1a4SDIJ3VY35EhPUolpuf2jI6UMb139uSxZg7lkOU+hkQjAg1MxHXWTu8wTaj2XPyVJD7RcOMvB7Obf7WY2q36binZ0l7nqxR8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0984; 7:L6NxiSilYKDuuP5Flq/4wnyZVIQcuAWmLwQstl96qTNrzhNUM1gLOp5To4eZUi3nkdJdd8QmHJYeN+srALILVEQumZ9J/ATqBjLj3kDG5pXapH6LfEwLNJyLJVp2jrzM4EvWFkq7wN347ZJCjTQX7mdlDErmjF3H946PAH1VjWPP/jOAxbPTb7eLLcgKqSTloIjbqAS3cPOsBfidMZdeyn3I7oMiBY1v6a9hbs0tLafr4ZlIvrmsRJNqDU4u0HHW5licgeEsut+iYnfQMsNehKOO77WI8UV5UjthQ2IQiy3dIH8FQmVEl/cAj7118XQ9PWXBAcC0gucuIg57m+yUaVRPzClJM5PxEIi0xdTIv2s=; 20:U33SmfqQBFuu+nKrBcx1KogQyS1lkZh8tbDBscRS7VPjnFPDYMZHmVO61/rfW+XxnI4o/Ss2IlVaqPh3NnirpZkkRlXb20cHk3cS5X3/Ze3Q2CKPSDD4aZjuuvW9LU1gO5lML2NAFgJfbVX510ASG2amDAaRYruXYSp6Zg1sOrI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2016 23:36:20.4502 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB0984 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-11-14_14:, , 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 - Nov. 14, 2016, 11:35 p.m.
Patch
diff --git a/mercurial/store.py b/mercurial/store.py --- a/mercurial/store.py +++ b/mercurial/store.py @@ -437,5 +437,5 @@ class fncache(object): if '' in self.entries: fp.seek(0) - for n, line in enumerate(fp): + for n, line in enumerate(util.iterfile(fp)): if not line.rstrip('\n'): t = _('invalid entry in fncache, line %d') % (n + 1)