Submitter | Jun Wu |
---|---|
Date | May 10, 2017, 8:34 a.m. |
Message ID | <86e994114f0e5971007b.1494405262@x1c> |
Download | mbox | patch |
Permalink | /patch/20549/ |
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 86FEC2C211; Wed, 10 May 2017 04:34:40 -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 6cZj_A2VneBr; Wed, 10 May 2017 04:34:40 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id E36762C26C; Wed, 10 May 2017 04:34:38 -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 CAB802C213 for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 04:34:37 -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 hXxB916SPTyu for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 04:34:37 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id B0DF32C211 for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 04:34:35 -0400 (EDT) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.20/8.16.0.20) with SMTP id v4A8RCR1012114 for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 01:34:34 -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=d/buEdc3l+9wj68yFMLUy4TEMYEeJFGoMQVUsCQ2Uxk=; b=Ciogt2IScb4QLOR6YmNdd7Skc364HWpBsRLXi8ODtr+mD7plWz8/3o4/SiObhR+IFiBu DoU34BbrVY+4bkHVT5ZAayo1lFq0FZjnqvN+FpSo4z1XFdQ1KWDv29D+BY7Q37qrz4T/ u0YsQx9lUffB05+OG4rxeyt96r8LTdMIddI= Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 2abkk6a1q3-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 01:34:34 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 10 May 2017 01:34:33 -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=d/buEdc3l+9wj68yFMLUy4TEMYEeJFGoMQVUsCQ2Uxk=; b=iEPC3oCPr9WSbh66m8z2uAGCEAXq0fcUMJZQXE5Pw24xsJ7yM/OEZEvkEmTWbcOZZC2jtRHg4sT/w5aB7mBrfWs42VkL6qnX1/vmFi4JV9jOoi2xvoJvqMnvaO2r/Y1l+xIgO5TS+F5HAxs+0uDlMCpFrTww4GS8kwqbpb0BYwU= 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] (69.181.140.208) by DM5PR15MB1514.namprd15.prod.outlook.com (10.173.225.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Wed, 10 May 2017 08:34:31 +0000 MIME-Version: 1.0 Subject: [PATCH 03 of 11] filectx: move size to basefilectx X-Mercurial-Node: 86e994114f0e5971007b92af1aa7322c91c4cd16 X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 11 Message-ID: <86e994114f0e5971007b.1494405262@x1c> X-Mercurial-Series-Id: <e4403b22312ef8d7a0d4.1494405260@x1c> In-Reply-To: <e4403b22312ef8d7a0d4.1494405260@x1c> References: <e4403b22312ef8d7a0d4.1494405260@x1c> User-Agent: Mercurial-patchbomb/4.2+124-e3c5cc632054 Date: Wed, 10 May 2017 01:34:22 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [69.181.140.208] X-ClientProxiedBy: DM5PR1601CA0016.namprd16.prod.outlook.com (10.174.111.29) To DM5PR15MB1514.namprd15.prod.outlook.com (10.173.225.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9355086-0c4e-425f-7259-08d4977f6172 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM5PR15MB1514; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 3:HTQ7DzvXwJpzuCbFu9X7igCHtIzUlov4EbJiMMBIE1PBr0ZwSogbnQG2BLcHkSUsVaHdvax9x0lhEshfztCYSQLbySwm/H1OUcF9AvlW5hLCT2ukBrcL63xqbGO2M5K+G8sPEQ+aMOfBSQDis0YWRkqWXYzZ1UWsCDXyVyO43Ek+uGTtOE/S2PM2K1PpwipsLOxqGMBugLEvfCPw7mtPECJnSJVzvoGuwf5HTYPNZrZQ/Y6ogIzqEvZZiODso01p5dyYTs5SGjX8unyenpdefYLeLWdMRGDMEJl0pxq+eGc6SFs3AlmAZ+/E7yoxnpYMQ2Iv8TrwAawTlCH+AQyJRg==; 25:ZjfY2OWy5Ck9pZtW6fdSslJFwPOptsc4rVB8jLuKPCrNR43Otxwq/gmmLA/MnztOpbLcvGQNwQph2xwjnEo6BdDokd7mDuBwIUZUiWjeucCLEc1em8nCljsyTSJtNFb6E4gqX8ddCFccGx3NdyxoRfMpCPI6ZvRO5IEPNLu1yE4HvcU/NqUDI9VkSpe5jje5sJ9ajd4oAVbKkEuc9lQxsqHH+doPS5h/3NQs0u87o6Hx7bnuXlQb3DL7LmtL8MNIcYD39U0jvu1DfNSevVZTFPoAwR1Rk71f5ystFsvbps10PypEN8T/+B/ffjmA96Cxc2Ev2wJFGC/uVy9Cqy1gwrKDeAm+xED0Jar8fMI2tnH01JVrG81wiUFwvuJBSixl+oljtkmDsRpqmoQ/2JF5SnRY885XwX4LN1csQtXP39j6wnjX9cFVJUOVbd/EX/N2spJGeLVmQ5ws3iVKTsvbbA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 31:VItVinB+cz0kpq8P22ExR/qF7mT/3KOhaeFSJmbcJxdR76gvJn4GBQqfQ1rwTst6aI/5oAPD1fx40nhLd68Lx1VGVtln0qqcR2p3cQ64TPoJoxvpaaqvZHvPBysU33vM9smmVU4Pdo7f+7rnuHzlAVRe95mGiDx5ve8zRJZXZINENMl/zm368DWW+LOsSlVHQb+kRTeg0POeNa9GM4Ct+Zgrn0Vve215GxciNu8sKamVO+q/6NAYf9FeMIhAUfDW; 20:VmovtLdI9rH2s6/90c9rmhWnkPAEAn7mJTJbQreWcL68prpKT67M8/NUeZivkf+OMwARsX5SbIPXu6SkH3h8riOLsnGOWN3rYPvvNemYD4YRF6RcVnDAeNUoAyUmFKnWdlVHWjZxTKAeBuW6Mj+jgXOcVGYN2GR6iyEGIvqlAYkcA8WVSHmYTrMQzvVDan5KnGw0BkkLAHfty6FAXv/BTXmiGtsIWVwlbRRqXkfhOk3awWmjMqyvtCxlzFDRcll1/O+XOqqHmbDSbTkf5A3BTatXQXJN2mmhtNf/Iqqrpwtj0D5nd30lhM/aCpHDL+XHnfN0VMGCTuGMQmAAd7e8P31agUecYQm9sxzbx7IrADpu/8orkjRFKoe300AsbAdW0ZzmERh1UBkrnVFEnMwQdGqRqlvYOMl5rPfDZMOpkeo+FkyUBrMDBMfrCzauXbh6CB6gfdYiJpnDa9OmSZEr0vYBLnnIW4PU9mcUL06Xd9tJRWKLOkCDHVcNtDysZbbx X-Microsoft-Antispam-PRVS: <DM5PR15MB15146DDA7C85CBEB0E3912EFCDEC0@DM5PR15MB1514.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)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123562025)(20161123558100)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148); SRVR:DM5PR15MB1514; BCL:0; PCL:0; RULEID:; SRVR:DM5PR15MB1514; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 4:sAH/6Dy+BR34sbqiXAmSdkxtvfb1F3pxD2Nu/++r8aA0tQfpSIsSmKuiOEJ9yMDLamF3pn9Q+sgLqnDWIk/5L/QsApNo5EAyio3krQaMb7raZaUs1DVjvErkMvy1jYTFxsyksgl9eGRfr2zXChC3ccoif+z7rzlC7+KdjQ91UQKDBJ4F+x6h+ZwlbKDzDf3bRGAGIJYQbMnlso/yI7jQy9HoOiIxsfjcl8nlqJpgUy/2R56+bPDTOq5VY80ltyKJWjYsAZqj9lRBcIzROeyp3e/O4xcpisOtbiyo4Kj5PkEKdbF8NrUCoXieUajDOmIpS8gXf3xUfYjMMkghoSouLdASfJcSBpUEAj6O6a8a41Czwa8ZLqSocrj9F/PzChcjFpgsyQnMn6eufRYYGHKun8MMaao72MtCckUNhpDLm0vRB0NLig18y472Mnl9HhYbujs0FIUgrC+A0wwAKBPlv0Sp+9JFXABVMqrK5em5H1cCiOceGDS1lN23KTI1rtaY/fLeYF3dkHQidWR5HAYOCOop5wb7TakWXDAcxBFo56g2sUncYtg4QudgTfCI5tnWSl/aZj4WcOud3yCibICb5MPodD7NOAMTKnesH3ncdHEObAnZRNHI0+8fsWRaitOA77f3N9JRQbjIUPmlN7OtxG5cjocmVqnzovKHK1yqffS8hM5SMWhwLgzcnadjR1SBcAyB6NlSWASBOL300md9LRQ9iPDrLHgNTD3UQ+kI2LemCgKH1MDDFuKQ4teChclj4ix4ECeRbyZ+DKvgHh6dbhbK2yxlEV77gIFFwRpZD7Nri2jMytBeMhHVyiMoQgew/KMc8y5dpi81oXIM2IZZFTCffJlELUUqSBD8n5dghV4= X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(39450400003)(39840400002)(39850400002)(39400400002)(39410400002)(189998001)(110136004)(38730400002)(3846002)(6116002)(4001350100001)(9686003)(6306002)(97756001)(77096006)(230700001)(66066001)(53936002)(47776003)(81166006)(8676002)(90366009)(50986999)(2906002)(76176999)(83506001)(6486002)(54356999)(46406003)(575784001)(25786009)(86362001)(2950100002)(5660300001)(23726003)(7736002)(33716001)(305945005)(6916009)(2351001)(6666003)(478600001)(42186005)(33646002)(50466002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR15MB1514; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR15MB1514; 23:uW6aq7HCUIyF6fQvVKgZ2t/VMx3nePF8LXUSrxQH6?= =?us-ascii?Q?DoPuxfDrPyhZDz0Kw9cDhc/4+F7sDNCvw04T+JHR4oLu5pvMIEkzSD33Uf9K?= =?us-ascii?Q?/GpvGyturkTE5HJUlvCQsK9uStsq9EXULMWDFNqF7cVsrwKXJ0oKabvGtNvo?= =?us-ascii?Q?ziq5TyaLmhUNa27Hz15xVk7Mc7iorVpvJ80+HjATryx3mhjC1QK38o4PbYbZ?= =?us-ascii?Q?q750I9Ok5dgz9wGzko6jLLwK5pGtsd3iQB9cNzDa6jNJbDcgbo6a/YB0GfUw?= =?us-ascii?Q?OfKJVSGfln9p0IlfrSu2YQwESLF3E8p6qr3X/4/rv1rrkQMCJeAewHOkLKbO?= =?us-ascii?Q?J+7q7p9wJghhaUtnIpx92RpsPECmaI2LlAsNzPznwFEQtRVxpowrtLMH2oy6?= =?us-ascii?Q?zfS+2QJDDHE0bn7J3crx5Sdh/Yb8HoIS+Bj7D+fLU64Jz7oqpk0vZnGfHOKV?= =?us-ascii?Q?wNvn4smg7bZXDb8sC/e8PkCmlpJJgLw6xzftbcvbZ3JWLG6nRj06DlP2Ff6+?= =?us-ascii?Q?bML92q93C7UcTk0+eJzXzZBSSucL4zeo4e/Q53gx4hZlGnbkvAd3uZCaxsg0?= =?us-ascii?Q?cf8Mr2nAwxqmj0w41sCsrB0SDk8b5CqFiTfW+iS7Upx8qMGArg76gmqYHS5F?= =?us-ascii?Q?AeuwEb8jPqlQ5ptJxyQlK+sf/HWWMpWbxdne4eJiuMTde//ALh8UYi7HeXn3?= =?us-ascii?Q?1ZHbtpS4KLYCqTL2dv2U4IwIQqeeOTRtNbXb36jbd+D/NARmU15EJyI7Tt3W?= =?us-ascii?Q?BCjqIO/knAce+4zhKNz9fdis37fzcTMx2pvdPNEdBvZeaAbM5a2VUbuy4P7f?= =?us-ascii?Q?GtU3SD0aXz1tw/gHUfDHvxAN667WozwRfR2Y7GyI+C4CSRfXZcVFMVYvJGT7?= =?us-ascii?Q?mxcngSBl5n7QaP8QZfKx0aobrtfGYdM+CD8ddPUcEMae7chBtBC2qRxea+U1?= =?us-ascii?Q?6mMPq2lw2dulridXrBE9GhMJnjwBC37+KoXBeBFSjnPdZ0zZLnUKbV03V59y?= =?us-ascii?Q?Dd6Yww0poXSMeGQb2FHm9xAkG0dc3p8PnA3JcIcxu7jL6qtZ32g4gzknU7A5?= =?us-ascii?Q?1YVtYwIfhvkEfLqrC3v1q0vyMJSAjQPfmXUXKWLHc5CoLBE5GLKUAXooap3X?= =?us-ascii?Q?hE/Nbso4ni60qtwGtVhUNNevHduy5PM7wQ0pTbD0ZmQMZwnQwyLSCbJQZ90D?= =?us-ascii?Q?tt3e2AgkG4fnzj5TIXv9GnCLyKbs7HL02+P?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 6:8890YMrsmLLHYMc70yi9fiJ3dQOsLZi4lGsSdX1Y0Ns2f9sD/fDurjJ1/S3l5RtLg4y/r4wBrS4ItamXEkw9atG+3pt7PBah4lZ2on6KNjf2770UZ525XjX0N5v82PYYPvFcUAnx3mRfU4/NSGuUn2LPmiWiu8vPmY/t0YPkBN6qxjIpW4DwtV7F8WtBMiEeU9mNnDTmPN5qovIG9xymv0OxwucxS/fWA7sVlrnCP8Zq4WD3gmfYQ4P+opGuz1cK8wiW4aYtFiYoggm5aUeNZZJMdyxr9ObO0hg5QE5d4pQAM5GkbKdLyUcvRlnO5IMKpDu4FbZhitnPM57boSqLkDkgLElR8wsdZjgnWl9x9lJssGGCfi9jQ4aJFLfEOmYaNBonO00h67VxGFpQfRmpSRvVF1D9wczm7xonwPagfqzxjYIBWHU6q50Sr45PtGEAZ0VERNhHKQ1NaMHkCXvAZMB4qf8WTYvWHeI7/G76qRhxFnBqrEU/N3KSkcnZGi54JcinK3PnP1al2mvfuV8chw==; 5:B7/72Ys2PiJg1K6nUgDEQVdIxsmHroUF+O199Tel5R7rKYebvwZyBxDgXNw9tF15YHp+y/wSXzteMlKOsKKiXFb6+xiF2QpdKl7lQpvJW5TvK2HI181TReBOzYn1OGpMz5jK+fWQkMvugwp0ffLVMg==; 24:Ul8L7GN6DET59uAqWdKueCRn4I5D9bEkGxhm/kd7ilsVQniIH3WHGC5frrb7BfYfR/aE985uPzTn7hmVsqpcI5Cto8AMb3GfQg3riW5w0pk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 7:zrHoBIXa3sb6eRky6nLs4zCj3v20g9MckhVKUfvRmq92rCM7uGlIdsR8sLQaKE1z+mF9+OJ53Jz/BWO/70aQ1QXYTZs3OBgg2y4vzi0/kFs0UG0i7z2JDmnmtr2xAA1hyS8MjZs4pZQsWrwXGOVAWMrNFwxKgeABnpJJw9bS/XIbh+ua28S7kiWaUhaAZT2UCy3HMyBgUD+doybbTZT/Tx7YXQ+rMyo3Il7hRh9zs8R2LlrvE0S9H5wvpcXGEIVN6hzenQeMAxk+EGr/s1lG8DgFjGgWZggkA9ig7VlZQj145iHZvQIRFSVIZ3ff7Gl9LTCtdllUdmWNbxzjLFKJUQ==; 20:99x39+7Cj12kyE3Q9l1hGpAYZ/uJKT8Li/IIYobJ+WpfIqmu8BovsCMggzPA6XdgnZzt9717fWs5fCuSKO0hear2H9jvZQpTtHgbdPg0d3dXpBeSFtSvwHF7TwvhtpRBkMERbhsqrm7Cff5Z1ejm52Scj5XmQlUsy4XD1yH0lUA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 08:34:31.4370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1514 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-10_06:, , 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 10, 2017, 8:34 a.m.
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -802,4 +802,6 @@ class basefilectx(object): def repo(self): return self._repo + def size(self): + return len(self.data()) def path(self): @@ -2066,6 +2068,4 @@ class memfilectx(committablefilectx): def data(self): return self._data - def size(self): - return len(self.data()) def remove(self, ignoremissing=False):