equal
deleted
inserted
replaced
1341 rejects += 1 |
1341 rejects += 1 |
1342 continue |
1342 continue |
1343 elif state == 'git': |
1343 elif state == 'git': |
1344 for gp in values: |
1344 for gp in values: |
1345 path = pstrip(gp.oldpath) |
1345 path = pstrip(gp.oldpath) |
1346 data, mode = backend.getfile(path) |
1346 try: |
1347 store.setfile(path, data, mode) |
1347 data, mode = backend.getfile(path) |
|
1348 except IOError, e: |
|
1349 if e.errno != errno.ENOENT: |
|
1350 raise |
|
1351 # The error ignored here will trigger a getfile() |
|
1352 # error in a place more appropriate for error |
|
1353 # handling, and will not interrupt the patching |
|
1354 # process. |
|
1355 else: |
|
1356 store.setfile(path, data, mode) |
1348 else: |
1357 else: |
1349 raise util.Abort(_('unsupported parser state: %s') % state) |
1358 raise util.Abort(_('unsupported parser state: %s') % state) |
1350 |
1359 |
1351 if current_file: |
1360 if current_file: |
1352 rejects += current_file.close() |
1361 rejects += current_file.close() |