equal
deleted
inserted
replaced
288 branch = ctx.branch() |
288 branch = ctx.branch() |
289 # don't show the default branch name |
289 # don't show the default branch name |
290 if branch != b'default': |
290 if branch != b'default': |
291 self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
291 self.ui.write(columns[b'branch'] % branch, label=b'log.branch') |
292 |
292 |
293 for nsname, ns in self.repo.names.iteritems(): |
293 for nsname, ns in pycompat.iteritems(self.repo.names): |
294 # branches has special logic already handled above, so here we just |
294 # branches has special logic already handled above, so here we just |
295 # skip it |
295 # skip it |
296 if nsname == b'branches': |
296 if nsname == b'branches': |
297 continue |
297 continue |
298 # we will use the templatename as the color name since those two |
298 # we will use the templatename as the color name since those two |
800 opts[b'_matchfiles'] = matchargs |
800 opts[b'_matchfiles'] = matchargs |
801 elif not follow: |
801 elif not follow: |
802 opts[b'_patslog'] = list(pats) |
802 opts[b'_patslog'] = list(pats) |
803 |
803 |
804 expr = [] |
804 expr = [] |
805 for op, val in sorted(opts.iteritems()): |
805 for op, val in sorted(pycompat.iteritems(opts)): |
806 if not val: |
806 if not val: |
807 continue |
807 continue |
808 if op not in _opt2logrevset: |
808 if op not in _opt2logrevset: |
809 continue |
809 continue |
810 revop, listop = _opt2logrevset[op] |
810 revop, listop = _opt2logrevset[op] |