Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 28288:e417e4512b0f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: remove deprecated option from synopsis of command help Before this patch, deprecated options below are used in synopsis of command help, even though they aren't listed up as available options by default. These might confuse readers. - -n (no-op, now) of strip - -a/--active of branches - -f/--force of merge
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Mar 2016 03:28:46 +0900
parents bb14a81ce647
children 549ff28a345f
comparison
equal deleted inserted replaced
28287:adf32601916c 28288:e417e4512b0f
1230 @command('branches', 1230 @command('branches',
1231 [('a', 'active', False, 1231 [('a', 'active', False,
1232 _('show only branches that have unmerged heads (DEPRECATED)')), 1232 _('show only branches that have unmerged heads (DEPRECATED)')),
1233 ('c', 'closed', False, _('show normal and closed branches')), 1233 ('c', 'closed', False, _('show normal and closed branches')),
1234 ] + formatteropts, 1234 ] + formatteropts,
1235 _('[-ac]')) 1235 _('[-c]'))
1236 def branches(ui, repo, active=False, closed=False, **opts): 1236 def branches(ui, repo, active=False, closed=False, **opts):
1237 """list repository named branches 1237 """list repository named branches
1238 1238
1239 List the repository's named branches, indicating which ones are 1239 List the repository's named branches, indicating which ones are
1240 inactive. If -c/--closed is specified, also list branches which have 1240 inactive. If -c/--closed is specified, also list branches which have
5173 _('force a merge including outstanding changes (DEPRECATED)')), 5173 _('force a merge including outstanding changes (DEPRECATED)')),
5174 ('r', 'rev', '', _('revision to merge'), _('REV')), 5174 ('r', 'rev', '', _('revision to merge'), _('REV')),
5175 ('P', 'preview', None, 5175 ('P', 'preview', None,
5176 _('review revisions to merge (no merge is performed)')) 5176 _('review revisions to merge (no merge is performed)'))
5177 ] + mergetoolopts, 5177 ] + mergetoolopts,
5178 _('[-P] [-f] [[-r] REV]')) 5178 _('[-P] [[-r] REV]'))
5179 def merge(ui, repo, node=None, **opts): 5179 def merge(ui, repo, node=None, **opts):
5180 """merge another revision into working directory 5180 """merge another revision into working directory
5181 5181
5182 The current working directory is updated with all changes made in 5182 The current working directory is updated with all changes made in
5183 the requested revision since the last common predecessor revision. 5183 the requested revision since the last common predecessor revision.