tests/hgterm.ti
author Denis Laxalde <denis.laxalde@logilab.fr>
Fri, 03 Nov 2017 14:47:37 +0100
changeset 35023 3649c3f2cd90
parent 14757 f0b047a24c57
permissions -rw-r--r--
revert: do not reverse hunks in interactive when REV is not parent (issue5096) And introduce a new "apply" operation verb for this case as suggested in issue5096. This replaces the no longer used "revert" operation. In interactive revert, when reverting to something else that the parent revision, display an "apply this change" message with a diff that is not reversed. The rationale is that `hg revert -i -r REV` will show hunks of the diff from the working directory to REV and prompt the user to select them for applying (to working directory). This contradicts dcc56e10c23b in which it was decided to have the "direction" of prompted hunks reversed. Later on [1], there was a broad consensus (but no decision) towards the "as to be applied direction". Now that --interactive is no longer experimental (5910db5d1913), it's time to switch and thus we drop no longer used "experimental.revertalternateinteractivemode" configuration option. [1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-November/090142.html .. feature:: When interactive revert is run against a revision other than the working directory parent, the diff shown is the diff to *apply* to the working directory, rather than the diff to *discard* from the working copy. This is in line with related user experiences with `git` and appears to be less confusing with `ui.interface=curses`.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14757
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     1
hgterm,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     2
	am, km, mir, msgr, xenl,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     3
	colors#8, cols#80, it#8, lines#24, pairs#64,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     4
	acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     5
	bel=^G, bold=\E[1m, clear=\E[H\E[2J, cr=\r,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     6
	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\b,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     7
	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     8
	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
     9
	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    10
	ed=\E[J, el=\E[K, enacs=\E)0, home=\E[H, ht=\t,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    11
	hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    12
	is2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, kbs=\b,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    13
	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    14
	kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    15
	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    16
	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    17
	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    18
	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    19
	kf9=\E[20~, kfnd=\E[1~, kich1=\E[2~, kmous=\E[M,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    20
	knp=\E[6~, kpp=\E[5~, kslt=\E[4~, op=\E[m, rc=\E8,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    21
	rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    22
	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    23
	rs2=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8, sc=\E7,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    24
	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    25
	smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    26
	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
f0b047a24c57 tests: hardcode terminfo entry for the terminfo color test
Danek Duvall <duvall@comfychair.org>
parents:
diff changeset
    27
	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,