Mercurial > public > mercurial-scm > hg
comparison mercurial/tagmerge.py @ 31415:5d92107dfb9b
tagmerge: use 'wvfs' instead of 'wfile'
Method is about to be deprecated and the modern form is shorter.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 15 Mar 2017 00:28:58 -0700 |
| parents | fa91c49a9b9f |
| children | d1aa3fee4ca4 |
comparison
equal
deleted
inserted
replaced
| 31414:279cbde7bf3d | 31415:5d92107dfb9b |
|---|---|
| 167 finaltags.sort(key=operator.itemgetter(0)) | 167 finaltags.sort(key=operator.itemgetter(0)) |
| 168 | 168 |
| 169 # finally we can join the sorted groups to get the final contents of the | 169 # finally we can join the sorted groups to get the final contents of the |
| 170 # merged .hgtags file, and then write it to disk | 170 # merged .hgtags file, and then write it to disk |
| 171 mergedtagstring = '\n'.join([tags for rank, tags in finaltags if tags]) | 171 mergedtagstring = '\n'.join([tags for rank, tags in finaltags if tags]) |
| 172 fp = repo.wfile('.hgtags', 'wb') | 172 fp = repo.wvfs('.hgtags', 'wb') |
| 173 fp.write(mergedtagstring + '\n') | 173 fp.write(mergedtagstring + '\n') |
| 174 fp.close() | 174 fp.close() |
| 175 | 175 |
| 176 def singletagmerge(p1nodes, p2nodes): | 176 def singletagmerge(p1nodes, p2nodes): |
| 177 ''' | 177 ''' |