equal
deleted
inserted
replaced
1341 else: |
1341 else: |
1342 fail(f, _("no match under directory!")) |
1342 fail(f, _("no match under directory!")) |
1343 elif f not in self.dirstate: |
1343 elif f not in self.dirstate: |
1344 fail(f, _("file not tracked!")) |
1344 fail(f, _("file not tracked!")) |
1345 |
1345 |
1346 cctx = context.workingctx(self, text, user, date, extra, status) |
1346 cctx = context.workingcommitctx(self, status, |
|
1347 text, user, date, extra) |
1347 |
1348 |
1348 if (not force and not extra.get("close") and not merge |
1349 if (not force and not extra.get("close") and not merge |
1349 and not cctx.files() |
1350 and not cctx.files() |
1350 and wctx.branch() == wctx.p1().branch()): |
1351 and wctx.branch() == wctx.p1().branch()): |
1351 return None |
1352 return None |