Mercurial > hg
comparison tests/test-sparse-merges.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 | 9db856446298 |
children | 5c2a4f37eace |
comparison
equal
deleted
inserted
replaced
42561:44e99811bea7 | 42565:4764e8436b2a |
---|---|
112 a | 112 a |
113 | 113 |
114 $ hg merge | 114 $ hg merge |
115 temporarily included 1 file(s) in the sparse checkout for merging | 115 temporarily included 1 file(s) in the sparse checkout for merging |
116 file 'd' was deleted in other [merge rev] but was modified in local [working copy]. | 116 file 'd' was deleted in other [merge rev] but was modified in local [working copy]. |
117 What do you want to do? | 117 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
118 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 118 What do you want to do? u |
119 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 119 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
120 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 120 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
121 [1] | 121 [1] |
122 | 122 |
123 $ cd .. | 123 $ cd .. |