obsolete/evolve: fix grammar in prerequisite messages stable
authorPatrick Mezard <patrick@mezard.eu>
Sat, 04 Aug 2012 12:28:21 +0200
branchstable
changeset 416 22f348c25d25
parent 415 ea7f2a4ad530
child 417 a1fb18ad29a1
obsolete/evolve: fix grammar in prerequisite messages
hgext/evolve.py
hgext/obsolete.py
--- a/hgext/evolve.py	Sat Aug 04 12:06:34 2012 +0200
+++ b/hgext/evolve.py	Sat Aug 04 12:28:21 2012 +0200
@@ -658,12 +658,12 @@
     try:
         obsolete = extensions.find('obsolete')
     except KeyError:
-        raise error.Abort(_('evolution extension require obsolete extension.'))
+        raise error.Abort(_('evolution extension requires obsolete extension.'))
     try:
         rebase = extensions.find('rebase')
     except KeyError:
         rebase = None
-        raise error.Abort(_('evolution extension require rebase extension.'))
+        raise error.Abort(_('evolution extension requires rebase extension.'))
 
     for cmd in ['amend', 'kill', 'uncommit']:
         entry = extensions.wrapcommand(cmdtable, cmd,
--- a/hgext/obsolete.py	Sat Aug 04 12:06:34 2012 +0200
+++ b/hgext/obsolete.py	Sat Aug 04 12:28:21 2012 +0200
@@ -997,7 +997,7 @@
         return
 
     if not util.safehasattr(repo.opener, 'tryread'):
-        raise util.Abort('Obsolete extension require Mercurial 2.2 (or later)')
+        raise util.Abort('Obsolete extension requires Mercurial 2.2 (or later)')
     opull = repo.pull
     opush = repo.push
     olock = repo.lock