equal
deleted
inserted
replaced
304 del opts['follow_first'] |
304 del opts['follow_first'] |
305 |
305 |
306 # branch and only_branch are really aliases and must be handled at |
306 # branch and only_branch are really aliases and must be handled at |
307 # the same time |
307 # the same time |
308 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
308 opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
|
309 opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] |
309 # pats/include/exclude are passed to match.match() directly in |
310 # pats/include/exclude are passed to match.match() directly in |
310 # _matchfile() revset but walkchangerevs() builds its matcher with |
311 # _matchfile() revset but walkchangerevs() builds its matcher with |
311 # scmutil.match(). The difference is input pats are globbed on |
312 # scmutil.match(). The difference is input pats are globbed on |
312 # platforms without shell expansion (windows). |
313 # platforms without shell expansion (windows). |
313 pctx = repo[None] |
314 pctx = repo[None] |