Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 28961:2e58dc022caa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugcreatestreamclonebundle: use single quotes around command hint Windows command lines use double quotes to quote arguments with spaces. This change is in a series to unify around using single quotes around commands, and double quotes around interior arguments.
author timeless <timeless@mozdev.org>
date Thu, 14 Apr 2016 15:17:15 +0000
parents 78759f78a44e
children 602cc9bf036e
comparison
equal deleted inserted replaced
28960:14e683d6b273 28961:2e58dc022caa
1385 'values for --type')) 1385 'values for --type'))
1386 1386
1387 # Packed bundles are a pseudo bundle format for now. 1387 # Packed bundles are a pseudo bundle format for now.
1388 if cgversion == 's1': 1388 if cgversion == 's1':
1389 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), 1389 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1390 hint=_('use "hg debugcreatestreamclonebundle"')) 1390 hint=_("use 'hg debugcreatestreamclonebundle'"))
1391 1391
1392 if opts.get('all'): 1392 if opts.get('all'):
1393 if dest: 1393 if dest:
1394 raise error.Abort(_("--all is incompatible with specifying " 1394 raise error.Abort(_("--all is incompatible with specifying "
1395 "a destination")) 1395 "a destination"))
4234 extra += ' --user %s' % opts['user'] 4234 extra += ' --user %s' % opts['user']
4235 if opts.get('date'): 4235 if opts.get('date'):
4236 extra += ' --date %s' % opts['date'] 4236 extra += ' --date %s' % opts['date']
4237 if opts.get('log'): 4237 if opts.get('log'):
4238 extra += ' --log' 4238 extra += ' --log'
4239 hint=_('use hg resolve and hg graft --continue%s') % extra 4239 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
4240 raise error.Abort( 4240 raise error.Abort(
4241 _("unresolved conflicts, can't continue"), 4241 _("unresolved conflicts, can't continue"),
4242 hint=hint) 4242 hint=hint)
4243 else: 4243 else:
4244 cont = False 4244 cont = False
6317 6317
6318 parent, p2 = repo.dirstate.parents() 6318 parent, p2 = repo.dirstate.parents()
6319 if not opts.get('rev') and p2 != nullid: 6319 if not opts.get('rev') and p2 != nullid:
6320 # revert after merge is a trap for new users (issue2915) 6320 # revert after merge is a trap for new users (issue2915)
6321 raise error.Abort(_('uncommitted merge with no revision specified'), 6321 raise error.Abort(_('uncommitted merge with no revision specified'),
6322 hint=_('use "hg update" or see "hg help revert"')) 6322 hint=_("use 'hg update' or see 'hg help revert'"))
6323 6323
6324 ctx = scmutil.revsingle(repo, opts.get('rev')) 6324 ctx = scmutil.revsingle(repo, opts.get('rev'))
6325 6325
6326 if (not (pats or opts.get('include') or opts.get('exclude') or 6326 if (not (pats or opts.get('include') or opts.get('exclude') or
6327 opts.get('all') or opts.get('interactive'))): 6327 opts.get('all') or opts.get('interactive'))):