Re: [PATCH] spelling: fixes of non-dictionary words

[Mads Kiilerich]

On 11/16/2016 04:16 PM, Augie Fackler wrote:

On Nov 16, 2016, at 08:47, Mads Kiilerich  wrote:

On 10/18/2016 02:20 AM, Augie Fackler wrote:

On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:

# HG changeset patch
# User Mads Kiilerich 
# Date 1476739015 -7200
#  Mon Oct 17 23:16:55 2016 +0200
# Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
# Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
spelling: fixes of non-dictionary words

Queued, with some hunks discarded. I've tried to note the interesting ones.

Thanks for pushing.

You omitted prioritises -> prioritizes. I thought we used US english?

We do, but I'm bad at remembering which is which. I'd gladly do that cleanup, 
but only if you'll publish your tool for this (it'd be nice to have this happen 
on an ongoing basis somehow rather than have you drop in with a monster patch 
once a year).


Sure. I will clean it up and post it now when the fixes have landed.

It hasn't changed much since 
https://www.mercurial-scm.org/pipermail/mercurial-devel/2012-August/043846.html 
and I still don't think it is feasible to upstream it ;-)


/Mads
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Jun Wu]

Excerpts from Augie Fackler's message of 2016-11-16 10:16:31 -0500:
> 
> > On Nov 16, 2016, at 08:47, Mads Kiilerich  wrote:
> > 
> > On 10/18/2016 02:20 AM, Augie Fackler wrote:
> >> On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:
> >>> # HG changeset patch
> >>> # User Mads Kiilerich 
> >>> # Date 1476739015 -7200
> >>> #  Mon Oct 17 23:16:55 2016 +0200
> >>> # Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
> >>> # Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
> >>> spelling: fixes of non-dictionary words
> >> Queued, with some hunks discarded. I've tried to note the interesting ones.
> > 
> > Thanks for pushing.
> > 
> > You omitted prioritises -> prioritizes. I thought we used US english?
> 
> We do, but I'm bad at remembering which is which. I'd gladly do that cleanup, 
> but only if you'll publish your tool for this (it'd be nice to have this 
> happen on an ongoing basis somehow rather than have you drop in with a 
> monster patch once a year).

If it's some tool that's widely available. It may be nice to run it in
check-commit.

> 
> > 
> > /Mads
> 
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Mads Kiilerich]

On 10/18/2016 02:20 AM, Augie Fackler wrote:

On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:

# HG changeset patch
# User Mads Kiilerich 
# Date 1476739015 -7200
#  Mon Oct 17 23:16:55 2016 +0200
# Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
# Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
spelling: fixes of non-dictionary words

Queued, with some hunks discarded. I've tried to note the interesting ones.


Thanks for pushing.

You omitted prioritises -> prioritizes. I thought we used US english?

/Mads
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Augie Fackler]

> On Nov 2, 2016, at 11:13, Mads Kiilerich  wrote:
> 
> On 11/02/2016 03:41 PM, Augie Fackler wrote:
>>> On Nov 2, 2016, at 10:32, Mads Kiilerich  wrote:
>>> 
>>> On 10/18/2016 02:20 AM, Augie Fackler wrote:
 On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich 
> # Date 1476739015 -7200
> #  Mon Oct 17 23:16:55 2016 +0200
> # Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
> # Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
> spelling: fixes of non-dictionary words
 Queued, with some hunks discarded. I've tried to note the interesting ones.
>>> Can you push your queued version now?
>> I thought I already had. If it's not local, then it's gone. Do you want to 
>> just send a new one, or should I try and reconstruct what I had?
> 
> Changes don't "go away" with Mercurial so I would assume that you must have 
> it locally somewhere. Digging it out is probably less work for you than the 
> alternatives.

I work across a wide variety of machines, and I *do not have* the change 
anymore.

> Alternatively, you are in a power position and can decide which alternative 
> you want ;-)

I'll regenerate the change.

But I'd rather you published your scripts for this, rather than sending us a 
code bomb once a year. ;)

> 
> /Mads

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Mads Kiilerich]

On 11/02/2016 03:41 PM, Augie Fackler wrote:

On Nov 2, 2016, at 10:32, Mads Kiilerich  wrote:

On 10/18/2016 02:20 AM, Augie Fackler wrote:

On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:

# HG changeset patch
# User Mads Kiilerich 
# Date 1476739015 -7200
#  Mon Oct 17 23:16:55 2016 +0200
# Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
# Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
spelling: fixes of non-dictionary words

Queued, with some hunks discarded. I've tried to note the interesting ones.

Can you push your queued version now?

I thought I already had. If it's not local, then it's gone. Do you want to just 
send a new one, or should I try and reconstruct what I had?


Changes don't "go away" with Mercurial so I would assume that you must 
have it locally somewhere. Digging it out is probably less work for you 
than the alternatives.


Alternatively, you are in a power position and can decide which 
alternative you want ;-)


/Mads
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Augie Fackler]

> On Nov 2, 2016, at 10:32, Mads Kiilerich  wrote:
> 
> On 10/18/2016 02:20 AM, Augie Fackler wrote:
>> On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:
>>> # HG changeset patch
>>> # User Mads Kiilerich 
>>> # Date 1476739015 -7200
>>> #  Mon Oct 17 23:16:55 2016 +0200
>>> # Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
>>> # Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
>>> spelling: fixes of non-dictionary words
>> Queued, with some hunks discarded. I've tried to note the interesting ones.
> 
> Can you push your queued version now?

I thought I already had. If it's not local, then it's gone. Do you want to just 
send a new one, or should I try and reconstruct what I had?

> 
> /Mads

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Mads Kiilerich]

On 10/18/2016 02:20 AM, Augie Fackler wrote:

On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:

# HG changeset patch
# User Mads Kiilerich 
# Date 1476739015 -7200
#  Mon Oct 17 23:16:55 2016 +0200
# Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
# Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
spelling: fixes of non-dictionary words

Queued, with some hunks discarded. I've tried to note the interesting ones.


Can you push your queued version now?

/Mads
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] spelling: fixes of non-dictionary words

[Augie Fackler]

On Mon, Oct 17, 2016 at 11:38:02PM +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich 
> # Date 1476739015 -7200
> #  Mon Oct 17 23:16:55 2016 +0200
> # Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
> # Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
> spelling: fixes of non-dictionary words

Queued, with some hunks discarded. I've tried to note the interesting ones.

>
> diff --git a/contrib/all-revsets.txt b/contrib/all-revsets.txt
> --- a/contrib/all-revsets.txt
> +++ b/contrib/all-revsets.txt
> @@ -8,7 +8,7 @@
>  #
>  # Please update this file with any revsets you use for benchmarking a change 
> so
>  # that future contributors can easily find and retest it when doing further
> -# modification. Feel free to highlight interresting variants if needed.
> +# modification. Feel free to highlight interesting variants if needed.
>
>
>  ## Revset from this section are all extracted from changelog when this file 
> was
> diff --git a/contrib/check-code.py b/contrib/check-code.py
> --- a/contrib/check-code.py
> +++ b/contrib/check-code.py
> @@ -463,7 +463,7 @@ def _preparepats():
>  failandwarn = c[-1]
>  for pats in failandwarn:
>  for i, pseq in enumerate(pats):
> -# fix-up regexes for multi-line searches
> +# fix-up regexps for multi-line searches

I've always used singular "regex" plural "regexes" - I don't see
"regexp" much in my day-to-day life. Dropped all instances of this
correction for now.

> @@ -192,7 +192,7 @@ def readbundle(ui, fh, fname, vfs=None):
>  def getbundlespec(ui, fh):
>  """Infer the bundlespec from a bundle file handle.
>
> -The input file handle is seeked and the original seek position is not
> +The input file handle is sought and the original seek position is not

I would correct this to seek()ed rather than sought - I'm a native
speaker and I wouldn't immediately follow the intent of the corrected
version here. Dropped all matching hunks for now.

Many thanks for this work - it's very valuable!
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH] spelling: fixes of non-dictionary words

[Mads Kiilerich]

# HG changeset patch
# User Mads Kiilerich 
# Date 1476739015 -7200
#  Mon Oct 17 23:16:55 2016 +0200
# Node ID efd5397e9da5b1d7e2c3353b0b06fc904651b150
# Parent  8a864844d5a0c34bdb24d2e098a0cd339e32e020
spelling: fixes of non-dictionary words

diff --git a/contrib/all-revsets.txt b/contrib/all-revsets.txt
--- a/contrib/all-revsets.txt
+++ b/contrib/all-revsets.txt
@@ -8,7 +8,7 @@
 #
 # Please update this file with any revsets you use for benchmarking a change so
 # that future contributors can easily find and retest it when doing further
-# modification. Feel free to highlight interresting variants if needed.
+# modification. Feel free to highlight interesting variants if needed.
 
 
 ## Revset from this section are all extracted from changelog when this file was
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -463,7 +463,7 @@ def _preparepats():
 failandwarn = c[-1]
 for pats in failandwarn:
 for i, pseq in enumerate(pats):
-# fix-up regexes for multi-line searches
+# fix-up regexps for multi-line searches
 p = pseq[0]
 # \s doesn't match \n
 p = re.sub(r'(?_GenericReview(argslist) 
 let s:origtabpagenr = tabpagenr()
 silent! exe 'tabedit ' . StrippedRelativeFilePath
 if exists('patchcmd')
-  " modelines in loaded files mess with diff comparision
+  " modelines in loaded files mess with diff comparison
   let s:keep_modeline=
   let =0
   silent! exe 'vert diffsplit ' . tmpname . '.file'
diff --git a/hgext/chgserver.py b/hgext/chgserver.py
--- a/hgext/chgserver.py
+++ b/hgext/chgserver.py
@@ -629,7 +629,7 @@ class chgunixservicehandler(object):
 
 def chgunixservice(ui, repo, opts):
 if repo:
-# one chgserver can serve multiple repos. drop repo infomation
+# one chgserver can serve multiple repos. drop repo information
 ui.setconfig('bundle', 'mainreporoot', '', 'repo')
 h = chgunixservicehandler(ui)
 return commandserver.unixforkingservice(ui, repo=None, opts=opts, 
handler=h)
diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py
--- a/hgext/fsmonitor/__init__.py
+++ b/hgext/fsmonitor/__init__.py
@@ -563,7 +563,7 @@ def wrapsymlink(orig, source, link_name)
 pass
 
 class state_update(object):
-''' This context mananger is responsible for dispatching the state-enter
+''' This context manager is responsible for dispatching the state-enter
 and state-leave signals to the watchman service '''
 
 def __init__(self, repo, node, distance, partial):
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1406,12 +1406,12 @@ def verifyactions(actions, state, ctxs):
% node.short(missing[0]))
 
 def adjustreplacementsfrommarkers(repo, oldreplacements):
-"""Adjust replacements from obsolescense markers
+"""Adjust replacements from obsolescence markers
 
 Replacements structure is originally generated based on
 histedit's state and does not account for changes that are
 not recorded there. This function fixes that by adding
-data read from obsolescense markers"""
+data read from obsolescence markers"""
 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
 return oldreplacements
 
diff --git a/hgext/logtoprocess.py b/hgext/logtoprocess.py
--- a/hgext/logtoprocess.py
+++ b/hgext/logtoprocess.py
@@ -27,7 +27,7 @@ For example::
 
 would log the warning message and traceback of any failed command dispatch.
 
-Scripts are run asychronously as detached daemon processes; mercurial will
+Scripts are run asynchronously as detached daemon processes; mercurial will
 not ensure that they exit cleanly.
 
 """
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1382,7 +1382,7 @@ def _computeobsoletenotrebased(repo, reb
 """return a mapping obsolete => successor for all obsolete nodes to be
 rebased that have a successors in the destination
 
-obsolete => None entries in the mapping indicate nodes with no succesor"""
+obsolete => None entries in the mapping indicate nodes with no successor"""
 obsoletenotrebased = {}
 
 # Build a mapping successor => obsolete nodes for the obsolete
diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -6713,7 +6713,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Scripts are run asychronously as detached daemon processes; mercurial will\n"
+"Scripts are run asynchronously as detached daemon processes; mercurial will\n"
 "not ensure that they exit cleanly."
 msgstr ""
 
@@ -10334,7 +10334,7 @@ msgid "corrupted shelved state file"
 msgstr "shelve 状態管理ファイルが破損しています"
 
 msgid "please run hg unshelve --abort to abort unshelve operation"
-msgstr "'hg unshelve --abort' を実施して unshleve 操作を中断してください"