mercurial/localrepo.py
changeset 43712 f965b1027fb0
parent 43711 7f443cce2972
child 43735 7eb701e355bd
equal deleted inserted replaced
43711:7f443cce2972 43712:f965b1027fb0
  2787         elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
  2787         elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
  2788             changelist.append(fname)
  2788             changelist.append(fname)
  2789 
  2789 
  2790         return fparent1
  2790         return fparent1
  2791 
  2791 
  2792     def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
  2792     def checkcommitpatterns(self, wctx, match, status, fail):
  2793         """check for commit arguments that aren't committable"""
  2793         """check for commit arguments that aren't committable"""
  2794         if match.isexact() or match.prefix():
  2794         if match.isexact() or match.prefix():
  2795             matched = set(status.modified + status.added + status.removed)
  2795             matched = set(status.modified + status.added + status.removed)
  2796 
  2796 
  2797             for f in match.files():
  2797             for f in match.files():
  2836 
  2836 
  2837         if not match:
  2837         if not match:
  2838             match = matchmod.always()
  2838             match = matchmod.always()
  2839 
  2839 
  2840         if not force:
  2840         if not force:
  2841             vdirs = []
       
  2842             match.explicitdir = vdirs.append
       
  2843             match.bad = fail
  2841             match.bad = fail
  2844 
  2842 
  2845         # lock() for recent changelog (see issue4368)
  2843         # lock() for recent changelog (see issue4368)
  2846         with self.wlock(), self.lock():
  2844         with self.wlock(), self.lock():
  2847             wctx = self[None]
  2845             wctx = self[None]
  2866                 self.ui, wctx, status, match, force=force
  2864                 self.ui, wctx, status, match, force=force
  2867             )
  2865             )
  2868 
  2866 
  2869             # make sure all explicit patterns are matched
  2867             # make sure all explicit patterns are matched
  2870             if not force:
  2868             if not force:
  2871                 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
  2869                 self.checkcommitpatterns(wctx, match, status, fail)
  2872 
  2870 
  2873             cctx = context.workingcommitctx(
  2871             cctx = context.workingcommitctx(
  2874                 self, status, text, user, date, extra
  2872                 self, status, text, user, date, extra
  2875             )
  2873             )
  2876 
  2874