D5621: commit: print "commit message saved in" message also if bookmark update fails
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 25 15:01:51 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG092c5d05ba01: commit: print "commit message saved in" message also if bookmark update fails (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5621?vs=13304&id=13449
REVISION DETAIL
https://phab.mercurial-scm.org/D5621
AFFECTED FILES
mercurial/localrepo.py
CHANGE DETAILS
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2475,16 +2475,16 @@
parent2=hookp2)
tr = self.transaction('commit')
ret = self.commitctx(cctx, True)
+ # update bookmarks, dirstate and mergestate
+ bookmarks.update(self, [p1, p2], ret)
+ cctx.markcommitted(ret)
+ ms.reset()
+ tr.close()
except: # re-raises
if edited:
self.ui.write(
_('note: commit message saved in %s\n') % msgfn)
raise
- # update bookmarks, dirstate and mergestate
- bookmarks.update(self, [p1, p2], ret)
- cctx.markcommitted(ret)
- ms.reset()
- tr.close()
finally:
lockmod.release(tr, lock, wlock)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list