Submitter | Jun Wu |
---|---|
Date | Dec. 14, 2016, 2:34 p.m. |
Message ID | <97bed60e80b3884e2452.1481726052@x1c> |
Download | mbox | patch |
Permalink | /patch/17906/ |
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 EA65B2C18F; Wed, 14 Dec 2016 09:34:50 -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 D1gxnx-VbE_e; Wed, 14 Dec 2016 09:34:50 -0500 (EST) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 97C562C161; Wed, 14 Dec 2016 09:34:50 -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 5D80F2C161 for <mercurial-devel@mercurial-scm.org>; Wed, 14 Dec 2016 09:34:49 -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 t1QZeoPG9dKW for <mercurial-devel@mercurial-scm.org>; Wed, 14 Dec 2016 09:34:48 -0500 (EST) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id DCDA52C15D for <mercurial-devel@mercurial-scm.org>; Wed, 14 Dec 2016 09:34:48 -0500 (EST) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uBEEYgeI011993 for <mercurial-devel@mercurial-scm.org>; Wed, 14 Dec 2016 06:34:48 -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 : date : from : to; s=facebook; bh=9Dnbw/+SSyBtP68W4IItCoRQAD1AMm6/VV85e8l8UjU=; b=qiCPhXtgteaZGC/jesNQ6c20gdC0KccZbbQDkeGxlNZaPn60W5JGF46H4ZZsxI2giUaX bfUEmXeffDRwSeu5rc3FVvLTWJmEn4gHi3oPnWjSRwZdJiOiWAofxAy95/kgz/v28B1X 3j8RLZbgswna2hfUd37GDi5VzoCosc8kOnk= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 27ax90dm0r-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Wed, 14 Dec 2016 06:34:48 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.15) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 14 Dec 2016 06:34:47 -0800 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=7NmtKToCgfenbu3IivOpdsJcJCYkcEDnGWeXF+VxIW4=; b=O4GQ/gqZmvRNcLUPcJ52/jUjClcPGO21OuomhOHbIPMTtcYZ3uN8Coqn4d7esCdOoXtT1fu14H2eMz3EwbFZI814dd/pS92b1TSOV+m1AVQuaOoiOxauW8SfvsDLQolvgoWvY17hVvKFp1K0B4qyTfFNl55nz/xSSLc3xFGUBa8= Received: from [10.0.2.15] (199.201.66.3) by SN2PR15MB0991.namprd15.prod.outlook.com (10.169.192.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Wed, 14 Dec 2016 14:34:45 +0000 MIME-Version: 1.0 Subject: [PATCH V2] chg: ignore HG_* in confighash X-Mercurial-Node: 97bed60e80b3884e24524822f0614b0ba7654dbf X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 1 Message-ID: <97bed60e80b3884e2452.1481726052@x1c> X-Mercurial-Series-Id: <97bed60e80b3884e2452.1481726052@x1c> User-Agent: Mercurial-patchbomb/4.0.1+3-7817df5585db Date: Wed, 14 Dec 2016 14:34:12 +0000 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.3] X-ClientProxiedBy: SN1PR19CA0037.namprd19.prod.outlook.com (10.163.220.47) To SN2PR15MB0991.namprd15.prod.outlook.com (10.169.192.7) X-MS-Office365-Filtering-Correlation-Id: 8bcc7377-4424-4b02-f8c0-08d4242e5984 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN2PR15MB0991; X-Microsoft-Exchange-Diagnostics: 1; SN2PR15MB0991; 3:rkvHlRpKgp6S9KZHxgo5pa8CmSf/mPksa3X6Z9XaPQ89fjISO5MZKhh+ZFO9PHMcIKmKrW8tIzynI7jaa26gzNJdwrnv4pvO9Eao3zPzbrDhDF80fnyYbWI4ozJotRGK+AeT+q3nz1GibHdPpKAOud94p5LmCvJSU1el2sGYz/sZIuqrQqUu5XjW/Hnba5rb8/1tzsl6wYse4Pq14Au+uIBvo/b/z8rgTt33ujGpqc2iR4zt2C1If+QuzmRgrb2wdUQHChGCwbgqXtjLB9+OCQ==; 25:4PplF+jfDIIL6DlQlQHQnhAVRZqymU/kCzKfWBriwwpr3r8i4xqZrFMJp/CVSLKWZgNHnsBpOcJo7PH/6nqXKW7ysf/FrWD7VBx5A2XzXwja4hWmSi5uwFz7FEef9HNXxG3uyR3KyUpLKAIoQJaLLFO+GfU3byzvZzdndWrGlSh/x8XWkG2HvGeFW/xwS89pSASWdUXFxHa/P5qFwdowIIT/kCOnabN/BpJMdcTbAmFT3kYTULZB3N9t+OusjEsU7xMIfUY8yWrdxr0kFesEoyfTkutpO4uFPu2uQ+pR3reIShDJFsLFRwlyMffWKWrdJoOuVp9zlYgpLjFWsbF1cqBk4dWVfgyYbNRvT/98c8kYQLp5h559FqjrlvA4R2eqh09uZDcCDAVoMuAHhPi0PbM/2Xjif2zsxkMUhzfx+Z+MAEQkV2TUKN8aIRQl//zlMkAlFLUtWvJPeLTIfDNyvg== X-Microsoft-Exchange-Diagnostics: 1; SN2PR15MB0991; 31:2q5WYvHqLyhm3frXdzk8jT083aUQiES86GLkqJ9TvLphiKM1R1cVpFo7nuKTBzJCagHiTUHQYhhpO3S/ExwqaW3Ox2icTiVDuIHMZgFspIOXmb3uq4Pwyi3RerGJ6PxHTPh7bvy8btwulURuuunWg+LEqXofq8ckwLT+KLO/fixdwgwc/2BFx9Jc5O6aKon/2oH+7o4Oo7mOcReqp2dzmcScnMr0VTd0IT6g9qixjejKKjQ7HEB3nA6G82tQYfyLt02yMCdhtWDOvHRzFWvAdA==; 20:JfRGflBgrPWdpk1w9GATPuWFF0kkOuz0uz6M1tT3A/jXJ6KMNjMv/dX7R1xMDA9UlyQz4VgN13PnP/9JRxGIwPnIcU1siInpXtbE76ztr7n5rHucvIStUbeSjQ1VYIF7dBszyN1cw+/XldOpenaCUW8pHJgYWKvkGxjFqEO63N6GM1Xv4+1PXTdH6bf6WmJzCS41g6gUa31h53t9VUiR84VZvrbVLC2Z6d1ykIDi+1Xg3pYrSj4nuY66Uf4kvd/H2xOIfBpkHnteuvoTiP9pGpFeA46dOh5O9Hb3Poh+4OmHgj8YDkdUarV+20wQzXp8MNUUFYZ/2FzZ8HatjfUaXAygfE7LPSX7NGN3bCBrVb52V8z8ZWsUcWg0If8KDkGrbQNFJsaTem75CUiYx453KNRldlKsvsamTu1tuoBqMJSo+bYxyzUl42J97VVTg9TMLjjUONOu6RJL0SL7XMXqLtGwiy0/6J6PODMuf2v2OZgKIkLlUGO406SWO94kZyxu X-Microsoft-Antispam-PRVS: <SN2PR15MB0991042B7658B8DA725808E2CD9A0@SN2PR15MB0991.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(158342451672863)(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123558021)(20161123564025)(6072148); SRVR:SN2PR15MB0991; BCL:0; PCL:0; RULEID:; SRVR:SN2PR15MB0991; X-Microsoft-Exchange-Diagnostics: 1; SN2PR15MB0991; 4:el1sJKPO4hsk+ECH/klLJOT7wNkbeR+gASSS5WH1UOeqMvngFvE/hcHH/olm1JR8R2AEWMg/UL20OjJ4hBDVYZNAkYP3NtN5I2Oby4yuXcS/l4G4Ktys7GBCNp1yRx2Kqxzu68v+bg6dPsop4eTsARRsD4QXrEEvn2GmpurbstSr/wJjuntKzebKwXZMk+7869EWrVLqLUD4hNvtV7gLlk3+J3noSJzKFV9hqVK4Lj5rg6LBReTN6O16BjxR1ZijVfVAy/QPtvfuiC2SaKiYLi9OkkIg6UlZau4LxMKdVPEaHzRasEJZ5yjAG2rpYa8k4Z+defZjmYzoHnkyLYy8fLxLdEkWJ/A8aCojJat15xOV/NWJKB+0MNC9iCihXCYFb1yEGK4NK4Puth9BoLLNT/nqCRpRNCCdqiFVhtLY/xxkYOEIGV2T463QyuvGqdWhmYDkoxRzCo2iFbGKC/Qi9F8X4upyZjUgEDtJtJ92xv3s6YEnml2lnKLXDmfNWnYaH+ZKPOajpETGwp9DBwU7oBUOifu8MFbb9zSHvdbRi+YQFxbNWZ72WFDQ5WJQ7YwlOjaZ3W1DWwh+fJZznQv9vicrfg/cSdYv2OEGyHPkJHMdBal36ffh7AYBPo2mBDmIoiVnqolKY0XUjSpsnRirsIhM7WApUPX3FD2qN2fgbb5h11RzSumJJS6M7LNxZ5V6j5xha0r1st+IoIOK9qrR3Q3jptHVlLd/YKJze0evgpM= X-Forefront-PRVS: 01565FED4C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(39410400002)(39840400002)(39850400002)(39450400003)(189002)(199003)(33646002)(7736002)(33716001)(83506001)(5660300001)(110136003)(6666003)(6916009)(230700001)(3846002)(107886002)(46406003)(6116002)(86362001)(305945005)(68736007)(4001350100001)(23726003)(97736004)(189998001)(92566002)(8676002)(50986999)(2906002)(106356001)(81166006)(54356999)(105586002)(42186005)(81156014)(50466002)(575784001)(97756001)(450100001)(101416001)(38730400001)(9686002)(90366009)(6486002)(77096006)(66066001)(47776003)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR15MB0991; 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; SN2PR15MB0991; 23:ZYg2MKx8TaSfEgfzeWLpJWljDLrlMnn0j6scA+bc9?= =?us-ascii?Q?lAkAg48+OgmqeXnTIIdRDGAJfa7G2edPgeKgVN4BYe0vSnhMkoYqqjCEOGBZ?= =?us-ascii?Q?oLh1Qp6zhFsVf++O0TjLJcQPhlUUh7klsXofEcZwKXf3c9iv56WOj+t35QXv?= =?us-ascii?Q?Hk/Lk2hHhBwMnygr4AEwHcck+QQs+1ELKXq8vau89nwXdvP6qB6mBe6q9vhG?= =?us-ascii?Q?E4QfWBp6im8VHTkhAVg3dA6a9LjzQv50ylSWpLcvJH4uKjcjhdwc4BvbCKOA?= =?us-ascii?Q?WFYY0DPwYEX4Jqs9QXILCoxRp2osORimQtpZ+6LbqvYw9CymZ1qfci6WfBZ4?= =?us-ascii?Q?bKPDPJ2Hmh2sDX720kJeqZ08iedqHQInpHXB5ATcokympNb7/h9HH+k0Ub2i?= =?us-ascii?Q?2TXHHiX57L8L//T1YkQfcPRN9xfaHEmbuVmalw3xEbB7Tz/Yi75p4awIbw+5?= =?us-ascii?Q?mC0HAanNrjQa2ZzDiUfhihni3zeiK8ocClNDP4AehZ6H2LXv7EuL06G9mNmL?= =?us-ascii?Q?bia3CjzJ7KOapyz73wI2qDF2Gp2IgXqXr4qWtYYOublDTxwDBeUXgBWYsm8m?= =?us-ascii?Q?L5IPxynD/NvmfWIxZYChX4H27I/mMuf8khWnS3iRNqin6sjcJqDqLBBo25Hl?= =?us-ascii?Q?RBHzejIQtIyPgDNtPsrsYJm5y3bXcRAc9zG1pDNm+y8NoUL1N2Fwx2gYn9s2?= =?us-ascii?Q?JR584jCattyzcAYVi/tjzBPq1P+cGb9q5ireX5YSSW0jOyq3vhHxUx4d8Jtm?= =?us-ascii?Q?pxfLVPqDmXOTg0TGCc5lI8V9UrMZ2JWZ8+V5sPY676HlnF/yK3KnRzgM8w0o?= =?us-ascii?Q?6X1qp/F77oo4ra/9Xa2e9mnzfmN6Op88ox1VM3L42GQnvWqaoOQfrAs2vHAR?= =?us-ascii?Q?cZnKW2N5pjRjc4UjC6o5MpEFTHSPV1UvPCbq0SGK0vF8aGfi1aYCRpDF3YbB?= =?us-ascii?Q?AqrrbnKu2oSweYpf+WyHj4PbAbLWRtlIwNXI4d6qB/PA9BJnUpXg7eKtplO2?= =?us-ascii?Q?uRNN1DAqxXkpBzRyYJuUEfe0cl2Y52dafZjWb9ZP3hgTlLwjY4oU3MFWPFMq?= =?us-ascii?Q?Og/OkXgiMttw2RXqYiyvIp2wMfjjkUbgW8CgBeyihgR+AEqOX7v1Dxl5pvUR?= =?us-ascii?Q?paBJ8++TcMymZkj+ei9Hla7BzNMIHhAOj+wgaxotNSTJqUP8gpO99fM1GbYr?= =?us-ascii?Q?n/tdg1o3m6LkmVC+Kl3M33Ksk+4NqNZ4pa9WC4NePhDd60p2AozQboaY8Dee?= =?us-ascii?Q?dnTundvwbzUkITayz95w/5QAJnp6nqZO5LlT/q00xKn7W9prXnjzcOutN4hz?= =?us-ascii?B?dz09?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR15MB0991; 6:C7K8U2tHWg1sOWzP238aPu95oIlKD6A/0+8y+BgmIp9oNVzwNwsIV8IrclOw2PTJABdQJuldQklOu0fwgtxORogEPz5AxzvVACL0nAurjLZYKbJbmsqK6TE4B9V7fWdYt6BD7At+NGMZSIHQtIqGWTTcWrXSuaWVjrGnEme5LlE+re9MZehlfPs9lW8BNsFIrmB/Y3zt21dA20A4i9oFhDqjDITJ6MYkw7MoJ6TaTOdEC5uFhJfX6riLNzUXGLIh3CnXqkYDESZkAyhhsnEngZmto1W/fPmTcSX5n/0GhrgFr8pY8gjYSBPFU8ULgIh5kupscRbpfhUHEOtPlLM48Zgq0h54cszVz/urDnUAHSdr1hD4LvXs1glMPLTc6KRHjGtgg4Nr0uFQIJ9B0MMlbxxlxLS2NumAJyJFSHzBvCo=; 5:Pjf08xhA1mAnZltM/Bnnpj15avYkxLtEe6VbXgNSHRk+FMJfv28jv6KwWnEjoADv4qxeIPmlMchsJ14a7yrESW7qPgTJEeE0L8SG8M3+IdOKvGYnuaAWIHb4FXaLelOiuD5PSpQ4ksP1dTmOe+v2lQ==; 24:jtrBeTkaLG8OIaL40gDtZ7b/SafjSbaXbLQEg4a9c9eBjI9Y3h81hSinorrtIQzzEAQt+fS+h3lgHX2h0cqUAI+KEG0mhtbylX89dqrQENI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR15MB0991; 7:+0nZoxyZ6kdqdjbqgITn/BAbeukY/YWD7Ct0AURDCecS8/xMddnAhXHWoeq8AZTCt1ez2wGyJswQhQfBJvnmkYzHP0FwFvR2Ej/ANBe2HUnDllRCwKgS4n/S2R6a0CFZM0ybTKTzDCeNEc30Gw7JRaThkI8O5AgCxrLOpN3Rp+e+R7IFY+pEgH6IlF2tcmDbW6AjmJeyUazmbu1oGWwVERgHXscXjO7cArE3dVPWe9Khalluss4jZ+6xnTt2xh4zq3QBRA21PDDLi1A7vY7M+rZ1wgUhz652P47/LGvDtnR0uFTXYwPkHguEKuPRAh+0QyzIvGyGgP6cp8/n00CFxrV0gp18LHffs870XOMu4bTs1xtmSSVasqGlhcoo4I7IfM/IYArGGW3BHyyRNZ7gcv0JT4VK0UnSOKK/DLd4w3scntAFEUElA3kxyHtv2HYlitOcZDSTjwuEqqxd7ny43w==; 20:xU+6k+YShKoYFW16vXhBApSwrJJbGgH7MUTZgEXkicKTAfq+f2XK1NMHQYW8ENQVMCmUHcJKwAKrhZsvwwYRULa6n7vFiYPo/IjHNb9LH7xxK4carvcEfnZ8uax4mS0b3VKISVmq0BdVC4putn+NiN0b3Fvk2uhEx1zq2eFy7Mg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2016 14:34:45.0461 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR15MB0991 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-12-14_10:, , 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 - Dec. 14, 2016, 2:34 p.m.
Yuya Nishihara - Dec. 14, 2016, 2:42 p.m.
On Wed, 14 Dec 2016 14:34:12 +0000, Jun Wu wrote: > # HG changeset patch > # User Jun Wu <quark@fb.com> > # Date 1481681879 0 > # Wed Dec 14 02:17:59 2016 +0000 > # Node ID 97bed60e80b3884e24524822f0614b0ba7654dbf > # Parent af482d20004c97e7ad8d6e2e5932e82a934761e3 > # Available At https://bitbucket.org/quark-zju/hg-draft > # hg pull https://bitbucket.org/quark-zju/hg-draft -r 97bed60e80b3 > chg: ignore HG_* in confighash Queued this, thanks.
Patch
diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py --- a/mercurial/chgserver.py +++ b/mercurial/chgserver.py @@ -78,5 +78,5 @@ def _hashlist(items): _envre = re.compile(r'''\A(?: CHGHG - |HG.* + |HG(?:[A-Z].*)? |LANG(?:UAGE)? |LC_.*