| hg-reviewers |
directory() was returning str and hgdirectory() was returning
bytes. This made the set compare fail. Let's normalize the types
on Python 3 so the test passes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| #if test-repo | #if test-repo | ||||
| $ . "$TESTDIR/helpers-testrepo.sh" | $ . "$TESTDIR/helpers-testrepo.sh" | ||||
| $ cat >> wixxml.py << EOF | $ cat >> wixxml.py << EOF | ||||
| > import os | > import os | ||||
| > import subprocess | > import subprocess | ||||
| > import sys | > import sys | ||||
| > import xml.etree.ElementTree as ET | > import xml.etree.ElementTree as ET | ||||
| > from mercurial import pycompat | |||||
| > | > | ||||
| > # MSYS mangles the path if it expands $TESTDIR | > # MSYS mangles the path if it expands $TESTDIR | ||||
| > testdir = os.environ['TESTDIR'] | > testdir = os.environ['TESTDIR'] | ||||
| > ns = {'wix' : 'http://schemas.microsoft.com/wix/2006/wi'} | > ns = {'wix' : 'http://schemas.microsoft.com/wix/2006/wi'} | ||||
| > | > | ||||
| > def directory(node, relpath): | > def directory(node, relpath): | ||||
| > '''generator of files in the xml node, rooted at relpath''' | > '''generator of files in the xml node, rooted at relpath''' | ||||
| > dirs = node.findall('./{%(wix)s}Directory' % ns) | > dirs = node.findall('./{%(wix)s}Directory' % ns) | ||||
| > | > | ||||
| > for d in dirs: | > for d in dirs: | ||||
| > for subfile in directory(d, relpath + d.attrib['Name'] + '/'): | > for subfile in directory(d, relpath + d.attrib['Name'] + '/'): | ||||
| > yield subfile | > yield subfile | ||||
| > | > | ||||
| > files = node.findall('./{%(wix)s}Component/{%(wix)s}File' % ns) | > files = node.findall('./{%(wix)s}Component/{%(wix)s}File' % ns) | ||||
| > | > | ||||
| > for f in files: | > for f in files: | ||||
| > yield relpath + f.attrib['Name'] | > yield pycompat.sysbytes(relpath + f.attrib['Name']) | ||||
| > | > | ||||
| > def hgdirectory(relpath): | > def hgdirectory(relpath): | ||||
| > '''generator of tracked files, rooted at relpath''' | > '''generator of tracked files, rooted at relpath''' | ||||
| > hgdir = "%s/../mercurial" % (testdir) | > hgdir = "%s/../mercurial" % (testdir) | ||||
| > args = ['hg', '--cwd', hgdir, 'files', relpath] | > args = ['hg', '--cwd', hgdir, 'files', relpath] | ||||
| > proc = subprocess.Popen(args, stdout=subprocess.PIPE, | > proc = subprocess.Popen(args, stdout=subprocess.PIPE, | ||||
| > stderr=subprocess.PIPE) | > stderr=subprocess.PIPE) | ||||
| > output = proc.communicate()[0] | > output = proc.communicate()[0] | ||||
| > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1])) | > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1])) | ||||
| > root = xml.getroot() | > root = xml.getroot() | ||||
| > dir = root.find('.//{%(wix)s}DirectoryRef' % ns) | > dir = root.find('.//{%(wix)s}DirectoryRef' % ns) | ||||
| > | > | ||||
| > installed = [f for f in directory(dir, '')] | > installed = [f for f in directory(dir, '')] | ||||
| > | > | ||||
| > print('Not installed:') | > print('Not installed:') | ||||
| > for f in sorted(set(tracked) - set(installed)): | > for f in sorted(set(tracked) - set(installed)): | ||||
| > print(' %s' % f) | > print(' %s' % pycompat.sysstr(f)) | ||||
| > | > | ||||
| > print('Not tracked:') | > print('Not tracked:') | ||||
| > for f in sorted(set(installed) - set(tracked)): | > for f in sorted(set(installed) - set(tracked)): | ||||
| > print(' %s' % f) | > print(' %s' % pycompat.sysstr(f)) | ||||
| > EOF | > EOF | ||||
| $ ( testrepohgenv; "$PYTHON" wixxml.py help ) | $ ( testrepohgenv; "$PYTHON" wixxml.py help ) | ||||
| Not installed: | Not installed: | ||||
| help/common.txt | help/common.txt | ||||
| help/hg-ssh.8.txt | help/hg-ssh.8.txt | ||||
| help/hg.1.txt | help/hg.1.txt | ||||
| help/hgignore.5.txt | help/hgignore.5.txt | ||||