comparison hgext/graphlog.py @ 16149:6acbbb0c7381

graphlog: multiple --branch must be or'ed
author Patrick Mezard <patrick@mezard.eu>
date Wed, 22 Feb 2012 12:30:15 +0100
parents 184cc3c3e0a6
children 0424f3c7d7ac
comparison
equal deleted inserted replaced
16148:184cc3c3e0a6 16149:6acbbb0c7381
252 'follow': ('follow()', None), 252 'follow': ('follow()', None),
253 'no_merges': ('not merge()', None), 253 'no_merges': ('not merge()', None),
254 'only_merges': ('merge()', None), 254 'only_merges': ('merge()', None),
255 'removed': ('removes("*")', None), 255 'removed': ('removes("*")', None),
256 'date': ('date($)', None), 256 'date': ('date($)', None),
257 'branch': ('branch($)', ' and '), 257 'branch': ('branch($)', ' or '),
258 'exclude': ('not file($)', ' and '), 258 'exclude': ('not file($)', ' and '),
259 'include': ('file($)', ' and '), 259 'include': ('file($)', ' and '),
260 'keyword': ('keyword($)', ' and '), 260 'keyword': ('keyword($)', ' and '),
261 'only_branch': ('branch($)', ' and '), 261 'only_branch': ('branch($)', ' and '),
262 'prune': ('not ($ or ancestors($))', ' and '), 262 'prune': ('not ($ or ancestors($))', ' and '),