equal
deleted
inserted
replaced
1461 |
1461 |
1462 cctx = context.workingcommitctx(self, status, |
1462 cctx = context.workingcommitctx(self, status, |
1463 text, user, date, extra) |
1463 text, user, date, extra) |
1464 |
1464 |
1465 allowemptycommit = (wctx.branch() != wctx.p1().branch() or force |
1465 allowemptycommit = (wctx.branch() != wctx.p1().branch() or force |
1466 or extra.get('close') or merge or cctx.files()) |
1466 or extra.get('close') or merge or cctx.files() |
|
1467 or self.ui.configbool('ui', 'allowemptycommit')) |
1467 if not allowemptycommit: |
1468 if not allowemptycommit: |
1468 return None |
1469 return None |
1469 |
1470 |
1470 if merge and cctx.deleted(): |
1471 if merge and cctx.deleted(): |
1471 raise util.Abort(_("cannot commit merge with missing files")) |
1472 raise util.Abort(_("cannot commit merge with missing files")) |