mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:defabf63e969
+:8ff1ecfadcd1
 )
 repo.setparents(op1, op2)
 hg._showstats(repo, stats)
 if stats.unresolvedcount:
 repo.ui.status(
-_(b"use 'hg resolve' to retry unresolved " b"file merges\n")
+_(b"use 'hg resolve' to retry unresolved file merges\n")
 )
 return 1
 else:
 hg.clean(repo, node, show_stats=False)
 repo.dirstate.setbranch(branch)
 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
 if opts.get(b'no_commit'):
-msg = _(b"changeset %s backed out, " b"don't forget to commit.\n")
+msg = _(b"changeset %s backed out, don't forget to commit.\n")
 ui.status(msg % short(node))
 return 0
 def commitfunc(ui, repo, message, match, opts):
 editform = b'backout'
 return cmdutil.changebranch(ui, repo, revs, label)
 if not opts.get(b'force') and label in repo.branchmap():
 if label not in [p.branch() for p in repo[None].parents()]:
 raise error.Abort(
-_(b'a branch of the same name already' b' exists'),
+_(b'a branch of the same name already exists'),
 # i18n: "it" refers to an existing branch
 hint=_(b"use 'hg update' to switch to it"),
 )
 repo.dirstate.setbranch(label)
 try:
 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
 except error.UnsupportedBundleSpecification as e:
 raise error.Abort(
 pycompat.bytestr(e),
-hint=_(
+hint=_(b"see 'hg help bundlespec' for supported values for --type"),
-b"see 'hg help bundlespec' for supported " b"values for --type"
-),
 )
 cgversion = bundlespec.contentopts[b"cg.version"]
 # Packed bundles are a pseudo bundle format for now.
 if cgversion == b's1':
 )
 if opts.get(b'all'):
 if dest:
 raise error.Abort(
-_(b"--all is incompatible with specifying " b"a destination")
+_(b"--all is incompatible with specifying a destination")
 )
 if opts.get(b'base'):
 ui.warn(_(b"ignoring --base because --all was specified\n"))
 base = [nullrev]
 else:
 )
 if base:
 if dest:
 raise error.Abort(
-_(b"--base is incompatible with specifying " b"a destination")
+_(b"--base is incompatible with specifying a destination")
 )
 common = [repo[rev].node() for rev in base]
 heads = [repo[r].node() for r in revs] if revs else None
 outgoing = discovery.outgoing(repo, common, heads)
 else:
 if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
 extra[b'close'] = b'1'
 if repo[b'.'].closesbranch():
 raise error.Abort(
-_(b'current revision is already a branch closing' b' head')
+_(b'current revision is already a branch closing head')
 )
 elif not bheads:
 raise error.Abort(_(b'branch "%s" has no heads to close') % branch)
 elif (
 branch == repo[b'.'].branch()
 if not contstate:
 raise error.Abort(_(b'no operation in progress'))
 if not contstate.continuefunc:
 raise error.Abort(
 (
-_(b"%s in progress but does not support " b"'hg continue'")
+_(b"%s in progress but does not support 'hg continue'")
 % (contstate._opname)
 ),
 hint=contstate.continuemsg(),
 )
 if dryrun:
 cont = False
 if opts.get(b'no_commit'):
 if opts.get(b'edit'):
 raise error.Abort(
-_(b"cannot specify --no-commit and " b"--edit together")
+_(b"cannot specify --no-commit and --edit together")
 )
 if opts.get(b'currentuser'):
 raise error.Abort(
-_(b"cannot specify --no-commit and " b"--currentuser together")
+_(b"cannot specify --no-commit and --currentuser together")
 )
 if opts.get(b'currentdate'):
 raise error.Abort(
-_(b"cannot specify --no-commit and " b"--currentdate together")
+_(b"cannot specify --no-commit and --currentdate together")
 )
 if opts.get(b'log'):
 raise error.Abort(
-_(b"cannot specify --no-commit and " b"--log together")
+_(b"cannot specify --no-commit and --log together")
 )
 graftstate = statemod.cmdstate(repo, b'graftstate')
 if opts.get(b'stop'):
 if opts.get(b'continue'):
 raise error.Abort(
-_(b"cannot use '--continue' and " b"'--stop' together")
+_(b"cannot use '--continue' and '--stop' together")
 )
 if opts.get(b'abort'):
 raise error.Abort(_(b"cannot use '--abort' and '--stop' together"))
 if any(
 raise error.Abort(_(b"cannot specify any other flag with '--stop'"))
 return _stopgraft(ui, repo, graftstate)
 elif opts.get(b'abort'):
 if opts.get(b'continue'):
 raise error.Abort(
-_(b"cannot use '--continue' and " b"'--abort' together")
+_(b"cannot use '--continue' and '--abort' together")
 )
 if any(
 (
 opts.get(b'edit'),
 opts.get(b'log'),
 """
 opts = pycompat.byteskwargs(opts)
 if not repo and not source:
 raise error.Abort(
-_(b"there is no Mercurial repository here " b"(.hg not found)")
+_(b"there is no Mercurial repository here (.hg not found)")
 )
 default = not (num or id or branch or tags or bookmarks)
 output = []
 revs = []
 clearable=True,
 allowcommit=True,
 cmdmsg=_(b'outstanding uncommitted merge'),
 abortfunc=hg.abortmerge,
 statushint=_(
-b'To continue:    hg commit\n' b'To abort:       hg merge --abort'
+b'To continue:    hg commit\nTo abort:       hg merge --abort'
 ),
 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
 )
 ui.status(
 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
 )
 elif currentbranchheads > 1:
 ui.status(
-_(b"(run 'hg heads .' to see heads, 'hg merge' to " b"merge)\n")
+_(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
 )
 else:
 ui.status(_(b"(run 'hg heads' to see heads)\n"))
 elif not ui.configbool(b'commands', b'update.requiredest'):
 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
 revs = scmutil.revrange(repo, [expr])
 revs = [repo[rev].node() for rev in revs]
 if not revs:
 raise error.Abort(
-_(b'default push revset for path evaluates to an ' b'empty set')
+_(b'default push revset for path evaluates to an empty set')
 )
 repo._subtoppath = dest
 try:
 # push subrepos depth-first for coherent ordering
 )
 if confirm:
 if all:
 if ui.promptchoice(
-_(b're-merge all unresolved files (yn)?' b'$$ &Yes $$ &No')
+_(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
 ):
 raise error.Abort(_(b'user quit'))
 if mark and not pats:
 if ui.promptchoice(
 _(
 raise error.Abort(_(b"cannot use --print-url with --verbose"))
 if opts[b"stdio"]:
 if repo is None:
 raise error.RepoError(
-_(b"there is no Mercurial repository here" b" (.hg not found)")
+_(b"there is no Mercurial repository here (.hg not found)")
 )
 s = wireprotoserver.sshserver(ui, repo)
 s.serve_forever()
 service = server.createservice(ui, repo, opts)
 raise error.Abort(_(b'tag names must be unique'))
 for n in names:
 scmutil.checknewlabel(repo, n, b'tag')
 if not n:
 raise error.Abort(
-_(b'tag names cannot consist entirely of ' b'whitespace')
+_(b'tag names cannot consist entirely of whitespace')
 )
 if opts.get(b'rev') and opts.get(b'remove'):
 raise error.Abort(_(b"--rev and --remove are incompatible"))
 if opts.get(b'rev'):
 rev_ = opts[b'rev']
 message = b'Removed tag %s' % b', '.join(names)
 elif not opts.get(b'force'):
 for n in names:
 if n in repo.tags():
 raise error.Abort(
-_(b"tag '%s' already exists " b"(use -f to force)") % n
+_(b"tag '%s' already exists (use -f to force)") % n
 )
 if not opts.get(b'local'):
 p1, p2 = repo.dirstate.parents()
 if p2 != nullid:
 raise error.Abort(_(b'uncommitted merge'))

changeset 43117	8ff1ecfadcd1
parent 43106	d783f945a701
child 43163	5617b748aad8