Submitter | Yuya Nishihara |
---|---|
Date | June 16, 2018, 11:06 a.m. |
Message ID | <5cb39a368c803683fd8b.1529147167@mimosa> |
Download | mbox | patch |
Permalink | /patch/32187/ |
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 5A78D2C3C2; Sat, 16 Jun 2018 07:06:26 -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 Jszd4IPK7pVP; Sat, 16 Jun 2018 07:06:26 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id C1DC22C3E4; Sat, 16 Jun 2018 07:06:25 -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 E43432C3C2 for <mercurial-devel@mercurial-scm.org>; Sat, 16 Jun 2018 07:06:23 -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 HgkvmV6pEriI for <mercurial-devel@mercurial-scm.org>; Sat, 16 Jun 2018 07:06:23 -0400 (EDT) Received: from mail-pg0-x22d.google.com (mail-pg0-x22d.google.com [IPv6:2607:f8b0:400e:c05::22d]) by mercurial-scm.org (Postfix) with ESMTPS id 44ACC2C3B2 for <mercurial-devel@mercurial-scm.org>; Sat, 16 Jun 2018 07:06:22 -0400 (EDT) Received: by mail-pg0-x22d.google.com with SMTP id z1-v6so5483840pgv.12 for <mercurial-devel@mercurial-scm.org>; Sat, 16 Jun 2018 04:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:subject:message-id :user-agent:date:from:to; bh=uhfdBCDimhQudGxKz00vAv6bK8E3QZj71Xv83UxyurE=; b=O+ENmGEECZqsw/0ZGz5v9BsGaPORIObXsQc7xPc1df8LcV+D4Ua10sT5nPnBDAJmPe 84IS8NsidNKLPZnqLuwFyMP+WLx1kak1Gk6O5QKjh4nMTwVoE46dTeyeVMsp5ZUx1F3Z WvZI7xtpN3dckDmk8g+7Od73JrAXhAZII4nhqCjdUfqX6niTc7yTpktoPS8L2DQSohP4 +SmHMwYVJsEunJrpyMi9bdq6dZG+mbJQhqudDP4dzd8mGzy3WUkZv3JcT1JuZhOpxdsb hKlNOhAYEvTrz3KQ0ACMSlT9mJ5xVt7Yf9kbhs6XHVQGvLIupJSRYerixkpOtRp5FA6F eLhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding :subject:message-id:user-agent:date:from:to; bh=uhfdBCDimhQudGxKz00vAv6bK8E3QZj71Xv83UxyurE=; b=ItlPe2CttEuODAiAaijQ4jdttR27245uDdptyikUeKVk6iRDA5s+m1zA2Iv4gffHD5 BebIK5WxsezwaATdlqXlmtEA1/4g2kECmBrB3ILBzdUGQzYb223Pb2tJLYQr6SOnvS9v LmL8amN8yskMWaHTGEaTG6ucAEaStYZE1suUC0CAIrI3d0fl2vy7hlaqJtV5P43HfnZT /7lGSavaUWo9cBaUN+w7qauSRX52vT9j+l69hrQKkiRqLTgCqgM/s7uWJgZwdnJZ1EL2 RUfREQKgRbJqIv68eBQRm3r5LHnqSRwDc6Cv/c9DXIc8gcD5SeN3U3b8qTvZxP9UX4QI A+WQ== X-Gm-Message-State: APt69E2BNXzlM8cDtcomgLmLLR50csd2Y611LKpMI7BRf3MqrS641PAK 5rZpLbNHHWUx2f5NhLtUYQO/U5tn X-Google-Smtp-Source: ADUXVKKyvRiBLA678lTc0GaZqUxg4OyhHX7YH0Eq1XE8VzFKmhPN6q+otXz0GSXjhLjXbRQ2j2EoLw== X-Received: by 2002:a62:c61d:: with SMTP id m29-v6mr5958333pfg.26.1529147181952; Sat, 16 Jun 2018 04:06:21 -0700 (PDT) Received: from [127.0.1.1] (pdb6fbe2b.tkyea126.ap.so-net.ne.jp. [219.111.190.43]) by smtp.gmail.com with ESMTPSA id m12-v6sm12596802pgp.88.2018.06.16.04.06.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Jun 2018 04:06:20 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 1 of 8] py3: cast bytes encoding name to str in fileset.py X-Mercurial-Node: 5cb39a368c803683fd8bc944480486a618ab785a X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 8 Message-Id: <5cb39a368c803683fd8b.1529147167@mimosa> X-Mercurial-Series-Id: <5cb39a368c803683fd8b.1529147167@mimosa> User-Agent: Mercurial-patchbomb/4.6.1+438-523f64466a05 Date: Sat, 16 Jun 2018 20:06:07 +0900 From: Yuya Nishihara <yuya@tcha.org> 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
Yuya Nishihara - June 16, 2018, 11:06 a.m.
Patch
diff --git a/mercurial/fileset.py b/mercurial/fileset.py --- a/mercurial/fileset.py +++ b/mercurial/fileset.py @@ -427,7 +427,7 @@ def encoding(mctx, x): for f in mctx.existing(): d = mctx.ctx[f].data() try: - d.decode(enc) + d.decode(pycompat.sysstr(enc)) except LookupError: raise error.Abort(_("unknown encoding '%s'") % enc) except UnicodeDecodeError: