This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7545

py3: make a pycompat.osdevnull, use it in extdiff
ClosedPublic

Authored by spectral on Dec 3 2019, 8:35 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG765a9c299c44: py3: make a pycompat.osdevnull, use it in extdiff

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Dec 3 2019, 8:35 PM
mharbison72 accepted this revision.Dec 3 2019, 11:56 PM
mharbison72 added a subscriber: mharbison72.

LGTM

spectral added a commit: rHG765a9c299c44: py3: make a pycompat.osdevnull, use it in extdiff.Dec 4 2019, 2:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG765a9c299c44: py3: make a pycompat.osdevnull, use it in extdiff (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/extdiff.py (8 lines)
Mmercurial/pycompat.py (2 lines)
Mtests/test-extdiff.t (24 lines)

Diff 18470

hgext/extdiff.py

# built in an "unstable" way and it's annoying to get files in a # built in an "unstable" way and it's annoying to get files in a
# random order, especially when "confirm" mode is enabled. # random order, especially when "confirm" mode is enabled.
waitprocs = [] waitprocs = []
totalfiles = len(commonfiles) totalfiles = len(commonfiles)
for idx, commonfile in enumerate(sorted(commonfiles)): for idx, commonfile in enumerate(sorted(commonfiles)):
path1a = os.path.join(tmproot, dir1a, commonfile) path1a = os.path.join(tmproot, dir1a, commonfile)
label1a = commonfile + rev1a label1a = commonfile + rev1a
if not os.path.isfile(path1a): if not os.path.isfile(path1a):
path1a = os.devnull path1a = pycompat.osdevnull
path1b = b'' path1b = b''
label1b = b'' label1b = b''
if do3way: if do3way:
path1b = os.path.join(tmproot, dir1b, commonfile) path1b = os.path.join(tmproot, dir1b, commonfile)
label1b = commonfile + rev1b label1b = commonfile + rev1b
if not os.path.isfile(path1b): if not os.path.isfile(path1b):
path1b = os.devnull path1b = pycompat.osdevnull
path2 = os.path.join(dir2root, dir2, commonfile) path2 = os.path.join(dir2root, dir2, commonfile)
label2 = commonfile + rev2 label2 = commonfile + rev2
if confirm: if confirm:
# Prompt before showing this diff # Prompt before showing this diff
difffiles = _(b'diff %s (%d of %d)') % ( difffiles = _(b'diff %s (%d of %d)') % (
commonfile, commonfile,
# If only one change, diff the files instead of the directories # If only one change, diff the files instead of the directories
# Handle bogus modifies correctly by checking if the files exist # Handle bogus modifies correctly by checking if the files exist
if len(common) == 1: if len(common) == 1:
common_file = util.localpath(common.pop()) common_file = util.localpath(common.pop())
dir1a = os.path.join(tmproot, dir1a, common_file) dir1a = os.path.join(tmproot, dir1a, common_file)
label1a = common_file + rev1a label1a = common_file + rev1a
if not os.path.isfile(dir1a): if not os.path.isfile(dir1a):
dir1a = os.devnull dir1a = pycompat.osdevnull
if do3way: if do3way:
dir1b = os.path.join(tmproot, dir1b, common_file) dir1b = os.path.join(tmproot, dir1b, common_file)
label1b = common_file + rev1b label1b = common_file + rev1b
if not os.path.isfile(dir1b): if not os.path.isfile(dir1b):
dir1b = os.devnull dir1b = pycompat.osdevnull
dir2 = os.path.join(dir2root, dir2, common_file) dir2 = os.path.join(dir2root, dir2, common_file)
label2 = common_file + rev2 label2 = common_file + rev2
else: else:
template = b'hg-%h.patch' template = b'hg-%h.patch'
with formatter.nullformatter(ui, b'extdiff', {}) as fm: with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export( cmdutil.export(
repo, repo,
[repo[node1a].rev(), repo[node2].rev()], [repo[node1a].rev(), repo[node2].rev()],

mercurial/pycompat.py

oslinesep = os.linesep.encode('ascii') oslinesep = os.linesep.encode('ascii')
osname = os.name.encode('ascii') osname = os.name.encode('ascii')
ospathsep = os.pathsep.encode('ascii') ospathsep = os.pathsep.encode('ascii')
ospardir = os.pardir.encode('ascii') ospardir = os.pardir.encode('ascii')
ossep = os.sep.encode('ascii') ossep = os.sep.encode('ascii')
osaltsep = os.altsep osaltsep = os.altsep
if osaltsep: if osaltsep:
osaltsep = osaltsep.encode('ascii') osaltsep = osaltsep.encode('ascii')
osdevnull = os.devnull.encode('ascii')
sysplatform = sys.platform.encode('ascii') sysplatform = sys.platform.encode('ascii')
sysexecutable = sys.executable sysexecutable = sys.executable
if sysexecutable: if sysexecutable:
sysexecutable = os.fsencode(sysexecutable) sysexecutable = os.fsencode(sysexecutable)
bytesio = io.BytesIO bytesio = io.BytesIO
# TODO deprecate stringio name, as it is a lie on Python 3. # TODO deprecate stringio name, as it is a lie on Python 3.
stringio = bytesio stringio = bytesio
oscurdir = os.curdir oscurdir = os.curdir
oslinesep = os.linesep oslinesep = os.linesep
osname = os.name osname = os.name
ospathsep = os.pathsep ospathsep = os.pathsep
ospardir = os.pardir ospardir = os.pardir
ossep = os.sep ossep = os.sep
osaltsep = os.altsep osaltsep = os.altsep
osdevnull = os.devnull
long = long long = long
stdin = sys.stdin stdin = sys.stdin
stdout = sys.stdout stdout = sys.stdout
stderr = sys.stderr stderr = sys.stderr
if getattr(sys, 'argv', None) is not None: if getattr(sys, 'argv', None) is not None:
sysargv = sys.argv sysargv = sys.argv
sysplatform = sys.platform sysplatform = sys.platform
sysexecutable = sys.executable sysexecutable = sys.executable

tests/test-extdiff.t

$ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help -k xyzzy $ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help -k xyzzy
abort: no matches abort: no matches
(try 'hg help' for a list of topics) (try 'hg help' for a list of topics)
[255] [255]
$ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help td \ $ LC_MESSAGES=ja_JP.UTF-8 hg --config hgext.extdiff= --config extdiff.cmd.td=$U help td \
> | grep "^ '" > | grep "^ '"
'\xa5\xa5' '\xa5\xa5'
$ cd $TESTTMP
Test that diffing a single file works, even if that file is new
$ hg init testsinglefile
$ cd testsinglefile
$ echo a > a
$ hg add a
$ hg falabala
diffing * */a (glob)
[1]
$ hg ci -qm a
$ hg falabala -c .
diffing * */a (glob)
[1]
$ echo a >> a
$ hg falabala
diffing */a */a (glob)
[1]
$ hg ci -qm 2a
$ hg falabala -c .
diffing */a */a (glob)
[1]