largefiles: make last line of prompts <40 english chars (issue6158)
Differential Revision: https://phab.mercurial-scm.org/D6571
--- a/hgext/largefiles/overrides.py Sun Jun 30 18:32:43 2019 +0900
+++ b/hgext/largefiles/overrides.py Mon Jun 24 16:00:39 2019 -0700
@@ -545,7 +545,8 @@
(dhash == ahash or
repo.ui.promptchoice(
_('largefile %s has a merge conflict\nancestor was %s\n'
- 'keep (l)ocal %s or\ntake (o)ther %s?'
+ 'you can keep (l)ocal %s or take (o)ther %s.\n'
+ 'what do you want to do?'
'$$ &Local $$ &Other') %
(lfutil.splitstandin(orig), ahash, dhash, ohash),
0) == 1)):
--- a/tests/test-largefiles-misc.t Sun Jun 30 18:32:43 2019 +0900
+++ b/tests/test-largefiles-misc.t Mon Jun 24 16:00:39 2019 -0700
@@ -957,8 +957,8 @@
$ hg merge
largefile f-different has a merge conflict
ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
- keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or
- take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l
+ you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a.
+ what do you want to do? l
getting changed largefiles
1 largefiles updated, 0 removed
0 files updated, 4 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-largefiles-update.t Sun Jun 30 18:32:43 2019 +0900
+++ b/tests/test-largefiles-update.t Mon Jun 24 16:00:39 2019 -0700
@@ -133,8 +133,8 @@
> EOF
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
- take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+ you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
+ what do you want to do? o
merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
getting changed largefiles
@@ -161,8 +161,8 @@
> EOF
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
- take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+ you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
+ what do you want to do? o
getting changed largefiles
large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob)
0 largefiles updated, 0 removed
@@ -361,8 +361,8 @@
> EOF
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
- take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o
+ you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
+ what do you want to do? o
getting changed largefiles
1 largefiles updated, 0 removed
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -380,8 +380,8 @@
$ hg update 3 --config debug.dirstate.delaywrite=2
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
- take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+ you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
+ what do you want to do? l
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg status -A large1
M large1
@@ -461,8 +461,8 @@
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
- take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+ you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
+ what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
updated to "d65e59e952a9: #5"
1 other heads for branch "default"
@@ -497,8 +497,8 @@
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
- take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+ you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
+ what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
updated to "d65e59e952a9: #5"
1 other heads for branch "default"
@@ -552,8 +552,8 @@
keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or
- take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l
+ you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
+ what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -587,8 +587,8 @@
rebasing 1:72518492caa6 "#1"
largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
- keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or
- take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o
+ you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
+ what do you want to do? o
merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
--- a/tests/test-largefiles.t Sun Jun 30 18:32:43 2019 +0900
+++ b/tests/test-largefiles.t Mon Jun 24 16:00:39 2019 -0700
@@ -1701,8 +1701,8 @@
$ hg merge
largefile sub/large4 has a merge conflict
ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
- keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
- take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
+ you can keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928.
+ what do you want to do? l
getting changed largefiles
1 largefiles updated, 0 removed
3 files updated, 1 files merged, 0 files removed, 0 files unresolved