--- a/hgext/evolve.py Fri Nov 06 21:14:35 2015 -0500
+++ b/hgext/evolve.py Fri Nov 06 21:42:06 2015 -0500
@@ -147,8 +147,8 @@
class exthelper(object):
"""Helper for modular extension setup
- A single helper should be instanciated for each extension. Helper
- methods are then used as decorator for various purpose.
+ A single helper should be instantiated for each extension. Helper
+ methods are then used as decorators for various purpose.
All decorators return the original function and may be chained.
"""
@@ -795,7 +795,7 @@
if histedit:
extensions.wrapcommand(histedit.cmdtable, 'histedit', warnobserrors)
except KeyError:
- pass # rebase not found
+ pass # histedit not found
#####################################################################
### Old Evolve extension content ###
@@ -1393,7 +1393,7 @@
ui.status(_('working directory is now at %s\n') % repo['.'])
class MultipleSuccessorsError(RuntimeError):
- """Exception raised by _singlesuccessor when multiple sucessors sets exists
+ """Exception raised by _singlesuccessor when multiple successor sets exists
The object contains the list of successorssets in its 'successorssets'
attribute to call to easily recover.
@@ -1747,7 +1747,7 @@
def _solveunstable(ui, repo, orig, dryrun=False, confirm=False,
progresscb=None):
- """Stabilize a unstable changeset"""
+ """Stabilize an unstable changeset"""
obs = orig.parents()[0]
if not obs.obsolete() and len(orig.parents()) == 2:
obs = orig.parents()[1] # second parent is obsolete ?