##// END OF EJS Templates
Spell Mercurial as a proper noun
timeless -
r8760:bf17aeaf default
parent child Browse files
Show More
@@ -5,7 +5,7 b''
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference.
6 # GNU General Public License version 2, incorporated herein by reference.
7
7
8 '''mercurial bookmarks
8 '''Mercurial bookmarks
9
9
10 Mercurial bookmarks are local moveable pointers to changesets. Every
10 Mercurial bookmarks are local moveable pointers to changesets. Every
11 bookmark points to a changeset identified by its hash. If you commit a
11 bookmark points to a changeset identified by its hash. If you commit a
@@ -112,7 +112,7 b' def setcurrent(repo, mark):'
112 repo._bookmarkcurrent = mark
112 repo._bookmarkcurrent = mark
113
113
114 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
114 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
115 '''mercurial bookmarks
115 '''Mercurial bookmarks
116
116
117 Bookmarks are pointers to certain commits that move when
117 Bookmarks are pointers to certain commits that move when
118 commiting. Bookmarks are local. They can be renamed, copied and
118 commiting. Bookmarks are local. They can be renamed, copied and
@@ -12,7 +12,7 b' graphical way. It requires Tcl/Tk versio'
12 distributed with Mercurial.)
12 distributed with Mercurial.)
13
13
14 hgk consists of two parts: a Tcl script that does the displaying and
14 hgk consists of two parts: a Tcl script that does the displaying and
15 querying of information, and an extension to mercurial named hgk.py,
15 querying of information, and an extension to Mercurial named hgk.py,
16 which provides hooks for hgk to get information. hgk can be found in
16 which provides hooks for hgk to get information. hgk can be found in
17 the contrib directory, and hgk.py can be found in the hgext directory.
17 the contrib directory, and hgk.py can be found in the hgext directory.
18
18
@@ -1645,7 +1645,7 b' def delete(ui, repo, *patches, **opts):'
1645 -r/--rev parameter. At least one patch or revision is required.
1645 -r/--rev parameter. At least one patch or revision is required.
1646
1646
1647 With --rev, mq will stop managing the named revisions (converting
1647 With --rev, mq will stop managing the named revisions (converting
1648 them to regular mercurial changesets). The qfinish command should
1648 them to regular Mercurial changesets). The qfinish command should
1649 be used as an alternative for qdelete -r, as the latter option is
1649 be used as an alternative for qdelete -r, as the latter option is
1650 deprecated.
1650 deprecated.
1651
1651
@@ -1753,7 +1753,7 b' def clone(ui, source, dest=None, **opts)'
1753 Source patch repository is looked for in <src>/.hg/patches by
1753 Source patch repository is looked for in <src>/.hg/patches by
1754 default. Use -p <url> to change.
1754 default. Use -p <url> to change.
1755
1755
1756 The patch directory must be a nested mercurial repository, as
1756 The patch directory must be a nested Mercurial repository, as
1757 would be created by qinit -c.
1757 would be created by qinit -c.
1758 '''
1758 '''
1759 def patchdir(repo):
1759 def patchdir(repo):
@@ -39,7 +39,7 b' To use this extension, enable the extens'
39 hgext.win32mbcs =
39 hgext.win32mbcs =
40
40
41 Path encoding conversion are done between Unicode and
41 Path encoding conversion are done between Unicode and
42 encoding.encoding which is decided by mercurial from current locale
42 encoding.encoding which is decided by Mercurial from current locale
43 setting or HGENCODING.
43 setting or HGENCODING.
44
44
45 """
45 """
@@ -5,7 +5,7 b''
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference.
6 # GNU General Public License version 2, incorporated herein by reference.
7
7
8 '''zeroconf support for mercurial repositories
8 '''zeroconf support for Mercurial repositories
9
9
10 Zeroconf enabled repositories will be announced in a network without
10 Zeroconf enabled repositories will be announced in a network without
11 the need to configure a server or a service. They can be discovered
11 the need to configure a server or a service. They can be discovered
@@ -1728,7 +1728,7 b' def import_(ui, repo, patch1, *patches, '
1728 wp = repo.parents()
1728 wp = repo.parents()
1729 if opts.get('exact'):
1729 if opts.get('exact'):
1730 if not nodeid or not p1:
1730 if not nodeid or not p1:
1731 raise util.Abort(_('not a mercurial patch'))
1731 raise util.Abort(_('not a Mercurial patch'))
1732 p1 = repo.lookup(p1)
1732 p1 = repo.lookup(p1)
1733 p2 = repo.lookup(p2 or hex(nullid))
1733 p2 = repo.lookup(p2 or hex(nullid))
1734
1734
General Comments 0
You need to be logged in to leave comments. Login now