Mercurial > hg-stable
changeset 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 | a01d2fb5ba65 |
| files | hgext/graphlog.py tests/test-glog.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
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 '),
--- a/tests/test-glog.t Wed Feb 22 12:30:15 2012 +0100 +++ b/tests/test-glog.t Wed Feb 22 12:30:15 2012 +0100 @@ -1435,8 +1435,8 @@ abort: unknown revision 'not-a-branch'! $ testlog -b default -b branch ('group', ('group', ('or', ('func', ('symbol', 'branch'), ('string', 'default')), ('func', ('symbol', 'branch'), ('string', 'branch'))))) - $ hg log -G --print-revset -k 'something' -k 'nice' - ('group', ('group', ('and', ('func', ('symbol', 'keyword'), ('string', 'something')), ('func', ('symbol', 'keyword'), ('string', 'nice'))))) + $ testlog -k expand -k merge + ('group', ('group', ('or', ('func', ('symbol', 'keyword'), ('string', 'expand')), ('func', ('symbol', 'keyword'), ('string', 'merge'))))) $ hg log -G --only-branch 'something nice' abort: unknown revision 'something nice'! [255]