Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 42057:566daffc607d
cleanup: use set literals where possible
Differential Revision: https://phab.mercurial-scm.org/D6192
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Apr 2019 11:21:27 -0700 |
| parents | 02fa567f8a3c |
| children | 3a7efcbdf288 |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Jul 19 13:17:49 2017 -0700 +++ b/mercurial/merge.py Wed Apr 03 11:21:27 2019 -0700 @@ -815,8 +815,8 @@ fileconflicts.add(f) allconflicts = fileconflicts | pathconflicts - ignoredconflicts = set([c for c in allconflicts - if repo.dirstate._ignore(c)]) + ignoredconflicts = {c for c in allconflicts + if repo.dirstate._ignore(c)} unknownconflicts = allconflicts - ignoredconflicts collectconflicts(ignoredconflicts, ignoredconfig) collectconflicts(unknownconflicts, unknownconfig) @@ -1104,7 +1104,7 @@ Raise an exception if the merge cannot be completed because the repo is narrowed. """ - nooptypes = set(['k']) # TODO: handle with nonconflicttypes + nooptypes = {'k'} # TODO: handle with nonconflicttypes nonconflicttypes = set('a am c cm f g r e'.split()) # We mutate the items in the dict during iteration, so iterate # over a copy.