1392 linkrev = len(self) |
1392 linkrev = len(self) |
1393 for f in sorted(ctx.modified() + ctx.added()): |
1393 for f in sorted(ctx.modified() + ctx.added()): |
1394 self.ui.note(f + "\n") |
1394 self.ui.note(f + "\n") |
1395 try: |
1395 try: |
1396 fctx = ctx[f] |
1396 fctx = ctx[f] |
1397 new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
1397 if fctx is None: |
1398 changed) |
1398 removed.append(f) |
1399 m1.set(f, fctx.flags()) |
1399 else: |
|
1400 new[f] = self._filecommit(fctx, m1, m2, linkrev, |
|
1401 trp, changed) |
|
1402 m1.set(f, fctx.flags()) |
1400 except OSError, inst: |
1403 except OSError, inst: |
1401 self.ui.warn(_("trouble committing %s!\n") % f) |
1404 self.ui.warn(_("trouble committing %s!\n") % f) |
1402 raise |
1405 raise |
1403 except IOError, inst: |
1406 except IOError, inst: |
1404 errcode = getattr(inst, 'errno', errno.ENOENT) |
1407 errcode = getattr(inst, 'errno', errno.ENOENT) |
1405 if error or errcode and errcode != errno.ENOENT: |
1408 if error or errcode and errcode != errno.ENOENT: |
1406 self.ui.warn(_("trouble committing %s!\n") % f) |
1409 self.ui.warn(_("trouble committing %s!\n") % f) |
1407 raise |
1410 raise |
1408 else: |
|
1409 removed.append(f) |
|
1410 |
1411 |
1411 # update manifest |
1412 # update manifest |
1412 m1.update(new) |
1413 m1.update(new) |
1413 removed = [f for f in sorted(removed) if f in m1 or f in m2] |
1414 removed = [f for f in sorted(removed) if f in m1 or f in m2] |
1414 drop = [f for f in removed if f in m1] |
1415 drop = [f for f in removed if f in m1] |