Patchwork [3,of,5] localrepo: remove check for matcher object that's never None

login
register
mail settings
Submitter Martin von Zweigbergk
Date March 18, 2015, 8:27 p.m.
Message ID <1cafeb13292131a62161.1426710462@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/8149/
State Accepted
Commit 5859af34c5a644b594e3e9d87e703b4b680542b6
Headers show

Comments

Martin von Zweigbergk - March 18, 2015, 8:27 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@gmail.com>
# Date 1412120415 25200
#      Tue Sep 30 16:40:15 2014 -0700
# Node ID 1cafeb13292131a62161de490230d90bf4b56c9a
# Parent  1c7d90d9ea3020b4ddf98de59046ab6dc1577794
localrepo: remove check for matcher object that's never None

Patch

diff -r 1c7d90d9ea30 -r 1cafeb132921 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Wed Mar 18 11:42:09 2015 -0700
+++ b/mercurial/localrepo.py	Tue Sep 30 16:40:15 2014 -0700
@@ -1304,8 +1304,7 @@ 
             wctx = self[None]
             merge = len(wctx.parents()) > 1
 
-            if (not force and merge and match and
-                (match.files() or match.anypats())):
+            if (not force and merge and (match.files() or match.anypats())):
                 raise util.Abort(_('cannot partially commit a merge '
                                    '(do not specify files or patterns)'))