Show More
@@ -115,20 +115,20 b' def topicmatch(ui, kw):' | |||
|
115 | 115 | doclines = docs.splitlines() |
|
116 | 116 | if doclines: |
|
117 | 117 | summary = doclines[0] |
|
118 |
cmdname = cmd. |
|
|
118 | cmdname = cmd.partition('|')[0].lstrip('^') | |
|
119 | 119 | results['commands'].append((cmdname, summary)) |
|
120 | 120 | for name, docs in itertools.chain( |
|
121 | 121 | extensions.enabled(False).iteritems(), |
|
122 | 122 | extensions.disabled().iteritems()): |
|
123 | 123 | # extensions.load ignores the UI argument |
|
124 | 124 | mod = extensions.load(None, name, '') |
|
125 |
name = name. |
|
|
125 | name = name.rpartition('.')[-1] | |
|
126 | 126 | if lowercontains(name) or lowercontains(docs): |
|
127 | 127 | # extension docs are already translated |
|
128 | 128 | results['extensions'].append((name, docs.splitlines()[0])) |
|
129 | 129 | for cmd, entry in getattr(mod, 'cmdtable', {}).iteritems(): |
|
130 | 130 | if kw in cmd or (len(entry) > 2 and lowercontains(entry[2])): |
|
131 |
cmdname = cmd. |
|
|
131 | cmdname = cmd.partition('|')[0].lstrip('^') | |
|
132 | 132 | if entry[0].__doc__: |
|
133 | 133 | cmddoc = gettext(entry[0].__doc__).splitlines()[0] |
|
134 | 134 | else: |
@@ -330,7 +330,7 b' def help_(ui, name, unknowncmd=False, fu' | |||
|
330 | 330 | h = {} |
|
331 | 331 | cmds = {} |
|
332 | 332 | for c, e in commands.table.iteritems(): |
|
333 |
f = c. |
|
|
333 | f = c.partition("|")[0] | |
|
334 | 334 | if select and not select(f): |
|
335 | 335 | continue |
|
336 | 336 | if (not select and name != 'shortlist' and |
@@ -445,7 +445,7 b' def help_(ui, name, unknowncmd=False, fu' | |||
|
445 | 445 | head, tail = doc, "" |
|
446 | 446 | else: |
|
447 | 447 | head, tail = doc.split('\n', 1) |
|
448 |
rst = [_('%s extension - %s\n\n') % (name. |
|
|
448 | rst = [_('%s extension - %s\n\n') % (name.rpartition('.')[-1], head)] | |
|
449 | 449 | if tail: |
|
450 | 450 | rst.extend(tail.splitlines(True)) |
|
451 | 451 | rst.append('\n') |
@@ -460,7 +460,7 b' def help_(ui, name, unknowncmd=False, fu' | |||
|
460 | 460 | ct = mod.cmdtable |
|
461 | 461 | except AttributeError: |
|
462 | 462 | ct = {} |
|
463 |
modcmds = set([c. |
|
|
463 | modcmds = set([c.partition('|')[0] for c in ct]) | |
|
464 | 464 | rst.extend(helplist(modcmds.__contains__)) |
|
465 | 465 | else: |
|
466 | 466 | rst.append(_('(use "hg help extensions" for information on enabling' |
General Comments 0
You need to be logged in to leave comments.
Login now