Submitter | Gregory Szorc |
---|---|
Date | March 29, 2017, 3 a.m. |
Message ID | <5cf00a25e8c066bd664d.1490756449@ubuntu-vm-main> |
Download | mbox | patch |
Permalink | /patch/19808/ |
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 510062C20C; Tue, 28 Mar 2017 23:01:00 -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 BOFEo8ga_a_I; Tue, 28 Mar 2017 23:01:00 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id D125B2C210; Tue, 28 Mar 2017 23:00:58 -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 6E7292C210 for <mercurial-devel@mercurial-scm.org>; Tue, 28 Mar 2017 23:00:56 -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 UYZssZClE6oL for <mercurial-devel@mercurial-scm.org>; Tue, 28 Mar 2017 23:00:53 -0400 (EDT) Received: from mail-pf0-x229.google.com (mail-pf0-x229.google.com [IPv6:2607:f8b0:400e:c00::229]) by mercurial-scm.org (Postfix) with ESMTPS id EFE5A2C201 for <mercurial-devel@mercurial-scm.org>; Tue, 28 Mar 2017 23:00:52 -0400 (EDT) Received: by mail-pf0-x229.google.com with SMTP id o126so706127pfb.3 for <mercurial-devel@mercurial-scm.org>; Tue, 28 Mar 2017 20:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=pDwOy3fZPM9CEwSJHMWz5FoCxTThZt8CbWcCM2Upwqk=; b=dNVpaGZzxnDXVtJgSgOxsFefRgkJoGIahcEwL82ziiYK0K3Pe0MLa2KT4iYdPcikke R27ZrDytpq7b0/CDQ6beNhDz9+stbW0IJT5J/3PjjIYgdVuMKS+Jv8dNh7u2TTnycKWu GbobUmc6TdrSJzjFRPpZRbWhpwNBe6by4Vk00V/jcWj9EOp/3uvqKPrxmu7lNJj2BvAe ea+C6PfcReU4lfiaTseE2Ql2fHAGLq4ZjzaHBQCsxkv7hsMjXkroU8aVV9o7LAt2vtD6 QhhgQcE6XK30J8dudpkCLDZaNAveAOMc1hJ6Es2yRyb4pg3Nqke6NOQtn/l9Ck514IhP dpmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=pDwOy3fZPM9CEwSJHMWz5FoCxTThZt8CbWcCM2Upwqk=; b=MxFYs4RfkQx4OMw/6dRIXRmk4WebBaCHghRetIKYDJV6jVI39ZsTIx29PDUo4j0hnw /sPunMXmkRol0qmlM1+uaOIJaqbi3Ewsx0jpl5fIAo4IAgGf/InBp6lNYLJ4iFOUZ1/t DbLSYztlPQnIIfUQyFyVOYKwJXwiF1ERoCU7UVvPB2iU23HmykkVuimeoxz/CzlHc0NK 25E7nIlbyiYLN8HzqfOLnLw+WBd0cLWtN7sAwU+E2a1CTgkTqqLKMuriCIHWM2AjB2q4 fV7T2a0t8KToMh1PF80iRVNVawVV3fUHju/hxT98YVeQxfMFXi+nljaMBFAEvBI15s+o Xp9g== X-Gm-Message-State: AFeK/H15B/cWOXLcfQyyYdko2EmwS+KBL5IYHMzwZ5gJOq7yyyOWbLPhxHvbBDpPPCXySw== X-Received: by 10.98.14.81 with SMTP id w78mr35513833pfi.9.1490756452193; Tue, 28 Mar 2017 20:00:52 -0700 (PDT) Received: from [127.0.1.1] (c-76-102-241-255.hsd1.ca.comcast.net. [76.102.241.255]) by smtp.gmail.com with ESMTPSA id m194sm9717725pga.62.2017.03.28.20.00.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 20:00:51 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 2 of 3 V2] httpconnection: allow a global auth.cookiefile config entry X-Mercurial-Node: 5cf00a25e8c066bd664dde4cb302bd52a75195d6 X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 3 Message-Id: <5cf00a25e8c066bd664d.1490756449@ubuntu-vm-main> X-Mercurial-Series-Id: <011f4e38687438d27341.1490756448@ubuntu-vm-main> In-Reply-To: <011f4e38687438d27341.1490756448@ubuntu-vm-main> References: <011f4e38687438d27341.1490756448@ubuntu-vm-main> User-Agent: Mercurial-patchbomb/4.1.1+744-cf6393b6a350 Date: Tue, 28 Mar 2017 20:00:49 -0700 From: Gregory Szorc <gregory.szorc@gmail.com> To: mercurial-devel@mercurial-scm.org 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
Gregory Szorc - March 29, 2017, 3 a.m.
Patch
diff --git a/mercurial/httpconnection.py b/mercurial/httpconnection.py --- a/mercurial/httpconnection.py +++ b/mercurial/httpconnection.py @@ -69,6 +69,9 @@ def readauthforuri(ui, uri, user): # Read configuration groups = {} for key, val in ui.configitems('auth'): + if key in ('cookiefile',): + continue + if '.' not in key: ui.warn(_("ignoring invalid [auth] key '%s'\n") % key) continue