This is an archive of the discontinued Mercurial Phabricator instance.

editor: file created for diff action should have .diff suffix
ClosedPublic

Authored by mbolin on Sep 1 2017, 4:03 PM.

Download Raw Diff

Details

Reviewers

durin42
ryanmce
quark
yuja

Group Reviewers

hg-reviewers

Commits

rHG3c82b14d2838: editor: file created for diff action should have .diff suffix

Summary

This is a follow-up to https://phab.mercurial-scm.org/D464 that introduced the
new file extension behavior. It erroneously changed .diff to .diff.hg.txt.

Test Plan

Verified make tests passes, particularly test-editor-filename.t.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

mbolin created this revision.Sep 1 2017, 4:03 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 1 2017, 4:03 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

Added integration test.

mbolin added a reviewer: yuja.Sep 1 2017, 4:16 PM

mbolin mentioned this in D464: editor: use an unambiguous path suffix for editor files.

Remove bin/bash shebang as @quark says this should fix the FreeBSD issue and should generally be banned from integration tests.

I dropped the shebang fix and queued, thanks.

tests/test-editor-filename.t
8	This works, but seems not nice to force the kernel to detect the type of executable. I'll send a follow up.

This revision is now accepted and ready to land.Sep 2 2017, 8:18 AM

Closed by commit rHG3c82b14d2838: editor: file created for diff action should have .diff suffix (authored by mbolin). · Explain WhySep 2 2017, 8:51 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/ui.py (4 lines)
M			tests/test-editor-filename.t (30 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	1550		Sep 1 2017, 4:03 PM	★	★
Diff 2	1551	Added integration test.	Sep 1 2017, 4:16 PM	★	★
Diff 3	1556	Remove bin/bash shebang as @quark says this should fix the FreeBSD issue and…	Sep 1 2017, 4:29 PM	★	★
Diff 4	1577	rHG3c82b14d28385883b696e8f97586886873f172ff	Sep 1 2017, 4:28 PM	★	★

Commit	Local	Parents	Author	Summary	Date
ef3ff27c0e30	36507	13a54ad9c068	Michael Bolin	editor: file created for diff action should have .diff suffix (Show More…)	Sep 1 2017, 4:16 PM

Diff 1551

mercurial/ui.py

	}			}
	if extra is not None:			if extra is not None:
	if extra.get('suffix') is not None:			if extra.get('suffix') is not None:
	self.develwarn('extra.suffix is not None but will soon be '			self.develwarn('extra.suffix is not None but will soon be '
	'ignored by ui.edit()')			'ignored by ui.edit()')
	extra_defaults.update(extra)			extra_defaults.update(extra)
	extra = extra_defaults			extra = extra_defaults

	if action:			if action == 'diff':
				suffix = '.diff'
				elif action:
	suffix = '.%s.hg.txt' % action			suffix = '.%s.hg.txt' % action
	else:			else:
	suffix = extra['suffix']			suffix = extra['suffix']

	rdir = None			rdir = None
	if self.configbool('experimental', 'editortmpinhg'):			if self.configbool('experimental', 'editortmpinhg'):
	rdir = repopath			rdir = repopath
	(fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',			(fd, name) = tempfile.mkstemp(prefix='hg-' + extra['prefix'] + '-',

tests/test-editor-filename.t

	Test temp file used with an editor has the expected suffix.			Test temp file used with an editor has the expected suffix.

	$ hg init			$ hg init

	Create an editor that writes its arguments to stdout and set it to $HGEDITOR.			Create an editor that writes its arguments to stdout and set it to $HGEDITOR.

	$ cat > editor.sh << EOF			$ cat > $TESTTMP/editor.sh << EOF
	> #!/bin/bash			> #!/bin/bash
				yujaUnsubmitted Not Done This works, but seems not nice to force the kernel to detect the type of executable. I'll send a follow up. yuja: This works, but seems not nice to force the kernel to detect the type of executable. I'll send…
	> echo "\$@"			> echo "\$@"
	> exit 1			> exit 1
	> EOF			> EOF
	$ chmod +x editor.sh			$ chmod +x editor.sh
	$ hg add editor.sh			$ hg add editor.sh
	$ HGEDITOR=$TESTTMP/editor.sh			$ HGEDITOR=$TESTTMP/editor.sh
	$ export HGEDITOR			$ export HGEDITOR

	> rebase=			> rebase=
	> histedit=			> histedit=
	> EOF			> EOF
	$ hg commit --message 'At least one commit for histedit.'			$ hg commit --message 'At least one commit for histedit.'
	$ hg histedit			$ hg histedit
	*.histedit.hg.txt (glob)			*.histedit.hg.txt (glob)
	abort: edit failed: editor.sh exited with status 1			abort: edit failed: editor.sh exited with status 1
	[255]			[255]

				Verify that when performing an action that has the side-effect of creating an
				editor for a diff, the file ends in .diff.

				$ echo 1 > one
				$ echo 2 > two
				$ hg add
				adding one
				adding two
				$ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
				> y
				> e
				> q
				> EOF
				diff --git a/one b/one
				new file mode 100644
				examine changes to 'one'? [Ynesfdaq?] y

				@@ -0,0 +1,1 @@
				+1
				record change 1/2 to 'one'? [Ynesfdaq?] e

				*.diff (glob)
				editor exited with exit code 1
				record change 1/2 to 'one'? [Ynesfdaq?] q

				abort: user quit
				[255]