Patchwork [STABLE] fileset: fix copy/paste in eol() error message

login
register
mail settings
Submitter Matt Harbison
Date Feb. 19, 2016, 4:04 a.m.
Message ID <673abb38dec427a0eafd.1455854699@Envy>
Download mbox | patch
Permalink /patch/13260/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Matt Harbison - Feb. 19, 2016, 4:04 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1455852738 18000
#      Thu Feb 18 22:32:18 2016 -0500
# Branch stable
# Node ID 673abb38dec427a0eafd01df992389f61895fe9d
# Parent  8da94662afe51a836eda500652097772c34002e8
fileset: fix copy/paste in eol() error message
Yuya Nishihara - Feb. 20, 2016, 9:12 a.m.
On Thu, 18 Feb 2016 23:04:59 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1455852738 18000
> #      Thu Feb 18 22:32:18 2016 -0500
> # Branch stable
> # Node ID 673abb38dec427a0eafd01df992389f61895fe9d
> # Parent  8da94662afe51a836eda500652097772c34002e8
> fileset: fix copy/paste in eol() error message

Pushed to the clowncopter, thanks!

Patch

diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -435,8 +435,8 @@ 
     styles.
     """
 
-    # i18n: "encoding" is a keyword
-    enc = getstring(x, _("encoding requires an encoding name"))
+    # i18n: "eol" is a keyword
+    enc = getstring(x, _("eol requires a style name"))
 
     s = []
     for f in mctx.existing():