equal
deleted
inserted
replaced
1370 newstate[s] = oldstate[s] |
1370 newstate[s] = oldstate[s] |
1371 continue |
1371 continue |
1372 if not force: |
1372 if not force: |
1373 raise util.Abort( |
1373 raise util.Abort( |
1374 _("commit with new subrepo %s excluded") % s) |
1374 _("commit with new subrepo %s excluded") % s) |
1375 if wctx.sub(s).dirty(True): |
1375 dirtyreason = wctx.sub(s).dirtyreason(True) |
|
1376 if dirtyreason: |
1376 if not self.ui.configbool('ui', 'commitsubrepos'): |
1377 if not self.ui.configbool('ui', 'commitsubrepos'): |
1377 raise util.Abort( |
1378 raise util.Abort(dirtyreason, |
1378 _("uncommitted changes in subrepo %s") % s, |
|
1379 hint=_("use --subrepos for recursive commit")) |
1379 hint=_("use --subrepos for recursive commit")) |
1380 subs.append(s) |
1380 subs.append(s) |
1381 commitsubs.add(s) |
1381 commitsubs.add(s) |
1382 else: |
1382 else: |
1383 bs = wctx.sub(s).basestate() |
1383 bs = wctx.sub(s).basestate() |