| hg-reviewers |
This involved a lot of b'' literals, conversion from %s to %d, and
using a hashing mechanism that returns bytes instead of str.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| tail | tail | ||||
| test | test | ||||
| readlink.py | readlink.py | ||||
| md5sum.py | md5sum.py | ||||
| """ | """ | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import binascii | |||||
| import glob | import glob | ||||
| import hashlib | import hashlib | ||||
| import optparse | import optparse | ||||
| import os | import os | ||||
| import re | import re | ||||
| import sys | import sys | ||||
| # Python 3 adapters | # Python 3 adapters | ||||
| isdir = os.path.isdir(f) | isdir = os.path.isdir(f) | ||||
| islink = os.path.islink(f) | islink = os.path.islink(f) | ||||
| isfile = os.path.isfile(f) and not islink | isfile = os.path.isfile(f) and not islink | ||||
| dirfiles = None | dirfiles = None | ||||
| content = None | content = None | ||||
| facts = [] | facts = [] | ||||
| if isfile: | if isfile: | ||||
| if opts.type: | if opts.type: | ||||
| facts.append('file') | facts.append(b'file') | ||||
| if any((opts.hexdump, opts.dump, opts.md5, opts.sha1, opts.sha256)): | if any((opts.hexdump, opts.dump, opts.md5, opts.sha1, opts.sha256)): | ||||
| content = open(f, 'rb').read() | content = open(f, 'rb').read() | ||||
| elif islink: | elif islink: | ||||
| if opts.type: | if opts.type: | ||||
| facts.append('link') | facts.append(b'link') | ||||
| content = os.readlink(f) | content = os.readlink(f) | ||||
| elif isstdin: | elif isstdin: | ||||
| content = getattr(sys.stdin, 'buffer', sys.stdin).read() | content = getattr(sys.stdin, 'buffer', sys.stdin).read() | ||||
| if opts.size: | if opts.size: | ||||
| facts.append('size=%s' % len(content)) | facts.append(b'size=%d' % len(content)) | ||||
| elif isdir: | elif isdir: | ||||
| if opts.recurse or opts.type: | if opts.recurse or opts.type: | ||||
| dirfiles = glob.glob(f + '/*') | dirfiles = glob.glob(f + '/*') | ||||
| facts.append('directory with %s files' % len(dirfiles)) | facts.append(b'directory with %d files' % len(dirfiles)) | ||||
| elif opts.type: | elif opts.type: | ||||
| facts.append('type unknown') | facts.append(b'type unknown') | ||||
| if not isstdin: | if not isstdin: | ||||
| stat = os.lstat(f) | stat = os.lstat(f) | ||||
| if opts.size and not isdir: | if opts.size and not isdir: | ||||
| facts.append('size=%s' % stat.st_size) | facts.append(b'size=%d' % stat.st_size) | ||||
| if opts.mode and not islink: | if opts.mode and not islink: | ||||
| facts.append('mode=%o' % (stat.st_mode & 0o777)) | facts.append(b'mode=%o' % (stat.st_mode & 0o777)) | ||||
| if opts.links: | if opts.links: | ||||
| facts.append('links=%s' % stat.st_nlink) | facts.append(b'links=%s' % stat.st_nlink) | ||||
| if opts.newer: | if opts.newer: | ||||
| # mtime might be in whole seconds so newer file might be same | # mtime might be in whole seconds so newer file might be same | ||||
| if stat.st_mtime >= os.stat(opts.newer).st_mtime: | if stat.st_mtime >= os.stat(opts.newer).st_mtime: | ||||
| facts.append('newer than %s' % opts.newer) | facts.append(b'newer than %s' % opts.newer) | ||||
| else: | else: | ||||
| facts.append('older than %s' % opts.newer) | facts.append(b'older than %s' % opts.newer) | ||||
| if opts.md5 and content is not None: | if opts.md5 and content is not None: | ||||
| h = hashlib.md5(content) | h = hashlib.md5(content) | ||||
| facts.append('md5=%s' % h.hexdigest()[:opts.bytes]) | facts.append(b'md5=%s' % binascii.hexlify(h.digest())[:opts.bytes]) | ||||
| if opts.sha1 and content is not None: | if opts.sha1 and content is not None: | ||||
| h = hashlib.sha1(content) | h = hashlib.sha1(content) | ||||
| facts.append('sha1=%s' % h.hexdigest()[:opts.bytes]) | facts.append(b'sha1=%s' % binascii.hexlify(h.digest())[:opts.bytes]) | ||||
| if opts.sha256 and content is not None: | if opts.sha256 and content is not None: | ||||
| h = hashlib.sha256(content) | h = hashlib.sha256(content) | ||||
| facts.append('sha256=%s' % h.hexdigest()[:opts.bytes]) | facts.append(b'sha256=%s' % | ||||
| binascii.hexlify(h.digest())[:opts.bytes]) | |||||
| if isstdin: | if isstdin: | ||||
| outfile.write(b', '.join(facts) + b'\n') | outfile.write(b', '.join(facts) + b'\n') | ||||
| elif facts: | elif facts: | ||||
| outfile.write(b'%s: %s\n' % (f.encode('utf-8'), b', '.join(facts))) | outfile.write(b'%s: %s\n' % (f.encode('utf-8'), b', '.join(facts))) | ||||
| elif not quiet: | elif not quiet: | ||||
| outfile.write(b'%s:\n' % f.encode('utf-8')) | outfile.write(b'%s:\n' % f.encode('utf-8')) | ||||
| if content is not None: | if content is not None: | ||||
| chunk = content | chunk = content | ||||