Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 20765:f042d4b263f4 stable
localrepo: save manually edited commit message as soon as possible
Before this patch, "localrepository.commit()" invokes specified
"editor" to edit commit message manually, and saves it after checking
sub-repositories.
This may lose manually edited commit message, if unexpected exception
is raised while checking (or commiting recursively) sub-repositories.
This patch saves manually edited commit message as soon as possible.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 19 Mar 2014 01:07:41 +0900 |
| parents | a959f7167077 |
| children | efbf15979538 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Mar 13 19:48:41 2014 +0900 +++ b/mercurial/localrepo.py Wed Mar 19 01:07:41 2014 +0900 @@ -1270,6 +1270,11 @@ cctx._text = editor(self, cctx, subs) edited = (text != cctx._text) + # Save commit message in case this transaction gets rolled back + # (e.g. by a pretxncommit hook). Leave the content alone on + # the assumption that the user will use the same editor again. + msgfn = self.savecommitmessage(cctx._text) + # commit subs and write new state if subs: for s in sorted(commitsubs): @@ -1280,11 +1285,6 @@ newstate[s] = (newstate[s][0], sr) subrepo.writestate(self, newstate) - # Save commit message in case this transaction gets rolled back - # (e.g. by a pretxncommit hook). Leave the content alone on - # the assumption that the user will use the same editor again. - msgfn = self.savecommitmessage(cctx._text) - p1, p2 = self.dirstate.parents() hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') try: