Show More
@@ -2455,10 +2455,11 b' class localrepository(object):' | |||||
2455 |
|
2455 | |||
2456 | # commit subs and write new state |
|
2456 | # commit subs and write new state | |
2457 | if subs: |
|
2457 | if subs: | |
|
2458 | uipathfn = scmutil.getuipathfn(self) | |||
2458 | for s in sorted(commitsubs): |
|
2459 | for s in sorted(commitsubs): | |
2459 | sub = wctx.sub(s) |
|
2460 | sub = wctx.sub(s) | |
2460 | self.ui.status(_('committing subrepository %s\n') % |
|
2461 | self.ui.status(_('committing subrepository %s\n') % | |
2461 | subrepoutil.subrelpath(sub)) |
|
2462 | uipathfn(subrepoutil.subrelpath(sub))) | |
2462 | sr = sub.commit(cctx._text, user, date) |
|
2463 | sr = sub.commit(cctx._text, user, date) | |
2463 | newstate[s] = (newstate[s][0], sr) |
|
2464 | newstate[s] = (newstate[s][0], sr) | |
2464 | subrepoutil.writestate(self, newstate) |
|
2465 | subrepoutil.writestate(self, newstate) | |
@@ -2526,8 +2527,9 b' class localrepository(object):' | |||||
2526 | removed = list(ctx.removed()) |
|
2527 | removed = list(ctx.removed()) | |
2527 | linkrev = len(self) |
|
2528 | linkrev = len(self) | |
2528 | self.ui.note(_("committing files:\n")) |
|
2529 | self.ui.note(_("committing files:\n")) | |
|
2530 | uipathfn = scmutil.getuipathfn(self) | |||
2529 | for f in sorted(ctx.modified() + ctx.added()): |
|
2531 | for f in sorted(ctx.modified() + ctx.added()): | |
2530 | self.ui.note(f + "\n") |
|
2532 | self.ui.note(uipathfn(f) + "\n") | |
2531 | try: |
|
2533 | try: | |
2532 | fctx = ctx[f] |
|
2534 | fctx = ctx[f] | |
2533 | if fctx is None: |
|
2535 | if fctx is None: | |
@@ -2538,12 +2540,14 b' class localrepository(object):' | |||||
2538 | trp, changed) |
|
2540 | trp, changed) | |
2539 | m.setflag(f, fctx.flags()) |
|
2541 | m.setflag(f, fctx.flags()) | |
2540 | except OSError: |
|
2542 | except OSError: | |
2541 |
self.ui.warn(_("trouble committing %s!\n") % |
|
2543 | self.ui.warn(_("trouble committing %s!\n") % | |
|
2544 | uipathfn(f)) | |||
2542 | raise |
|
2545 | raise | |
2543 | except IOError as inst: |
|
2546 | except IOError as inst: | |
2544 | errcode = getattr(inst, 'errno', errno.ENOENT) |
|
2547 | errcode = getattr(inst, 'errno', errno.ENOENT) | |
2545 | if error or errcode and errcode != errno.ENOENT: |
|
2548 | if error or errcode and errcode != errno.ENOENT: | |
2546 |
self.ui.warn(_("trouble committing %s!\n") % |
|
2549 | self.ui.warn(_("trouble committing %s!\n") % | |
|
2550 | uipathfn(f)) | |||
2547 | raise |
|
2551 | raise | |
2548 |
|
2552 | |||
2549 | # update manifest |
|
2553 | # update manifest |
General Comments 0
You need to be logged in to leave comments.
Login now