Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 28815:44611ad4fbd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
crecord: check for untracked arguments hg commit tracked untracked -- fails complaining about untracked prior to this commit, hg commit -i tracked untracked -- did not fail This is corrected by calling the refactored localrepo.checkcommitpatterns
author timeless <timeless@mozdev.org>
date Wed, 06 Apr 2016 18:19:36 +0000
parents 44319097e7b9
children d54a7410307f
comparison
equal deleted inserted replaced
28814:1f65f291a5b7 28815:44611ad4fbd9
133 In the end we'll record interesting changes, and everything else 133 In the end we'll record interesting changes, and everything else
134 will be left in place, so the user can continue working. 134 will be left in place, so the user can continue working.
135 """ 135 """
136 136
137 checkunfinished(repo, commit=True) 137 checkunfinished(repo, commit=True)
138 merge = len(repo[None].parents()) > 1 138 wctx = repo[None]
139 merge = len(wctx.parents()) > 1
139 if merge: 140 if merge:
140 raise error.Abort(_('cannot partially commit a merge ' 141 raise error.Abort(_('cannot partially commit a merge '
141 '(use "hg commit" instead)')) 142 '(use "hg commit" instead)'))
142 143
144 def fail(f, msg):
145 raise error.Abort('%s: %s' % (f, msg))
146
147 force = opts.get('force')
148 if not force:
149 vdirs = []
150 match.explicitdir = vdirs.append
151 match.bad = fail
152
143 status = repo.status(match=match) 153 status = repo.status(match=match)
154 if not force:
155 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
144 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) 156 diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
145 diffopts.nodates = True 157 diffopts.nodates = True
146 diffopts.git = True 158 diffopts.git = True
147 diffopts.showfunc = True 159 diffopts.showfunc = True
148 originaldiff = patch.diff(repo, changes=status, opts=diffopts) 160 originaldiff = patch.diff(repo, changes=status, opts=diffopts)