##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r37803:b4d85bc1 default
r38817:bb54db4a @96 default
Show More
wireprotohelpers.sh
58 lines | 1.5 KiB | application/x-sh | BashLexer
/ tests / wireprotohelpers.sh
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500 HTTPV2=exp-http-v2-0001
Gregory Szorc
wireprotov2: change command response protocol to include a leading map...
r37743 MEDIATYPE=application/mercurial-exp-framing-0005
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500
sendhttpraw() {
hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/
}
Gregory Szorc
wireproto: crude support for version 2 HTTP peer...
r37501 sendhttpv2peer() {
Gregory Szorc
debugcommands: ability to suppress logging of handshake...
r37736 hg --verbose debugwireproto --nologhandshake --peer http2 http://$LOCALIP:$HGPORT/
}
sendhttpv2peerhandshake() {
Gregory Szorc
wireproto: crude support for version 2 HTTP peer...
r37501 hg --verbose debugwireproto --peer http2 http://$LOCALIP:$HGPORT/
}
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500 cat > dummycommands.py << EOF
from mercurial import (
wireprototypes,
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 wireprotov1server,
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 wireprotov2server,
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500 )
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 @wireprotov1server.wireprotocommand('customreadonly', permission='pull')
Gregory Szorc
wireproto: make @wireprotocommand version 1 only by default...
r37558 def customreadonlyv1(repo, proto):
return wireprototypes.bytesresponse(b'customreadonly bytes response')
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 @wireprotov2server.wireprotocommand('customreadonly', permission='pull')
Gregory Szorc
wireproto: make @wireprotocommand version 1 only by default...
r37558 def customreadonlyv2(repo, proto):
Gregory Szorc
wireprotov2: define response data as CBOR...
r37740 return wireprototypes.cborresponse(b'customreadonly bytes response')
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 @wireprotov1server.wireprotocommand('customreadwrite', permission='push')
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500 def customreadwrite(repo, proto):
return wireprototypes.bytesresponse(b'customreadwrite bytes response')
Gregory Szorc
wireproto: make @wireprotocommand version 1 only by default...
r37558
Gregory Szorc
wireproto: make version 2 @wireprotocommand an independent function...
r37798 @wireprotov2server.wireprotocommand('customreadwrite', permission='push')
Gregory Szorc
wireproto: make @wireprotocommand version 1 only by default...
r37558 def customreadwritev2(repo, proto):
Gregory Szorc
wireprotov2: define response data as CBOR...
r37740 return wireprototypes.cborresponse(b'customreadwrite bytes response')
Gregory Szorc
tests: extract wire protocol shell helpers to standalone file...
r37500 EOF
cat >> $HGRCPATH << EOF
[extensions]
drawdag = $TESTDIR/drawdag.py
EOF
enabledummycommands() {
cat >> $HGRCPATH << EOF
[extensions]
dummycommands = $TESTTMP/dummycommands.py
EOF
}
enablehttpv2() {
cat >> $1/.hg/hgrc << EOF
[experimental]
web.apiserver = true
web.api.http-v2 = true
EOF
}