| Alphare | |
| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (4 lines) | |||
| M | mercurial/interfaces/repository.py (2 lines) | |||
| M | mercurial/localrepo.py (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| ) | ) | ||||
| ) | ) | ||||
| def fail(f, msg): | def fail(f, msg): | ||||
| raise error.Abort(b'%s: %s' % (f, msg)) | raise error.Abort(b'%s: %s' % (f, msg)) | ||||
| force = opts.get(b'force') | force = opts.get(b'force') | ||||
| if not force: | if not force: | ||||
| vdirs = [] | |||||
| match = matchmod.badmatch(match, fail) | match = matchmod.badmatch(match, fail) | ||||
| match.explicitdir = vdirs.append | |||||
| status = repo.status(match=match) | status = repo.status(match=match) | ||||
| overrides = {(b'ui', b'commitsubrepos'): True} | overrides = {(b'ui', b'commitsubrepos'): True} | ||||
| with repo.ui.configoverride(overrides, b'record'): | with repo.ui.configoverride(overrides, b'record'): | ||||
| # subrepoutil.precommit() modifies the status | # subrepoutil.precommit() modifies the status | ||||
| tmpstatus = scmutil.status( | tmpstatus = scmutil.status( | ||||
| repo.ui, wctx, tmpstatus, match, force=True | repo.ui, wctx, tmpstatus, match, force=True | ||||
| ) | ) | ||||
| for s in subs: | for s in subs: | ||||
| if s in commitsubs: | if s in commitsubs: | ||||
| dirtyreason = wctx.sub(s).dirtyreason(True) | dirtyreason = wctx.sub(s).dirtyreason(True) | ||||
| raise error.Abort(dirtyreason) | raise error.Abort(dirtyreason) | ||||
| if not force: | if not force: | ||||
| repo.checkcommitpatterns(wctx, vdirs, match, status, fail) | repo.checkcommitpatterns(wctx, match, status, fail) | ||||
| diffopts = patch.difffeatureopts( | diffopts = patch.difffeatureopts( | ||||
| ui, | ui, | ||||
| opts=opts, | opts=opts, | ||||
| whitespace=True, | whitespace=True, | ||||
| section=b'commands', | section=b'commands', | ||||
| configprefix=b'commit.interactive.', | configprefix=b'commit.interactive.', | ||||
| ) | ) | ||||
| diffopts.nodates = True | diffopts.nodates = True | ||||
| """Lock the repository store and return a lock instance.""" | """Lock the repository store and return a lock instance.""" | ||||
| def wlock(wait=True): | def wlock(wait=True): | ||||
| """Lock the non-store parts of the repository.""" | """Lock the non-store parts of the repository.""" | ||||
| def currentwlock(): | def currentwlock(): | ||||
| """Return the wlock if it's held or None.""" | """Return the wlock if it's held or None.""" | ||||
| def checkcommitpatterns(wctx, vdirs, match, status, fail): | def checkcommitpatterns(wctx, match, status, fail): | ||||
| pass | pass | ||||
| def commit( | def commit( | ||||
| text=b'', | text=b'', | ||||
| user=None, | user=None, | ||||
| date=None, | date=None, | ||||
| match=None, | match=None, | ||||
| force=False, | force=False, | ||||
| changelist.append(fname) | changelist.append(fname) | ||||
| return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) | ||||
| # are just the flags changed during merge? | # are just the flags changed during merge? | ||||
| elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): | elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): | ||||
| changelist.append(fname) | changelist.append(fname) | ||||
| return fparent1 | return fparent1 | ||||
| def checkcommitpatterns(self, wctx, vdirs, match, status, fail): | def checkcommitpatterns(self, wctx, match, status, fail): | ||||
| """check for commit arguments that aren't committable""" | """check for commit arguments that aren't committable""" | ||||
| if match.isexact() or match.prefix(): | if match.isexact() or match.prefix(): | ||||
| matched = set(status.modified + status.added + status.removed) | matched = set(status.modified + status.added + status.removed) | ||||
| for f in match.files(): | for f in match.files(): | ||||
| f = self.dirstate.normalize(f) | f = self.dirstate.normalize(f) | ||||
| if f == b'.' or f in matched or f in wctx.substate: | if f == b'.' or f in matched or f in wctx.substate: | ||||
| continue | continue | ||||
| def fail(f, msg): | def fail(f, msg): | ||||
| raise error.Abort(b'%s: %s' % (f, msg)) | raise error.Abort(b'%s: %s' % (f, msg)) | ||||
| if not match: | if not match: | ||||
| match = matchmod.always() | match = matchmod.always() | ||||
| if not force: | if not force: | ||||
| vdirs = [] | |||||
| match.explicitdir = vdirs.append | |||||
| match.bad = fail | match.bad = fail | ||||
| # lock() for recent changelog (see issue4368) | # lock() for recent changelog (see issue4368) | ||||
| with self.wlock(), self.lock(): | with self.wlock(), self.lock(): | ||||
| wctx = self[None] | wctx = self[None] | ||||
| merge = len(wctx.parents()) > 1 | merge = len(wctx.parents()) > 1 | ||||
| if not force and merge and not match.always(): | if not force and merge and not match.always(): | ||||
| # check subrepos | # check subrepos | ||||
| subs, commitsubs, newstate = subrepoutil.precommit( | subs, commitsubs, newstate = subrepoutil.precommit( | ||||
| self.ui, wctx, status, match, force=force | self.ui, wctx, status, match, force=force | ||||
| ) | ) | ||||
| # make sure all explicit patterns are matched | # make sure all explicit patterns are matched | ||||
| if not force: | if not force: | ||||
| self.checkcommitpatterns(wctx, vdirs, match, status, fail) | self.checkcommitpatterns(wctx, match, status, fail) | ||||
| cctx = context.workingcommitctx( | cctx = context.workingcommitctx( | ||||
| self, status, text, user, date, extra | self, status, text, user, date, extra | ||||
| ) | ) | ||||
| # internal config: ui.allowemptycommit | # internal config: ui.allowemptycommit | ||||
| allowemptycommit = ( | allowemptycommit = ( | ||||
| wctx.branch() != wctx.p1().branch() | wctx.branch() != wctx.p1().branch() | ||||