diff mercurial/localrepo.py @ 25114:d1d69ca78883

match: add match.ispartial() match.ispartial() will return the opposite of match.always() in core, but this function will be extensible by extensions to produce another result even if match.always() will be untouched. This will be useful for narrowhg, where ispartial() will return False even if the match won't always match. This would happen in the case where the only time the match function is False is when the path is outside of the narrow spec.
author Drew Gottlieb <drgott@google.com>
date Fri, 15 May 2015 15:43:26 -0700
parents 9a74b9919581
children 49c583ca48c4
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sat May 16 11:28:04 2015 -0700
+++ b/mercurial/localrepo.py	Fri May 15 15:43:26 2015 -0700
@@ -1377,7 +1377,7 @@
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if not force and merge and not match.always():
+            if not force and merge and match.ispartial():
                 raise util.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))