Show More
@@ -90,7 +90,7 b' def countrate(ui, repo, amap, *pats, **o' | |||||
90 |
|
90 | |||
91 |
|
91 | |||
92 | def churn(ui, repo, *pats, **opts): |
|
92 | def churn(ui, repo, *pats, **opts): | |
93 |
''' |
|
93 | '''graph count of revisions grouped by template | |
94 |
|
94 | |||
95 | Will graph count of changed lines or revisions grouped by template or |
|
95 | Will graph count of changed lines or revisions grouped by template or | |
96 | alternatively by date, if dateformat is used. In this case it will override |
|
96 | alternatively by date, if dateformat is used. In this case it will override |
@@ -14,7 +14,7 b' from mercurial.i18n import _' | |||||
14 | # Commands definition was moved elsewhere to ease demandload job. |
|
14 | # Commands definition was moved elsewhere to ease demandload job. | |
15 |
|
15 | |||
16 | def convert(ui, src, dest=None, revmapfile=None, **opts): |
|
16 | def convert(ui, src, dest=None, revmapfile=None, **opts): | |
17 |
""" |
|
17 | """convert a foreign SCM repository to a Mercurial one. | |
18 |
|
18 | |||
19 | Accepted source formats [identifiers]: |
|
19 | Accepted source formats [identifiers]: | |
20 | - Mercurial [hg] |
|
20 | - Mercurial [hg] | |
@@ -185,7 +185,7 b' def debugsvnlog(ui, **opts):' | |||||
185 | return convcmd.debugsvnlog(ui, **opts) |
|
185 | return convcmd.debugsvnlog(ui, **opts) | |
186 |
|
186 | |||
187 | def debugcvsps(ui, *args, **opts): |
|
187 | def debugcvsps(ui, *args, **opts): | |
188 |
''' |
|
188 | '''create changeset information from CVS | |
189 |
|
189 | |||
190 | This command is intended as a debugging tool for the CVS to Mercurial |
|
190 | This command is intended as a debugging tool for the CVS to Mercurial | |
191 | converter, and can be used as a direct replacement for cvsps. |
|
191 | converter, and can be used as a direct replacement for cvsps. | |
@@ -216,18 +216,18 b' cmdtable = {' | |||||
216 | (debugcvsps, |
|
216 | (debugcvsps, | |
217 | [ |
|
217 | [ | |
218 | # Main options shared with cvsps-2.1 |
|
218 | # Main options shared with cvsps-2.1 | |
219 |
('b', 'branches', [], _(' |
|
219 | ('b', 'branches', [], _('only return changes on specified branches')), | |
220 |
('p', 'prefix', '', _(' |
|
220 | ('p', 'prefix', '', _('prefix to remove from file names')), | |
221 |
('r', 'revisions', [], _(' |
|
221 | ('r', 'revisions', [], _('only return changes after or between specified tags')), | |
222 |
('u', 'update-cache', None, _(" |
|
222 | ('u', 'update-cache', None, _("update cvs log cache")), | |
223 |
('x', 'new-cache', None, _(" |
|
223 | ('x', 'new-cache', None, _("create new cvs log cache")), | |
224 |
('z', 'fuzz', 60, _(' |
|
224 | ('z', 'fuzz', 60, _('set commit time fuzz in seconds')), | |
225 |
('', 'root', '', _(' |
|
225 | ('', 'root', '', _('specify cvsroot')), | |
226 | # Options specific to builtin cvsps |
|
226 | # Options specific to builtin cvsps | |
227 |
('', 'parents', '', _(' |
|
227 | ('', 'parents', '', _('show parent changesets')), | |
228 |
('', 'ancestors', '', _(' |
|
228 | ('', 'ancestors', '', _('show current changeset in ancestor branches')), | |
229 | # Options that are ignored for compatibility with cvsps-2.1 |
|
229 | # Options that are ignored for compatibility with cvsps-2.1 | |
230 |
('A', 'cvs-direct', None, ' |
|
230 | ('A', 'cvs-direct', None, 'ignored for compatibility'), | |
231 | ], |
|
231 | ], | |
232 | 'hg debugcvsps [OPTION]... [PATH]...'), |
|
232 | 'hg debugcvsps [OPTION]... [PATH]...'), | |
233 | } |
|
233 | } |
@@ -11,7 +11,7 b' from mercurial.node import nullid, short' | |||||
11 | from mercurial import commands, cmdutil, hg, util, url |
|
11 | from mercurial import commands, cmdutil, hg, util, url | |
12 |
|
12 | |||
13 | def fetch(ui, repo, source='default', **opts): |
|
13 | def fetch(ui, repo, source='default', **opts): | |
14 |
''' |
|
14 | '''pull changes from a remote repository, merge new changes if needed. | |
15 |
|
15 | |||
16 | This finds all changes from the repository at the specified path |
|
16 | This finds all changes from the repository at the specified path | |
17 | or URL and adds them to the local repository. |
|
17 | or URL and adds them to the local repository. |
@@ -130,7 +130,7 b' def catcommit(ui, repo, n, prefix, ctx=N' | |||||
130 | ui.write('\0') |
|
130 | ui.write('\0') | |
131 |
|
131 | |||
132 | def base(ui, repo, node1, node2): |
|
132 | def base(ui, repo, node1, node2): | |
133 |
""" |
|
133 | """output common ancestor information""" | |
134 | node1 = repo.lookup(node1) |
|
134 | node1 = repo.lookup(node1) | |
135 | node2 = repo.lookup(node2) |
|
135 | node2 = repo.lookup(node2) | |
136 | n = repo.changelog.ancestor(node1, node2) |
|
136 | n = repo.changelog.ancestor(node1, node2) | |
@@ -282,7 +282,7 b' def revtree(ui, args, repo, full="tree",' | |||||
282 | count += 1 |
|
282 | count += 1 | |
283 |
|
283 | |||
284 | def revparse(ui, repo, *revs, **opts): |
|
284 | def revparse(ui, repo, *revs, **opts): | |
285 |
""" |
|
285 | """parse given revisions""" | |
286 | def revstr(rev): |
|
286 | def revstr(rev): | |
287 | if rev == 'HEAD': |
|
287 | if rev == 'HEAD': | |
288 | rev = 'tip' |
|
288 | rev = 'tip' |
@@ -2015,7 +2015,7 b' def guard(ui, repo, *args, **opts):' | |||||
2015 | status(q.series.index(q.lookup(patch))) |
|
2015 | status(q.series.index(q.lookup(patch))) | |
2016 |
|
2016 | |||
2017 | def header(ui, repo, patch=None): |
|
2017 | def header(ui, repo, patch=None): | |
2018 |
""" |
|
2018 | """print the header of the topmost or specified patch""" | |
2019 | q = repo.mq |
|
2019 | q = repo.mq | |
2020 |
|
2020 | |||
2021 | if patch: |
|
2021 | if patch: |
@@ -8,7 +8,7 b'' | |||||
8 | # This software may be used and distributed according to the terms |
|
8 | # This software may be used and distributed according to the terms | |
9 | # of the GNU General Public License, incorporated herein by reference. |
|
9 | # of the GNU General Public License, incorporated herein by reference. | |
10 | # |
|
10 | # | |
11 |
""" |
|
11 | """allow to use MBCS path with problematic encoding. | |
12 |
|
12 | |||
13 | Some MBCS encodings are not good for some path operations |
|
13 | Some MBCS encodings are not good for some path operations | |
14 | (i.e. splitting path, case conversion, etc.) with its encoded bytes. |
|
14 | (i.e. splitting path, case conversion, etc.) with its encoded bytes. |
@@ -1333,7 +1333,7 b' def help_(ui, name=None, with_version=Fa' | |||||
1333 | # description |
|
1333 | # description | |
1334 | doc = gettext(i[0].__doc__) |
|
1334 | doc = gettext(i[0].__doc__) | |
1335 | if not doc: |
|
1335 | if not doc: | |
1336 |
doc = _("( |
|
1336 | doc = _("(no help text available)") | |
1337 | if ui.quiet: |
|
1337 | if ui.quiet: | |
1338 | doc = doc.splitlines(0)[0] |
|
1338 | doc = doc.splitlines(0)[0] | |
1339 | ui.write("\n%s\n" % doc.rstrip()) |
|
1339 | ui.write("\n%s\n" % doc.rstrip()) | |
@@ -1362,7 +1362,7 b' def help_(ui, name=None, with_version=Fa' | |||||
1362 | continue |
|
1362 | continue | |
1363 | doc = gettext(e[0].__doc__) |
|
1363 | doc = gettext(e[0].__doc__) | |
1364 | if not doc: |
|
1364 | if not doc: | |
1365 |
doc = _("( |
|
1365 | doc = _("(no help text available)") | |
1366 | h[f] = doc.splitlines(0)[0].rstrip() |
|
1366 | h[f] = doc.splitlines(0)[0].rstrip() | |
1367 | cmds[f] = c.lstrip("^") |
|
1367 | cmds[f] = c.lstrip("^") | |
1368 |
|
1368 | |||
@@ -1405,7 +1405,7 b' def help_(ui, name=None, with_version=Fa' | |||||
1405 |
|
1405 | |||
1406 | # description |
|
1406 | # description | |
1407 | if not doc: |
|
1407 | if not doc: | |
1408 |
doc = _("( |
|
1408 | doc = _("(no help text available)") | |
1409 | if callable(doc): |
|
1409 | if callable(doc): | |
1410 | doc = doc() |
|
1410 | doc = doc() | |
1411 |
|
1411 | |||
@@ -1418,7 +1418,7 b' def help_(ui, name=None, with_version=Fa' | |||||
1418 | except KeyError: |
|
1418 | except KeyError: | |
1419 | raise cmdutil.UnknownCommand(name) |
|
1419 | raise cmdutil.UnknownCommand(name) | |
1420 |
|
1420 | |||
1421 |
doc = gettext(mod.__doc__) or _(' |
|
1421 | doc = gettext(mod.__doc__) or _('no help text available') | |
1422 | doc = doc.splitlines(0) |
|
1422 | doc = doc.splitlines(0) | |
1423 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) |
|
1423 | ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0])) | |
1424 | for d in doc[1:]: |
|
1424 | for d in doc[1:]: | |
@@ -3077,7 +3077,7 b' table = {' | |||||
3077 | ('g', 'good', False, _('mark changeset good')), |
|
3077 | ('g', 'good', False, _('mark changeset good')), | |
3078 | ('b', 'bad', False, _('mark changeset bad')), |
|
3078 | ('b', 'bad', False, _('mark changeset bad')), | |
3079 | ('s', 'skip', False, _('skip testing changeset')), |
|
3079 | ('s', 'skip', False, _('skip testing changeset')), | |
3080 |
('c', 'command', '', _(' |
|
3080 | ('c', 'command', '', _('use command to check changeset state')), | |
3081 | ('U', 'noupdate', False, _('do not update to target'))], |
|
3081 | ('U', 'noupdate', False, _('do not update to target'))], | |
3082 | _("[-gbsr] [-c CMD] [REV]")), |
|
3082 | _("[-gbsr] [-c CMD] [REV]")), | |
3083 | "branch": |
|
3083 | "branch": |
@@ -1,6 +1,6 b'' | |||||
1 | hg convert [OPTION]... SOURCE [DEST [REVMAP]] |
|
1 | hg convert [OPTION]... SOURCE [DEST [REVMAP]] | |
2 |
|
2 | |||
3 |
|
|
3 | convert a foreign SCM repository to a Mercurial one. | |
4 |
|
4 | |||
5 | Accepted source formats [identifiers]: |
|
5 | Accepted source formats [identifiers]: | |
6 | - Mercurial [hg] |
|
6 | - Mercurial [hg] |
@@ -33,7 +33,7 b' list of commands:' | |||||
33 | qfold fold the named patches into the current patch |
|
33 | qfold fold the named patches into the current patch | |
34 | qgoto push or pop patches until named patch is at top of stack |
|
34 | qgoto push or pop patches until named patch is at top of stack | |
35 | qguard set or print guards for a patch |
|
35 | qguard set or print guards for a patch | |
36 |
qheader |
|
36 | qheader print the header of the topmost or specified patch | |
37 | qimport import a patch |
|
37 | qimport import a patch | |
38 | qinit init a new queue repository |
|
38 | qinit init a new queue repository | |
39 | qnew create a new patch |
|
39 | qnew create a new patch |
General Comments 0
You need to be logged in to leave comments.
Login now