commit: move some setup outside the lock

mercurial/localrepo.py

@@ -782,15 +782,6 b' class localrepository(repo.repository):'
         supplied, it is called to get a commit message.
         """
 
-        wlock = self.wlock()
-        try:
-            p1, p2 = self.dirstate.parents()
-
-            if (not force and p2 != nullid and match and
-                (match.files() or match.anypats())):
-                raise util.Abort(_('cannot partially commit a merge '
-                                   '(do not specify files or patterns)'))
-
             def fail(f, msg):
                 raise util.Abort('%s: %s' % (f, msg))
 
@@ -802,6 +793,15 b' class localrepository(repo.repository):'
                 match.dir = vdirs.append
                 match.bad = fail
 
+        wlock = self.wlock()
+        try:
+            p1, p2 = self.dirstate.parents()
+
+            if (not force and p2 != nullid and match and
+                (match.files() or match.anypats())):
+                raise util.Abort(_('cannot partially commit a merge '
+                                   '(do not specify files or patterns)'))
+
             changes = self.status(match=match, clean=force)
             if force:
                 changes[0].extend(changes[6]) # mq may commit unchanged files