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

comparison hgext/extdiff.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	9f70512ae2cf

comparison

equal deleted inserted replaced

-:2372284d9457
+:687b865b95ad
 configtable = {}
 configitem = registrar.configitem(configtable)
 configitem(
-'extdiff', br'opts\..*', default='', generic=True,
+b'extdiff', br'opts\..*', default=b'', generic=True,
 )
 configitem(
-'extdiff', br'gui\..*', generic=True,
+b'extdiff', br'gui\..*', generic=True,
 )
 configitem(
-'diff-tools', br'.*\.diffargs$', default=None, generic=True,
+b'diff-tools', br'.*\.diffargs$', default=None, generic=True,
 )
 configitem(
-'diff-tools', br'.*\.gui$', generic=True,
+b'diff-tools', br'.*\.gui$', generic=True,
 )
 # 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'
 def snapshot(ui, repo, files, node, tmproot, listsubrepos):
 '''snapshot files as of some revision
 if not using snapshot, -I/-X does not work and recursive diff
 in tools like kdiff3 and meld displays too many files.'''
 dirname = os.path.basename(repo.root)
-if dirname == "":
+if dirname == b"":
-dirname = "root"
+dirname = b"root"
 if node is not None:
-dirname = '%s.%s' % (dirname, short(node))
+dirname = b'%s.%s' % (dirname, short(node))
 base = os.path.join(tmproot, dirname)
 os.mkdir(base)
 fnsandstat = []
 if node is not None:
 ui.note(
-_('making snapshot of %d files from rev %s\n')
+_(b'making snapshot of %d files from rev %s\n')
 % (len(files), short(node))
 )
 else:
 ui.note(
-_('making snapshot of %d files from working directory\n')
+_(b'making snapshot of %d files from working directory\n')
 % (len(files))
 )
 if files:
-repo.ui.setconfig("ui", "archivemeta", False)
+repo.ui.setconfig(b"ui", b"archivemeta", False)
 archival.archive(
 repo,
 base,
 node,
-'files',
+b'files',
 match=scmutil.matchfiles(repo, files),
 subrepos=listsubrepos,
 )
 for fn in sorted(files):
 wfn = util.pconvert(fn)
-ui.note('  %s\n' % wfn)
+ui.note(b'  %s\n' % wfn)
 if node is None:
 dest = os.path.join(base, wfn)
 fnsandstat.append((dest, repo.wjoin(fn), os.lstat(dest)))
 ):
 # Function to quote file/dir names in the argument string.
 # When not operating in 3-way mode, an empty string is
 # returned for parent2
 replace = {
-'parent': parent1,
+b'parent': parent1,
-'parent1': parent1,
+b'parent1': parent1,
-'parent2': parent2,
+b'parent2': parent2,
-'plabel1': plabel1,
+b'plabel1': plabel1,
-'plabel2': plabel2,
+b'plabel2': plabel2,
-'child': child,
+b'child': child,
-'clabel': clabel,
+b'clabel': clabel,
-'root': repo_root,
+b'root': repo_root,
 }
 def quote(match):
 pre = match.group(2)
 key = match.group(3)
-if not do3way and key == 'parent2':
+if not do3way and key == b'parent2':
 return pre
 return pre + procutil.shellquote(replace[key])
 # Match parent2 first, so 'parent1?' will match both parent1 and parent
 regex = (
 br'''(['"]?)([^\s'"$]*)'''
 br'\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1'
 )
 if not do3way and not re.search(regex, cmdline):
-cmdline += ' $parent1 $child'
+cmdline += b' $parent1 $child'
 return re.sub(regex, quote, cmdline)
 def _systembackground(cmd, environ=None, cwd=None):
 ''' like 'procutil.system', but returns the Popen object directly
 path1a = os.path.join(tmproot, dir1a, commonfile)
 label1a = commonfile + rev1a
 if not os.path.isfile(path1a):
 path1a = os.devnull
-path1b = ''
+path1b = b''
-label1b = ''
+label1b = b''
 if do3way:
 path1b = os.path.join(tmproot, dir1b, commonfile)
 label1b = commonfile + rev1b
 if not os.path.isfile(path1b):
 path1b = os.devnull
 path2 = os.path.join(dir2root, dir2, commonfile)
 label2 = commonfile + rev2
 if confirm:
 # Prompt before showing this diff
-difffiles = _('diff %s (%d of %d)') % (
+difffiles = _(b'diff %s (%d of %d)') % (
 commonfile,
 idx + 1,
 totalfiles,
 )
 responses = _(
-'[Yns?]'
+b'[Yns?]'
-'$$ &Yes, show diff'
+b'$$ &Yes, show diff'
-'$$ &No, skip this diff'
+b'$$ &No, skip this diff'
-'$$ &Skip remaining diffs'
+b'$$ &Skip remaining diffs'
-'$$ &? (display help)'
+b'$$ &? (display help)'
 )
-r = ui.promptchoice('%s %s' % (difffiles, responses))
+r = ui.promptchoice(b'%s %s' % (difffiles, responses))
 if r == 3:  # ?
 while r == 3:
 for c, t in ui.extractchoices(responses)[1]:
-ui.write('%s - %s\n' % (c, encoding.lower(t)))
+ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
-r = ui.promptchoice('%s %s' % (difffiles, responses))
+r = ui.promptchoice(b'%s %s' % (difffiles, responses))
 if r == 0:  # yes
 pass
 elif r == 1:  # no
 continue
 elif r == 2:  # skip
 # This is because either we need to wait for confirmation
 # from the user between each invocation, or because, as far
 # as we know, the tool doesn't have a GUI, in which case
 # we can't run multiple CLI programs at the same time.
 ui.debug(
-'running %r in %s\n' % (pycompat.bytestr(curcmdline), tmproot)
+b'running %r in %s\n' % (pycompat.bytestr(curcmdline), tmproot)
 )
-ui.system(curcmdline, cwd=tmproot, blockedtag='extdiff')
+ui.system(curcmdline, cwd=tmproot, blockedtag=b'extdiff')
 else:
 # Run the comparison program but don't wait, as we're
 # going to rapid-fire each file diff and then wait on
 # the whole group.
 ui.debug(
-'running %r in %s (backgrounded)\n'
+b'running %r in %s (backgrounded)\n'
 % (pycompat.bytestr(curcmdline), tmproot)
 )
 proc = _systembackground(curcmdline, cwd=tmproot)
 waitprocs.append(proc)
 if waitprocs:
-with ui.timeblockedsection('extdiff'):
+with ui.timeblockedsection(b'extdiff'):
 for proc in waitprocs:
 proc.wait()
 def dodiff(ui, repo, cmdline, pats, opts, guitool=False):
 - copy to a temp structure if diffing working revision with
 another one and more than 1 file is changed
 - just invoke the diff for a single file in the working dir
 '''
-revs = opts.get('rev')
+revs = opts.get(b'rev')
-change = opts.get('change')
+change = opts.get(b'change')
-do3way = '$parent2' in cmdline
+do3way = b'$parent2' in cmdline
 if revs and change:
-msg = _('cannot specify --rev and --change at the same time')
+msg = _(b'cannot specify --rev and --change at the same time')
 raise error.Abort(msg)
 elif change:
 ctx2 = scmutil.revsingle(repo, change, None)
 ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
 else:
 if not revs:
 ctx1b = repo[None].p2()
 else:
 ctx1b = repo[nullid]
-perfile = opts.get('per_file')
+perfile = opts.get(b'per_file')
-confirm = opts.get('confirm')
+confirm = opts.get(b'confirm')
 node1a = ctx1a.node()
 node1b = ctx1b.node()
 node2 = ctx2.node()
 # Disable 3-way merge if there is only one parent
 if do3way:
 if node1b == nullid:
 do3way = False
-subrepos = opts.get('subrepos')
+subrepos = opts.get(b'subrepos')
 matcher = scmutil.match(repo[node2], pats, opts)
-if opts.get('patch'):
+if opts.get(b'patch'):
 if subrepos:
-raise error.Abort(_('--patch cannot be used with --subrepos'))
+raise error.Abort(_(b'--patch cannot be used with --subrepos'))
 if perfile:
-raise error.Abort(_('--patch cannot be used with --per-file'))
+raise error.Abort(_(b'--patch cannot be used with --per-file'))
 if node2 is None:
-raise error.Abort(_('--patch requires two revisions'))
+raise error.Abort(_(b'--patch requires two revisions'))
 else:
 mod_a, add_a, rem_a = map(
 set, repo.status(node1a, node2, matcher, listsubrepos=subrepos)[:3]
 )
 if do3way:
 modadd = mod_a | add_a | mod_b | add_b
 common = modadd | rem_a | rem_b
 if not common:
 return 0
-tmproot = pycompat.mkdtemp(prefix='extdiff.')
+tmproot = pycompat.mkdtemp(prefix=b'extdiff.')
 try:
-if not opts.get('patch'):
+if not opts.get(b'patch'):
 # Always make a copy of node1a (and node1b, if applicable)
 dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a)
 dir1a = snapshot(ui, repo, dir1a_files, node1a, tmproot, subrepos)[
 0
 ]
-rev1a = '@%d' % repo[node1a].rev()
+rev1a = b'@%d' % repo[node1a].rev()
 if do3way:
 dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b)
 dir1b = snapshot(
 ui, repo, dir1b_files, node1b, tmproot, subrepos
 )[0]
-rev1b = '@%d' % repo[node1b].rev()
+rev1b = b'@%d' % repo[node1b].rev()
 else:
 dir1b = None
-rev1b = ''
+rev1b = b''
 fnsandstat = []
 # If node2 in not the wc or there is >1 change, copy it
-dir2root = ''
+dir2root = b''
-rev2 = ''
+rev2 = b''
 if node2:
 dir2 = snapshot(ui, repo, modadd, node2, tmproot, subrepos)[0]
-rev2 = '@%d' % repo[node2].rev()
+rev2 = b'@%d' % repo[node2].rev()
 elif len(common) > 1:
 # we only actually need to get the files to copy back to
 # the working dir in this case (because the other cases
 # are: diffing 2 revisions or single file -- in which case
 # the file is already directly passed to the diff tool).
 dir2, fnsandstat = snapshot(
 ui, repo, modadd, None, tmproot, subrepos
 )
 else:
 # This lets the diff tool open the changed file directly
-dir2 = ''
+dir2 = b''
 dir2root = repo.root
 label1a = rev1a
 label1b = rev1b
 label2 = rev2
 if not os.path.isfile(dir1b):
 dir1b = os.devnull
 dir2 = os.path.join(dir2root, dir2, common_file)
 label2 = common_file + rev2
 else:
-template = 'hg-%h.patch'
+template = b'hg-%h.patch'
-with formatter.nullformatter(ui, 'extdiff', {}) as fm:
+with formatter.nullformatter(ui, b'extdiff', {}) as fm:
 cmdutil.export(
 repo,
 [repo[node1a].rev(), repo[node2].rev()],
 fm,
 fntemplate=repo.vfs.reljoin(tmproot, template),
 plabel2=label1b,
 child=dir2,
 clabel=label2,
 )
 ui.debug(
-'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)
+b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)
 )
-ui.system(cmdline, cwd=tmproot, blockedtag='extdiff')
+ui.system(cmdline, cwd=tmproot, blockedtag=b'extdiff')
 else:
 # Run the external tool once for each pair of files
 _runperfilediff(
 cmdline,
 repo.root,
 cpstat[stat.ST_MTIME] != st[stat.ST_MTIME]
 or cpstat.st_size != st.st_size
 or (cpstat.st_mode & 0o100) != (st.st_mode & 0o100)
 ):
 ui.debug(
-'file changed while diffing. '
+b'file changed while diffing. '
-'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)
+b'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)
 )
 util.copyfile(copy_fn, working_fn)
 return 1
 finally:
-ui.note(_('cleaning up temp directory\n'))
+ui.note(_(b'cleaning up temp directory\n'))
 shutil.rmtree(tmproot)
 extdiffopts = (
 [
-('o', 'option', [], _('pass option to comparison program'), _('OPT')),
-('r', 'rev', [], _('revision'), _('REV')),
-('c', 'change', '', _('change made by revision'), _('REV')),
 (
-'',
+b'o',
-'per-file',
+b'option',
+[],
+_(b'pass option to comparison program'),
+_(b'OPT'),
+),
+(b'r', b'rev', [], _(b'revision'), _(b'REV')),
+(b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
+(
+b'',
+b'per-file',
 False,
-_('compare each file instead of revision snapshots'),
+_(b'compare each file instead of revision snapshots'),
 ),
 (
-'',
+b'',
-'confirm',
+b'confirm',
 False,
-_('prompt user before each external program invocation'),
+_(b'prompt user before each external program invocation'),
 ),
-('', 'patch', None, _('compare patches for two revisions')),
+(b'', b'patch', None, _(b'compare patches for two revisions')),
 ]
 + cmdutil.walkopts
 + cmdutil.subrepoopts
 )
 @command(
-'extdiff',
+b'extdiff',
-[('p', 'program', '', _('comparison program to run'), _('CMD')),]
+[(b'p', b'program', b'', _(b'comparison program to run'), _(b'CMD')),]
 + extdiffopts,
-_('hg extdiff [OPT]... [FILE]...'),
+_(b'hg extdiff [OPT]... [FILE]...'),
 helpcategory=command.CATEGORY_FILE_CONTENTS,
 inferrepo=True,
 )
 def extdiff(ui, repo, *pats, **opts):
 '''use external program to diff repository (or selected files)
 The --confirm option will prompt the user before each invocation of
 the external program. It is ignored if --per-file isn't specified.
 '''
 opts = pycompat.byteskwargs(opts)
-program = opts.get('program')
+program = opts.get(b'program')
-option = opts.get('option')
+option = opts.get(b'option')
 if not program:
-program = 'diff'
+program = b'diff'
-option = option or ['-Npru']
+option = option or [b'-Npru']
-cmdline = ' '.join(map(procutil.shellquote, [program] + option))
+cmdline = b' '.join(map(procutil.shellquote, [program] + option))
 return dodiff(ui, repo, cmdline, pats, opts)
 class savedcmd(object):
 """use external program to diff repository (or selected files)
 self._cmdline = cmdline
 self._isgui = isgui
 def __call__(self, ui, repo, *pats, **opts):
 opts = pycompat.byteskwargs(opts)
-options = ' '.join(map(procutil.shellquote, opts['option']))
+options = b' '.join(map(procutil.shellquote, opts[b'option']))
 if options:
-options = ' ' + options
+options = b' ' + options
 return dodiff(
 ui, repo, self._cmdline + options, pats, opts, guitool=self._isgui
 )
 def uisetup(ui):
-for cmd, path in ui.configitems('extdiff'):
+for cmd, path in ui.configitems(b'extdiff'):
 path = util.expandpath(path)
-if cmd.startswith('cmd.'):
+if cmd.startswith(b'cmd.'):
 cmd = cmd[4:]
 if not path:
 path = procutil.findexe(cmd)
 if path is None:
 path = filemerge.findexternaltool(ui, cmd) or cmd
-diffopts = ui.config('extdiff', 'opts.' + cmd)
+diffopts = ui.config(b'extdiff', b'opts.' + cmd)
 cmdline = procutil.shellquote(path)
 if diffopts:
-cmdline += ' ' + diffopts
+cmdline += b' ' + diffopts
-isgui = ui.configbool('extdiff', 'gui.' + cmd)
+isgui = ui.configbool(b'extdiff', b'gui.' + cmd)
-elif cmd.startswith('opts.') or cmd.startswith('gui.'):
+elif cmd.startswith(b'opts.') or cmd.startswith(b'gui.'):
 continue
 else:
 if path:
 # case "cmd = path opts"
 cmdline = path
 path = procutil.findexe(cmd)
 if path is None:
 path = filemerge.findexternaltool(ui, cmd) or cmd
 cmdline = procutil.shellquote(path)
 diffopts = False
-isgui = ui.configbool('extdiff', 'gui.' + cmd)
+isgui = ui.configbool(b'extdiff', b'gui.' + cmd)
 # look for diff arguments in [diff-tools] then [merge-tools]
 if not diffopts:
-key = cmd + '.diffargs'
+key = cmd + b'.diffargs'
-for section in ('diff-tools', 'merge-tools'):
+for section in (b'diff-tools', b'merge-tools'):
 args = ui.config(section, key)
 if args:
-cmdline += ' ' + args
+cmdline += b' ' + args
 if isgui is None:
-isgui = ui.configbool(section, cmd + '.gui') or False
+isgui = ui.configbool(section, cmd + b'.gui') or False
 break
 command(
 cmd,
 extdiffopts[:],
-_('hg %s [OPTION]... [FILE]...') % cmd,
+_(b'hg %s [OPTION]... [FILE]...') % cmd,
 helpcategory=command.CATEGORY_FILE_CONTENTS,
 inferrepo=True,
 )(savedcmd(path, cmdline, isgui))

Mercurial > public > mercurial-scm > hg

comparison hgext/extdiff.py @ 43077:687b865b95ad