This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7374

hghave: add a check for the `xz` compression utility
ClosedPublic

Authored by mharbison72 on Nov 13 2019, 9:44 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG21e05aabef8c: hghave: add a check for the `xz` compression utility
Summary

This isn't install by default on Mac, which causes a test failure. The logic
for avoiding the command is a little goofy, but nested #if isn't supported,
and it still seems worth running the hg command to see if anything explodes.

With this, the py3 tests run (almost) cleanly on 10.14.6:

  1. Ran 835 tests, 58 skipped, 1 failed.

Alas, the mac-packaging test is skipped because it's slow. The failure here is
in test-releasenotes-merging.t, complaining about not being able to import the
fuzzywuzzy module. I have it installed on py3 (thus the test isn't skipped),
but not on py2. So there must be some unintended cross pollination here when
running hg commands.

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

mharbison72 created this revision.Nov 13 2019, 9:44 AM
indygreg accepted this revision.Nov 18 2019, 10:41 PM
indygreg added a subscriber: indygreg.

Regarding nested conditionals, you could do something like #if py3 xz. But then we wouldn't have test coverage of Mercurial itself generating lzma, which is built in to Python 3. So this suggestion is not appropriate here: the patch as authored is great!

This revision is now accepted and ready to land.Nov 18 2019, 10:41 PM
mharbison72 added a commit: rHG21e05aabef8c: hghave: add a check for the `xz` compression utility.Nov 18 2019, 10:49 PM
Closed by commit rHG21e05aabef8c: hghave: add a check for the `xz` compression utility (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (7 lines)
Mtests/test-archive.t (4 lines)

Diff 18222

tests/hghave.py

import curses import curses
curses.COLOR_BLUE curses.COLOR_BLUE
return matchoutput('test -x "`which tic`"', br'') return matchoutput('test -x "`which tic`"', br'')
except ImportError: except ImportError:
return False return False
@check("xz", "xz compression utility")
def has_xz():
# When Windows invokes a subprocess in shell mode, it uses `cmd.exe`, which
# only knows `where`, not `which`. So invoke MSYS shell explicitly.
return matchoutput("sh -c 'test -x \"`which xz`\"'", b'')
@check("msys", "Windows with MSYS") @check("msys", "Windows with MSYS")
def has_msys(): def has_msys():
return os.getenv('MSYSTEM') return os.getenv('MSYSTEM')
@check("aix", "AIX") @check("aix", "AIX")
def has_aix(): def has_aix():
return sys.platform.startswith("aix") return sys.platform.startswith("aix")

tests/test-archive.t

\s*Length.* (re) \s*Length.* (re)
*172*80*00:00*old/.hg_archival.txt (glob) *172*80*00:00*old/.hg_archival.txt (glob)
*0*80*00:00*old/old (glob) *0*80*00:00*old/old (glob)
test xz support only available in Python 3.4 test xz support only available in Python 3.4
#if py3 #if py3
$ hg archive ../archive.txz $ hg archive ../archive.txz
$ xz -l ../archive.txz | head -n1 $ which xz >/dev/null && xz -l ../archive.txz | head -n1 || true
Strms Blocks Compressed Uncompressed Ratio Check Filename Strms Blocks Compressed Uncompressed Ratio Check Filename (xz !)
$ rm -f ../archive.txz $ rm -f ../archive.txz
#else #else
$ hg archive ../archive.txz $ hg archive ../archive.txz
abort: xz compression is only available in Python 3 abort: xz compression is only available in Python 3
[255] [255]
#endif #endif
show an error when a provided pattern matches no files show an error when a provided pattern matches no files