Mercurial > hg
comparison tests/test-rename-merge2.t @ 42565:4764e8436b2a
filemerge: make last line of prompts <40 english chars (issue6158)
I've chosen <40 as the target so that other languages that may have a 2x blowup
in character count can still have a chance to fit into an 80 column screen.
Previously, we would show a prompt like:
```
keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved for some/potentially/really/long/path?
```
On at least some systems, if readline was in use then the last line of the
prompt would be wrapped strangely if it couldn't fit entirely on one line. This
strange wrapping may be just a carriage return without a line feed, overwriting
the beginning of the line; example (100 columns wide, 65 character filename, and
yes there's 10 spaces on the end, I assume this is to handle the user inputting
longest word we provide as an option, "unresolved"):
```
ng/dir/name/that/does/not/work/well/with/readline/file.txt? ave (u)nresolved for some/lon
```
In some cases it may partially wrap onto the next line, but still be missing
earlier parts in the line, such as below (60 columns wide, 65 character
filename):
```
rev], or leave (u)nresolved for some/long/dir/name/that/do
s/not/work/well/with/readline/file.txt?
```
With this fix, this looks like this on a 60 column screen:
```
tool vim_with_markers (for pattern some/long/dir/name/that/d
oes/not/work/well/with/readline/file.txt) can't handle binar
y
tool meld can't handle binary
tool vim_with_markers can't handle binary
tool internal:merge3 can't handle binary
tool merge can't handle binary
no tool found to merge some/long/dir/name/that/does/not/work
/well/with/readline/file.txt
file 'some/long/dir/name/that/does/not/work/well/with/readli
ne/file.txt' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev
], or leave (u)nresolved.
What do you want to do?
```
Differential Revision: https://phab.mercurial-scm.org/D6562
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 20 Jun 2019 11:40:47 -0700 |
parents | 57203e0210f8 |
children | 17e12938f8e7 |
comparison
equal
deleted
inserted
replaced
42561:44e99811bea7 | 42565:4764e8436b2a |
---|---|
681 preserving rev for resolve of rev | 681 preserving rev for resolve of rev |
682 starting 4 threads for background file closing (?) | 682 starting 4 threads for background file closing (?) |
683 a: prompt deleted/changed -> m (premerge) | 683 a: prompt deleted/changed -> m (premerge) |
684 picked tool ':prompt' for a (binary False symlink False changedelete True) | 684 picked tool ':prompt' for a (binary False symlink False changedelete True) |
685 file 'a' was deleted in local [working copy] but was modified in other [merge rev]. | 685 file 'a' was deleted in local [working copy] but was modified in other [merge rev]. |
686 What do you want to do? | 686 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
687 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 687 What do you want to do? u |
688 b: both created -> m (premerge) | 688 b: both created -> m (premerge) |
689 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 689 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
690 merging b | 690 merging b |
691 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 691 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
692 rev: versions differ -> m (premerge) | 692 rev: versions differ -> m (premerge) |
727 preserving rev for resolve of rev | 727 preserving rev for resolve of rev |
728 starting 4 threads for background file closing (?) | 728 starting 4 threads for background file closing (?) |
729 a: prompt changed/deleted -> m (premerge) | 729 a: prompt changed/deleted -> m (premerge) |
730 picked tool ':prompt' for a (binary False symlink False changedelete True) | 730 picked tool ':prompt' for a (binary False symlink False changedelete True) |
731 file 'a' was deleted in other [merge rev] but was modified in local [working copy]. | 731 file 'a' was deleted in other [merge rev] but was modified in local [working copy]. |
732 What do you want to do? | 732 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
733 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 733 What do you want to do? u |
734 b: both created -> m (premerge) | 734 b: both created -> m (premerge) |
735 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 735 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
736 merging b | 736 merging b |
737 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 737 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
738 rev: versions differ -> m (premerge) | 738 rev: versions differ -> m (premerge) |