[PATCH 03 of 21] capitalize Mercurial

Martin Geisler mg at daimi.au.dk
Sat Jan 3 10:40:01 CST 2009

# HG changeset patch
# User Martin Geisler <mg at daimi.au.dk>
# Date 1230995713 -3600
# Node ID 677697762a36e3da95c18416968bfb8f6c0c8908
# Parent  a57a68af4179fe25ea6226a8d49d5e2b6d80fdf0
capitalize Mercurial

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
-'''mercurial bookmarks
+'''Mercurial bookmarks
 Mercurial bookmarks are local moveable pointers to changesets. Every
 bookmark points to a changeset identified by its hash. If you commit a
@@ -113,7 +113,7 @@
     repo._bookmarkcurrent = mark
 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
-    '''mercurial bookmarks
+    '''Mercurial bookmarks
     Bookmarks are pointers to certain commits that move when
     commiting. Bookmarks are local. They can be renamed, copied and
diff --git a/hgext/hgk.py b/hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -11,7 +11,7 @@
 not distributed with Mercurial.)
 hgk consists of two parts: a Tcl script that does the displaying and
-querying of information, and an extension to mercurial named hgk.py,
+querying of information, and an extension to Mercurial named hgk.py,
 which provides hooks for hgk to get information. hgk can be found in
 the contrib directory, and hgk.py can be found in the hgext directory.
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1615,7 +1615,7 @@
     the --rev parameter. At least one patch or revision is required.
     With --rev, mq will stop managing the named revisions (converting
-    them to regular mercurial changesets). The qfinish command should be
+    them to regular Mercurial changesets). The qfinish command should be
     used as an alternative for qdel -r, as the latter option is deprecated.
     With --keep, the patch files are preserved in the patch directory."""
@@ -1712,7 +1712,7 @@
     Source patch repository is looked for in <src>/.hg/patches by
     default.  Use -p <url> to change.
-    The patch directory must be a nested mercurial repository, as
+    The patch directory must be a nested Mercurial repository, as
     would be created by qinit -c.
     def patchdir(repo):
diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py
--- a/hgext/win32mbcs.py
+++ b/hgext/win32mbcs.py
@@ -37,7 +37,7 @@
   hgext.win32mbcs =
 Path encoding conversion are done between unicode and util._encoding
-which is decided by mercurial from current locale setting or HGENCODING.
+which is decided by Mercurial from current locale setting or HGENCODING.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1643,7 +1643,7 @@
                 wp = repo.parents()
                 if opts.get('exact'):
                     if not nodeid or not p1:
-                        raise util.Abort(_('not a mercurial patch'))
+                        raise util.Abort(_('not a Mercurial patch'))
                     p1 = repo.lookup(p1)
                     p2 = repo.lookup(p2 or hex(nullid))

More information about the Mercurial-devel mailing list