| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 ''' | 2 ''' |
| 3 Copyright 2012 Google Inc. | 3 Copyright 2012 Google Inc. |
| 4 | 4 |
| 5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
| 6 found in the LICENSE file. | 6 found in the LICENSE file. |
| 7 ''' | 7 ''' |
| 8 | 8 |
| 9 ''' | 9 ''' |
| 10 Generates a visual diff of all pending changes in the local SVN (or git!) | 10 Generates a visual diff of all pending changes in the local SVN (or git!) |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 for (imagename, results) in diff_dict.iteritems(): | 140 for (imagename, results) in diff_dict.iteritems(): |
| 141 # TODO(epoger): Currently, this assumes that all images have been | 141 # TODO(epoger): Currently, this assumes that all images have been |
| 142 # checksummed using gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5 | 142 # checksummed using gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5 |
| 143 | 143 |
| 144 old_checksum = results['old'] | 144 old_checksum = results['old'] |
| 145 if old_checksum: | 145 if old_checksum: |
| 146 old_image_url = _CreateGSUrl( | 146 old_image_url = _CreateGSUrl( |
| 147 imagename=imagename, | 147 imagename=imagename, |
| 148 hash_type=gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5, | 148 hash_type=gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5, |
| 149 hash_digest=old_checksum) | 149 hash_digest=old_checksum) |
| 150 try: | 150 _DownloadUrlToFile( |
| 151 _DownloadUrlToFile( | 151 source_url=old_image_url, |
| 152 source_url=old_image_url, | 152 dest_path=os.path.join(old_flattened_dir, |
| 153 dest_path=os.path.join(old_flattened_dir, | 153 filename_prefix + imagename)) |
| 154 filename_prefix + imagename)) | |
| 155 except: | |
| 156 print "unable to find image ", os.path.join(old_flattened_dir,
filename_prefix + imagename) | |
| 157 | 154 |
| 158 new_checksum = results['new'] | 155 new_checksum = results['new'] |
| 159 if new_checksum: | 156 if new_checksum: |
| 160 new_image_url = _CreateGSUrl( | 157 new_image_url = _CreateGSUrl( |
| 161 imagename=imagename, | 158 imagename=imagename, |
| 162 hash_type=gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5, | 159 hash_type=gm_json.JSONKEY_HASHTYPE_BITMAP_64BITMD5, |
| 163 hash_digest=new_checksum) | 160 hash_digest=new_checksum) |
| 164 _DownloadUrlToFile( | 161 _DownloadUrlToFile( |
| 165 source_url=new_image_url, | 162 source_url=new_image_url, |
| 166 dest_path=os.path.join(new_flattened_dir, | 163 dest_path=os.path.join(new_flattened_dir, |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 help='path to already-built skdiff tool; if not set, ' | 310 help='path to already-built skdiff tool; if not set, ' |
| 314 'will search for it in typical directories near this ' | 311 'will search for it in typical directories near this ' |
| 315 'script') | 312 'script') |
| 316 parser.add_option(OPTION_SOURCE_DIR, | 313 parser.add_option(OPTION_SOURCE_DIR, |
| 317 action='store', type='string', | 314 action='store', type='string', |
| 318 default=os.path.join('expectations', 'gm'), | 315 default=os.path.join('expectations', 'gm'), |
| 319 help='root directory within which to compare all ' + | 316 help='root directory within which to compare all ' + |
| 320 'files; defaults to "%default"') | 317 'files; defaults to "%default"') |
| 321 (options, args) = parser.parse_args() | 318 (options, args) = parser.parse_args() |
| 322 Main(options, args) | 319 Main(options, args) |
| OLD | NEW |