Submitter | Jun Wu |
---|---|
Date | Nov. 23, 2016, 11:24 p.m. |
Message ID | <d4c7651935165820d8bf.1479943477@x1c> |
Download | mbox | patch |
Permalink | /patch/17734/ |
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 6A59E2C2D7; Wed, 23 Nov 2016 18:25:24 -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 JqwVpPiDK3uh; Wed, 23 Nov 2016 18:25:23 -0500 (EST) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id B49B42C2D0; Wed, 23 Nov 2016 18:25:23 -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 A72682C2D0 for <mercurial-devel@mercurial-scm.org>; Wed, 23 Nov 2016 18:25:22 -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 R-hKT5ZNE307 for <mercurial-devel@mercurial-scm.org>; Wed, 23 Nov 2016 18:25:22 -0500 (EST) Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id 3AAA92C27B for <mercurial-devel@mercurial-scm.org>; Wed, 23 Nov 2016 18:25:22 -0500 (EST) Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uANNLuJn024836 for <mercurial-devel@mercurial-scm.org>; Wed, 23 Nov 2016 15:25:21 -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=yQbZ8JKZ1Jvg/m8v5X3bzOwbLdSx9OzsNauqDzp78Jg=; b=qWSsbI3BKF8ROdrcI7t7vYaVQOVniOr9tESWho/r/eHtmdcApnoQg8UAmd0G5WJqmA6E PyUFVE4xtQbeoBNYd0k+KbKejhB/MpxLGxnn8j057GoHWglEdOkuwGc6AxPxD0iiPI+X ZyZm1oc/iQrsI1vZv6l2+A5gBjogXTMusIc= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0b-00082601.pphosted.com with ESMTP id 26wjea9843-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Wed, 23 Nov 2016 15:25:21 -0800 Received: from NAM01-BY2-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.294.0; Wed, 23 Nov 2016 18:25:20 -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=R+8fBHqD9nY3xnyRYBTpnhu8OACv2k+sPQBfCfY5R48=; b=gUSMczWFDT1eTSxpIwYI2krB3el2vM7HtOX/1HeTSBmDZ/N7G3t8VcSh/JEFxPlXE7qxHewVYIMw7Lo2l0ohFlSniQJ5XwAQNGGSWMXzWJvBRtlYwQrMLWtmy3daPwO9L2pM0zYFhWqBGaUw2CgJkMnpOJrsCWR6ZxlcdRHmAoY= Received: from [10.0.2.15] (199.201.66.0) by DM3PR15MB0986.namprd15.prod.outlook.com (10.166.159.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Wed, 23 Nov 2016 23:25:17 +0000 MIME-Version: 1.0 Subject: [PATCH 2 of 8] revert: pass operation to crecord X-Mercurial-Node: d4c7651935165820d8bfe363c8cae95e0192af1f X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 8 Message-ID: <d4c7651935165820d8bf.1479943477@x1c> X-Mercurial-Series-Id: <c1aa248a8bc0fac647a1.1479943476@x1c> In-Reply-To: <c1aa248a8bc0fac647a1.1479943476@x1c> References: <c1aa248a8bc0fac647a1.1479943476@x1c> User-Agent: Mercurial-patchbomb/4.0+169-1156ec81f709 Date: Wed, 23 Nov 2016 23:24:37 +0000 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.0] X-ClientProxiedBy: CY4PR03CA0018.namprd03.prod.outlook.com (10.168.162.28) To DM3PR15MB0986.namprd15.prod.outlook.com (10.166.159.156) X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0986; 2:mBFUaVGIvE6vW982Aek23ASvgH002ERDLsM1Se4Qf+PrSyyL1BjBZOhE8ntS+tGwxoMcLEuDxxLXOYRKtuBktnw+LtKpddB9yg9zvj2qL5gonBMfNr3uLmz3H+zgbt2Ie3VXbSmv8Y6MDAZWi2WyfUII1xh6LNdjXZ8KCoJ+YDc=; 3:OqNJIzlgTcG62NPZAGHFzBNbhGKvutRCJV1daohptBiRDXEw7xSNzL2DzK8M4wGbL3lhyDZZ/VCR5f40tgxhHu8Nto2VNXfAJ3vrlM3jPia105zovcbngrUSt19ITLKpm+MfKh4IA6EZgbFgKeiHwZCqJE/ybcRSgeVRBPe6mPs=; 25:DO3MUbUHqOcOoCLWeYt6Z9wxTxjYG3F044wzi1KJyrYktCaDwCSjf9KUKOjV7kb5Gx+sxHQ3/90egY4+agMlPfVi92HcmA1hnh2UoajJJ6L7zYQGElhLxzhcyIr0UGEYDeuwq/Fh89aL5D3Uk8THJ5R6hLvi1sHqRAHaMRnvGvYERSAR76RQsmj5utRm5fwxZ6Y12ShCQMaeMu2r3ia2m+WmBwkvLXG0eWVAizToNPpeCu7BON63GPsM3eke9Bg4LOmSdAzhTdChQV1l9l7L2Z7BjOiu66PNndqd5oWGA8uVn3VjkKsQu0ryvQtnkeQI/Bb9oqC16CyhIcI1BoyvP1efAAzkshV7PCL5C1eaqQJiCp8XRkoMx8jp0tbTIiWcA1DBXhLEMn24yBmdhyKMHM3/32kSXGEKFkPgoVsmUjSHB7ETkc3ua8XTgSbmw7+5rUdpbedEe7hcVq75rHq0Jg== X-MS-Office365-Filtering-Correlation-Id: 98bc34c3-6ef8-40d4-faf3-08d413f7fce2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM3PR15MB0986; X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0986; 31:S7gGch+k2+HfMtoy9BjaDsv+D0ZKYCBtbCFeAfZ/OwZBXKWgGBgQkYxPxK5AwJFzkqzuqWINXJMw/guS/Hbdcdcje4cG79iGdFgrv6ho82oQ7xlcuCwRbqG+pH203iTQMVB2i/F3HXh7KgnyNeRyaE7zYnt4mxgTbuBUveRnMy7GpAh/RVqbqu4z+RoYhM05ZVAvFZct7xuRQbM/wZ8vIb+CESSrvxTyTAXcOK3fHxW/AZtQvp1Oc+e4Ih8eJyknbT2UXTO7oHLhD/I8KPrAAg==; 20:0wppB0RSI5Ngxo5YmWGlfiXTkmgobqdPgVoF6UvivdsilwffP1hpaWSv3DlOmOuUH7ctkQpGhWuPHWpFOvcaUqPJ/DPKm8a76jf5gnHgQC9aQ9UduB1MqTR1WSj27WSOFsZWYZF+DedLAJ/GgS05Lm8oOf0u3SL8wmwTsuw9qZGuCwgtuR1EqBaainBDJFBJzouz5a1KS8f1aCWjYD2aJKgDLOn5qvNb+llYHQ2lx2pfi0+qeKEM/UNmCZvyi999 X-Microsoft-Antispam-PRVS: <DM3PR15MB09865AFA2A3EFC7CD2279FB4CDB70@DM3PR15MB0986.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040307)(6060326)(6045199)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6061324)(6041248); SRVR:DM3PR15MB0986; BCL:0; PCL:0; RULEID:; SRVR:DM3PR15MB0986; X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0986; 4:J8d6BAqEMZrw7qM605yTi0ewnmlIaUsUu0B1Wyv5C6Dy5IJrdhSA6PV0Z23izuIl+dIbCaRHuaVlmy5LpyVNIccZe+wHfIPY77oEPpnGJ9bmzPSGMZkL/ccRbj3mD6vaQLZgW5YWRzj0Qds+E1q1FVF3pjjwtsl/Xxs8V+5L543A5PiEHJGCC7aLaJuej0nr5aAy8e8RiePwMIuzDCpmcDYv7D3M0SF2ZFcW2dAfzmowIR601cJhlNnOjNdyN5Un3J56du66XMiVlBCps6e8aQe8sOeARP8ZU7zpRB9bvtmpuYyUYsqkbe/aH687ggmdJY5puChkYDMrdwTNFFmi0KkVNx5a9x1dpoKO09UoD4woSEewZeK1gvvroFVYyLpNvNKPksd+RA+0EArtibUcZVtj50n/FR2iV1eYIBV2r/OSniMoguLo3eFB1vp4BS90qx18u/0Eq7PBfzWAJ2bVFRXs0zkHYJR0d+oXKNKGoTZFz1NEaXkAVopVKzGp+w6zE8pCmHVmxKcMipvRSMVhTewyoQoTO6rEg8ZIV+rsDXI= X-Forefront-PRVS: 013568035E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(97756001)(77096005)(38730400001)(46406003)(2906002)(105586002)(6116002)(76176999)(47776003)(54356999)(9686002)(66066001)(50986999)(107886002)(23726003)(575784001)(86362001)(92566002)(3846002)(5660300001)(106356001)(2351001)(33716001)(81156014)(83506001)(305945005)(97736004)(450100001)(50466002)(4001350100001)(230700001)(6666003)(189998001)(81166006)(68736007)(7736002)(7846002)(8676002)(33646002)(110136003)(2950100002)(101416001)(6916009)(42186005)(7756004); DIR:OUT; SFP:1102; SCL:1; SRVR:DM3PR15MB0986; H:[10.0.2.15]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; DM3PR15MB0986; 23:Y6EqvLGjhw3f5nl51XPFqh5VfM050kyuYzqoWpn5Q?= =?us-ascii?Q?tVnABTuQUTKRTqppAKHaOk3LNerpsihhXMXckk56KRYzIFZqdBhlL45uDdlK?= =?us-ascii?Q?Ezt6hB1YieR6Qyi0GVNe36pW6oZ7u9lwtOv6X7LK7e9ko2PGx41y2GhgBh/p?= =?us-ascii?Q?sG8+5nubMwwqqKdlVaUHqHGCRRi5D61/maMS58ZEa6UjwzLbYKhwvr3oXbxQ?= =?us-ascii?Q?hvgZq3Ou/Z/OPc4WB87oTZ2kPx3HnzcIoxY9VNgKlLXC8uuevlcOpxcLe23K?= =?us-ascii?Q?0HyC3PHKEG9vfonfGRBvEvp9YlJQB9zaLD6/6YYyDLD3dn2zk3s60oTGwGLQ?= =?us-ascii?Q?s0eEnNCaUKlMPOuQPPHjXKYpkLwgUr/XU9Rrj0SgksrhiW4bv7kvF+f37d+d?= =?us-ascii?Q?nAV5DiPTsiT/TTGuzmqgyQWNuPEu3izYsn81GPlgbVHflyLTjghpXndPl91T?= =?us-ascii?Q?s0fZbpDgtdZdDTvcfQ2FOa9fNphQvErKGXnZcvt4cOW20asIlB0nwrk61z/P?= =?us-ascii?Q?0pFngilIhA1edwTWHi4I03w7kkU21pycVdhbWQk06zI+/19oIslE0RYZ5vf8?= =?us-ascii?Q?p8UFA6rwvi0YuKt/ZzQjDzxHjkykPU6holDysu0wtWwSrU562H6f+v5H3gWu?= =?us-ascii?Q?PcaqRCAib40eaYfJnpfTPzclwFzkLzDPudqc56Ltp/oxlhHO9KmAT7kjiLiG?= =?us-ascii?Q?ZeDcQtLl1fPNLAGLRKBspxkO6sQEjtbowFVl5crJTA4k7KPMAwg/7yQHp/aO?= =?us-ascii?Q?7QhrLVC+77i/SnM0rTTzy2b0lo1/6sVyjJGzSenEZnClitW2//BIeL6OjZoL?= =?us-ascii?Q?FJ3ldMhEDM0dzCON+tyWBpVe42gbYFxx1TRE44DcOWUHP0cIzeAmeUy6XLxJ?= =?us-ascii?Q?g6QZfK7wGRql/0Q6Nd9AzUXPSoYHQYO3e/6Fg8+7bF968dPRcimuQf8znFbo?= =?us-ascii?Q?lK4zi876BQCm9xYGF+3vKoPtjMPjxCAOUYlPzHevT1AT48tRdyYo3jr4T0CA?= =?us-ascii?Q?UotUKTo0uR5SYgDEeJUh2QxKzPhjOTm3a4U+bFgWyuq6VlkU44RnIU0AmQSy?= =?us-ascii?Q?lONatQfNDK+eAChaCXIGrdZ98Qf9PohCQ9h+wVwc55ZKisx1Wwg3987Vm0Co?= =?us-ascii?Q?phkCcd3ue5fq0p0ROMKSa6aJ6ty/tBwOzNZt+9PrIngo9aN9cipUcbAHBP9R?= =?us-ascii?Q?Vvs3iDnfiw7UdNUZUTIlhBuKuyZWJSUStc/h9Rsqg7WhTANEb+GR0YNxPmqM?= =?us-ascii?Q?BzdeLAyc68JvdNALeEqtlzJVq+ymcr2zM1vVfsu?= X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0986; 6:QcAwYI3IpGJPwCoZNYLx1QPqxUV5NQocmj5NjnynUaBZ8G/4zqKTj2MmZhIriBoX2JHcDEVKkBT6uJoYx5U6dvQJJqlJXIRQuahd4HA5ew61f3p2W+ASOdfU94OIXITmcn8cbTZNnnz+VU4O4YYRDrWMpKoPV3PC9PnroK8g5y0EvZxUiN9yB6qQ5YGajD9iHFIgjKbfYdh0+r1OtJLykQrwoznl6r5KKYd55Wa/FBGCcD+pVBGo8x7GNqTBRcGanXfrNmAPXuwWXlMNqAmpcOdc8erh0zTF1KB1lFjVzvm/5LvE1mpXblKLm5hj2kWvHsE7Y/rFwbvX7+bHumMXqsLGxtwyGPJRiw1lQkMSw1U=; 5:okjstBP0AYHjzv0lyCYaA/dacMVh6vDyF6CS0r4ouMhXXZQXf74iR3LqbMsvAy+rsPHj2VQVDtPp+NPedtBrsNm8F8yrf6n7k6eHg4wA4IDdlhbqHYVz416HuNTkt7RkPl+uRidd/y071hPpGKPGyA==; 24:yd4ZRo3gzgHHkeZEo9uFJ+WmFcshePIi1PdZ++aegO50OxpOWZ4++0RW0hyG5Cs6QZvG/8YymGcH8VcRaTxzEgdtfH+mihocx7K/5KaMRr4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0986; 7:7wng80PswkXhu2/N5KYdXZiHYbkhkDgw6eXManIFO5zyINd8LFuWJT8Kr4iLJNKxLIfzr+bzZ9OCWS1aq4QxIYrYLkXXOQPN5CyM4BzvIfaLjDfeTJtY1XOzZC1fEBG2NXmEIZ6yENg7JoDNTFUdgLkYDM72aIsJla36cQGgB3kFblUaFWf5jlK4tGevUdptRxgIh1190cBfymq4cY7XaTZc9pAI1nzBIoZQR8P3lRrKoRseGKTlfaEIFroZvr41Fg4Dx5YKk5KlgBXBrJ0VHgXOyoh7lfUGjm599trqwrXmEJ1Fud7ir5MPNGRijiY4DFxAr72s+j4kgaPO9tE5qHq5Vt6Vl+xoQUbMnfoB3pk=; 20:N8tDRTGELZgZKgyMyDxMEsZGZigWBlLHWV6zcX2YDXhr+7r5A99AXsBXowlwhI3g6yyvATaXLmDiPesvKsc+if7QTuDo3bT/JaB8NB1Miop1BtxjJrDhWBbQ4DrSKnvhbMQd7wYB0FhPWhWwrRVmgry+ldb5sY8yq1szn5aC89k= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2016 23:25:17.4790 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR15MB0986 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-23_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 - Nov. 23, 2016, 11:24 p.m.
Patch
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -85,5 +85,5 @@ def filterchunks(ui, originalhunks, usec recordfn = crecordmod.chunkselector - return crecordmod.filterpatch(ui, originalhunks, recordfn) + return crecordmod.filterpatch(ui, originalhunks, recordfn, operation) else: