##// END OF EJS Templates
bundle1: fix bundle1-denied reporting for push over ssh...
bundle1: fix bundle1-denied reporting for push over ssh Changeset b288fb2724bf introduced a config option to have the server deny push using bundle1. The original protocol has not really be design to allow such kind of error reporting so some hack was used. It turned the hack only works on HTTP and that ssh wire peer hangs forever when the same hack is used. After further digging, there is no way to report the error in a unified way. Using 'ooberror' freeze ssh and raising 'Abort' makes HTTP return a HTTP500 without further details. So with sadness we implement a version that dispatch according to the protocol used. We also add a test for pushing over ssh to make sure we won't regress in the future. That test show that the hint is missing, this is another bug fixed in the next changeset.

File last commit:

r16556:f9262456 stable
r30909:d554e624 stable
Show More
9diff
42 lines | 1.0 KiB | text/plain | TextLexer
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 #!/bin/rc
# 9diff - Mercurial extdiff wrapper for diff(1)
rfork e
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 fn getfiles {
cd $1 &&
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 for(f in `{du -as | awk '{print $2}'})
test -f $f && echo `{cleanname $f}
}
Steven Stallion
plan9: mkfile and 9diff fixes...
r16556 fn usage {
Steven Stallion
plan9: initial support for plan 9 from bell labs...
r16383 echo >[1=2] usage: 9diff [diff options] parent child root
exit usage
}
opts=()
while(~ $1 -*){
opts=($opts $1)
shift
}
if(! ~ $#* 3)
usage
# extdiff will set the parent and child to a single file if there is
# only one change. If there are multiple changes, directories will be
# set. diff(1) does not cope particularly with directories; instead we
# do the recursion ourselves and diff each file individually.
if(test -f $1)
diff $opts $1 $2
if not{
# extdiff will create a snapshot of the working copy to prevent
# conflicts during the diff. We circumvent this behavior by
# diffing against the repository root to produce plumbable
# output. This is antisocial.
for(f in `{sort -u <{getfiles $1} <{getfiles $2}}){
file1=$1/$f; test -f $file1 || file1=/dev/null
file2=$3/$f; test -f $file2 || file2=/dev/null
diff $opts $file1 $file2
}
}
exit ''