Mercurial > hg
comparison tests/failfilemerge.py @ 29774:a7f8939641aa
merge: use labels in prompts to the user
Now that we persist the labels, we can consistently use the labels in
prompts for the user without risk of confusion. This changes a huge amount
of command output:
This means that merge prompts like:
no tool found to merge a
keep (l)ocal, take (o)ther, or leave (u)nresolved? u
and
remote changed a which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
become:
no tool found to merge a
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u
and
remote [source] changed a which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
where "working copy" and "destination" were supplied by the command that
requested the merge as labels for conflict markers, and thus should be
human-friendly.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 12 Aug 2016 06:01:42 -0700 |
parents | 424c1632fffb |
children | 318a24b52eeb |
comparison
equal
deleted
inserted
replaced
29773:f2241c13d5a1 | 29774:a7f8939641aa |
---|---|
7 extensions, | 7 extensions, |
8 filemerge, | 8 filemerge, |
9 ) | 9 ) |
10 | 10 |
11 def failfilemerge(filemergefn, | 11 def failfilemerge(filemergefn, |
12 premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | 12 premerge, repo, mynode, orig, fcd, fco, fca, labels=None): |
13 raise error.Abort("^C") | 13 raise error.Abort("^C") |
14 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) | 14 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
15 | 15 |
16 def extsetup(ui): | 16 def extsetup(ui): |
17 extensions.wrapfunction(filemerge, '_filemerge', | 17 extensions.wrapfunction(filemerge, '_filemerge', |