diff --git a/hgext/churn.py b/hgext/churn.py --- a/hgext/churn.py +++ b/hgext/churn.py @@ -90,7 +90,7 @@ def countrate(ui, repo, amap, *pats, **o def churn(ui, repo, *pats, **opts): - '''Graph count of revisions grouped by template + '''graph count of revisions grouped by template Will graph count of changed lines or revisions grouped by template or alternatively by date, if dateformat is used. In this case it will override diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -14,7 +14,7 @@ from mercurial.i18n import _ # Commands definition was moved elsewhere to ease demandload job. def convert(ui, src, dest=None, revmapfile=None, **opts): - """Convert a foreign SCM repository to a Mercurial one. + """convert a foreign SCM repository to a Mercurial one. Accepted source formats [identifiers]: - Mercurial [hg] @@ -185,7 +185,7 @@ def debugsvnlog(ui, **opts): return convcmd.debugsvnlog(ui, **opts) def debugcvsps(ui, *args, **opts): - '''Create changeset information from CVS + '''create changeset information from CVS This command is intended as a debugging tool for the CVS to Mercurial converter, and can be used as a direct replacement for cvsps. @@ -216,18 +216,18 @@ cmdtable = { (debugcvsps, [ # Main options shared with cvsps-2.1 - ('b', 'branches', [], _('Only return changes on specified branches')), - ('p', 'prefix', '', _('Prefix to remove from file names')), - ('r', 'revisions', [], _('Only return changes after or between specified tags')), - ('u', 'update-cache', None, _("Update cvs log cache")), - ('x', 'new-cache', None, _("Create new cvs log cache")), - ('z', 'fuzz', 60, _('Set commit time fuzz in seconds')), - ('', 'root', '', _('Specify cvsroot')), + ('b', 'branches', [], _('only return changes on specified branches')), + ('p', 'prefix', '', _('prefix to remove from file names')), + ('r', 'revisions', [], _('only return changes after or between specified tags')), + ('u', 'update-cache', None, _("update cvs log cache")), + ('x', 'new-cache', None, _("create new cvs log cache")), + ('z', 'fuzz', 60, _('set commit time fuzz in seconds')), + ('', 'root', '', _('specify cvsroot')), # Options specific to builtin cvsps - ('', 'parents', '', _('Show parent changesets')), - ('', 'ancestors', '', _('Show current changeset in ancestor branches')), + ('', 'parents', '', _('show parent changesets')), + ('', 'ancestors', '', _('show current changeset in ancestor branches')), # Options that are ignored for compatibility with cvsps-2.1 - ('A', 'cvs-direct', None, 'Ignored for compatibility'), + ('A', 'cvs-direct', None, 'ignored for compatibility'), ], 'hg debugcvsps [OPTION]... [PATH]...'), } diff --git a/hgext/fetch.py b/hgext/fetch.py --- a/hgext/fetch.py +++ b/hgext/fetch.py @@ -11,7 +11,7 @@ from mercurial.node import nullid, short from mercurial import commands, cmdutil, hg, util, url def fetch(ui, repo, source='default', **opts): - '''Pull changes from a remote repository, merge new changes if needed. + '''pull changes from a remote repository, merge new changes if needed. This finds all changes from the repository at the specified path or URL and adds them to the local repository. diff --git a/hgext/hgk.py b/hgext/hgk.py --- a/hgext/hgk.py +++ b/hgext/hgk.py @@ -130,7 +130,7 @@ def catcommit(ui, repo, n, prefix, ctx=N ui.write('\0') def base(ui, repo, node1, node2): - """Output common ancestor information""" + """output common ancestor information""" node1 = repo.lookup(node1) node2 = repo.lookup(node2) n = repo.changelog.ancestor(node1, node2) @@ -282,7 +282,7 @@ def revtree(ui, args, repo, full="tree", count += 1 def revparse(ui, repo, *revs, **opts): - """Parse given revisions""" + """parse given revisions""" def revstr(rev): if rev == 'HEAD': rev = 'tip' diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2015,7 +2015,7 @@ def guard(ui, repo, *args, **opts): status(q.series.index(q.lookup(patch))) def header(ui, repo, patch=None): - """Print the header of the topmost or specified patch""" + """print the header of the topmost or specified patch""" q = repo.mq if patch: diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -8,7 +8,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. # -"""Allow to use MBCS path with problematic encoding. +"""allow to use MBCS path with problematic encoding. Some MBCS encodings are not good for some path operations (i.e. splitting path, case conversion, etc.) with its encoded bytes. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1333,7 +1333,7 @@ def help_(ui, name=None, with_version=Fa # description doc = gettext(i[0].__doc__) if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") if ui.quiet: doc = doc.splitlines(0)[0] ui.write("\n%s\n" % doc.rstrip()) @@ -1362,7 +1362,7 @@ def help_(ui, name=None, with_version=Fa continue doc = gettext(e[0].__doc__) if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") h[f] = doc.splitlines(0)[0].rstrip() cmds[f] = c.lstrip("^") @@ -1405,7 +1405,7 @@ def help_(ui, name=None, with_version=Fa # description if not doc: - doc = _("(No help text available)") + doc = _("(no help text available)") if callable(doc): doc = doc() @@ -1418,7 +1418,7 @@ def help_(ui, name=None, with_version=Fa except KeyError: raise cmdutil.UnknownCommand(name) - doc = gettext(mod.__doc__) or _('No help text available') + doc = gettext(mod.__doc__) or _('no help text available') doc = doc.splitlines(0) ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) for d in doc[1:]: @@ -3077,7 +3077,7 @@ table = { ('g', 'good', False, _('mark changeset good')), ('b', 'bad', False, _('mark changeset bad')), ('s', 'skip', False, _('skip testing changeset')), - ('c', 'command', '', _('Use command to check changeset state')), + ('c', 'command', '', _('use command to check changeset state')), ('U', 'noupdate', False, _('do not update to target'))], _("[-gbsr] [-c CMD] [REV]")), "branch": diff --git a/tests/test-convert.out b/tests/test-convert.out --- a/tests/test-convert.out +++ b/tests/test-convert.out @@ -1,6 +1,6 @@ hg convert [OPTION]... SOURCE [DEST [REVMAP]] -Convert a foreign SCM repository to a Mercurial one. +convert a foreign SCM repository to a Mercurial one. Accepted source formats [identifiers]: - Mercurial [hg] diff --git a/tests/test-mq.out b/tests/test-mq.out --- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -33,7 +33,7 @@ list of commands: qfold fold the named patches into the current patch qgoto push or pop patches until named patch is at top of stack qguard set or print guards for a patch - qheader Print the header of the topmost or specified patch + qheader print the header of the topmost or specified patch qimport import a patch qinit init a new queue repository qnew create a new patch