Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 31198:71a6723c0029
patch: set a blockedtag when running an external filter
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Mon, 06 Mar 2017 03:25:29 -0800 |
parents | 48dea083f66d |
children | 21fa3d3688f3 |
comparison
equal
deleted
inserted
replaced
31197:764f4581d1f3 | 31198:71a6723c0029 |
---|---|
1062 f.write('\n'.join(['# ' + i for i in phelp.splitlines()])) | 1062 f.write('\n'.join(['# ' + i for i in phelp.splitlines()])) |
1063 f.close() | 1063 f.close() |
1064 # Start the editor and wait for it to complete | 1064 # Start the editor and wait for it to complete |
1065 editor = ui.geteditor() | 1065 editor = ui.geteditor() |
1066 ret = ui.system("%s \"%s\"" % (editor, patchfn), | 1066 ret = ui.system("%s \"%s\"" % (editor, patchfn), |
1067 environ={'HGUSER': ui.username()}) | 1067 environ={'HGUSER': ui.username()}, |
1068 blockedtag='filterpatch') | |
1068 if ret != 0: | 1069 if ret != 0: |
1069 ui.warn(_("editor exited with exit code %d\n") % ret) | 1070 ui.warn(_("editor exited with exit code %d\n") % ret) |
1070 continue | 1071 continue |
1071 # Remove comment lines | 1072 # Remove comment lines |
1072 patchfp = open(patchfn) | 1073 patchfp = open(patchfn) |