equal
deleted
inserted
replaced
2537 else: |
2537 else: |
2538 added.append(f) |
2538 added.append(f) |
2539 m[f] = self._filecommit(fctx, m1, m2, linkrev, |
2539 m[f] = self._filecommit(fctx, m1, m2, linkrev, |
2540 trp, changed) |
2540 trp, changed) |
2541 m.setflag(f, fctx.flags()) |
2541 m.setflag(f, fctx.flags()) |
2542 except OSError as inst: |
2542 except OSError: |
2543 self.ui.warn(_("trouble committing %s!\n") % f) |
2543 self.ui.warn(_("trouble committing %s!\n") % f) |
2544 raise |
2544 raise |
2545 except IOError as inst: |
2545 except IOError as inst: |
2546 errcode = getattr(inst, 'errno', errno.ENOENT) |
2546 errcode = getattr(inst, 'errno', errno.ENOENT) |
2547 if error or errcode and errcode != errno.ENOENT: |
2547 if error or errcode and errcode != errno.ENOENT: |