##// END OF EJS Templates
localrepo: create context used for actual commit earlier...
David Schleimer -
r18659:b946470e default
parent child Browse files
Show More
@@ -1230,6 +1230,8 b' class localrepository(object):'
1230 elif f not in self.dirstate:
1230 elif f not in self.dirstate:
1231 fail(f, _("file not tracked!"))
1231 fail(f, _("file not tracked!"))
1232
1232
1233 cctx = context.workingctx(self, text, user, date, extra, changes)
1234
1233 if (not force and not extra.get("close") and not merge
1235 if (not force and not extra.get("close") and not merge
1234 and not (changes[0] or changes[1] or changes[2])
1236 and not (changes[0] or changes[1] or changes[2])
1235 and wctx.branch() == wctx.p1().branch()):
1237 and wctx.branch() == wctx.p1().branch()):
@@ -1244,7 +1246,6 b' class localrepository(object):'
1244 raise util.Abort(_("unresolved merge conflicts "
1246 raise util.Abort(_("unresolved merge conflicts "
1245 "(see hg help resolve)"))
1247 "(see hg help resolve)"))
1246
1248
1247 cctx = context.workingctx(self, text, user, date, extra, changes)
1248 if editor:
1249 if editor:
1249 cctx._text = editor(self, cctx, subs)
1250 cctx._text = editor(self, cctx, subs)
1250 edited = (text != cctx._text)
1251 edited = (text != cctx._text)
General Comments 0
You need to be logged in to leave comments. Login now