Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 17059:fba17a64fa49
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Jun 2012 00:40:52 -0500 |
parents | 5487088f0d43 2440822446ce |
children | ae0629161090 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Fri Jun 29 00:01:19 2012 +0200 +++ b/mercurial/cmdutil.py Fri Jun 29 00:40:52 2012 -0500 @@ -1301,7 +1301,11 @@ try: # First, do a regular commit to record all changes in the working # directory (if there are any) - node = commit(ui, repo, commitfunc, pats, opts) + ui.callhooks = False + try: + node = commit(ui, repo, commitfunc, pats, opts) + finally: + ui.callhooks = True ctx = repo[node] # Participating changesets: