Submitter | Jun Wu |
---|---|
Date | May 3, 2017, 5:39 a.m. |
Message ID | <5bd87ecd9af71a0d660a.1493789973@x1c> |
Download | mbox | patch |
Permalink | /patch/20395/ |
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 1198F2C211; Wed, 3 May 2017 01:39:45 -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 DzOLnXXqiIUO; Wed, 3 May 2017 01:39:44 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id A18DE2C1C8; Wed, 3 May 2017 01:39: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 9C39C2C1C8 for <mercurial-devel@mercurial-scm.org>; Wed, 3 May 2017 01:39:43 -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 K6n14hhSxleo for <mercurial-devel@mercurial-scm.org>; Wed, 3 May 2017 01:39:43 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id 3A1BA2C1C3 for <mercurial-devel@mercurial-scm.org>; Wed, 3 May 2017 01:39:43 -0400 (EDT) Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v435cKVN028968 for <mercurial-devel@mercurial-scm.org>; Tue, 2 May 2017 22:39:42 -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 : date : from : to; s=facebook; bh=HCVV11NO18Bv6ugR5CiFcRvPA71lTv85c14NNGr5syo=; b=ltWt7aH8dGbxkpQJgTFTAw1yFx36uggJgwzlQl59v/STrThMnm00YimNZ0Rxqc19nRsV phrz7UMHPvfJCxWwd0uEbq5ptJZbISuRkJi4RUyYX98juBznXeaPHu0Rss8eHAIFXC9Q Cvxj0EIbl0Zci/U+84qzZFvQM92vhEgQTQ0= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2a795rg0av-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Tue, 02 May 2017 22:39:42 -0700 Received: from NAM02-BL2-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; Tue, 2 May 2017 22:39:41 -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=HCVV11NO18Bv6ugR5CiFcRvPA71lTv85c14NNGr5syo=; b=QVXXxQhZrWXXGWGI54x8fz6rCs/TUA76ZKowd6Ah0FAAq1OUOwevlvGrNwtu5aGPY2BhqiZaiQfmh+LjbSHlljfG+sFOd7cRT/aoByhzSfTUNSENmoxtduc/1dVdbvdkS34cs+0zgCTmrDRipYpUTsWH5HN1JeUnPlAQ5QJTb+Q= 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.4) by CY4PR15MB1510.namprd15.prod.outlook.com (10.172.161.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Wed, 3 May 2017 05:39:39 +0000 MIME-Version: 1.0 Subject: [PATCH] filelog: fix parsemeta docstring X-Mercurial-Node: 5bd87ecd9af71a0d660a8496496f3dfb13a17f12 X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-ID: <5bd87ecd9af71a0d660a.1493789973@x1c> X-Mercurial-Series-Id: <5bd87ecd9af71a0d660a.1493789973@x1c> User-Agent: Mercurial-patchbomb/4.2-rc+16-7a0ed9aad852 Date: Tue, 2 May 2017 22:39:33 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.64.4] X-ClientProxiedBy: CY1PR03CA0027.namprd03.prod.outlook.com (10.174.128.37) To CY4PR15MB1510.namprd15.prod.outlook.com (10.172.161.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58c11fc2-bb4f-4905-b354-08d491e6cb36 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR15MB1510; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 3:RUaJBbNAWoFrjd4L1z+OPmnxO6ePNkgzSbkXsi5v7YFXNw4iDcYx3a6MBMzMGGGXV594SPwu5vLqgTvy1eDEkN8o+xzw/YDH5nsaf6kzWhUdPf9t7imFTzbRTEemQrkyh62E7JaMP79lDWefshqDNXTRhUA0535pG8fNzg3mgbzXQ6UYrR40VUmnW0Qib8H8w5foNDLtpHDMV14VgfDeWYaoOP9ASe6O1Vna18Oy+MPOh1z7+5qrVgP2Yn0hASHrROVrVmgPZs4AVJ8YRCJCdig6XFdTYU3rmpx6XcMgYWIHwvl9Mj06dphZ3xiZWjRpgV/OJ0ZcbARygqRP8ao8OA==; 25:jOCi/xRdab8TeJnamx7xfkS9J4DyP+aN0nKh2laAli8eMYjQjIGTyNxDkQkzE6NU92xZEn42ILALyF4xTnDf4fDQh0DlfqtbNN+RIbneIUn/aB4PALX1q34y+YNlpUMyDRNszB78OQAzukOskWGWAtc28etImhksNwRWKmBkpDKuMdLamMJWvwkiWEkk3Lg/5N0IgFnBOgStzxInS42xJtZT9t6LhxoWNTKZ+WbFkRw6to2ZLtEc3yylT8DlHfjdnVEaIRgOZppTJ8evQLloqyXw4vcmt3KiQJqJdeHjroyK1hRgSNEXEpxVMj+42JCTBNUvML0yR3xmSIjYjOUnWzRVBoiW1dL6Rqo7m3RhB1U/2du0u4Bl79VVdNuZPnikK2RMzBNdLa65t5oNps24PjGfene0+jje4qNT5Adv47DvI50BmADHMsPqCqCNldWY X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 31:jTmf1E6ZHSLYdxCRev36fxIRlCfr/voIRUameT8eXifZy8cD+ECgcI/FRj+jG+ctbD6GXlsD4GiH8leFPf9Pt51IKli1XR7WxYAEpU5bFWn5PiICpnWCd91+RCYrVnTL5sC0iJvDAndUiZHGr9utS/l+ayxt0dWP+GdH5Z7kOpOJVjzajzizhIpB6xlZCmzUiYSKPl1BhwgILP2A4SP2B0xxGbQGrmj3Do4CfunODhFTkwdXlvwSpiXow18fd2I2FhY7xa0J6nweiOct0KClHg==; 20:D7YRYTLM84B//rnkkyqDDctNh7l/ihF9Pm/IVvDT3wF4La1Tb+yV/MHvloH3gWntcpP9dQmvS+diVbfcHpLehw34Xa94YAx2lpmx+Miqh9tpTVdrrTsYnfNCVJn45awttRXcMXfZLR3FiCSS2Xl0eCYGf6+bqvyZnoFV1pL0OJfKthgX1cnUWw36kMavPcuWfmeNBCesab2MPbhHf2/O2DDatXp126nDn/jr376Au7Miutt/emlLYzbCpAV5lYki001wwWx2Mpfs3miDSdSCo1eS+GqrIlZ1kcJQW943dhfnREeg/R9vTeHrmFn9omM4L+hIsRzAcgvJLf+JPLcBMHrSAQVmxJBCPqTueRThIp+AIVDbQRJdUphnJVARjrmntjsW2J3L0JUrfX251PJ4/EvZJupaqBCokABrUTt/ogeEw4lBUiPaG8rWUOVDa82iu3tsAgmYUmcgU5eylBu3HvNAgNMjP7FDlXc4XINtP8Mwl7Bn8HIIb84RjJ92urFd X-Microsoft-Antispam-PRVS: <CY4PR15MB1510EDAA2981A20AA42AE82FCD160@CY4PR15MB1510.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)(10201501046)(3002001)(93006095)(93001095)(6041248)(20161123560025)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148); SRVR:CY4PR15MB1510; BCL:0; PCL:0; RULEID:; SRVR:CY4PR15MB1510; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 4:RhrzkKyB0yrSeeXL+en0k54McWtgTExyxD68fKneytrVu9dHgpX24oVf1svljDI03XzuuE5oJktwkFVoRuzQIla8MKg7Ct1r4XaQlv2SsfHeV7vRUxIZZeEHxfnOOtVM0o/ufheU2+y93wZ5bT7ls3V0lYGFoA1Vd9WRLJZFRCtCviX7027vvhl26F1njUvcoUAS6hod7gyoQLP+9lsy0KAvyRCwFDXsSWWZITOKShiwE6iNhwocOM866Hl4O5Fe4P39XTkUYQ9JRKKuimQWL3Qr15hwju16M4TVJNucmDDcYXStYTMCsD4Tnt1Y50VNe2eGTn7TMJQug+BeDcM6zweXpi0njNFIDJBbWgpbNt4g4KwPQuHHIiORcHafQQoRKWyOugeaO6e9ob+/3ZXWi8KTrC7mS2X/OlQRao18trmhiAIGgQB9D+aPZKsImH5U9cmDrv8owy1oEcWz/4DZ63YMiVBRaNflSin0DpKQPPDdJ+Yib4h5e5X3YnxtlKu/swnE6M7XtRt4ZDd2ex+Tg3Aaf1hW06LFQqrrrNRWoDsfXlDF2A/KlHyYGsb/gZv2Q1lEgbtYGdey7+Hx6bGUK9llD/DSTa4hXXevPXBPFBReoXTCqJMFRFXY2Zf9WR/rRAe4YtlFZATI86K93wvK6hgEmyn6qmh/v67f+1g+NSVHhbLoRMS4T6XqL/MduaOKZPANly9CMZejYgL46uBMWeTrpI5B7FNG8kDPgIrsz2djEqBzfby1NrCQLNYh49RmNtOEFHMU75K07czszSuo+io+sG9Tn0/Gozq8negYYJQ+mCF7Ra9eexvoGmsYY1wNFTHkOQkr52UqNOUEnOyPrI5MxmgXw/HZlrEfKVy4bUk= X-Forefront-PRVS: 029651C7A1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(39400400002)(39410400002)(39450400003)(39840400002)(575784001)(3846002)(86362001)(6116002)(5660300001)(478600001)(110136004)(47776003)(83506001)(8676002)(230700001)(7736002)(90366009)(6306002)(77096006)(6486002)(81166006)(6666003)(6916009)(23726003)(66066001)(54356999)(9686003)(305945005)(4001350100001)(50466002)(33646002)(50986999)(38730400002)(25786009)(189998001)(2351001)(53936002)(42186005)(33716001)(97756001)(46406003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR15MB1510; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1510; 23:IfGrGFOD3tnukR/pTocPInFVdadwwOJUEFL5PhG3Q?= =?us-ascii?Q?KG6ZWn+bsXodF364wZeeWGBExYFSAnXFogEWR96mhH+QMLY0wxwqKyeocXZo?= =?us-ascii?Q?GjxCqwZXn5EkOlLfgjYywJRDy4fl6UdpXhDqv+GOESG+TsKFo09ySAeUBaSi?= =?us-ascii?Q?LSe8gjc39uAPaIzS+FhuOPF7F1YJl+PaqA9pJ8xrzfEpcJ4JbfNm95NvzQaa?= =?us-ascii?Q?zFSpCZwnpfyeRlWHHDnByRH+ZQ7IejKKBJ62VdgJSWKa3r8syS9Ylc1mZ/aU?= =?us-ascii?Q?yOcpx5dKrM1mczMM231cqTFJPIXGkBRbGjRQGqjxN2Jkzxlq6Wl+CBePS9Ep?= =?us-ascii?Q?tB3JbA9lnoepXPOHGGzxerNz5edgreLj7oiSHgll1MVk0y2adBZjiWIMS/ib?= =?us-ascii?Q?ulC2YAJmQVjur2ipHBJM72yZYgGLSdCARBaeYxG60a2fXty5twn5boCjAkxG?= =?us-ascii?Q?G6oiXSZng9QZODcuQ5yibbcCUs+oaLdX05i2qiOmwWsn0FLlYr7sfm0T5+nF?= =?us-ascii?Q?O9JAnHlnhE26BskGOtxjxzWBe1QcAhdnroFepjs5BFgeUxGLUV87TMLFFV68?= =?us-ascii?Q?9rFKr+xqfxzvlbcLwidpIuiAcO7jYZw0jgXg7HAKN+4l8L3dMZjcirTU3t8+?= =?us-ascii?Q?KjVH+TNqOUOXvF47dz6jxTomOp2DzTEH8pe4xVGHNPw1JH3nOSqrNnfSK0eE?= =?us-ascii?Q?MDnqKsKMN4Sevpl72oKuiqzNFOV3dDHgb0kOo589QZzfU9eNTNPepFiyxUdy?= =?us-ascii?Q?UhJ3ko4E2QS2TrROXGT/vdlHkRwdLSdoV5C36KZHtO0eJcR6qxl9h5QBrwlf?= =?us-ascii?Q?X5sbL9WewLxgE+5q6ARrEfXZDIfn4+KZCMbl7LNO6A1okWeFBMNXDHAfSg/n?= =?us-ascii?Q?AT/rTvQTzi+W2Fi0t6+3oPK8kWcpJjEqmsHKo6VU/pAoJaCd8yfqeYaK2Ir+?= =?us-ascii?Q?NTE+nwzszvXTrR+5p3CWLU9hU7BNxEZ2/r/ZKSwVfFpqOXgqPTvak5RLvpFF?= =?us-ascii?Q?JQPOhUYZzfcIO6nRhqgjAt/pEHy0mpVAf7ufnWsJBrrunlTXNECfSih7ZYWZ?= =?us-ascii?Q?Us6FXAOQmIP1XBk5931fCWC5c/M5sfWjZtgT7heVfT8nRnznA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 6:IHimdA9Bq+VL/z0UFqAxC6vhg6zc4m5C8SI2XPXFmTAlVTZX5gjNSrTILyiEiqTOkjxw2hrw1x5m7MuLBCHuQnqxAev9eU/sq9SjCR0XljfovXXf5pbTruwaFsg0gdiH3tj8gEyNEEjJ7kXECEa19aOlsZZ17IxKt+qRRt+1qkevSW9L5wo7z4nGMH67JygHksNlx8Qltrbc0S3m/4ApEyci0WY8fIK3zYcK/eMF4VD5+yV9FEvWhvQ5g9dzn5eyCO39N4iWkE3Wy7q6mTz029Jb2svzvmHwXL/7Dx56VlUe28446xSWywO/XRCvaXSMruCeWxTcECzhxKaurUn1hYqVFoEpGdc7OtYPyErMrk1nry0EPe3jVPAcdgVbv9/jdEZZHzmnf7C1s8KsltwoDjZZPLVSDCtuN/IQb1BT9H9s+C/E2mxnK/TV8/LkSQVkIpPSNvaTEvlelM+i+dbJeUHSURZ80hEiaZoRvqsQRUOlTDcLtJqkooje0kcxwAXAWU8cfU9AnEPdoZmZ8fuRsA==; 5:73jDJwJ1cqcf2H7jOyAmDbmhzRdFjnTw6MJ1yfByDpgUMcMxJTU3eQe62jE8METCJWmDrof+0iQUa4qP8NXMw+dLpgcB5e9WoxKmzfn58ovh01OhrgePUTp0waQPEs+qC6F55EUqWrtE8wGx0Fcylg==; 24:X+o7TyYNDJ8jhGO0WZreolQHS0LkfUqpbJedz0yqc5TtiOOKYgTIj0G4V9xaQtbF1EP3/zBzhJ/Mg7eTjGy42313t6BmQDIugPHQd+pUumk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 7:IK16ymEfC/bq4+G7cg+VBx795qv/vhrckgGgiKOJhfT5j11mEmna3VtXtSfD9htC3wR2eXlGKO9yrYbjHY8Ifwz8dMGD7oGJAV+Cy3aZGDdkqak3iCt7B0YEi3rThKnh/X0TyzRp+W83E0rwoOMA4HPAnpJVX83UFOpPzdqzt6iAv8y8y7wc1abiPMRJw8RyIDYlcfLSt34zMr8Lprc/lQSq2WoBLXxnwK9zoEdlW2nqu3MePcqCPqDO/3qjHB14YLe569g1WJ0fDQJWkyhc7YmOx4E7Lpo5VR63193vr56LsX1+6JfaaDzgO2D7kL/EbTiHFck2q5l/Wfji+6qXrg==; 20:vMJx5svY/c70gf866Bz9KzJrqqZ29X4o3z6W6qonvfI74tHp/IfXQ0+inQ38eN3xUWRwyDDrfDDLOSxnmhCEHrNOkRU5mluC3DmhYcNxXM6TPT9YwetNBP9ncd6nyJTtz4nlVQx7Qh4LqWfiytp+XOKl4b0lVMwdY4jrl6vTbHg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2017 05:39:39.9884 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1510 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-03_03:, , 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 3, 2017, 5:39 a.m.
Yuya Nishihara - May 3, 2017, 7:56 a.m.
On Tue, 2 May 2017 22:39:33 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu <quark@fb.com> > # Date 1493789954 25200 > # Tue May 02 22:39:14 2017 -0700 > # Node ID 5bd87ecd9af71a0d660a8496496f3dfb13a17f12 > # Parent 5f8450df55625fb0be8e40eacb662717fef33de2 > # Available At https://bitbucket.org/quark-zju/hg-draft > # hg pull https://bitbucket.org/quark-zju/hg-draft -r 5bd87ecd9af7 > filelog: fix parsemeta docstring Queued, thanks.
Patch
diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -19,5 +19,5 @@ from . import ( _mdre = re.compile('\1\n') def parsemeta(text): - """return (metadatadict, keylist, metadatasize)""" + """return (metadatadict, metadatasize)""" # text can be buffer, so we can't use .startswith or .index if text[:2] != '\1\n':