Submitter | Jun Wu |
---|---|
Date | March 31, 2017, 4:45 a.m. |
Message ID | <290c65aad38108cc59c7.1490935514@x1c> |
Download | mbox | patch |
Permalink | /patch/19859/ |
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 024262C1DC; Fri, 31 Mar 2017 00:45:42 -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 qjtYv6-bhAjj; Fri, 31 Mar 2017 00:45:41 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 78B062C1E8; Fri, 31 Mar 2017 00:45:33 -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 2DC972C1B7 for <mercurial-devel@mercurial-scm.org>; Fri, 31 Mar 2017 00:45:32 -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 D-PPfwlFTYQW for <mercurial-devel@mercurial-scm.org>; Fri, 31 Mar 2017 00:45:31 -0400 (EDT) Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id ABDFB2C1DB for <mercurial-devel@mercurial-scm.org>; Fri, 31 Mar 2017 00:45:23 -0400 (EDT) Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2V4hl2X029631 for <mercurial-devel@mercurial-scm.org>; Thu, 30 Mar 2017 21:45:23 -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=Ns4LFKs9/VToIo3Lc6lOk2SACDSqxV9i+J9SC90fw80=; b=AbZeSrcD8DF2OIJUoN7f8tbKFifKg0qe0giEBDSCs6L5ZkaogT22lVr6ap8eaa8saBJX K1p8ZAWRydZYhBlmWekmCXzhSCC0g3KgXygoOBu0Dh+L3VQ3fnPlUdSP6mhCmNf6DxEg n8LCnDf5mNbwXYiE4tquUnB34z+nCcOc9N8= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 29hf81r4ws-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Thu, 30 Mar 2017 21:45:23 -0700 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.28) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 31 Mar 2017 00:45:22 -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=Ns4LFKs9/VToIo3Lc6lOk2SACDSqxV9i+J9SC90fw80=; b=DMYd+biuDmNuYzNzVbirOtpB1qyzQNmIuHYyFV7i7LBX8mnPh4i/Sq7ebafHMrk38r4sG8FpcmMD69OkrWhVOI8diwSLJXi5mAXmP8+H4dO4hEiXJDoarTi/CjulBuGnxNS9hGngdRIivmfQt4JY/hBgWe/3Rml/OyZceGZKvWM= 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 CY4PR15MB1512.namprd15.prod.outlook.com (10.172.161.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Fri, 31 Mar 2017 04:45:20 +0000 MIME-Version: 1.0 Subject: [PATCH 5 of 9 V2] revlog: use raw content when building delta X-Mercurial-Node: 290c65aad38108cc59c7e8fb7f3b37a7c7a7573b X-Mercurial-Series-Index: 5 X-Mercurial-Series-Total: 9 Message-ID: <290c65aad38108cc59c7.1490935514@x1c> X-Mercurial-Series-Id: <4a3f09c00a850667225b.1490935510@x1c> In-Reply-To: <4a3f09c00a850667225b.1490935510@x1c> References: <4a3f09c00a850667225b.1490935510@x1c> User-Agent: Mercurial-patchbomb/4.1.1+542-b2fb0fd239b8 Date: Thu, 30 Mar 2017 21:45:14 -0700 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [69.181.140.208] X-ClientProxiedBy: DM5PR16CA0001.namprd16.prod.outlook.com (10.173.216.11) To CY4PR15MB1512.namprd15.prod.outlook.com (10.172.161.146) X-MS-Office365-Filtering-Correlation-Id: 7752eafd-3037-4cd3-6847-08d477f0bcb1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR15MB1512; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1512; 3:fKHHc/l8r/p/gf3szBiJeC1mvQsZaGAbzI3Y4eNSgH0+5+F1gB8Foh8zKv3qCh+WU3Nd2MeH/vC7wZbtPh0ELt5Qpnndl3Ho64T5wHs3OK9paYQDAbMH6De/Iz015DZXMcUzdJZ1D+mtcRoRY8ifQJwW72++Z75SdaeeDbyVSOkQaDviTnWFjBzE+mMx15UO6BnPlu22WmI4OvRyoty95uuydUqgJjWAPAJgDHOL+RwuFq7XFnyR739QGaFgzQCkTsgiZ6fsst2uuF0n/PXGjO3jBGcPqQG+HhCdMh3erCb3GWnjSPWSSYiUFzVY070OPAnCTS39cVefQBY9M1ykpg==; 25:Ge/ZdwaygB4A8YbwF+D5K8koWv8NQiHyPHtkAEJCm3PQ5z81HzRFzWGQsdVYkmBNQlEMVEpFSjw98atQhrFX5PKhu1ezM0d7wqA26n+x5LAVICTT+IwuZ7LH77xJhEcrrGDlWNODgzBj9PFdcfCIXM00s+gBVRX4ZdIssXT5v20tOhZrvpgIpweaxUJbVqXf64Bh8OMK5i9cOFkeW0HFWI6ZAHOPmcFmS87MfKUs5UoodG4eE7/0ppPoyWTkbwv6mk3MElcPMsB4mIxxBHuyyDbyjVtSnn1Oxp8Ma8+vVCBQstFfYr6vmyxOVV+R+j5uM/HNvk2pbbIX1sPpeSMQjhO5bE1vRB0AL2bxgJVVud8qYUvj3APB5tmvrjAuzL1f5NUlY/tQzIJZwWgTQNwLfI8C+G/zx+S8D68pnvcGSYkQcg52Hdu8j4uTUUnjgys+oNngKTw0vSlDAOsQHenrOA== X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1512; 31:e1tkH4l6CoVlhsIxvCuQD6WNSVsy/G4z7kf/s2gjhyjA0IDsMsWTack41Q3ApffCp7gmAVJScUqHxqwKVsAouCCs0MR3xh/XCx/mf77dpQ20Aq/Y668/7NC/RLAJPpFs9Ggz8cl4VhPouHWmApqNCWePYz/NTendrOFZa7lhQkQdiS7/33jkVX/qoC+NNQbH1/SOB2cgX4cfTRcvA06FZqrwRyyikifa5KFmMgY3V7JDBa8+YRt3PzJtFBjfRVoLd/2vvKATqnlGp86yKAIWJQ==; 20:Wfw7PdHGluaWn7wCPU3U76qQacCpMuO+CLt9b8clYmrDu/WAwLBRh5keu4/7A/fpbeLMkfFDMH/SlMbmSrXwDS8ZJ0N5Doqz45SIERTAiIi8/P7ltlMNet7cxcJTmxyTVux3GC4QSlTWUhKkIeTUu1PKpn37eQZCBIUvsLXMwq3zyNPPfX0xQ/kndPXFXjYc08qfKdAUtfuUbFJCBY+zzjaY4KMayCY3OcV1rYVL1/dqW8Df12g9h/miiQQizYGg1ecCSLmPOSW1EWGSCsk/EPsKqY4QLwNqFSmyk6TowfDKhSIaOPzZEbnm/gV8UO+txSuDd/lSZg70QL+T32BjFGHzQhBjXDnr7Ei0BgPQxl/XGntupci+6tdwy6jvP7OOeSCHjR+fcGYVsIQj9uwagX280PklSVdCexPeotD+Iuu/XD2VAKw9omxc6xEQ2g7vLMtuk+g7DbPKlE76AnmY7nHUWVAycAfl5+a3erog7RuQrkMWoeUxLEegpM3dQGNk X-Microsoft-Antispam-PRVS: <CY4PR15MB151245959017FAB6F443CD3BCD370@CY4PR15MB1512.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)(93006088)(93001088)(6041248)(20161123560025)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(6072148); SRVR:CY4PR15MB1512; BCL:0; PCL:0; RULEID:; SRVR:CY4PR15MB1512; X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1512; 4:Pl6yxrVaKRzQwFZwL4lS36N4aad+BtteY0LlYbBja9LVqjFKpleku+sYDtPjR7oshtkYhdl21o2zmeiuNpF5FXAvI9d5y/t6BKDbP3dgKoqN2DTZI0pTSHK0CsiY/lXtsYeOlW7V2LTa0YwPU/8qcR7TmIDbiSOObFukudspUi8kR84kTS5GKzBJ7C29CWMO2kIcq0CpFa3nhIMmzUaNJ0y8/KIl2wk53FuTQDE8KG57bz3v1g25vU1lYSxx9QdGuCjTrVILZ1HEM+pk1g7fD75H0uQfTo/rI8GtvSfhhczCLx21SuFWLSwDSWTzYG/cpytAMd+3Edwr1W26oEWOG4snb2h8wIHk7eSx8MxDqoYpQPASiVmF8gL3rkhu7yfz1FAL6Dh79XeZD3W6Yh0knidn7tbym8vIBRyGAoZneq5q/ugi0DDdvePECtqzWOw7TJ4sq0PRZk9uL0liCsahLi+T598/6koNXgo0KFfxbwEHfJrm2n5k0/BcyHfaiHtxVV+L7Bbau9MPogRRD3NDzJR5ZChPLozwXAk3eWNNzhKYSJ33CWtNp0bR6E5lP4SzyDHTJmTIDWWnBUEENOxQpS30Pp9myBHph7TKpXNmDDw6USeCdSu9NaEaADVWW2YN30FCu4BRj+9hUc7Rc7gS2NN9clrs7O2W4xba0YH5UsCKzuAXnuMK7Bfvf4SJ6rS2jurX13ow7YVnzM8dsrc/w3QY/v1BR6Rb4p4SqNDWkmxk4Ym7FgquzrT88CbKJiIZ6hstz1wDkUkUSUveMYH6Zi6V4KAx8qYsh1rv0uC87X8= X-Forefront-PRVS: 02638D901B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(39400400002)(39410400002)(39850400002)(39840400002)(39450400003)(6306002)(2351001)(90366009)(9686003)(53936002)(5660300001)(81166006)(47776003)(305945005)(7736002)(2906002)(33716001)(4001350100001)(83506001)(77096006)(6486002)(8676002)(6116002)(42186005)(230700001)(66066001)(25786009)(50466002)(189998001)(86362001)(23726003)(6916009)(3846002)(54356999)(97756001)(50986999)(76176999)(6666003)(2950100002)(46406003)(33646002)(38730400002)(110136004); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR15MB1512; H:[127.0.0.1]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR15MB1512; 23:wQQ4yyek7i/bOUMoDDzHuIRDwHbRLqwGF7tYrBstp?= =?us-ascii?Q?BVCq43YI53MPWGRR4J/QZ4NmRXQEOJPgtIQgkc9sb25L0G1lI+ygI7NYgQJT?= =?us-ascii?Q?/ovBrAY3obtOQHJRT64Rx7xN/UlNoZp+3mT1RMcdUZS+KofS5q/S+YDaHA9V?= =?us-ascii?Q?CpPPfAySp49WzF5JuBv0pz/+9HPlEvSPAooOTsUnvolojhXBlVstEmRRhhOx?= =?us-ascii?Q?giqzb+jO2VXAaVH4GWnF6EDLBrH3ReAtmDr/6sXwuy0RzCPorjhucYqYKRAG?= =?us-ascii?Q?FDG9RkY6TWFkY9IVyM+7WfMG/cYkcI4NoZmjM6O3f70xLucQt/FEdYT52TKc?= =?us-ascii?Q?qGvti4HJTpR0aJORWJD60F4CZSHzsxGA8OnkaC1+ExkC2A5W0IS8hLllny88?= =?us-ascii?Q?6x3dMbm/YovyiDF5TQjr+kvEgF1ICZaMuJFVHPRNwsWheaEBvp5LzQ1GTQo0?= =?us-ascii?Q?i0+kqk7PuYu0+bJAWoGv/sfmmNJ9hBkdv638fR6FwdZdlMTy6J6DHbh4/m61?= =?us-ascii?Q?t/gUX+lCru/AzuqdJoFRloTGQ5NNXP2tv/US6eSjK5vH01nRMPF/cJ48LxsU?= =?us-ascii?Q?OA5Qpb9ZcHcV8RL9ui6tY5f3+BM45CLf9x78AH92Ng9jQ/KoLgx4vck9OEDC?= =?us-ascii?Q?EIxsbhUdMPrg6LETrUQP7L8wvoivWD4BGclB5+UJs8gy1raWkpJbedqoQ2NP?= =?us-ascii?Q?b9nRXUkAZ6CQtf31Kf+L9MXhQJyyyvq3rdJVGrS9pkDZTeGk490odQdjOfFS?= =?us-ascii?Q?YnNWyjGvmSgIYuqEefzHlzyfWBNLU3uEbZRvdh3lLgoGic0gH7Dm7Kd/axbp?= =?us-ascii?Q?K8BcpQxY8/QnDCUI4cX0/ZeLgtg6t/l3G7p8wVGUpqq76Mb9nH6DzxSQvQnQ?= =?us-ascii?Q?IdHFnOPOt57ix80mVwZQD4Kus5ojNJJU4e2yo7JIcMNtMYWTItJGhuYOIyQN?= =?us-ascii?Q?iiNgvMD8p3WQAbcyR/N2zvKCbBs/swR1vYlJGPzm4YJsMjQVg/SqQiTsMkGo?= =?us-ascii?Q?NR4ycnbaP5zY7p9a0DGh8mx3e7QFIfiMC4qX4ucjDgiLQL/rq4ZUnR5DbVWo?= =?us-ascii?Q?tGax6jXgNIpA2iz2mM1pWJIYnsNVjeILtPzpCGEgnYQDXcs2/Qdy7SOB5mn9?= =?us-ascii?Q?zjQroT68ycVW8Tnx5qnsIXlI9uGaHjf?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1512; 6:Pq47QkOVZenBEdQKhZU+3/VaqpUvEo0IVw/HaW4rcvstmaBxMKX9aqGZwwbmYfz1AhgDzEAdJBAqOcxFA2GOl9SxSc8Lgfmuw5vGDMX1JFqK4c9fu6HS18avN465CP/8WEwqNJR6tYF+jM/MznZrm9GNLyN8rs1t07F6MOq9u6ske8zvN4eiflbDMd9+FrBhpmghlxUFNJ3M7zkPMyytsM8897nljNuKkX8J1mPJaFYtGByFq8cFUyJ4skx1Q3scPXUsZgYO8UW1jkbNtFltkjC1ACU7x6RzYrGOZ7UV7x6ox1vKWwmOD0e2ywijjmuKGaoQTmDuCRsdYrM9uvJyQh1SxvoRr1H8IxmHoRiLt6/0SMWH+GhtGtfQoVCYYOB6GBYzbST0HY5/HJLNUyiGLA==; 5:tE3mGtLmaFcC31InsXxShrrFz8UYlesmS0TkJGIcwKtIk7IgIM9uPEyvhiiHfycNo1ZVRyEdZtoNihuo1dlRpL/rUi1KnZyUebkeihDuXC8KgmuvTiumevUvS9dcX6oLv0F6FrK7h9rVv33fROLylA==; 24:w90Cc1UEtj/I6D2r8rx/FxWzKlWfbChJsEXwl7oc1Tj/T5Q1mmS5A/kHLn9Y150FLJIzKxSiGLZre/mh+kz2odKBofzNpP6twAjCeog6lNs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR15MB1512; 7:n10e8yoOk0YQyuhCYmhtVUjEElWa4tqR3XJBpOzysf7BSEVGFrcRSGJV96S9SmVsSBEeJU0RrLTEKrWNRqOMspXQ0AVyDb/OWPDqLNe1O13o1eLBBNpRN8pDLuNgjdV4+rGBVRIdyPXZcL6QoPRwpr8EqblKpS3Wzn/J/ptG/yJVRFCMP1nzJacICEDtANwDx6tosgMq71Db2/q7uil7SKQCh/Yn1OsV+XwGesx/1DcgeHeOAOIH5+TDgzIYK5YPHYtRbPn9lAcOqZ1S/s67X9EQN75qOKWRLtmZXWY7r6QegbYl9fLD7qxRe0Qq9btItPJLms4yXl2GP4aKg7DFVQ==; 20:P5AAHrinOZFV3uYlkrqaXRk/CSTLbooSfqEkpng1+YvDm4hOHaBE6VqpZqXWIS3CY2xPGWPytOO+6BvRlsCvplNmV+UQ/FAzCY7mqPpFzuv274IQnHkOKfgKFpPHm/XFGkGJc4EKx/mvT/kSdwHHD8kndOvaDQ4EaDhDQPSdSxQ= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 04:45:20.4259 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1512 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-03-31_04:, , 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 - March 31, 2017, 4:45 a.m.
Patch
diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -1636,5 +1636,5 @@ class revlog(object): else: fh = dfh - ptext = self.revision(self.node(rev), _df=fh) + ptext = self.revision(self.node(rev), _df=fh, raw=True) delta = mdiff.textdiff(ptext, t) header, data = self.compress(delta) diff --git a/tests/test-revlog-raw.py.out b/tests/test-revlog-raw.py.out --- a/tests/test-revlog-raw.py.out +++ b/tests/test-revlog-raw.py.out @@ -1,1 +1,2 @@ -abort: crashed: integrity check failed on _testrevlog.i:11 +local test passed +abort: crashed: invalid patch