mercurial-scm/hg: hgext/fetch.py comparison

comparison hgext/fetch.py @ 43077:687b865b95ad

formatting: byteify all mercurial/ and hgext/ string literals Done with python3.7 contrib/byteify-strings.py -i $(hg files 'set:mercurial/**.py - mercurial/thirdparty/** + hgext/**.py - hgext/fsmonitor/pywatchman/** - mercurial/__init__.py') black -l 80 -t py33 -S $(hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**') # skip-blame mass-reformatting only Differential Revision: https://phab.mercurial-scm.org/D6972

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:48:39 -0400
parents	2372284d9457
children	8ff1ecfadcd1

comparison

equal deleted inserted replaced

-:2372284d9457
+:687b865b95ad
 command = registrar.command(cmdtable)
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
-testedwith = 'ships-with-hg-core'
+testedwith = b'ships-with-hg-core'
 @command(
-'fetch',
+b'fetch',
 [
 (
-'r',
+b'r',
-'rev',
+b'rev',
 [],
-_('a specific revision you would like to pull'),
+_(b'a specific revision you would like to pull'),
-_('REV'),
+_(b'REV'),
 ),
-('', 'edit', None, _('invoke editor on commit messages')),
+(b'', b'edit', None, _(b'invoke editor on commit messages')),
-('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
+(b'', b'force-editor', None, _(b'edit commit message (DEPRECATED)')),
-('', 'switch-parent', None, _('switch parents when merging')),
+(b'', b'switch-parent', None, _(b'switch parents when merging')),
 ]
 + cmdutil.commitopts
 + cmdutil.commitopts2
 + cmdutil.remoteopts,
-_('hg fetch [SOURCE]'),
+_(b'hg fetch [SOURCE]'),
 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
 )
-def fetch(ui, repo, source='default', **opts):
+def fetch(ui, repo, source=b'default', **opts):
 '''pull changes from a remote repository, merge new changes if needed.
 This finds all changes from the repository at the specified path
 or URL and adds them to the local repository.
 Returns 0 on success.
 '''
 opts = pycompat.byteskwargs(opts)
-date = opts.get('date')
+date = opts.get(b'date')
 if date:
-opts['date'] = dateutil.parsedate(date)
+opts[b'date'] = dateutil.parsedate(date)
 parent = repo.dirstate.p1()
 branch = repo.dirstate.branch()
 try:
 branchnode = repo.branchtip(branch)
 except error.RepoLookupError:
 branchnode = None
 if parent != branchnode:
 raise error.Abort(
-_('working directory not at branch tip'),
+_(b'working directory not at branch tip'),
-hint=_("use 'hg update' to check out branch tip"),
+hint=_(b"use 'hg update' to check out branch tip"),
 )
 wlock = lock = None
 try:
 wlock = repo.wlock()
 bheads = repo.branchheads(branch)
 bheads = [head for head in bheads if len(repo[head].children()) == 0]
 if len(bheads) > 1:
 raise error.Abort(
 _(
-'multiple heads in this branch '
+b'multiple heads in this branch '
-'(use "hg heads ." and "hg merge" to merge)'
+b'(use "hg heads ." and "hg merge" to merge)'
 )
 )
 other = hg.peer(repo, opts, ui.expandpath(source))
 ui.status(
-_('pulling from %s\n') % util.hidepassword(ui.expandpath(source))
+_(b'pulling from %s\n') % util.hidepassword(ui.expandpath(source))
 )
 revs = None
-if opts['rev']:
+if opts[b'rev']:
 try:
-revs = [other.lookup(rev) for rev in opts['rev']]
+revs = [other.lookup(rev) for rev in opts[b'rev']]
 except error.CapabilityError:
 err = _(
-"other repository doesn't support revision lookup, "
+b"other repository doesn't support revision lookup, "
-"so a rev cannot be specified."
+b"so a rev cannot be specified."
 )
 raise error.Abort(err)
 # Are there any changes at all?
 modheads = exchange.pull(repo, other, heads=revs).cgresult
 hg.clean(repo, newparent)
 newheads = [n for n in newheads if n != newparent]
 if len(newheads) > 1:
 ui.status(
 _(
-'not merging with %d other new branch heads '
+b'not merging with %d other new branch heads '
-'(use "hg heads ." and "hg merge" to merge them)\n'
+b'(use "hg heads ." and "hg merge" to merge them)\n'
 )
 % (len(newheads) - 1)
 )
 return 1
 err = False
 if newheads:
 # By default, we consider the repository we're pulling
 # *from* as authoritative, so we merge our changes into
 # theirs.
-if opts['switch_parent']:
+if opts[b'switch_parent']:
 firstparent, secondparent = newparent, newheads[0]
 else:
 firstparent, secondparent = newheads[0], newparent
 ui.status(
-_('updating to %d:%s\n')
+_(b'updating to %d:%s\n')
 % (repo.changelog.rev(firstparent), short(firstparent))
 )
 hg.clean(repo, firstparent)
 ui.status(
-_('merging with %d:%s\n')
+_(b'merging with %d:%s\n')
 % (repo.changelog.rev(secondparent), short(secondparent))
 )
 err = hg.merge(repo, secondparent, remind=False)
 if not err:
 # we don't translate commit messages
 message = cmdutil.logmessage(ui, opts) or (
-'Automated merge with %s' % util.removeauth(other.url())
+b'Automated merge with %s' % util.removeauth(other.url())
 )
-editopt = opts.get('edit') or opts.get('force_editor')
+editopt = opts.get(b'edit') or opts.get(b'force_editor')
-editor = cmdutil.getcommiteditor(edit=editopt, editform='fetch')
+editor = cmdutil.getcommiteditor(edit=editopt, editform=b'fetch')
-n = repo.commit(message, opts['user'], opts['date'], editor=editor)
+n = repo.commit(
+message, opts[b'user'], opts[b'date'], editor=editor
+)
 ui.status(
-_('new changeset %d:%s merges remote changes ' 'with local\n')
+_(b'new changeset %d:%s merges remote changes ' b'with local\n')
 % (repo.changelog.rev(n), short(n))
 )
 return err

Mercurial > public > mercurial-scm > hg

comparison hgext/fetch.py @ 43077:687b865b95ad