mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
largefiles: use 'remote'/'local' in merge prompts like in other merge prompts
Prompts like foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? was not as clear as the usual prompts that use 'remote' or 'local' to explain what happened on which side ... especially not when used to the normal prompts. "as" could also indicate that it would be possible to take the content of the largefile and somehow put it into the normal file. It could make it more clear that it was a choice between one side or the other. For consistency we will now phrase it like: remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file?
This commit is contained in:
parent
fa135cf955
commit
3c628b9e09
@ -387,8 +387,8 @@ def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force,
|
||||
# the second parent
|
||||
lfile = splitstandin
|
||||
standin = f
|
||||
msg = _('%s has been turned into a largefile\n'
|
||||
'use (l)argefile or keep as (n)ormal file?'
|
||||
msg = _('remote turned local normal file %s into a largefile\n'
|
||||
'use (l)argefile or keep (n)ormal file?'
|
||||
'$$ &Largefile $$ &Normal file') % lfile
|
||||
if repo.ui.promptchoice(msg, 0) == 0:
|
||||
processed.append((lfile, "r", None, msg))
|
||||
@ -401,8 +401,8 @@ def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force,
|
||||
# the second parent
|
||||
standin = lfutil.standin(f)
|
||||
lfile = f
|
||||
msg = _('%s has been turned into a normal file\n'
|
||||
'keep as (l)argefile or use (n)ormal file?'
|
||||
msg = _('remote turned local largefile %s into a normal file\n'
|
||||
'keep (l)argefile or use (n)ormal file?'
|
||||
'$$ &Largefile $$ &Normal file') % lfile
|
||||
if repo.ui.promptchoice(msg, 0) == 0:
|
||||
processed.append((lfile, "r", None, msg))
|
||||
|
@ -28,8 +28,8 @@ $HOME/.cache/largefiles.
|
||||
Normal file in the working copy, keeping the normal version:
|
||||
|
||||
$ echo "n" | hg merge --config ui.interactive=Yes
|
||||
foo has been turned into a largefile
|
||||
use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
remote turned local normal file foo into a largefile
|
||||
use (l)argefile or keep (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
0 largefiles updated, 0 removed
|
||||
@ -42,8 +42,8 @@ Normal file in the working copy, keeping the largefile version:
|
||||
|
||||
$ hg update -q -C
|
||||
$ echo "l" | hg merge --config ui.interactive=Yes
|
||||
foo has been turned into a largefile
|
||||
use (l)argefile or keep as (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
remote turned local normal file foo into a largefile
|
||||
use (l)argefile or keep (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
1 largefiles updated, 0 removed
|
||||
@ -70,8 +70,8 @@ Largefile in the working copy, keeping the normal version:
|
||||
|
||||
$ hg update -q -C -r 1
|
||||
$ echo "n" | hg merge --config ui.interactive=Yes
|
||||
foo has been turned into a normal file
|
||||
keep as (l)argefile or use (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
remote turned local largefile foo into a normal file
|
||||
keep (l)argefile or use (n)ormal file? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
0 largefiles updated, 0 removed
|
||||
@ -98,8 +98,8 @@ Largefile in the working copy, keeping the largefile version:
|
||||
|
||||
$ hg update -q -C -r 1
|
||||
$ echo "l" | hg merge --config ui.interactive=Yes
|
||||
foo has been turned into a normal file
|
||||
keep as (l)argefile or use (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
remote turned local largefile foo into a normal file
|
||||
keep (l)argefile or use (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
1 largefiles updated, 0 removed
|
||||
@ -219,8 +219,8 @@ Ancestor: normal Parent: normal2 Parent: large result: ?
|
||||
$ hg merge -r large
|
||||
local changed f which remote deleted
|
||||
use (c)hanged version or (d)elete? c
|
||||
f has been turned into a largefile
|
||||
use (l)argefile or keep as (n)ormal file? l
|
||||
remote turned local normal file f into a largefile
|
||||
use (l)argefile or keep (n)ormal file? l
|
||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
@ -231,8 +231,8 @@ Ancestor: normal Parent: normal2 Parent: large result: ?
|
||||
$ hg up -Cqr normal2
|
||||
$ ( echo c; echo n ) | hg merge -r large --config ui.interactive=Yes
|
||||
local changed f which remote deleted
|
||||
use (c)hanged version or (d)elete? f has been turned into a largefile
|
||||
use (l)argefile or keep as (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
use (c)hanged version or (d)elete? remote turned local normal file f into a largefile
|
||||
use (l)argefile or keep (n)ormal file? 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
0 largefiles updated, 0 removed
|
||||
@ -255,8 +255,8 @@ swap
|
||||
$ hg merge -r normal2
|
||||
remote changed f which local deleted
|
||||
use (c)hanged version or leave (d)eleted? c
|
||||
f has been turned into a normal file
|
||||
keep as (l)argefile or use (n)ormal file? l
|
||||
remote turned local largefile f into a normal file
|
||||
keep (l)argefile or use (n)ormal file? l
|
||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
@ -267,8 +267,8 @@ swap
|
||||
$ hg up -Cqr large
|
||||
$ ( echo c; echo n ) | hg merge -r normal2 --config ui.interactive=Yes
|
||||
remote changed f which local deleted
|
||||
use (c)hanged version or leave (d)eleted? f has been turned into a normal file
|
||||
keep as (l)argefile or use (n)ormal file? 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
use (c)hanged version or leave (d)eleted? remote turned local largefile f into a normal file
|
||||
keep (l)argefile or use (n)ormal file? 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
0 largefiles updated, 0 removed
|
||||
@ -312,8 +312,8 @@ Ancestor: large Parent: large2 Parent: normal result: ?
|
||||
$ hg merge -r normal
|
||||
local changed .hglf/f which remote deleted
|
||||
use (c)hanged version or (d)elete? c
|
||||
f has been turned into a normal file
|
||||
keep as (l)argefile or use (n)ormal file? l
|
||||
remote turned local largefile f into a normal file
|
||||
keep (l)argefile or use (n)ormal file? l
|
||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
@ -337,8 +337,8 @@ swap
|
||||
$ hg merge -r large2
|
||||
remote changed .hglf/f which local deleted
|
||||
use (c)hanged version or leave (d)eleted? c
|
||||
f has been turned into a largefile
|
||||
use (l)argefile or keep as (n)ormal file? l
|
||||
remote turned local normal file f into a largefile
|
||||
use (l)argefile or keep (n)ormal file? l
|
||||
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
||||
(branch merge, don't forget to commit)
|
||||
getting changed largefiles
|
||||
|
Loading…
Reference in New Issue
Block a user