Submitter | Jun Wu |
---|---|
Date | July 8, 2017, 11:51 p.m. |
Message ID | <9a325ae88021e0e02a87.1499557893@x1c> |
Download | mbox | patch |
Permalink | /patch/22143/ |
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 380AF2C290; Sat, 8 Jul 2017 19:53:41 -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 1d5NHwlpxAff; Sat, 8 Jul 2017 19:53:40 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 239212C295; Sat, 8 Jul 2017 19:53: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 F03382C28E for <mercurial-devel@mercurial-scm.org>; Sat, 8 Jul 2017 19:53:36 -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 O9UJOraIpG9G for <mercurial-devel@mercurial-scm.org>; Sat, 8 Jul 2017 19:53:35 -0400 (EDT) Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id 49CD52C26C for <mercurial-devel@mercurial-scm.org>; Sat, 8 Jul 2017 19:53:35 -0400 (EDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v68NqPd3032681 for <mercurial-devel@mercurial-scm.org>; Sat, 8 Jul 2017 16:53: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=bqVlcDUlzYcFx+MPl9c8lXYNTgPLnANs+jxnezYWNNA=; b=ZRK9MgalqM9OUkrGVPtREwgdc7Oxep61tUUrl3N2BJrGu6CjuEdCMZhliVlTFuMFQDaq B630/DbxIcysg5H8DA0ystfPkNaNe7xfbuBncrprzceUxBJdZBDeFMSTLWV+sI9o7KwD 5Gwj2UteAXE28HM3wjDnMSi61u3Fca4N7Q4= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 2bjw7d19rt-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Sat, 08 Jul 2017 16:53:34 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.26) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 8 Jul 2017 19:53:33 -0400 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=bqVlcDUlzYcFx+MPl9c8lXYNTgPLnANs+jxnezYWNNA=; b=fTSpcWPj4IgHDJC8ok2gCLmuOOhp5irQf8gQmOaRMhLDXnszNyudx0HrFYo/TP53ZDHx2IjhjmPm2Nd89tkBl0RzFQXIcx5T8iW1Vce3iU8AVGmaKBPkTX/y5/FsFLiGuaqS8FO3LFcwVYBx1pBaD75tQFHjZqcSWgBvWBhyHjk= 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.3) 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.1220.11; Sat, 8 Jul 2017 23:53:13 +0000 MIME-Version: 1.0 Subject: [PATCH 5 of 7] histedit: pass multiple nodes to strip (BC) X-Mercurial-Node: 9a325ae88021e0e02a87ef1ae6baa8a199405140 X-Mercurial-Series-Index: 5 X-Mercurial-Series-Total: 7 Message-ID: <9a325ae88021e0e02a87.1499557893@x1c> X-Mercurial-Series-Id: <13b585039b6ee38f06fa.1499557889@x1c> In-Reply-To: <13b585039b6ee38f06fa.1499557889@x1c> References: <13b585039b6ee38f06fa.1499557889@x1c> User-Agent: Mercurial-patchbomb/4.2.1+850-c6eb0d49ae8f Date: Sat, 8 Jul 2017 16:51:33 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.64.3] X-ClientProxiedBy: MWHPR14CA0028.namprd14.prod.outlook.com (10.171.142.142) To CY4PR15MB1510.namprd15.prod.outlook.com (10.172.161.144) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c447cd58-c6ff-43d0-9b33-08d4c65c8011 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR15MB1510; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 3:FwIeMbNmEqSC+kSvySHn5bD9FEkS3dNQ4LA1XEjVDk5psnIMD38wHiEQI1GlRj4kc58a+X+gf1bUbRlRamq2BuBn6XdBj5X8s9pXTRVc70VRY6nwMYewep/6WdOXoKqAvhXLkiBJ75JPpb4kP0FmHA1mTlQkEupcNbbU3P0rru1cNP0h3/5LWZO1W0PgMHF17i73itiP+Qc+2bUKZahiDNBJYspipYhL8IPQUHUhvaASleyz9CZJ+vTfn9wKIBx5alv5jM5efZ1PM6Sn0ut+ad0YVVFzAFzRD4Y6c5vSQdwJf+JtEXKlfBJI+1ggKB/09RgipfW7QWg/wEhVkgL7ffH+aBfMEnKE6vNS1n6V//rezNXKYipU4ORzrx+eivULq8k6moSxq8ppnYQUTnn8OI0uRkM2/mw3WRTTIU7OpGQ6lpq4U9lpgtl1ATpCm7vsFwCv8RlPhhui9vNOFmhU8zcYEGSeZLT2CWoBRBaK0SLZTwaoGB/zmSZ6hySAOkkgFcFoBN554G3YyRfl3b4r9508bOw5F4ohjMN4e9fL7OGZxqTCnuSf8qNNTbObdU8Do7H+DiXKbnvtmuPAQPLS//W0BZG0/CKcbN3LRgpaua8RCk798UwH/FHHCdmBC2yM9dT4g9yk8tLSaDftiNGxhm92UM2Exd271ER4ndSlKZovIIaVZGAbrFP+Ero46Lq7+PLfa9g7h9tkC+0GhECufKy5zEw33NtX/HeDseustPE= X-MS-TrafficTypeDiagnostic: CY4PR15MB1510: X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 25:UR3Rqd5/BeVHnaMh5XjI721BWXYpgqXCN0XbBy/y5sEqHf3d6yu2Eog1OaYjYgM0jSrRHXMVKfHUDM3e0D/JQ02uaXBhY+CoMVwCtDaAwD+A2eLDg4qSpPhG5ua6VtMuZ6yNUyon3g1kRxk5ATcMzTaDQ4bBxCaXEAU1+fJOZBkjAFr19BVVcrNenlBU/SJyqHKtGLiPccXWU6RYST0tovZ2INai7kyJ5D6y5Q7uVP4cdqYT8SaU6t06wPNkgQ9lH29PS6QBg3c8ldHOFt3TS1NNHGn0SSIWLadDuCRwLEIEGEgDFpiiG93ORUyyXAAEfXGCH9sw2p0riYtvoGdL1eCncYlgAgHO42G3j5rOlLfEOs4FjEu3gOx80zoW8VuiMuNhiHYIinH8YlwzDeATbUJd5eAb/9GqoqOoaGimrLzHWGKCdh+LK7C6n1dPi8YoNQe+N5ZqU1K6tHpqMCnLHnYt21vg9jJPRaitIKEHNkmCsu7X2O61xbwzeoJzep02aGcNMttVvOGqBUUR2E3WK04O5I8BffrFIrt08zfA1n3OoZmT58FPNFW7RQJQ71VmZcnY2sJ4ZsgvkYOf2ETQG1vzlxq1gxK7hvkgpdx8IdpP6KloEhsWa3ETeNZ98rag/CUvYOzPwptPOhoRJENT7CQ6PO4i9SHLuGnWeaRQa9+J5isgGt1ODEqemPkZAHF8Z9X8sX83tknyxSuAwuPfY5IhpzOitVW44qA9wjHL8Kad4gyO5XMWHsIYXMdjv6u4o+qGLIm5kIGxUAfxGwG9MQVBIWH+Ope6CIBRPEYbsNoMbEb3GNwmSdFNAd32efL6uOurx4NdRJ5/NEibTrPthPuCvVsfBBFWMAAiUDJmtQCMZL6FzcpPptbiu+4Ewjx5Q2lnlawXZD01HyWbuuDO3pPqsTajwjhEnpur6KNr0oU= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 31:4KGoYoonrn0ttWDNKdJmoMz1HKZraVryMqAbydF8eHuxL033o3277ljfVGpA/kcW12mTeVQDRE2kBLz6a4XS3grNttIckbb+oQQ7ali0AJ3w3kz7WcLY2LxrdfvSD0WBo/leAjHaXrJnMMQ26YbU07rBs+pyCWMGFY1fsS/fbIWId7KGQqVpaWlVRHwNhgOuMM4r48ihtmqyoT9xGZ1C21mIJBacaUztX468YZ1SAOjlpSQs7NDZiQHoDK1Ds3RpsJw8xIfyoJ5IN8bB4QJa26y2J8Js8KbhoXNxyyON4zfU0Pg2v+oMb8fMmkf3oHnJ+ViiBtdFQ7GK6ToPkfCwlRpGGmAUt09XHePM3B4OKdPpSdnIUKQaaepuxU294oAiceRl4WvbRhaXsQzB4mU2q06yNAJxpo9rHvhWdt5muVKlWAiusrGcfpGToCVrD/M/ASTRkRK+LNLvIzknaj28n6XvqsrxTRwXpMB8RCmojEMKlDP71t63iL86Apeg3kMUagXzCJ6hVtxDDkFoyMzQ6VHVDuMHPaBxEZKfNKck/eJVsYwPxEidZdgu7hArijiuA5R7IuH1zntdSv8Sq3nFobXtXuD3xQp6aNZJA4Iik+VBq/8peRv2+XeAG+NSMYhno56xe6knvWXIpHP5tfGRRPHbRIzb+Xioe1uNJteJR3P3ciCjyPjlt875gqUNma74 X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 20:NdFxnK7VvIoYUFZ04o67B1WDzxOrR1UCNP1neHXEMZs6IBCCbGrayBg2+uM+J4o3jLXpDECwm9e+FGe3xreYrIKpqk4T5lqB+gmriHFiOcpb+79dddET6nPeuV80CUJjvl7E7iSOJN5cZu5v0e3XAYs1Ip7S0iG8+WearkfJZIe1LlCE2nJe1Nsde/MgYVrj05ZfvLJ9URVtExka2GctHLi70ZY0Vd74DdUMqqNDRzmvQu9Is7T5dawgw5eA/oEho0wjfKo3Wycbkr48UfDhGD5RAKvt7NfcJQjmB5hizFIaeYG17dm815+TRadqi74nr+5q/3LqzImxm+OlV8TbBOzTACK6rMpWAwx4N9ZIsxMxLa9Lx6f2zBDBcEulSiSHqUpqY9QKxYOxoXno0qRyW5Z009MaqZhPP33LITb2/lxkU66WyZfo8vlCfKnGcrmv26VasJ3hH+B4IWGYZ9zABO+EkZZV3QAwUsDCSbOCvFrRFj26lavGsmOWJosN1hok X-Microsoft-Antispam-PRVS: <CY4PR15MB1510F373C0AF14A7B1B9C6ABCDAB0@CY4PR15MB1510.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(67672495146484)(63843785518722)(247924648384137); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(2017060910075)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR15MB1510; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR15MB1510; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1510; 4:82Fx0yBOJXz8oylJrG6fAvLLvkO+49Ldl35pB3YjvE?= =?us-ascii?Q?ZvLtVGf+VOG+t6RFkAvxdHWVQeJm3bNwqmD48JKXXAzQPu7xBRZBgGarT3cF?= =?us-ascii?Q?zrVjL2mlBwMlxe2iCw+KoJVq4JnCj4o/QTSbtc7TnQucilEddNxEibAcQ/2A?= =?us-ascii?Q?j8GUG4D6hO0YxF3knvnT5gB4k3OX0iFRcWlt0PzxM/6ZXZs4nvdDNcxEqZRw?= =?us-ascii?Q?P5XUYyzDxjU4pcS5zilIPNoGKAUeSBHHAFQ149Xc6oOfkv1JCE2pGWj8c68l?= =?us-ascii?Q?++DsBLT8M2A7nZElrsJ7TM0HGeEIoQjjpluCiZkHQ2OAJauuj0zVkn3zBTwc?= =?us-ascii?Q?XbDn+1S6tv1mtmA4uGl9FPbbI2Po15S3ka5Aa74MTOOVnLMtFYrSYbJNGaPn?= =?us-ascii?Q?gR6MqCBSwNvYDNNCdrpyTMRBi/4CATeT8/cTAD5lB6U6WPH2SW6hSUR2kDuw?= =?us-ascii?Q?ld/pO+txmnBJ7vtdLYSmcMfNuBhds0E0ufYm2Q8i6o3+BuHQhdUmsxugk3Gh?= =?us-ascii?Q?K/r+Yovxt55gRFDzmOpaNqjQLV8JU+CFl2mzthD6GV7IFm/+YuZXX9T0L1jw?= =?us-ascii?Q?b6wpPbVRmGWwqQJTR7cqaxNDEGRxPmuvYw5BwdBbPYXd5zYtwIcc+Mppfwew?= =?us-ascii?Q?/EKjZFuRVgvsYS9T4PvEbLOImNhC9qjLN+1lkNpnHBtDQybquEybJYsxmPFl?= =?us-ascii?Q?9+Sap+4+R4FazxJPzHGQQ/+uL80YmV/9qnHJsqEbzCGPRQGZA5YZISNlQiNj?= =?us-ascii?Q?gUviFRQVxWCPajKjppWPPa3q+BDLOMm/iPSzR3rxi2PxICDjx7gwfFoSZ03n?= =?us-ascii?Q?gKT0gwHw7rPkv4unPPVFWbOl2inS+1W4nDE5y0IwJa/eTpxHJcZcWZw6p471?= =?us-ascii?Q?5iWNp1sAUW3a1v3sGSAYags5urUljV2/Zi+Tmogx7ox/WFizaFSA8QAzDlp7?= =?us-ascii?Q?5C18iLI8vsH/8rAztE5lpptYuuV0oGbQwNgc86g3hcDP3cRnFKLNQZVV4iTl?= =?us-ascii?Q?c8s9LnxJSKv9dR+Iw1sCypbOd3puSyw7Dr+DqynmotVhETigEecodmpDif6k?= =?us-ascii?Q?mQ75Vh5MQqvzwsnOOGrCMOqb00i/PdWqfDDH3sYdg9zqWV4Cw15PyRbvsSC2?= =?us-ascii?Q?qwEUfxJ/JvyefBMHO+FFKCrZugcqCJRKT1vMhwcDAcyhuAL1mCYxJvIY8YT7?= =?us-ascii?Q?mAmMg6uDP+RqBxnwaFJbHB7CiqLy7xMu7armBsUtgJ6O3kX3Jg7STS+W0r+e?= =?us-ascii?Q?+5dRVFLp+1NOubvIUJuibv2CQ2RIzVnkqNc421g+sQL+P6XH9s9mcxJoymjs?= =?us-ascii?Q?/8JYkLzElhyyuS6oixSEUiayVyhfngPHb/rxcp+xl2?= X-Forefront-PRVS: 0362BF9FDB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(7370300001)(6049001)(6009001)(39410400002)(39450400003)(39840400002)(39400400002)(50466002)(2351001)(47776003)(305945005)(66066001)(230700001)(83506001)(7736002)(2906002)(8676002)(5660300001)(2361001)(478600001)(7350300001)(81166006)(2950100002)(50986999)(33646002)(86362001)(77096006)(6916009)(25786009)(6666003)(4001350100001)(97756001)(575784001)(6486002)(42186005)(76176999)(23726003)(90366009)(110136004)(33716001)(6306002)(966005)(9686003)(6116002)(3846002)(38730400002)(189998001)(54356999)(53936002); 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:mSxTqiCJVnV56vd/JCh+DVmLEfOFqmvpUVzUTxyXX?= =?us-ascii?Q?5Gij9NPvFgzbT7U0PX50SpCJISHwu4SDKZAUWsZCOmRK3TjeFdg9RRa0aSzH?= =?us-ascii?Q?GokDv9OpWlltvH71h2yJWqmprqGvlFU3aWkI50hR+d0bP8uIeasTHbSVSYKo?= =?us-ascii?Q?5LYl0c/WiACxXrxQHLJKD2Dteu9pNikkpkqQrnYgRa9xFZRCoRy92vhpRPc+?= =?us-ascii?Q?FD5XyLP9cxOwhuLC2JPiw+fKKa1isEbI9pwFr6FpZBRLcBSlvlg9gpivt8ju?= =?us-ascii?Q?NfizdE608sLkrqeVSoPZPK1JB1O34n6814yztywxyH3sYvltg2EWEqvghi/N?= =?us-ascii?Q?uPR9YBFNLNAIEVD+Jpp0Poh8lOTcKQCFVVrQnYfJMV2t6IxhFCPQDULxhB19?= =?us-ascii?Q?Pw6A0TX5gIEaohbkWfjFvQ1zP7XgFclGUOooaOygI+ujsOXWQaTc3I/S4k1v?= =?us-ascii?Q?0VM0AfBwvFSFnmEFb7XyOrjtbjuc7qG78POk1RWokOUHGc/iCTHmtC2cMWy9?= =?us-ascii?Q?mMv02/XjGI5UIROfWS20bgDSptUhTbof6926hqqeBTkw3703skAYFI/GSh2g?= =?us-ascii?Q?CYQnxqnCIRFAmF5erb4F9+/ztDDU/6mIV4dvraWjxzmtgmwcJjPI4faSXj3v?= =?us-ascii?Q?PRfMqCbnmXVH/3JvzQF6v3MdmmEZR9MfZFBJ1wutapg43m5KukgjTCGyZLQZ?= =?us-ascii?Q?wY0gn/pWdMJ3TaS/qehXjQSJr0ih5FoZ/SWOT+ymR5L+UY9OHb3R5dmtLYIb?= =?us-ascii?Q?UKqYdFn67R0Pq5jaAdTEDCAyuwUIOKKBQjEUTqS5nuYj+Srnt3Tl5HucydA8?= =?us-ascii?Q?Inv6U/oUWcdR9YGnpqgojZp+T9jutj5rfpf+1AOL47YrVh2Z9PnHSZ1zHqQX?= =?us-ascii?Q?p2blFXGabuFXMmxR3wqM2ThDYyfVfIRMZyA/xv/YOZ8nSFs9RpS9Mkhw8POy?= =?us-ascii?Q?S2gHaGxm1lgFCQRU87BKMAZrCrklOGz1VDT5HpjsgTzn/zTekPeoiRsvr5Js?= =?us-ascii?Q?A9sAUNmGFuqWuHmdvigy6DGoO/d3FUFEmMEXjPTqSxZqGePovUi8TGANFLNU?= =?us-ascii?Q?K2o3qolGRA4TQuGMSvK9+lD4nkZ69m37t3QPVRGW/FsW0BV0ohpAqDRFVXPB?= =?us-ascii?Q?z80dF/CJobc9K8bMOKFGPnMojp1oB4PLoGCRQ9KNHzaaFqos2LUTes3drIFC?= =?us-ascii?Q?bvLgiGEONrJzpR60GU9/+1O+3XOvKdKeoHeKXyd67pTSbJtKEEvybrGKHjVJ?= =?us-ascii?Q?3sAqjA4dz7+GG1crrU=3D?= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1510; 6:ASC3qgwjARMaX4paHJiWEhHdk3AqpeQZNMDVnCOPJ2?= =?us-ascii?Q?EQCHMl5iWw0Txxdu6td3eG6fSnB9Elug9AF3LSFwMp+NKVnvVtY1orY7QXEt?= =?us-ascii?Q?g4t2TEovcREaMmrzDoNlt+zXRLILAjygH6tufpC+ShjKURTbT9U+vWtXaIHK?= =?us-ascii?Q?V4s+hQLIC0QQuL2tsvy66lzk6t/Ny3sM6Ahgf9sxSdP34WLlDoOrcqMM+7ML?= =?us-ascii?Q?zyIO5Pfi2EdDtnCXIOlil0BSybvPIlVURqisqfnMzO29PDhX5e5WQlZWTP1D?= =?us-ascii?Q?J2wnI/+fGp55CGQAD9vTYBXY7REdZ4EbOvw5RLruoBm3KESXnOujcHeaQu7K?= =?us-ascii?Q?wbTdBO04JT+HdSmj6bSby5K6307cTdhmKRltWpzBrQJTOklzMcKF7eAGVBrP?= =?us-ascii?Q?5YmaP7xM3nas1MmBipeCN4H/N2qJJ8kh/U3Pt19XSsOisoTDoZfir8SdflNg?= =?us-ascii?Q?T2GDeUAh/qmwb7SAjvw9WeNjpcC50TmhLe7NUDV27eo2+lc1SKqvUahT8u79?= =?us-ascii?Q?hTIzLKWIFkbedytzE0mJY4K0H4YeJXyHoVId/q4GAXsQ4uC8X9tD2K4ir16S?= =?us-ascii?Q?Gmk0FuoomIj2DInYSlrg5Wsu+/Jcy316vFELSFSp9XrJtFFMNIrsYay5EmTc?= =?us-ascii?Q?6ijPr6vFN/3y2CfkClxYQrwvxN2jOe2lR4Jb3gbz9FAGIFnEr6q9wNd2CxM0?= =?us-ascii?Q?NPQWXm0eXN/SPAuN1SWssbZvf+Zc9Fr/57bFhzJfMfSQEDpAAksoUAtz0XpQ?= =?us-ascii?Q?D8KjifXAak0RvQ8w+SVJOuX/yvG449y37MPfNZTUXUzf9hwpDc2T2NgkwcQn?= =?us-ascii?Q?f9FlUXnP7EaERSVG2CdqZK27Skv9DCP4Ftg6x7q5Uw58VPM9MvgyJq0otgDp?= =?us-ascii?Q?3ZDQ2iKlsRx6vF3CsLMIgsWGoU4NeqEYIhuWsnb8tn8uuzqk4q6xirOmSYrW?= =?us-ascii?Q?BOkHQUAM3bZ40Mx3Ed+P0TriPt+ew5bnTQLuo6DtVgzeKADmrkUuOOOz56Qm?= =?us-ascii?Q?M=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 5:c3eSw4xj6rIGU4sy0aRyHDVOj4cEDUMfDfBfp/bzzWTNPaBiGMl3c8nZrrsShabL58XZmifDXoyZVvEBhQMoJs++4eh0Ln8/ZBJsExzoogwJn4EEFBFbuCQLoSrsct+pPX2vSqczkFysT2NOx+/OVNvoEaHuupC0ajzN5evhNfdBPb34KylKi1ZbtWYh5wVM4BsDy+obdqMKYd+Axfvn+REiKKJ5Aa7bcTuE27nRQEJeZgXVVmtDdhEZKyZVamJ9+5rgucVmG+utOzv85IOaqOPGGXUm/4TNL2G8xHONMXjqUeSkIAAWaQBb/xq8zsMTg9h0vk073HtGEHmTbsnHgwYtQM9US0i4/SKT4+7h7V2JvFVDLKqiF2CPwz7BJOT3k4Sl8NkiZzI6GDBRYC0uFpV4f5dD3v1okg4oHmhbwRZhW9BoqzCfGQ/U25yTnMUCgfviuDJmbjaqZGNmr7mQFSFlZ8rlzCsJM0Ql857bR/hSyL5M5t8qyR9Qu/cdxmYo; 24:BNFrlA586n9PQ3m4e6Hlqrg1JBn6oVA1W8wsNgz3cP72+64qL2zk4yu+KLdUS54wir6KT3k82iK8VLeQfAWuHCGPZ+yHoJ5TYPp9MA/80h4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 7:0dUuemvLPfLSoDi2U1XZrx5v5uw1scwVjBQEV9jbubLeQCk2teLOMHjz7H7Iivw450T4QK6gOQOb/MWrC1ERkpb3B6KGEjxV0+nefTlVe+GiW441Yiz22Ne5DUfv6pAdfmPJtigoLOIRx+VhmM332gbh+UUR3yih1WO+bzZ3zXJ12WBE2qORzDT/MezSRPVG2rH/kNcY2BzVDmmMsyS2ESW3T9VtOyF+0RyhIDaf9amZX01Og47R5CXw3RajuuyR0x+nsoG/qfTn6/sI1vw+mbE9aiJQEBg5xW6iUXmKeam/QZdvmqOHSn8dgEoV/O6jQr5qsZgxdNIHevsTqldAXFf9oxw7GYfcqDA9U4pVYoBfIQFP7bC2aILT/vz3NH8QR3qaTsvgeFTibb59gr9ZUhDoKw8S0AZBVskNZtmVNI6JwPtbuUM6sy1faPXRGogtSJzctj3LPVZ3T5SEtkvToXMohPNkustsDBMCtqHFmjoO3yKPKgGGeub9Sz63d86acD+Ytc+ydywmHN+GuzdozuUkoe1hbK/GKz6Czr66fZQJVKgFg4qSbGuYVpKrHoEQYSZqUEp8TCUIdQAYz3d4VouUZ/h4Hyc+7Zor1lLamvgB4KaXZi/hsxXB06HsTi58e5FXZ8C9Zdw+SgI8dq28uRHjDx03s7izRu8+h/5JDZskldDDWEXZp8/FNxrKX2dbJVf2vaJ61ARQdBJPBO5tp6hDzE3pUjDbDXr0YQByzkF/NG/+AiFJ2Lxqeghnf/SZCgU4Lex+FLbUji863jxt37/1oOeeHfC1g0Agzy8/PGs= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1510; 20:bCU+FRSRMgSUmknm6jOUEOUCTJPZV6spgvqAuZyHtPJdlDCd85rTH9he/iknu/Ht9kmFkD5ybbfYRKsWaDXBs2tNpD1g6UeRkciwELirZ/YuXBV1tNKr4eNfkBh1UQTH/jDKlOVWWG5jRdDCeDE9hYjJOYf3gDdMNswGGV90X/8= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2017 23:53:13.4167 (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-07-08_09:, , 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 - July 8, 2017, 11:51 p.m.
via Mercurial-devel - July 9, 2017, 5:02 p.m.
On Sat, Jul 8, 2017 at 4:51 PM, Jun Wu <quark@fb.com> wrote: > # HG changeset patch > # User Jun Wu <quark@fb.com> > # Date 1499557831 25200 > # Sat Jul 08 16:50:31 2017 -0700 > # Node ID 9a325ae88021e0e02a87ef1ae6baa8a199405140 > # Parent d1b9eb1ad8ac5f9e645337034594862e1ba37092 > # Available At https://bitbucket.org/quark-zju/hg-draft > # hg pull https://bitbucket.org/quark-zju/hg-draft -r 9a325ae88021 > histedit: pass multiple nodes to strip (BC) > > Previously, histedit.cleanupnode pass root nodes one by one. Since > repair.strip takes multiple nodes and can handle them just fine, pass all > strip roots at once. > > This is BC because the number of strip backup files may change from N to 1. > > diff --git a/hgext/histedit.py b/hgext/histedit.py > --- a/hgext/histedit.py > +++ b/hgext/histedit.py > @@ -1604,9 +1604,6 @@ def cleanupnode(ui, repo, nodes): > nodes = sorted(n for n in nodes if n in nm) > roots = [c.node() for c in repo.set("roots(%ln)", nodes)] > - for c in roots: > - # We should process node in reverse order to strip tip most first. > - # but this trigger a bug in changegroup hook. > - # This would reduce bundle overhead Oddly enough, all the histedit tests pass with your patch applied even in the revision that introduced this comment -- 4eb13b619785 (histedit: factorise node stripping logic, 2012-09-26). The commit message didn't mention the problem, so I don't know how to reproduce the "bug in changegroup hook". We'll just have to assume it's been fixed (if it was ever there). > - repair.strip(ui, repo, c) > + if roots: > + repair.strip(ui, repo, roots) > > def safecleanupnode(ui, repo, nodes): > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1604,9 +1604,6 @@ def cleanupnode(ui, repo, nodes): nodes = sorted(n for n in nodes if n in nm) roots = [c.node() for c in repo.set("roots(%ln)", nodes)] - for c in roots: - # We should process node in reverse order to strip tip most first. - # but this trigger a bug in changegroup hook. - # This would reduce bundle overhead - repair.strip(ui, repo, c) + if roots: + repair.strip(ui, repo, roots) def safecleanupnode(ui, repo, nodes):