diff hgext/graphlog.py @ 16150:0424f3c7d7ac

graphlog: multiple --keyword must be or'ed
author Patrick Mezard <patrick@mezard.eu>
date Wed, 22 Feb 2012 12:30:15 +0100
parents 6acbbb0c7381
children 4a828d3bc04a
line wrap: on
line diff
--- a/hgext/graphlog.py	Wed Feb 22 12:30:15 2012 +0100
+++ b/hgext/graphlog.py	Wed Feb 22 12:30:15 2012 +0100
@@ -257,7 +257,7 @@
         'branch':      ('branch($)', ' or '),
         'exclude':     ('not file($)', ' and '),
         'include':     ('file($)', ' and '),
-        'keyword':     ('keyword($)', ' and '),
+        'keyword':     ('keyword($)', ' or '),
         'only_branch': ('branch($)', ' and '),
         'prune':       ('not ($ or ancestors($))', ' and '),
         'user':        ('user($)', ' or '),