Mercurial > hg
comparison hgext/keyword.py @ 39432:16c27483f50f
py3: bytestr a bytes val to make sure we get bytechr while iterating
Differential Revision: https://phab.mercurial-scm.org/D4460
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Tue, 04 Sep 2018 17:58:39 +0300 |
| parents | 5bf99c27a7b6 |
| children | 7ce9dea3a14a |
comparison
equal
deleted
inserted
replaced
| 39431:5bf99c27a7b6 | 39432:16c27483f50f |
|---|---|
| 565 showfiles = [], [], [] | 565 showfiles = [], [], [] |
| 566 if opts.get('all') or opts.get('ignore'): | 566 if opts.get('all') or opts.get('ignore'): |
| 567 showfiles += ([f for f in files if f not in kwfiles], | 567 showfiles += ([f for f in files if f not in kwfiles], |
| 568 [f for f in status.unknown if f not in kwunknown]) | 568 [f for f in status.unknown if f not in kwunknown]) |
| 569 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split() | 569 kwlabels = 'enabled deleted enabledunknown ignored ignoredunknown'.split() |
| 570 kwstates = zip(kwlabels, 'K!kIi', showfiles) | 570 kwstates = zip(kwlabels, pycompat.bytestr('K!kIi'), showfiles) |
| 571 fm = ui.formatter('kwfiles', opts) | 571 fm = ui.formatter('kwfiles', opts) |
| 572 fmt = '%.0s%s\n' | 572 fmt = '%.0s%s\n' |
| 573 if opts.get('all') or ui.verbose: | 573 if opts.get('all') or ui.verbose: |
| 574 fmt = '%s %s\n' | 574 fmt = '%s %s\n' |
| 575 for kwstate, char, filenames in kwstates: | 575 for kwstate, char, filenames in kwstates: |