D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[spectral (Kyle Lippincott)]

Closed by commit rHG4764e8436b2a: filemerge: make last line of prompts 40 
english chars (issue6158) (authored by spectral).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs 
Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6562?vs=15626=15795

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6562/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

AFFECTED FILES
  mercurial/filemerge.py
  tests/test-commit-amend.t
  tests/test-copy-move-merge.t
  tests/test-copytrace-heuristics.t
  tests/test-largefiles-update.t
  tests/test-lfconvert.t
  tests/test-merge-changedelete.t
  tests/test-merge-force.t
  tests/test-merge-remove.t
  tests/test-merge-subrepos.t
  tests/test-merge-tools.t
  tests/test-merge-types.t
  tests/test-rebase-newancestor.t
  tests/test-rename-merge2.t
  tests/test-resolve.t
  tests/test-sparse-merges.t

CHANGE DETAILS

diff --git a/tests/test-sparse-merges.t b/tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t
+++ b/tests/test-sparse-merges.t
@@ -114,8 +114,8 @@
   $ hg merge
   temporarily included 1 file(s) in the sparse checkout for merging
   file 'd' was deleted in other [merge rev] but was modified in local [working 
copy].
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to 
abandon
   [1]
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -649,8 +649,8 @@
 
   $ hg merge -r 1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to 
abandon
   [1]
@@ -678,8 +678,8 @@
   $ hg resolve --unmark file1
   $ echo 'd' | hg resolve file1 --config ui.interactive=1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? d
   (no more unresolved files)
   $ hg resolve --list
   R file1
@@ -694,8 +694,8 @@
   $ hg resolve --unmark file1
   $ hg resolve file1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? u
   [1]
   $ [ -f file1 ] || echo "File does not exist?"
   $ hg resolve --list
@@ -708,8 +708,8 @@
   $ hg resolve --unmark file1
   $ hg resolve file1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? u
   [1]
   $ [ -f file1 ] || echo "File does not exist?"
   $ hg resolve --list
@@ -726,8 +726,8 @@
   $ hg update -qCr 1
   $ hg merge -r 2
   file 'file1' was deleted in other [merge rev] but was modified in local 
[working copy].
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to 
abandon
   [1]
@@ -755,8 +755,8 @@
   $ hg resolve --unmark file1
   $ echo 'd' | hg resolve file1 --config ui.interactive=1
   file 'file1' was deleted in other [merge rev] but was modified in local 
[working copy].
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? d
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? d
   (no more unresolved files)
   $ hg resolve --list
   R file1
@@ -771,8 +771,8 @@
   $ hg resolve --unmark file1
   $ hg resolve file1
   file 'file1' was deleted in other [merge rev] but was modified in local 
[working copy].
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
   [1]
   $ [ -f file1 ] || echo "File does not 

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[durin42 (Augie Fackler)]

durin42 added a comment.


  In D6562#95823 , @spectral wrote:
  
  > In D6562#95775 , @durin42 wrote:
  >
  >> I like this, but could I get you to add a patch 3 that introduces a 
develwarn for this?
  >
  > Done, and it found a couple other cases, but I'm not sure I like it (D6573 
) - non-English users might not be able 
to enable the devel warnings without getting a bunch of spam. I believe by the 
time we get to `ui.prompt()` we've already done the `_()` translation and it's 
in the target language?  Do we have any idea if anyone enables developer 
warnings outside of tests (which would typically be written in English, at 
least for core).
  > Unfortunately, I don't think it's something we could put in check-style.py 
either... we won't know that these are going to a prompt. Anyway, we can 
continue discussion on this on D6573 .
  
  Oh. Yeah, good point.
  
  Welp. I guess the best bet is to not land that last patch then. :(

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6562/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

To: spectral, #hg-reviewers
Cc: durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[spectral (Kyle Lippincott)]

spectral added a comment.


  Ah, a question: should this be lowercasing the first character of things? I 
think I copied this from somewhere where it did have an uppercase letter, but I 
wasn't consistent in my application of the leading uppercase letter.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6562/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

To: spectral, #hg-reviewers
Cc: durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[spectral (Kyle Lippincott)]

spectral added a comment.


  In D6562#95775 , @durin42 wrote:
  
  > I like this, but could I get you to add a patch 3 that introduces a 
develwarn for this?
  
  Done, and it found a couple other cases, but I'm not sure I like it (D6573 
) - non-English users might not be able 
to enable the devel warnings without getting a bunch of spam. I believe by the 
time we get to `ui.prompt()` we've already done the `_()` translation and it's 
in the target language?  Do we have any idea if anyone enables developer 
warnings outside of tests (which would typically be written in English, at 
least for core).
  
  Unfortunately, I don't think it's something we could put in check-style.py 
either... we won't know that these are going to a prompt. Anyway, we can 
continue discussion on this on D6573 .

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6562/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

To: spectral, #hg-reviewers
Cc: durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[durin42 (Augie Fackler)]

durin42 added a comment.


  I like this, but could I get you to add a patch 3 that introduces a develwarn 
for this?

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6562/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

To: spectral, #hg-reviewers
Cc: durin42, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6562: filemerge: make last line of prompts <40 english chars (issue6158)

[spectral (Kyle Lippincott)]

spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6562

AFFECTED FILES
  mercurial/filemerge.py
  tests/test-commit-amend.t
  tests/test-copy-move-merge.t
  tests/test-copytrace-heuristics.t
  tests/test-largefiles-update.t
  tests/test-lfconvert.t
  tests/test-merge-changedelete.t
  tests/test-merge-force.t
  tests/test-merge-remove.t
  tests/test-merge-subrepos.t
  tests/test-merge-tools.t
  tests/test-merge-types.t
  tests/test-rebase-newancestor.t
  tests/test-rename-merge2.t
  tests/test-resolve.t
  tests/test-sparse-merges.t

CHANGE DETAILS

diff --git a/tests/test-sparse-merges.t b/tests/test-sparse-merges.t
--- a/tests/test-sparse-merges.t
+++ b/tests/test-sparse-merges.t
@@ -114,8 +114,8 @@
   $ hg merge
   temporarily included 1 file(s) in the sparse checkout for merging
   file 'd' was deleted in other [merge rev] but was modified in local [working 
copy].
-  What do you want to do?
-  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+  What do you want to do? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to 
abandon
   [1]
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -649,8 +649,8 @@
 
   $ hg merge -r 1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? u
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to 
abandon
   [1]
@@ -678,8 +678,8 @@
   $ hg resolve --unmark file1
   $ echo 'd' | hg resolve file1 --config ui.interactive=1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? d
   (no more unresolved files)
   $ hg resolve --list
   R file1
@@ -694,8 +694,8 @@
   $ hg resolve --unmark file1
   $ hg resolve file1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? u
   [1]
   $ [ -f file1 ] || echo "File does not exist?"
   $ hg resolve --list
@@ -708,8 +708,8 @@
   $ hg resolve --unmark file1
   $ hg resolve file1
   file 'file1' was deleted in local [working copy] but was modified in other 
[merge rev].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or