##// END OF EJS Templates
filemerge: when merge tool uses $output, don't leave markers in $local...
filemerge: when merge tool uses $output, don't leave markers in $local As explained in the previous patch, we incorrectly leave conflict markers in both `$local` and `$output` since D12190. I don't understand why it broke but the fix is simple and clear after all the recent refactoring. Differential Revision: https://phab.mercurial-scm.org/D12379

File last commit:

r43346:2372284d default
r49823:a54a8663 stable
Show More
pypi.py
21 lines | 551 B | text/x-python | PythonLexer
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177 # pypi.py - Automation around PyPI
#
# Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
# no-check-code because Python 3 native.
Augie Fackler
formatting: blacken the codebase...
r43346 from twine.commands.upload import upload as twine_upload
from twine.settings import Settings
Gregory Szorc
automation: implement "publish-windows-artifacts" command...
r43177
def upload(paths):
"""Upload files to PyPI.
`paths` is an iterable of `pathlib.Path`.
"""
settings = Settings()
twine_upload(settings, [str(p) for p in paths])