This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	rdamazio	D8763 diff: move no-eol text constant to a common location
	Closed	rdamazio	D8762 revert: fix interactive reverting of end-of-file newline changes

Diff 21950

	6			6

	Note "4" was first deleted then added. That's because "4" exists in B			Note "4" was first deleted then added. That's because "4" exists in B
	side and "-4" must exist between "-3" and "-5" to make the patch			side and "-4" must exist between "-3" and "-5" to make the patch
	applicable to B.			applicable to B.
	"""			"""
	dels = []			dels = []
	adds = []			adds = []
				noeol = False
	for line in self.changedlines:			for line in self.changedlines:
	text = line.linetext			text = line.linetext
				if line.linetext == b'\\ No newline at end of file\n':
				noeol = True
				break
	if line.applied:			if line.applied:
	if text.startswith(b'+'):			if text.startswith(b'+'):
	dels.append(text[1:])			dels.append(text[1:])
	elif text.startswith(b'-'):			elif text.startswith(b'-'):
	adds.append(text[1:])			adds.append(text[1:])
	elif text.startswith(b'+'):			elif text.startswith(b'+'):
	dels.append(text[1:])			dels.append(text[1:])
	adds.append(text[1:])			adds.append(text[1:])
	hunk = [b'-%s' % l for l in dels] + [b'+%s' % l for l in adds]			hunk = [b'-%s' % l for l in dels] + [b'+%s' % l for l in adds]
				if noeol and hunk:
				# Remove the newline from the end of the hunk.
				hunk[-1] = hunk[-1][:-1]
	h = self._hunk			h = self._hunk
	return patchmod.recordhunk(			return patchmod.recordhunk(
	h.header, h.toline, h.fromline, h.proc, h.before, hunk, h.after			h.header, h.toline, h.fromline, h.proc, h.before, hunk, h.after
	)			)

	def __getattr__(self, name):			def __getattr__(self, name):
	return getattr(self._hunk, name)			return getattr(self._hunk, name)

				#require tic

				Revert interactive tests with the Curses interface

				$ cat <<EOF >> $HGRCPATH
				> [ui]
				> interactive = true
				> interface = curses
				> [experimental]
				> crecordtest = testModeCommands
				> EOF

				TODO: Make a curses version of the other tests from test-revert-interactive.t.

				When a line without EOL is selected during "revert -i"

				$ hg init $TESTTMP/revert-i-curses-eol
				$ cd $TESTTMP/revert-i-curses-eol
				$ echo 0 > a
				$ hg ci -qAm 0
				$ printf 1 >> a
				$ hg ci -qAm 1
				$ cat a
				0
				1 (no-eol)

				$ cat <<EOF >testModeCommands
				> c
				> EOF

				$ hg revert -ir'.^'
				reverting a
				$ cat a
				0

				When a selected line is reverted to have no EOL

				$ hg init $TESTTMP/revert-i-curses-eol2
				$ cd $TESTTMP/revert-i-curses-eol2
				$ printf 0 > a
				$ hg ci -qAm 0
				$ echo 0 > a
				$ hg ci -qAm 1
				$ cat a
				0

				$ cat <<EOF >testModeCommands
				> c
				> EOF

				$ hg revert -ir'.^'
				reverting a
				$ cat a
				0 (no-eol)