1994 listsubrepos=opts.get('subrepos'), |
1994 listsubrepos=opts.get('subrepos'), |
1995 root=opts.get('root')) |
1995 root=opts.get('root')) |
1996 |
1996 |
1997 @command('export', |
1997 @command('export', |
1998 [('B', 'bookmark', '', |
1998 [('B', 'bookmark', '', |
1999 _('export changes only reachable by given bookmark')), |
1999 _('export changes only reachable by given bookmark'), _('BOOKMARK')), |
2000 ('o', 'output', '', |
2000 ('o', 'output', '', |
2001 _('print output to file with formatted name'), _('FORMAT')), |
2001 _('print output to file with formatted name'), _('FORMAT')), |
2002 ('', 'switch-parent', None, _('diff against the second parent')), |
2002 ('', 'switch-parent', None, _('diff against the second parent')), |
2003 ('r', 'rev', [], _('revisions to export'), _('REV')), |
2003 ('r', 'rev', [], _('revisions to export'), _('REV')), |
2004 ] + diffopts + formatteropts, |
2004 ] + diffopts + formatteropts, |
2255 _("don't commit, just apply the changes in working directory")), |
2255 _("don't commit, just apply the changes in working directory")), |
2256 ('f', 'force', False, _('force graft')), |
2256 ('f', 'force', False, _('force graft')), |
2257 ('D', 'currentdate', False, |
2257 ('D', 'currentdate', False, |
2258 _('record the current date as commit date')), |
2258 _('record the current date as commit date')), |
2259 ('U', 'currentuser', False, |
2259 ('U', 'currentuser', False, |
2260 _('record the current user as committer'), _('DATE'))] |
2260 _('record the current user as committer'))] |
2261 + commitopts2 + mergetoolopts + dryrunopts, |
2261 + commitopts2 + mergetoolopts + dryrunopts, |
2262 _('[OPTION]... [-r REV]... REV...'), |
2262 _('[OPTION]... [-r REV]... REV...'), |
2263 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) |
2263 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) |
2264 def graft(ui, repo, *revs, **opts): |
2264 def graft(ui, repo, *revs, **opts): |
2265 '''copy changes from other branches onto the current branch |
2265 '''copy changes from other branches onto the current branch |
3014 |
3014 |
3015 @command('help', |
3015 @command('help', |
3016 [('e', 'extension', None, _('show only help for extensions')), |
3016 [('e', 'extension', None, _('show only help for extensions')), |
3017 ('c', 'command', None, _('show only help for commands')), |
3017 ('c', 'command', None, _('show only help for commands')), |
3018 ('k', 'keyword', None, _('show topics matching keyword')), |
3018 ('k', 'keyword', None, _('show topics matching keyword')), |
3019 ('s', 'system', [], _('show help for specific platform(s)')), |
3019 ('s', 'system', [], |
|
3020 _('show help for specific platform(s)'), _('PLATFORM')), |
3020 ], |
3021 ], |
3021 _('[-ecks] [TOPIC]'), |
3022 _('[-eck] [-s PLATFORM] [TOPIC]'), |
3022 helpcategory=command.CATEGORY_HELP, |
3023 helpcategory=command.CATEGORY_HELP, |
3023 norepo=True, |
3024 norepo=True, |
3024 intents={INTENT_READONLY}) |
3025 intents={INTENT_READONLY}) |
3025 def help_(ui, name=None, **opts): |
3026 def help_(ui, name=None, **opts): |
3026 """show help for a given topic or a help overview |
3027 """show help for a given topic or a help overview |