This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6571

largefiles: make last line of prompts <40 english chars (issue6158)
ClosedPublic

Authored by spectral on Jun 24 2019, 7:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG421fdf30c37c: largefiles: make last line of prompts <40 english chars (issue6158)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Jun 24 2019, 7:27 PM
spectral added a commit: rHG421fdf30c37c: largefiles: make last line of prompts <40 english chars (issue6158).Jul 10 2019, 3:38 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG421fdf30c37c: largefiles: make last line of prompts <40 english chars (issue6158) (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15868

hgext/largefiles/overrides.py

ahash = lfutil.readasstandin(fca).lower() ahash = lfutil.readasstandin(fca).lower()
dhash = lfutil.readasstandin(fcd).lower() dhash = lfutil.readasstandin(fcd).lower()
ohash = lfutil.readasstandin(fco).lower() ohash = lfutil.readasstandin(fco).lower()
if (ohash != ahash and if (ohash != ahash and
ohash != dhash and ohash != dhash and
(dhash == ahash or (dhash == ahash or
repo.ui.promptchoice( repo.ui.promptchoice(
_('largefile %s has a merge conflict\nancestor was %s\n' _('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') % '$$ &Local $$ &Other') %
(lfutil.splitstandin(orig), ahash, dhash, ohash), (lfutil.splitstandin(orig), ahash, dhash, ohash),
0) == 1)): 0) == 1)):
repo.wwrite(fcd.path(), fco.data(), fco.flags()) repo.wwrite(fcd.path(), fco.data(), fco.flags())
return True, 0, False return True, 0, False
@eh.wrapfunction(copiesmod, 'pathcopies') @eh.wrapfunction(copiesmod, 'pathcopies')
def copiespathcopies(orig, ctx1, ctx2, match=None): def copiespathcopies(orig, ctx1, ctx2, match=None):

tests/test-largefiles-misc.t

Invoking status precommit hook Invoking status precommit hook
M f-different M f-different
M f-same M f-same
M f-unchanged-1 M f-unchanged-1
M f-unchanged-2 M f-unchanged-2
$ hg merge $ hg merge
largefile f-different has a merge conflict largefile f-different has a merge conflict
ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or you can keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a.
take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l what do you want to do? l
getting changed largefiles getting changed largefiles
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
0 files updated, 4 files merged, 0 files removed, 0 files unresolved 0 files updated, 4 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ cat f-different $ cat f-different
1 1
$ cat f-same $ cat f-same
1 1

tests/test-largefiles-update.t

$ hg commit -m '#3' $ hg commit -m '#3'
$ cat .hglf/large1 $ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b e5bb990443d6a92aaf7223813720f7566c9dd05b
$ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF $ hg merge --config debug.dirstate.delaywrite=2 --config ui.interactive=True <<EOF
> o > o
> EOF > EOF
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o what do you want to do? o
merging normal1 merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
getting changed largefiles getting changed largefiles
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
0 files updated, 1 files merged, 0 files removed, 1 files unresolved 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg status -A large1 $ hg status -A large1
$ mv .hg/largefiles/58e24f733a964da346e2407a2bee99d9001184f5 . $ mv .hg/largefiles/58e24f733a964da346e2407a2bee99d9001184f5 .
$ hg update -q -C 3 $ hg update -q -C 3
$ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF $ hg merge --config largefiles.usercache=not --config debug.dirstate.delaywrite=2 --tool :local --config ui.interactive=True <<EOF
> o > o
> EOF > EOF
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o what do you want to do? o
getting changed largefiles getting changed largefiles
large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob)
0 largefiles updated, 0 removed 0 largefiles updated, 0 removed
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg commit -m '1-2-3 testing' --config largefiles.usercache=not $ hg commit -m '1-2-3 testing' --config largefiles.usercache=not
large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from local store large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from local store
$ hg up -C . --config largefiles.usercache=not $ hg up -C . --config largefiles.usercache=not
$ hg update -q -C 2 $ hg update -q -C 2
$ echo 'large1 for linear merge (conflict)' > large1 $ echo 'large1 for linear merge (conflict)' > large1
$ hg update 3 --config ui.interactive=True <<EOF $ hg update 3 --config ui.interactive=True <<EOF
> o > o
> EOF > EOF
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? o what do you want to do? o
getting changed largefiles getting changed largefiles
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg status -A large1 $ hg status -A large1
C large1 C large1
$ cat large1 $ cat large1
large1 in #3 large1 in #3
$ cat .hglf/large1 $ cat .hglf/large1
e5bb990443d6a92aaf7223813720f7566c9dd05b e5bb990443d6a92aaf7223813720f7566c9dd05b
(linear merge with conflict, choosing "local") (linear merge with conflict, choosing "local")
$ hg update -q -C 2 $ hg update -q -C 2
$ echo 'large1 for linear merge (conflict)' > large1 $ echo 'large1 for linear merge (conflict)' > large1
$ hg update 3 --config debug.dirstate.delaywrite=2 $ hg update 3 --config debug.dirstate.delaywrite=2
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l what do you want to do? l
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg status -A large1 $ hg status -A large1
M large1 M large1
$ cat large1 $ cat large1
large1 for linear merge (conflict) large1 for linear merge (conflict)
$ cat .hglf/large1 $ cat .hglf/large1
ba94c2efe5b7c5e0af8d189295ce00553b0612b7 ba94c2efe5b7c5e0af8d189295ce00553b0612b7
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 5 changes to 5 files added 3 changesets with 5 changes to 5 files
new changesets 9530e27857f7:d65e59e952a9 (3 drafts) new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
remote turned local largefile large2 into a normal file remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
updated to "d65e59e952a9: #5" updated to "d65e59e952a9: #5"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg status -A large1 $ hg status -A large1
M large1 M large1
$ cat large1 $ cat large1
large1 for linear merge (conflict) large1 for linear merge (conflict)
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 5 changes to 5 files added 3 changesets with 5 changes to 5 files
new changesets 9530e27857f7:d65e59e952a9 (3 drafts) new changesets 9530e27857f7:d65e59e952a9 (3 drafts)
remote turned local largefile large2 into a normal file remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
updated to "d65e59e952a9: #5" updated to "d65e59e952a9: #5"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg status -A large1 $ hg status -A large1
M large1 M large1
$ cat large1 $ cat large1
large1 for linear merge (conflict) large1 for linear merge (conflict)
subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9)
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
subrepository sources for sub differ (in checked out version) subrepository sources for sub differ (in checked out version)
use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r
remote turned local largefile large2 into a normal file remote turned local largefile large2 into a normal file
keep (l)argefile or use (n)ormal file? l keep (l)argefile or use (n)ormal file? l
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or you can keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b.
take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l what do you want to do? l
2 files updated, 1 files merged, 0 files removed, 0 files unresolved 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R sub status -A sub/large1 $ hg -R sub status -A sub/large1
M sub/large1 M sub/large1
$ cat sub/large1 $ cat sub/large1
large1 for linear merge (conflict) large1 for linear merge (conflict)
$ cat sub/.hglf/large1 $ cat sub/.hglf/large1
$ cat large1 $ cat large1
large1 in #3 large1 in #3
$ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF $ hg rebase -s 1 -d 3 --keep --config ui.interactive=True <<EOF
> o > o
> EOF > EOF
rebasing 1:72518492caa6 "#1" rebasing 1:72518492caa6 "#1"
largefile large1 has a merge conflict largefile large1 has a merge conflict
ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64
keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.
take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5? o what do you want to do? o
merging normal1 merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark') warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cat .hglf/large1 $ cat .hglf/large1
58e24f733a964da346e2407a2bee99d9001184f5 58e24f733a964da346e2407a2bee99d9001184f5
$ cat large1 $ cat large1
large1 in #1 large1 in #1

tests/test-largefiles.t

adding file changes adding file changes
added 2 changesets with 4 changes to 4 files (+1 heads) added 2 changesets with 4 changes to 4 files (+1 heads)
new changesets a381d2c8c80e:598410d3eb9a (2 drafts) new changesets a381d2c8c80e:598410d3eb9a (2 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
2 largefiles cached 2 largefiles cached
$ hg merge $ hg merge
largefile sub/large4 has a merge conflict largefile sub/large4 has a merge conflict
ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or you can keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928.
take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l what do you want to do? l
getting changed largefiles getting changed largefiles
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
3 files updated, 1 files merged, 0 files removed, 0 files unresolved 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg commit -m "Merge repos e and f" $ hg commit -m "Merge repos e and f"
Invoking status precommit hook Invoking status precommit hook
M normal3 M normal3
M sub/normal4 M sub/normal4