Patchwork [5,of,5] convert: grammar: does

login
register
mail settings
Submitter timeless@mozdev.org
Date Oct. 15, 2015, 8:45 p.m.
Message ID <199640c4f3d817a34bb4.1444941916@waste.org>
Download mbox | patch
Permalink /patch/11118/
State Deferred
Headers show

Comments

timeless@mozdev.org - Oct. 15, 2015, 8:45 p.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1444802627 14400
#      Wed Oct 14 02:03:47 2015 -0400
# Node ID 199640c4f3d817a34bb4314b832d26a8cbfab778
# Parent  32f349fea579d7f0a4539e1450490a802ae1327b
convert: grammar: does
Matt Mackall - Oct. 19, 2015, 10:01 p.m.
On Thu, 2015-10-15 at 15:45 -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1444802627 14400
> #      Wed Oct 14 02:03:47 2015 -0400
> # Node ID 199640c4f3d817a34bb4314b832d26a8cbfab778
> # Parent  32f349fea579d7f0a4539e1450490a802ae1327b
> convert: grammar: does

I've queued 1, 4, and 5 of this set. In the future, you can combine any
number of trivial changes like 4 and 5 into one patch, I don't really
want one per file. I'll probably fold these two.

Patch

diff --git a/hgext/convert/bzr.py b/hgext/convert/bzr.py
--- a/hgext/convert/bzr.py
+++ b/hgext/convert/bzr.py
@@ -137,7 +137,7 @@ 
 
     def getchanges(self, version, full):
         if full:
-            raise error.Abort(_("convert from cvs do not support --full"))
+            raise error.Abort(_("convert from cvs does not support --full"))
         self._modecache = {}
         self._revtree = self.sourcerepo.revision_tree(version)
         # get the parentids from the cache
diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -263,7 +263,7 @@ 
 
     def getchanges(self, rev, full):
         if full:
-            raise error.Abort(_("convert from cvs do not support --full"))
+            raise error.Abort(_("convert from cvs does not support --full"))
         self._parse()
         return sorted(self.files[rev].iteritems()), {}, set()
 
diff --git a/hgext/convert/darcs.py b/hgext/convert/darcs.py
--- a/hgext/convert/darcs.py
+++ b/hgext/convert/darcs.py
@@ -158,7 +158,7 @@ 
 
     def getchanges(self, rev, full):
         if full:
-            raise error.Abort(_("convert from darcs do not support --full"))
+            raise error.Abort(_("convert from darcs does not support --full"))
         copies = {}
         changes = []
         man = None
diff --git a/hgext/convert/git.py b/hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -210,7 +210,7 @@ 
 
     def getchanges(self, version, full):
         if full:
-            raise error.Abort(_("convert from git do not support --full"))
+            raise error.Abort(_("convert from git does not support --full"))
         self.modecache = {}
         fh = self.gitopen("git diff-tree -z --root -m -r %s %s" % (
             self.simopt, version))
diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -144,7 +144,7 @@ 
 
     def getchanges(self, rev, full):
         if full:
-            raise error.Abort(_("convert from arch do not support --full"))
+            raise error.Abort(_("convert from arch does not support --full"))
         self._update(rev)
         changes = []
         copies = {}
diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -229,7 +229,8 @@ 
 
     def getchanges(self, rev, full):
         if full:
-            raise error.Abort(_("convert from monotone do not support --full"))
+            raise error.Abort(_("convert from monotone does not support "
+                              "--full"))
         revision = self.mtnrun("get_revision", rev).split("\n\n")
         files = {}
         ignoremove = {}
diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
--- a/hgext/convert/p4.py
+++ b/hgext/convert/p4.py
@@ -277,7 +277,7 @@ 
 
     def getchanges(self, rev, full):
         if full:
-            raise error.Abort(_("convert from p4 do not support --full"))
+            raise error.Abort(_("convert from p4 does not support --full"))
         return self.files[rev], self.copies[rev], set()
 
     def getcommit(self, rev):