| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2016 The LUCI Authors. All rights reserved. | 2 # Copyright 2016 The LUCI Authors. All rights reserved. |
| 3 # Use of this source code is governed under the Apache License, Version 2.0 | 3 # Use of this source code is governed under the Apache License, Version 2.0 |
| 4 # that can be found in the LICENSE file. | 4 # that can be found in the LICENSE file. |
| 5 | 5 |
| 6 """Perform a recursive diff on two isolated file hashes.""" | 6 """Perform a recursive diff on two isolated file hashes.""" |
| 7 | 7 |
| 8 import argparse | 8 import argparse |
| 9 import ast | 9 import ast |
| 10 import os | 10 import os |
| 11 import json | 11 import json |
| 12 import shutil | 12 import shutil |
| 13 import subprocess | 13 import subprocess |
| 14 import sys | 14 import sys |
| 15 import tempfile | 15 import tempfile |
| 16 | 16 |
| 17 CLIENT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) | 17 CLIENT_DIR = os.path.dirname(os.path.dirname(os.path.abspath( |
| 18 __file__.decode(sys.getfilesystemencoding())))) |
| 18 sys.path.insert(0, CLIENT_DIR) | 19 sys.path.insert(0, CLIENT_DIR) |
| 19 | 20 |
| 20 from utils import net | 21 from utils import net |
| 21 | 22 |
| 22 | 23 |
| 23 def download_isolated_file(h, workdir, isolate_server, namespace): | 24 def download_isolated_file(h, workdir, isolate_server, namespace): |
| 24 """Download the isolated file with the given hash and return its contents.""" | 25 """Download the isolated file with the given hash and return its contents.""" |
| 25 dst = os.path.join(workdir, h) | 26 dst = os.path.join(workdir, h) |
| 26 if not os.path.isfile(dst): | 27 if not os.path.isfile(dst): |
| 27 subprocess.check_call(['python', 'isolateserver.py', 'download', | 28 subprocess.check_call(['python', 'isolateserver.py', 'download', |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 try: | 109 try: |
| 109 return diff_isolates(args.hash1, args.hash2, args.workdir, args.difftool, | 110 return diff_isolates(args.hash1, args.hash2, args.workdir, args.difftool, |
| 110 args.isolate_server, args.namespace) | 111 args.isolate_server, args.namespace) |
| 111 finally: | 112 finally: |
| 112 if using_tmp_dir: | 113 if using_tmp_dir: |
| 113 shutil.rmtree(args.workdir) | 114 shutil.rmtree(args.workdir) |
| 114 | 115 |
| 115 | 116 |
| 116 if __name__ == '__main__': | 117 if __name__ == '__main__': |
| 117 sys.exit(main()) | 118 sys.exit(main()) |
| OLD | NEW |