This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6124

patch: include newline at EOF in help text for interactive patch
ClosedPublic

Authored by martinvonz on Mar 12 2019, 6:13 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG95e4ae86329f: patch: include newline at EOF in help text for interactive patch
Summary

The lack of a newline means that some "editors" that are useful in
tests, such as echo "+new line" >> "$1" don't work. It's obviously
easy to work around it, but newline at EOF seems like a good practice
anyway.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 12 2019, 6:13 PM
pulkit accepted this revision.Mar 19 2019, 2:06 PM
pulkit added a comment.Mar 19 2019, 2:15 PM

test-check-code.t says hi.

pulkit added a comment.Mar 19 2019, 2:19 PM

Amended the following in flight:

diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -1117,7 +1117,8 @@ the hunk is left unchanged.
                     f = util.nativeeolwriter(os.fdopen(patchfd, r'wb'))
                     chunk.header.write(f)
                     chunk.write(f)
-                    f.write(''.join(['# ' + i + '\n' for i in phelp.splitlines()]))
+                    f.write(''.join(['# ' + i + '\n'
+                                     for i in phelp.splitlines()]))
                     f.close()
                     # Start the editor and wait for it to complete
                     editor = ui.geteditor()
martinvonz added a comment.Mar 19 2019, 2:22 PM
In D6124#89743, @pulkit wrote:

Amended the following in flight:

Sorry, and thanks for fixing!

Closed by commit rHG95e4ae86329f: patch: include newline at EOF in help text for interactive patch (authored by martinvonz). · Explain WhyMar 19 2019, 2:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)

Diff 14479

mercurial/patch.py

(patchfd, patchfn) = pycompat.mkstemp(prefix="hg-editor-", (patchfd, patchfn) = pycompat.mkstemp(prefix="hg-editor-",
suffix=".diff") suffix=".diff")
ncpatchfp = None ncpatchfp = None
try: try:
# Write the initial patch # Write the initial patch
f = util.nativeeolwriter(os.fdopen(patchfd, r'wb')) f = util.nativeeolwriter(os.fdopen(patchfd, r'wb'))
chunk.header.write(f) chunk.header.write(f)
chunk.write(f) chunk.write(f)
f.write('\n'.join(['# ' + i for i in phelp.splitlines()])) f.write(''.join(['# ' + i + '\n' for i in phelp.splitlines()]))
f.close() f.close()
# Start the editor and wait for it to complete # Start the editor and wait for it to complete
editor = ui.geteditor() editor = ui.geteditor()
ret = ui.system("%s \"%s\"" % (editor, patchfn), ret = ui.system("%s \"%s\"" % (editor, patchfn),
environ={'HGUSER': ui.username()}, environ={'HGUSER': ui.username()},
blockedtag='filterpatch') blockedtag='filterpatch')
if ret != 0: if ret != 0:
ui.warn(_("editor exited with exit code %d\n") % ret) ui.warn(_("editor exited with exit code %d\n") % ret)