--- a/hgext/convert/bzr.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/bzr.py Wed Oct 14 02:06:54 2015 -0400
@@ -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
--- a/hgext/convert/cvs.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/cvs.py Wed Oct 14 02:06:54 2015 -0400
@@ -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()
--- a/hgext/convert/darcs.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/darcs.py Wed Oct 14 02:06:54 2015 -0400
@@ -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
--- a/hgext/convert/git.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/git.py Wed Oct 14 02:06:54 2015 -0400
@@ -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))
--- a/hgext/convert/gnuarch.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/gnuarch.py Wed Oct 14 02:06:54 2015 -0400
@@ -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 = {}
--- a/hgext/convert/monotone.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/monotone.py Wed Oct 14 02:06:54 2015 -0400
@@ -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 = {}
--- a/hgext/convert/p4.py Wed Oct 14 22:29:03 2015 -0400
+++ b/hgext/convert/p4.py Wed Oct 14 02:06:54 2015 -0400
@@ -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):
--- a/mercurial/exchange.py Wed Oct 14 22:29:03 2015 -0400
+++ b/mercurial/exchange.py Wed Oct 14 02:06:54 2015 -0400
@@ -178,7 +178,7 @@
remoteversions = bundle2.obsmarkersversion(bundler.capabilities)
version = obsolete.commonversion(remoteversions)
if version is None:
- raise ValueError('bundler do not support common obsmarker format')
+ raise ValueError('bundler does not support common obsmarker format')
stream = obsolete.encodemarkers(markers, True, version=version)
return bundler.newpart('obsmarkers', data=stream)
return None