equal
deleted
inserted
replaced
325 branch = ctx.branch() |
325 branch = ctx.branch() |
326 # don't show the default branch name |
326 # don't show the default branch name |
327 if branch != b'default': |
327 if branch != b'default': |
328 self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
328 self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
329 |
329 |
330 for nsname, ns in pycompat.iteritems(self.repo.names): |
330 for nsname, ns in self.repo.names.items(): |
331 # branches has special logic already handled above, so here we just |
331 # branches has special logic already handled above, so here we just |
332 # skip it |
332 # skip it |
333 if nsname == b'branches': |
333 if nsname == b'branches': |
334 continue |
334 continue |
335 # we will use the templatename as the color name since those two |
335 # we will use the templatename as the color name since those two |
989 opts[b'_matchfiles'] = matchargs |
989 opts[b'_matchfiles'] = matchargs |
990 elif wopts.filter_revisions_by_pats and not wopts.follow: |
990 elif wopts.filter_revisions_by_pats and not wopts.follow: |
991 opts[b'_patslog'] = list(wopts.pats) |
991 opts[b'_patslog'] = list(wopts.pats) |
992 |
992 |
993 expr = [] |
993 expr = [] |
994 for op, val in sorted(pycompat.iteritems(opts)): |
994 for op, val in sorted(opts.items()): |
995 if not val: |
995 if not val: |
996 continue |
996 continue |
997 revop, listop = _opt2logrevset[op] |
997 revop, listop = _opt2logrevset[op] |
998 if revop and b'%' not in revop: |
998 if revop and b'%' not in revop: |
999 expr.append(revop) |
999 expr.append(revop) |