Submitter | Jun Wu |
---|---|
Date | May 10, 2017, 8:34 a.m. |
Message ID | <eb7b96bc42d08670983d.1494405266@x1c> |
Download | mbox | patch |
Permalink | /patch/20553/ |
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 D18A92C213; Wed, 10 May 2017 04:34:47 -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 LraRR4tgXmHE; Wed, 10 May 2017 04:34:47 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 2740A2C276; Wed, 10 May 2017 04:34:42 -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 193102C212 for <mercurial-devel@mercurial-scm.org>; 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 J3lfO8y-9h6S for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 04:34:39 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id AF2D32C1EE for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 04:34:37 -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 v4A8RDt8012119 for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 01:34:37 -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=u0zpSM3QGoD9r13dRUz8PfMtPppaf17Ph8ZqntLasCk=; b=L6iRmNVEzpdfeHTJ5DoNUpL1E3mjaaouLfIDlCZQExVo4euQLVTzjx0aCnpqA7gXKtDC N0VWGIcHsjIJ5WG9PsUjRVO88tJiRZZhzV5bxfCYupNNCtctUqsPAf+1Yuvc5E3pCPHt 0jsVIcv9qOLXoVJCh9q3tOl90LmQdRn0dLc= Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 2abkk6a1q7-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Wed, 10 May 2017 01:34:37 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.16) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 10 May 2017 01:34:35 -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=u0zpSM3QGoD9r13dRUz8PfMtPppaf17Ph8ZqntLasCk=; b=WqhOmM4AishmNAfsnyKJ7wsvJ+ihcqKRy4bceXNiqtsPwGJIT1CSIOZ+zaCoNkNh/lI2ZRK2oHtbHeqK9ZYZ/Y73FeWhYQNeQlc6db/QOUG7SppKl7lt41KpRbJoLx9dOHhjE6dJ+n5UALziovrLaxGF8D11sgzeZan3jqZYnNw= 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:34 +0000 MIME-Version: 1.0 Subject: [PATCH 07 of 11] revlog: move part of "addrevision" to "addrawrevision" X-Mercurial-Node: eb7b96bc42d08670983d5d75635198f62c3459a8 X-Mercurial-Series-Index: 7 X-Mercurial-Series-Total: 11 Message-ID: <eb7b96bc42d08670983d.1494405266@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:26 -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: 44151728-9bb6-4138-07e2-08d4977f630c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM5PR15MB1514; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 3:oOKTmqTOPZGHWb/k8qIPcB4kVUijQ+aVJ4YCq0XOSslEGe98U9N9BXDweajF8gJsdsb5rDNR+vPa3LKH9VDlGauAd2mZUgekOoyEFvR9GYlHXWfcjalWcgEW0hpoeTtvzYu4N787KSJUK4bDhOQB9Vcy54WrjN7RZCxnh5+maXzQOquijTYoAiERldM0X74TCG4yXgDP2tm2ycmwZFd/lMKesIXKC2Bdl7c3Ibut1PkSNXXeajsyf2n5+DOEes7eeePnCjypiaaNvSIQAhCkhFFruXYd/nOkGN19P92xfDEGmiWCr89xofMfziGsG2TMJQLb908sHpHF9ZdUh1AlMQ==; 25:KmWE6k/Np8eoIKQpWv3EphtWshV/kqoDiQHFmDeFRGW8ScOojbPydtrWnqRRzbYI7FLH8GbP1clUBUUMV5t5RGg1Atwthr8wC6rLxChhv5TiHy8puOz+Y4Qf1kxXUx0NODMSGmxtnNJlK9JCf4I6IQMqKQrIQmooBREUn/1qwcp8LcZSOKQA947JSMK+o413TUm+ivrH4EXmOK5WarV8ZDJH9XWHbq5QzBSEzhdt89VaHkqWsdEnzrtwoc//GKJ17ptgJDF77PHDBzqMeErCSMu1cj+dZYHMI2ieeuwkpjBfZLkBYAQXyPPT8l11+3zdGMqtdIugxeNU4wUhaubEO2+I9+5COnwc26IAXk0mzFJxmMg5LJGl/6KlJLmGn/9FfsCdY14FDGqKU03rX34Z3VB64ME0yErgSIJozNFmmob5ALj121pbhkdvQ/xQrE3NumLWovKsjsaVbDDaNynpSA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 31:9z35v/lJvvh2PueYhA0YrdVzDND5wACkkFERv4fQmurEI727rk8HEQuHdprP1obvQ9iGQ7xncrt8y+rstSFhIBKIE/x6er0FaUNFNOPyEHrIeZUYvZJNIKbUfwmXoPu3Vbq54E7db3+2lr8DUqJaHLkPyKE/y93xPSUOSHG3x7lM4MN1Xz66Fo+4YdK3+dLwMd6aqcJHVoq8zKpX1hXuml5u5kaKtiaIRgLEOEXVl209vvcLhFa/QLgLkiMUo25o30DXjH/+ouZmyuT8J8gABA==; 20:WUaCS8I81xI60PJwx9U95gMfOPswzSTdXPl7dUKr7vhr9gKylibvaJ/zKcjQzmvJeV54B5ketZ9wlN9PRIeTYeGEAIL79U0mXrPDlVBFA11VNFnZFxMmKpSkhv6arU/SbLx2jGKQCQ1Cl/Xx/LzTAwG6vy5TnuYJGV5TxIufFBXbo6tiDgDqXSbnrWUr2MYWge/CGTtRa70MLSjL6e3qadx5BzX9kihLNLeJYZjiKDqmBEE36wdcBkgc5KqnCDXw4Yalg98F8WcI8LDk2B20PDwIgOg9w4uavcx+7HFTid5UWH+TkPg8yTIZ0hklKmHhT41QaJ6/07DynnRTYhfqU7Nh9fkS6fJJr7VY6lL8VOjzpXVwG5dyk4IhNHf4kixCgA16na52fE9DjwGfC9Dv5PWslfjS4yTZb1h10m9S67p/bvcN5RUfRXa4Wr4k5XV5SCE8ZSn83mMxb7dTUBOkoaloPaKGfTPKTQOtqd2j96tloWa4myya9kzhcb7Y2osd X-Microsoft-Antispam-PRVS: <DM5PR15MB15146864621702CD963F8542CDEC0@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:LlnCeparB+Ye/ub1JnOAj6Xs756A0js4x/e9hpdxrQJd4fSrKJyjWo4bJXlnGgJRHWmXzZKDF1P62A+HkpMIw58YNEJx674pvXa18njuNdMucqoH4HyBZFm11WIoboSKO84pi1iAOQfFIxCTIVNGpZSG+csoZD/tklJMDyGFM9XAI/4XvoFwN3vlvSLlv0l6aLFvkdkHgHioWshR0HO+GHwkudNk4IDM5QMa7zkAdyVTmVFMJUCH3hG4DehLV1auk+VrD7uRWG+Ickz+44NKYNRoabVN7fcQRx7kt9BFAzCy40EXINm1I7cr92whUW1ZR8ZesgrNUpTZpVa589PhYF15UHH6aqUd3SWJQ1bdYGs8+5AAPn/Eg9dGqs5Dq3AdJwIVRGHBGCsjkvvb0bhxWoZ/717VsCTElraJFmwLm1d+NlmLGmT94VAqQesoUORYuMzmPnqfc7sNm88M65abw4L8ZoBSGamyLc/kfMQGQQaQbkHLlCGhJ2m1PiJHkw0zfiaY2Hph6a7MbvBwPBx5xAIcJMRlG7XBFK9yuGRD1dm3No4kJjbee37wbsrPGmASty9mKUa40/rG/9o9/26njUdFYH0LUNPecutftWM7GE36704AYIlDTrXX5kPJmpG1a0zWT90cZwaOo9jcK94MSi+iWLfNYCZ4EFY05vExSowL4ripXieYhN5PFkT30GWOI2TEN2xVDtqK3R+Z7ZSUN4rQo/vhUgvmW5rhvIoLE1jJN3qU6f0TcB6rBY8skVRWfBhOhtDwmoscOhogn1Ld/4YHPd5NIjted7VDV9rP79Gx5+Z3Na55wRbvGfG2hfIpzayEBCtG3wlgSykSHnLSKSbWTbQl5UOeAU4wwSCWcsY= 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)(25786009)(86362001)(2950100002)(5660300001)(23726003)(7736002)(33716001)(551934003)(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:jd6SkwKuFzPctcDXvVyJ+gFoGVURBM7PIHo52DeOz?= =?us-ascii?Q?YLyRSvqgslii/EoN3/i8cNVq3wE3gSvOB/w1ED2V4JlTkbgoYF6mpZIoXdw+?= =?us-ascii?Q?qeKElGMcE9vlFvT/Hcnpf+SJbokV6DeumeCUItvdh3GX1xyGhbwNoLFlEdAl?= =?us-ascii?Q?W7pRu2+J+xCJqLLv62RTAN9TS4XRKgjN/zEA/xC597ZWK/wFH8Scnp4wk1Pq?= =?us-ascii?Q?3IMiSIbEu0OmYgd46jk2+REOAN6IfJr+J97LcvN3FunSdKISZmQgP8xskpJg?= =?us-ascii?Q?rtwp51wpIUZwLFJ1X72tFmbu5DF7UUmjoW38Jo/35Jlv4TVuhlmP9+X00SXQ?= =?us-ascii?Q?NKl9VM6U0CWH5KOZTWoidA/KFbffA6eOdTKMs0OiRTV4ftI3mfV1q0xnu0cL?= =?us-ascii?Q?mXsodRHAOwL4rQOSj2Dgy2IFr/LvzD6cIgLy4+gYiFVXFrwKzOiEc3kaHYkJ?= =?us-ascii?Q?C+EAuhBjluD4LMFy1pVRxl/niD2Zwqq1pmzQjcxet+cISXtT9q3XsuFbbvub?= =?us-ascii?Q?4KVzNyxmgyJRYxMsIjjLkhbsZSiO8/+2kpXVocgtIhGNHKDzJhMyvVdhEvIs?= =?us-ascii?Q?cowdJ83+9iK93FsMqRw1nb/MRv37FNVV2NneOeeEdJpV9cOED6/4dUKRp46j?= =?us-ascii?Q?a7Cj3tfUK2COPw7pVe12L++qrQGG+4VNmLFOa9/ZE1d6anVTGx7biSH8vSU/?= =?us-ascii?Q?Vfsu9D2jWMtaVpYA/kSOsyrzJFHMTZLdYWr5jpujfWXI/80IM70u04MW2EyY?= =?us-ascii?Q?8bd6UFzf/9S5PnIKDjjvLWq8AnoKdrGVb1Prhxeulmtof9/gcjwixNYk/+4D?= =?us-ascii?Q?BUeCkvM/UJyaHwN31ppiOHiujQFKmjDm6CJFY129fJfsp9mqrol8wbDW/nof?= =?us-ascii?Q?U19PL17/Ro+BcmdZx1BjT8wLWDk6cQWRpJVZMB3mVfzwCmiWQzYmHabLrp/O?= =?us-ascii?Q?JK5tt0v56CIRJf9Ixl4Z9L/h+RmqocrktCD6ca6fWTXmkXS9mN4qU99divLV?= =?us-ascii?Q?PqZ8yUtzb883DzOutFYrZSZC8OKSbxM4KAcd2QGXvMPbapMD6BBO5VCDJC/H?= =?us-ascii?Q?gBPdEd0RB+i0qoxT1KazIx8bfIsIqGjvV4QilFgqpVudaIR3k3Dk0nmWARK5?= =?us-ascii?Q?jBoDrGdE0A6Uys7qDpxxtGMzWMCSdB4qrYyThjkTue4a/uEp4/fhsXcP4spD?= =?us-ascii?Q?2fogE22ZfQkEhwo6Q+0pU2J5XHJLy6Kukqf?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 6:5R6QvyAOJhjKkZxDja2T9Jd5LcRKznj5A7HLwaqVtzY6zY/4oPPMoQxt0NatTpX8LiFdlWJyUlvJkj0MtyBZDZMLbXQ3UCf8tAZ+ZIjzFYL4F3YenkfzshZyMEQHnBl1p60gkjJ7N8Cu7fksIpcXHCm0ydEYMlQD/G3LcOSVMzFavXhdPvV4AhDBki+rS1Uc7HiL28nkFscqNefxRsnSwvBIUxGlnjz4qvmwhnsX/zKjWS5RbPon3TkKb9qstJuAXEiaVQ/XjjpYAWaw6XZ8+WOsC6Lc0ml2CIrut9T44vWrDPBe8qccq/aqeJZn/rTn1tqT4Vv2MvIGDnDKWmvxutGKpYIXp0VctCR04DtQSOHZzeKdervI6pZZNYGyLMLTN9M/wgbfDB4tC7OeJ51xwWso8WCOWfoYihJET/5diy0F+rLd1gWbp19CgQ0MIgDTdF0nxSmBzLTPRKibjNyJP2jH0f25bq488fyxHijMbHPaMCh6aSKMPXjC+HBqijQWEjAu+XO+qmWqWXklP4fv5A==; 5:5/jIzjQc8jQahH72f3gENH4wemkBRV/0/aa5WZlOMEhpA2PVLItS1Xw2AEE9U+hdvg48m8ZxPHfVa3i+h1q9HkmqvJdhvO4ze3/0oGN4DLsbgunaLvzvdR6JQTtKPb42i2HIEnGyPSwxK6tvQkdkbg==; 24:SCHfJmRVSyIyuORo1cWqUzmtNzBqbRn2RZRfd8avWQ+WI9bFCiLL5xw/EaTGxLo0TW0DrqLZOr1EMMsKbYtKHC0yUjzX8mL641wjqRrAOhk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1514; 7:xB0pFN70mtxPq/vBNgTwSg/nWvu9yzxs7sg7aaXe91VHK7nHnMVFPSUFDStVElAYPDLpwdboKao7EMQEP0K2/vRRmrbqDXusfRTBf0ODatK2YFqqDwXASUMbNxV/avciJDWKnZXDj0JeMy1v1uhmJMwtLY+ZRAcG7SeFr4VzdacWlhOHBcBvHPJiid3qRk2g+MfBOl+Dl5UlyUGw2zHhb6eO4d63yWb4jFjC1iI8Ipp5BhsFV6aQ3BkxBRSOjKe1QArp+6kyAuuztSVdN1o/+Pn2TIT4QFoNb+xFtratJhcFDZKepbcTbPB2wwMeMQeTTJfAdHcrM0+e6hTgdCf0FA==; 20:n9U6anzypvX9IGFxPP9UuCI3DemWG3ENnMg6i5VeEbl51+pQVD0fofN5rswDDQZQG/GB1Iw3vxR/VdoLMb4bVRoiu88sAm0LKlRC3Ghv5zhOpEQAnnwe2twEoO+WR4vUu/ypGm1EH0fXtrxXiXSuJjgek8EAx9+P+tNwKi3hp8Y= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 08:34:34.0983 (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/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1503,4 +1503,13 @@ class revlog(object): self.checkhash(rawtext, node, p1=p1, p2=p2) + return self.addrawrevision(rawtext, transaction, link, p1, p2, node, + flags, cachedelta=cachedelta) + + def addrawrevision(self, rawtext, transaction, link, p1, p2, node, flags, + cachedelta=None): + """add a raw revision with known flags, node and parents + useful when reusing a revision not stored in this revlog (ex: received + over wire, or read from an external bundle). + """ dfh = None if not self._inline: