Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 32312:0d6b3572ad92
match: remove ispartial()
The function was added in d1d69ca78883 (match: add match.ispartial(),
2015-05-15) for use by narrowhg, but narrowhg never ended up needing
it.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 17 May 2017 09:43:50 -0700 |
| parents | 0ad0d26ff703 |
| children | 9f35c7836f60 |
comparison
equal
deleted
inserted
replaced
| 32311:a77a75a428f7 | 32312:0d6b3572ad92 |
|---|---|
| 1573 lock = self.lock() # for recent changelog (see issue4368) | 1573 lock = self.lock() # for recent changelog (see issue4368) |
| 1574 | 1574 |
| 1575 wctx = self[None] | 1575 wctx = self[None] |
| 1576 merge = len(wctx.parents()) > 1 | 1576 merge = len(wctx.parents()) > 1 |
| 1577 | 1577 |
| 1578 if not force and merge and match.ispartial(): | 1578 if not force and merge and not match.always(): |
| 1579 raise error.Abort(_('cannot partially commit a merge ' | 1579 raise error.Abort(_('cannot partially commit a merge ' |
| 1580 '(do not specify files or patterns)')) | 1580 '(do not specify files or patterns)')) |
| 1581 | 1581 |
| 1582 status = self.status(match=match, clean=force) | 1582 status = self.status(match=match, clean=force) |
| 1583 if force: | 1583 if force: |