Patchwork [evolve-ext] typos: fix typos in several locations

login
register
mail settings
Submitter via Mercurial-devel
Date Dec. 4, 2017, 10:33 p.m.
Message ID <c7efdd5d0edec14d0053.1512426809@dragonair.svl.corp.google.com>
Download mbox | patch
Permalink /patch/25931/
State Accepted
Headers show

Comments

via Mercurial-devel - Dec. 4, 2017, 10:33 p.m.
# HG changeset patch
# User Kyle Lippincott <spectral@google.com>
# Date 1512426447 28800
#      Mon Dec 04 14:27:27 2017 -0800
# Node ID c7efdd5d0edec14d00538cf2487a005cc7c3cbb3
# Parent  adbae782aac7387d35781816cb015c8d6b845329
typos: fix typos in several locations

A user at Google attempted to fix our local copy because they had noticed a
typo (accross instead of across), but this will just get overwritten on our
next import.  This commit fixes that case and a few others that my editor found.

Most of the typos were in comments, but user-visible output is changed in a few
cases:
- accross -> across
- splitted -> split
- ambigious -> ambiguous
- evolvestte -> evolvestate  (this is in a ui.debug, so not often seen)

There is another typo that I wanted to fix, but didn't: 'supercede' is spelled
'superseed' in a few locations.  I believe this is only internal to the
extension, instead of being user-visible, so while it could probably be fixed
easily, I wasn't 100% sure it didn't end up in a file on disk or something and
might cause problems, so I left it alone.
Boris Feld - Dec. 5, 2017, 2:12 p.m.
Pushed, thanks for the many fixes.

On Mon, 2017-12-04 at 14:33 -0800, Kyle Lippincott via Mercurial-devel
wrote:
> # HG changeset patch
> # User Kyle Lippincott <spectral@google.com>
> # Date 1512426447 28800
> #      Mon Dec 04 14:27:27 2017 -0800
> # Node ID c7efdd5d0edec14d00538cf2487a005cc7c3cbb3
> # Parent  adbae782aac7387d35781816cb015c8d6b845329
> typos: fix typos in several locations
> 
> A user at Google attempted to fix our local copy because they had
> noticed a
> typo (accross instead of across), but this will just get overwritten
> on our
> next import.  This commit fixes that case and a few others that my
> editor found.
> 
> Most of the typos were in comments, but user-visible output is
> changed in a few
> cases:
> - accross -> across
> - splitted -> split
> - ambigious -> ambiguous
> - evolvestte -> evolvestate  (this is in a ui.debug, so not often
> seen)
> 
> There is another typo that I wanted to fix, but didn't: 'supercede'
> is spelled
> 'superseed' in a few locations.  I believe this is only internal to
> the
> extension, instead of being user-visible, so while it could probably
> be fixed
> easily, I wasn't 100% sure it didn't end up in a file on disk or
> something and
> might cause problems, so I left it alone.
> 
> diff --git a/hgext3rd/evolve/__init__.py
> b/hgext3rd/evolve/__init__.py
> --- a/hgext3rd/evolve/__init__.py
> +++ b/hgext3rd/evolve/__init__.py
> @@ -58,10 +58,10 @@
>  is already raising better results than the previous version (when
> usable).
>  
>  "Large" repositories (hundreds of thousand) are currently
> unsupported. Some key
> -algorithm has a naive implementation with too agressive caching,
> creating
> +algorithm has a naive implementation with too aggressive caching,
> creating
>  memory consumption issue (this will get fixed).
>  
> -Medium sized repositories works fine, but be prepared for a
> noticable initial
> +Medium sized repositories works fine, but be prepared for a
> noticeable initial
>  cache filling. for the Mercurial repository, this is around 20
> seconds
>  
>  The following config control the experiment::
> @@ -97,7 +97,7 @@
>  
>      # automatically disable obshashrange related computation and
> capabilities
>      # if the repository has more than N revisions.  This is meant to
> help large
> -    # server deployement to enable the feature on smaller
> repositories while
> +    # server deployment to enable the feature on smaller
> repositories while
>      # ensuring no large repository will get affected.
>      obshashrange.max-revs = 100000 # default is None
>  
> @@ -159,12 +159,12 @@
>  
>    - precursors, for each obsolete changeset show the closest visible
>      precursors.
> -  - successors, for each obsolete changeset show the closests
> visible
> +  - successors, for each obsolete changeset show the closest visible
>      successors. It is useful when your working directory is obsolete
> to see
>      what are its successors. This information can also be retrieved
> with the
>      obslog command and the --all option.
>    - obsfate, for each obsolete changeset display a line summarizing
> what
> -    changed between the changeset and its successors. Dependending
> on the
> +    changed between the changeset and its successors. Depending on
> the
>      verbosity level (-q and -v) it display the changeset successors,
> the users
>      that created the obsmarkers and the date range of these changes.
>  
> @@ -1452,8 +1452,8 @@
>      Automatic mode only handles common use cases. For example, it
> avoids taking
>      action in the case of ambiguity, and it ignores unstable
> changesets that
>      are not related to your working copy.
> -    It also refuses to solve bumped or divergent changesets unless
> you explicity
> -    request such behavior (see below).
> +    It also refuses to solve bumped or divergent changesets unless
> you
> +    explicitly request such behavior (see below).
>  
>      Eliminating all instability around your working copy may require
> multiple
>      invocations of :hg:`evolve`. Alternately, use ``--all`` to
> recursively
> @@ -1719,7 +1719,7 @@
>          roots = repo.revs('roots(%ld)', targetrevs)
>          heads = repo.revs('heads(%ld)', targetrevs)
>          if len(roots) > 1 or len(heads) > 1:
> -            msg = "cannot solve split accross two branches\n"
> +            msg = "cannot solve split across two branches\n"
>              ui.write_err(msg)
>              return 2
>          target = repo[heads.first()]
> @@ -1869,7 +1869,7 @@
>      base, others = divergentdata(divergent)
>      if len(others) > 1:
>          othersstr = "[%s]" % (','.join([str(i) for i in others]))
> -        msg = _("skipping %d:divergent with a changeset that got
> splitted"
> +        msg = _("skipping %d:divergent with a changeset that got
> split"
>                  " into multiple ones:\n"
>                  "|[%s]\n"
>                  "| This is not handled by automatic evolution yet\n"
> @@ -2172,7 +2172,7 @@
>                  displayer.show(c)
>              result = 0
>          elif children:
> -            ui.warn(_("ambigious next changeset:\n"))
> +            ui.warn(_("ambiguous next changeset:\n"))
>              for c in children:
>                  displayer.show(c)
>              ui.warn(_('explicitly update to one of them\n'))
> @@ -2196,7 +2196,7 @@
>                      ui.warn(msg % len(aspchildren))
>                  result = 1
>              elif 1 < len(aspchildren):
> -                ui.warn(_("ambigious next (unstable) changeset:\n"))
> +                ui.warn(_("ambiguous next (unstable) changeset:\n"))
>                  for c in aspchildren:
>                      displayer.show(repo[c])
>                  ui.warn(_("(run 'hg evolve --rev REV' on one of
> them)\n"))
> @@ -2462,7 +2462,7 @@
>      try:
>          versionblob = f.read(4)
>          if len(versionblob) < 4:
> -            repo.ui.debug('ignoring corrupted evolvestte (file
> contains %i bits)'
> +            repo.ui.debug('ignoring corrupted evolvestate (file
> contains %i bits)'
>                            % len(versionblob))
>              return None
>          version = _unpack('>I', versionblob)[0]
> diff --git a/hgext3rd/topic/__init__.py b/hgext3rd/topic/__init__.py
> --- a/hgext3rd/topic/__init__.py
> +++ b/hgext3rd/topic/__init__.py
> @@ -9,12 +9,12 @@
>  
>  Compared to bookmark, topic is reference carried by each changesets
> of the
>  series instead of just the single head revision.  Topic are quite
> similar to
> -the way named branch work, except they eventualy fade away when the
> changeset
> +the way named branch work, except they eventually fade away when the
> changeset
>  becomes part of the immutable history. Changeset can belong to both
> a topic and
>  a named branch, but as long as it is mutable, its topic identity
> will prevail.
>  As a result, default destination for 'update', 'merge', etc...  will
> take topic
>  into account. When a topic is active these operations will only
> consider other
> -changesets on that topic (and, in some occurence, bare changeset on
> same
> +changesets on that topic (and, in some occurrence, bare changeset on
> same
>  branch).  When no topic is active, changeset with topic will be
> ignored and
>  only bare one on the same branch will be taken in account.
>  
> @@ -77,7 +77,7 @@
>  ===================
>  
>  Topic vanish when changeset move to the public phases. Moving to the
> public
> -phase usually happens on push, but it is possible ot update that
> behavior. The
> +phase usually happens on push, but it is possible to update that
> behavior. The
>  server needs to have specific config for this.
>  
>      # everything pushed become public (the default)
> @@ -201,9 +201,9 @@
>      )
>  
>      def extsetup(ui):
> -        # register config that strickly belong to other code (thg,
> core, etc)
> +        # register config that strictly belong to other code (thg,
> core, etc)
>          #
> -        # To ensure all config items we used are registerd, we
> register them if
> +        # To ensure all config items we used are registered, we
> register them if
>          # nobody else did so far.
>          from mercurial import configitems
>          extraitem = functools.partial(configitems._register,
> ui._knownconfig)
> @@ -444,7 +444,7 @@
>              reporef = weakref.ref(self)
>  
>              def currenttopicempty(tr):
> -                # check active topic emptyness
> +                # check active topic emptiness
>                  repo = reporef()
>                  csetcount = stack.stack(repo,
> topic=ct).changesetcount
>                  empty = csetcount == 0
> @@ -741,14 +741,14 @@
>  """
>  
>  def _findconvertbmarktopic(repo, bmark):
> -    """find revisions unambigiously defined by a bookmark
> +    """find revisions unambiguously defined by a bookmark
>  
>      find all changesets under the bookmark and under that bookmark
> only.
>      """
>      return repo.revs(CONVERTBOOKREVSET, bmark, bmark, bmark, bmark,
> bmark)
>  
>  def _applyconvertbmarktopic(ui, repo, revs, old, bmark, tr):
> -    """apply bookmark convertion to topic
> +    """apply bookmark conversion to topic
>  
>      Sets a topic as same as bname to all the changesets under the
> bookmark
>      and delete the bookmark, if topic is set to any changeset
> diff --git a/hgext3rd/topic/stack.py b/hgext3rd/topic/stack.py
> --- a/hgext3rd/topic/stack.py
> +++ b/hgext3rd/topic/stack.py
> @@ -262,7 +262,7 @@
>      else:
>          if data['behindcount'] == -1:
>              fm.plain(', ')
> -            fm.plain('ambigious rebase destination - %s' %
> data['behinderror'],
> +            fm.plain('ambiguous rebase destination - %s' %
> data['behinderror'],
>                       label='topic.stack.summary.behinderror')
>          elif data['behindcount']:
>              fm.plain(', ')
> diff --git a/tests/test-prev-next.t b/tests/test-prev-next.t
> --- a/tests/test-prev-next.t
> +++ b/tests/test-prev-next.t
> @@ -212,7 +212,7 @@
>    0 files updated, 0 files merged, 1 files removed, 0 files
> unresolved
>    [3] added b (2)
>    $ hg next
> -  ambigious next changeset:
> +  ambiguous next changeset:
>    [4] added c
>    [5] added d
>    explicitly update to one of them
> @@ -227,7 +227,7 @@
>    (2 unstable changesets to be evolved here, do you want --evolve?)
>    [1]
>    $ hg next --evolve
> -  ambigious next (unstable) changeset:
> +  ambiguous next (unstable) changeset:
>    [4] added c
>    [5] added d
>    (run 'hg evolve --rev REV' on one of them)
> diff --git a/tests/test-topic-stack-data.t b/tests/test-topic-stack-
> data.t
> --- a/tests/test-topic-stack-data.t
> +++ b/tests/test-topic-stack-data.t
> @@ -282,7 +282,7 @@
>    t0^ add base_c (base)
>    $ hg stack foo
>    ### topic: foo
> -  ### target: lake (branch), ambigious rebase destination - branch
> 'lake' has 2 heads
> +  ### target: lake (branch), ambiguous rebase destination - branch
> 'lake' has 2 heads
>    t2@ add foo_b (current)
>    t1: add foo_a
>    t0^ add lake_a (base)
> diff --git a/tests/test-topic-stack.t b/tests/test-topic-stack.t
> --- a/tests/test-topic-stack.t
> +++ b/tests/test-topic-stack.t
> @@ -553,7 +553,7 @@
>  
>    $ hg stack foo
>    ### topic: foo
> -  ### target: default (branch), ambigious rebase destination - topic
> 'foo' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'foo' has 3 heads
>    t4: c_f
>      ^ c_e
>    t3: c_h
> @@ -645,7 +645,7 @@
>    t0^ c_A (base)
>    $ hg stack blue
>    ### topic: blue
> -  ### target: default (branch), ambigious rebase destination - topic
> 'blue' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'blue' has 3 heads
>    t3@ c_I (current)
>      ^ c_H
>    t2: c_D
> @@ -698,7 +698,7 @@
>  
>    $ hg stack red
>    ### topic: red
> -  ### target: default (branch), ambigious rebase destination - topic
> 'red' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'red' has 3 heads
>    t5$ c_H (unstable)
>      ^ c_G
>      ^ c_D
> @@ -710,7 +710,7 @@
>    t0^ c_A (base)
>    $ hg stack blue
>    ### topic: blue
> -  ### target: default (branch), ambigious rebase destination - topic
> 'blue' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'blue' has 3 heads
>    t3$ c_I (unstable)
>      ^ c_H
>    t2$ c_G (unstable)
> @@ -772,7 +772,7 @@
>  
>    $ hg stack red
>    ### topic: red
> -  ### target: default (branch), ambigious rebase destination - topic
> 'red' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'red' has 3 heads
>    t5$ c_H (unstable)
>      ^ c_G
>      ^ c_D
> @@ -784,7 +784,7 @@
>    t0^ c_A (base)
>    $ hg stack blue
>    ### topic: blue
> -  ### target: default (branch), ambigious rebase destination - topic
> 'blue' has 3 heads
> +  ### target: default (branch), ambiguous rebase destination - topic
> 'blue' has 3 heads
>    t3$ c_I (unstable)
>      ^ c_H
>    t2$ c_G (unstable)
> diff --git a/tests/test-topic.t b/tests/test-topic.t
> --- a/tests/test-topic.t
> +++ b/tests/test-topic.t
> @@ -638,7 +638,7 @@
>    1 files updated, 0 files merged, 0 files removed, 0 files
> unresolved
>    $ hg stack
>    ### topic: fran
> -  ### target: default (branch), ambigious rebase destination -
> branch 'default' has 2 heads
> +  ### target: default (branch), ambiguous rebase destination -
> branch 'default' has 2 heads
>    t1@ start on fran (current)
>    t0^ Add file delta (base)
>  
> @@ -650,7 +650,7 @@
>     * fran (1 changesets)
>    $ hg stack
>    ### topic: fran
> -  ### target: default (branch), ambigious rebase destination -
> branch 'default' has 2 heads
> +  ### target: default (branch), ambiguous rebase destination -
> branch 'default' has 2 heads
>    t1: start on fran
>    t0^ Add file delta (base current)
>  
> diff --git a/tests/test-unstable.t b/tests/test-unstable.t
> --- a/tests/test-unstable.t
> +++ b/tests/test-unstable.t
> @@ -302,7 +302,7 @@
>    
>  
>    $ hg evo --all --any --orphan
> -  cannot solve split accross two branches
> +  cannot solve split across two branches
>    $ hg log -G
>    @  4:3c69ea6aa93e@default(draft) add bprimesplit2
>    |
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -58,10 +58,10 @@ 
 is already raising better results than the previous version (when usable).
 
 "Large" repositories (hundreds of thousand) are currently unsupported. Some key
-algorithm has a naive implementation with too agressive caching, creating
+algorithm has a naive implementation with too aggressive caching, creating
 memory consumption issue (this will get fixed).
 
-Medium sized repositories works fine, but be prepared for a noticable initial
+Medium sized repositories works fine, but be prepared for a noticeable initial
 cache filling. for the Mercurial repository, this is around 20 seconds
 
 The following config control the experiment::
@@ -97,7 +97,7 @@ 
 
     # automatically disable obshashrange related computation and capabilities
     # if the repository has more than N revisions.  This is meant to help large
-    # server deployement to enable the feature on smaller repositories while
+    # server deployment to enable the feature on smaller repositories while
     # ensuring no large repository will get affected.
     obshashrange.max-revs = 100000 # default is None
 
@@ -159,12 +159,12 @@ 
 
   - precursors, for each obsolete changeset show the closest visible
     precursors.
-  - successors, for each obsolete changeset show the closests visible
+  - successors, for each obsolete changeset show the closest visible
     successors. It is useful when your working directory is obsolete to see
     what are its successors. This information can also be retrieved with the
     obslog command and the --all option.
   - obsfate, for each obsolete changeset display a line summarizing what
-    changed between the changeset and its successors. Dependending on the
+    changed between the changeset and its successors. Depending on the
     verbosity level (-q and -v) it display the changeset successors, the users
     that created the obsmarkers and the date range of these changes.
 
@@ -1452,8 +1452,8 @@ 
     Automatic mode only handles common use cases. For example, it avoids taking
     action in the case of ambiguity, and it ignores unstable changesets that
     are not related to your working copy.
-    It also refuses to solve bumped or divergent changesets unless you explicity
-    request such behavior (see below).
+    It also refuses to solve bumped or divergent changesets unless you
+    explicitly request such behavior (see below).
 
     Eliminating all instability around your working copy may require multiple
     invocations of :hg:`evolve`. Alternately, use ``--all`` to recursively
@@ -1719,7 +1719,7 @@ 
         roots = repo.revs('roots(%ld)', targetrevs)
         heads = repo.revs('heads(%ld)', targetrevs)
         if len(roots) > 1 or len(heads) > 1:
-            msg = "cannot solve split accross two branches\n"
+            msg = "cannot solve split across two branches\n"
             ui.write_err(msg)
             return 2
         target = repo[heads.first()]
@@ -1869,7 +1869,7 @@ 
     base, others = divergentdata(divergent)
     if len(others) > 1:
         othersstr = "[%s]" % (','.join([str(i) for i in others]))
-        msg = _("skipping %d:divergent with a changeset that got splitted"
+        msg = _("skipping %d:divergent with a changeset that got split"
                 " into multiple ones:\n"
                 "|[%s]\n"
                 "| This is not handled by automatic evolution yet\n"
@@ -2172,7 +2172,7 @@ 
                 displayer.show(c)
             result = 0
         elif children:
-            ui.warn(_("ambigious next changeset:\n"))
+            ui.warn(_("ambiguous next changeset:\n"))
             for c in children:
                 displayer.show(c)
             ui.warn(_('explicitly update to one of them\n'))
@@ -2196,7 +2196,7 @@ 
                     ui.warn(msg % len(aspchildren))
                 result = 1
             elif 1 < len(aspchildren):
-                ui.warn(_("ambigious next (unstable) changeset:\n"))
+                ui.warn(_("ambiguous next (unstable) changeset:\n"))
                 for c in aspchildren:
                     displayer.show(repo[c])
                 ui.warn(_("(run 'hg evolve --rev REV' on one of them)\n"))
@@ -2462,7 +2462,7 @@ 
     try:
         versionblob = f.read(4)
         if len(versionblob) < 4:
-            repo.ui.debug('ignoring corrupted evolvestte (file contains %i bits)'
+            repo.ui.debug('ignoring corrupted evolvestate (file contains %i bits)'
                           % len(versionblob))
             return None
         version = _unpack('>I', versionblob)[0]
diff --git a/hgext3rd/topic/__init__.py b/hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py
+++ b/hgext3rd/topic/__init__.py
@@ -9,12 +9,12 @@ 
 
 Compared to bookmark, topic is reference carried by each changesets of the
 series instead of just the single head revision.  Topic are quite similar to
-the way named branch work, except they eventualy fade away when the changeset
+the way named branch work, except they eventually fade away when the changeset
 becomes part of the immutable history. Changeset can belong to both a topic and
 a named branch, but as long as it is mutable, its topic identity will prevail.
 As a result, default destination for 'update', 'merge', etc...  will take topic
 into account. When a topic is active these operations will only consider other
-changesets on that topic (and, in some occurence, bare changeset on same
+changesets on that topic (and, in some occurrence, bare changeset on same
 branch).  When no topic is active, changeset with topic will be ignored and
 only bare one on the same branch will be taken in account.
 
@@ -77,7 +77,7 @@ 
 ===================
 
 Topic vanish when changeset move to the public phases. Moving to the public
-phase usually happens on push, but it is possible ot update that behavior. The
+phase usually happens on push, but it is possible to update that behavior. The
 server needs to have specific config for this.
 
     # everything pushed become public (the default)
@@ -201,9 +201,9 @@ 
     )
 
     def extsetup(ui):
-        # register config that strickly belong to other code (thg, core, etc)
+        # register config that strictly belong to other code (thg, core, etc)
         #
-        # To ensure all config items we used are registerd, we register them if
+        # To ensure all config items we used are registered, we register them if
         # nobody else did so far.
         from mercurial import configitems
         extraitem = functools.partial(configitems._register, ui._knownconfig)
@@ -444,7 +444,7 @@ 
             reporef = weakref.ref(self)
 
             def currenttopicempty(tr):
-                # check active topic emptyness
+                # check active topic emptiness
                 repo = reporef()
                 csetcount = stack.stack(repo, topic=ct).changesetcount
                 empty = csetcount == 0
@@ -741,14 +741,14 @@ 
 """
 
 def _findconvertbmarktopic(repo, bmark):
-    """find revisions unambigiously defined by a bookmark
+    """find revisions unambiguously defined by a bookmark
 
     find all changesets under the bookmark and under that bookmark only.
     """
     return repo.revs(CONVERTBOOKREVSET, bmark, bmark, bmark, bmark, bmark)
 
 def _applyconvertbmarktopic(ui, repo, revs, old, bmark, tr):
-    """apply bookmark convertion to topic
+    """apply bookmark conversion to topic
 
     Sets a topic as same as bname to all the changesets under the bookmark
     and delete the bookmark, if topic is set to any changeset
diff --git a/hgext3rd/topic/stack.py b/hgext3rd/topic/stack.py
--- a/hgext3rd/topic/stack.py
+++ b/hgext3rd/topic/stack.py
@@ -262,7 +262,7 @@ 
     else:
         if data['behindcount'] == -1:
             fm.plain(', ')
-            fm.plain('ambigious rebase destination - %s' % data['behinderror'],
+            fm.plain('ambiguous rebase destination - %s' % data['behinderror'],
                      label='topic.stack.summary.behinderror')
         elif data['behindcount']:
             fm.plain(', ')
diff --git a/tests/test-prev-next.t b/tests/test-prev-next.t
--- a/tests/test-prev-next.t
+++ b/tests/test-prev-next.t
@@ -212,7 +212,7 @@ 
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [3] added b (2)
   $ hg next
-  ambigious next changeset:
+  ambiguous next changeset:
   [4] added c
   [5] added d
   explicitly update to one of them
@@ -227,7 +227,7 @@ 
   (2 unstable changesets to be evolved here, do you want --evolve?)
   [1]
   $ hg next --evolve
-  ambigious next (unstable) changeset:
+  ambiguous next (unstable) changeset:
   [4] added c
   [5] added d
   (run 'hg evolve --rev REV' on one of them)
diff --git a/tests/test-topic-stack-data.t b/tests/test-topic-stack-data.t
--- a/tests/test-topic-stack-data.t
+++ b/tests/test-topic-stack-data.t
@@ -282,7 +282,7 @@ 
   t0^ add base_c (base)
   $ hg stack foo
   ### topic: foo
-  ### target: lake (branch), ambigious rebase destination - branch 'lake' has 2 heads
+  ### target: lake (branch), ambiguous rebase destination - branch 'lake' has 2 heads
   t2@ add foo_b (current)
   t1: add foo_a
   t0^ add lake_a (base)
diff --git a/tests/test-topic-stack.t b/tests/test-topic-stack.t
--- a/tests/test-topic-stack.t
+++ b/tests/test-topic-stack.t
@@ -553,7 +553,7 @@ 
 
   $ hg stack foo
   ### topic: foo
-  ### target: default (branch), ambigious rebase destination - topic 'foo' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads
   t4: c_f
     ^ c_e
   t3: c_h
@@ -645,7 +645,7 @@ 
   t0^ c_A (base)
   $ hg stack blue
   ### topic: blue
-  ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads
   t3@ c_I (current)
     ^ c_H
   t2: c_D
@@ -698,7 +698,7 @@ 
 
   $ hg stack red
   ### topic: red
-  ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads
   t5$ c_H (unstable)
     ^ c_G
     ^ c_D
@@ -710,7 +710,7 @@ 
   t0^ c_A (base)
   $ hg stack blue
   ### topic: blue
-  ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads
   t3$ c_I (unstable)
     ^ c_H
   t2$ c_G (unstable)
@@ -772,7 +772,7 @@ 
 
   $ hg stack red
   ### topic: red
-  ### target: default (branch), ambigious rebase destination - topic 'red' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads
   t5$ c_H (unstable)
     ^ c_G
     ^ c_D
@@ -784,7 +784,7 @@ 
   t0^ c_A (base)
   $ hg stack blue
   ### topic: blue
-  ### target: default (branch), ambigious rebase destination - topic 'blue' has 3 heads
+  ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads
   t3$ c_I (unstable)
     ^ c_H
   t2$ c_G (unstable)
diff --git a/tests/test-topic.t b/tests/test-topic.t
--- a/tests/test-topic.t
+++ b/tests/test-topic.t
@@ -638,7 +638,7 @@ 
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg stack
   ### topic: fran
-  ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads
+  ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads
   t1@ start on fran (current)
   t0^ Add file delta (base)
 
@@ -650,7 +650,7 @@ 
    * fran (1 changesets)
   $ hg stack
   ### topic: fran
-  ### target: default (branch), ambigious rebase destination - branch 'default' has 2 heads
+  ### target: default (branch), ambiguous rebase destination - branch 'default' has 2 heads
   t1: start on fran
   t0^ Add file delta (base current)
 
diff --git a/tests/test-unstable.t b/tests/test-unstable.t
--- a/tests/test-unstable.t
+++ b/tests/test-unstable.t
@@ -302,7 +302,7 @@ 
   
 
   $ hg evo --all --any --orphan
-  cannot solve split accross two branches
+  cannot solve split across two branches
   $ hg log -G
   @  4:3c69ea6aa93e@default(draft) add bprimesplit2
   |