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 @@ class bzr_source(converter_source): 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 @@ class convert_cvs(converter_source): 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 @@ class darcs_source(converter_source, com 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 @@ class convert_git(converter_source): 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 @@ class gnuarch_source(converter_source, c 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 @@ class monotone_source(converter_source, 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 @@ class p4_source(converter_source): 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): diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -178,7 +178,7 @@ def buildobsmarkerspart(bundler, markers 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