Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 32352: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 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue May 16 21:17:40 2017 -0700 +++ b/mercurial/localrepo.py Wed May 17 09:43:50 2017 -0700 @@ -1575,7 +1575,7 @@ wctx = self[None] merge = len(wctx.parents()) > 1 - if not force and merge and match.ispartial(): + if not force and merge and not match.always(): raise error.Abort(_('cannot partially commit a merge ' '(do not specify files or patterns)'))