mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
98d9269874
Summary: Create a fork of the Mercurial code that we can use to build server rpms. The hg servers will continue to exist for a few more months while we move the darkstorm and ediscovery use cases off them. In the mean time, we want to start making breaking changes to the client, so let's create a stable copy of the hg code to produce rpms for the hg servers. The fork is based off c7770c78d, the latest hg release. This copies the files as is, then adds some minor tweaks to get it to build: - Disables some lint checks that appear to be bypassed by path - sed replace eden/scm with eden/hg-server - Removed a dependency on scm/telemetry from the edenfs-client tests since scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts with the hg-server conflict parser. allow-large-files Reviewed By: quark-zju Differential Revision: D27632557 fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
70 lines
1.9 KiB
Bash
Executable File
70 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Script to get stable diff output on any platform.
|
|
#
|
|
# Output of this script is almost equivalent to GNU diff with "-Nru".
|
|
#
|
|
# Use this script as "hg pdiff" via extdiff extension with preparation
|
|
# below in test scripts:
|
|
#
|
|
# $ cat >> $HGRCPATH <<EOF
|
|
# > [extdiff]
|
|
# > pdiff = sh "$RUNTESTDIR/pdiff"
|
|
# > EOF
|
|
|
|
filediff(){
|
|
# USAGE: filediff file1 file2 [header]
|
|
|
|
# compare with /dev/null if file doesn't exist (as "-N" option)
|
|
file1="$1"
|
|
if test ! -f "$file1"; then
|
|
file1=/dev/null
|
|
fi
|
|
file2="$2"
|
|
if test ! -f "$file2"; then
|
|
file2=/dev/null
|
|
fi
|
|
|
|
if cmp -s "$file1" "$file2" 2> /dev/null; then
|
|
# Return immediately, because comparison isn't needed. This
|
|
# also avoids redundant message of diff like "No differences
|
|
# encountered" (on Solaris)
|
|
return
|
|
fi
|
|
|
|
if test -n "$3"; then
|
|
# show header only in recursive case
|
|
echo "$3"
|
|
fi
|
|
|
|
# replace "/dev/null" by corresponded filename (as "-N" option)
|
|
diff -u "$file1" "$file2" |
|
|
sed "s@^--- /dev/null\(.*\)\$@--- $1\1@" |
|
|
sed "s@^\+\+\+ /dev/null\(.*\)\$@+++ $2\1@"
|
|
|
|
# in this case, files differ from each other
|
|
return 1
|
|
}
|
|
|
|
if test -d "$1" -o -d "$2"; then
|
|
# ensure comparison in dictionary order
|
|
(
|
|
if test -d "$1"; then (cd "$1" && find . -type f); fi
|
|
if test -d "$2"; then (cd "$2" && find . -type f); fi
|
|
) |
|
|
sed 's@^\./@@g' | sort | uniq |
|
|
while read file; do
|
|
filediff "$1/$file" "$2/$file" "diff -Nru $1/$file $2/$file"
|
|
done
|
|
|
|
# TODO: there is no portable way for current while-read based
|
|
# implementation to return 1 at detecting changes.
|
|
#
|
|
# On bash and dash, assignment to variable inside while-block
|
|
# doesn't affect outside, because inside while-block is executed
|
|
# in sub-shell. BTW, it affects outside while-block on ksh (as sh
|
|
# on Solaris).
|
|
else
|
|
filediff "$1" "$2"
|
|
fi
|