comparison hgext/journal.py @ 32291:bd872f64a8ba

cleanup: use set literals We no longer support Python 2.6, so we can now use set literals.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Feb 2017 16:56:29 -0800
parents 809fa1d7eb99
children 46ba2cdda476
comparison
equal deleted inserted replaced
32290:2959c3e986e0 32291:bd872f64a8ba
156 """Copy shared journal entries into this repo when unsharing""" 156 """Copy shared journal entries into this repo when unsharing"""
157 if (repo.path == repopath and repo.shared() and 157 if (repo.path == repopath and repo.shared() and
158 util.safehasattr(repo, 'journal')): 158 util.safehasattr(repo, 'journal')):
159 sharedrepo = share._getsrcrepo(repo) 159 sharedrepo = share._getsrcrepo(repo)
160 sharedfeatures = _readsharedfeatures(repo) 160 sharedfeatures = _readsharedfeatures(repo)
161 if sharedrepo and sharedfeatures > set(['journal']): 161 if sharedrepo and sharedfeatures > {'journal'}:
162 # there is a shared repository and there are shared journal entries 162 # there is a shared repository and there are shared journal entries
163 # to copy. move shared date over from source to destination but 163 # to copy. move shared date over from source to destination but
164 # move the local file first 164 # move the local file first
165 if repo.vfs.exists('namejournal'): 165 if repo.vfs.exists('namejournal'):
166 journalpath = repo.vfs.join('namejournal') 166 journalpath = repo.vfs.join('namejournal')