# into the libgo library. This does the easy stuff; the hard stuff is
# left to the user.
-# The file MERGE should hold the Mercurial revision number of the last
+# The file MERGE should hold the Git revision number of the last
# revision which was merged into these sources. Given that, and given
# the current sources, we can run the usual diff3 algorithm to merge
# all changes into our sources.
exit 1
fi
-if test $# -ne 1; then
- echo 1>&2 "merge.sh: Usage: merge.sh mercurial-repository"
+rev=weekly
+case $# in
+1) ;;
+2) rev=$2 ;;
+*)
+ echo 1>&2 "merge.sh: Usage: merge.sh git-repository [revision]"
exit 1
-fi
+ ;;
+esac
repository=$1
old_rev=`sed 1q MERGE`
rm -rf ${OLDDIR}
-hg clone -r ${old_rev} ${repository} ${OLDDIR}
+git clone ${repository} ${OLDDIR}
+(cd ${OLDDIR} && git checkout ${old_rev})
rm -rf ${NEWDIR}
-hg clone -u release ${repository} ${NEWDIR}
+git clone ${repository} ${NEWDIR}
+(cd ${NEWDIR} && git checkout ${rev})
-new_rev=`cd ${NEWDIR} && hg log | sed 1q | sed -e 's/.*://'`
+new_rev=`cd ${NEWDIR} && git log | sed 1q | sed -e 's/commit //'`
merge() {
name=$1
old=$2
new=$3
libgo=$4
- if ! test -f ${new}; then
+ if test -d ${new}; then
+ if ! test -d ${old}; then
+ if test -f ${old}; then
+ echo 1>&2 "merge.sh: ${name}: FILE BECAME DIRECTORY"
+ fi
+ fi
+ elif ! test -f ${new}; then
# The file does not exist in the new version.
if ! test -f ${old}; then
echo 1>&2 "merge.sh internal error no files $old $new"
else
echo "merge.sh: ${name}: REMOVED"
rm -f ${libgo}
- hg rm ${libgo}
fi
elif test -f ${old}; then
# The file exists in the old version.
if ! test -f ${libgo}; then
- echo "merge.sh: $name: skipping: exists in old and new hg, but not in libgo"
- continue
+ if ! cmp -s ${old} ${new}; then
+ echo "merge.sh: $name: skipping: exists in old and new git, but not in libgo"
+ fi
+ return
fi
if cmp -s ${old} ${libgo}; then
# The libgo file is unchanged from the old version.
if cmp -s ${new} ${libgo}; then
# File is unchanged from old to new version.
- continue
+ return
fi
# Update file in libgo.
echo "merge.sh: $name: updating"
1)
echo "merge.sh: $name: CONFLICTS"
mv ${libgo}.tmp ${libgo}
- hg resolve -u ${libgo}
;;
*)
- echo 1>&2 "merge.sh: $name: diff3 failure"
- exit 1
+ echo 1>&2 "merge.sh: $name: DIFF3 FAILURE"
;;
esac
fi
mkdir -p ${dir}
fi
cp ${new} ${libgo}
- hg add ${libgo}
fi
fi
}
-(cd ${NEWDIR}/src/pkg && find . -name '*.go' -print) | while read f; do
- if test `dirname $f` = "./syscall"; then
+echo ${rev} > VERSION
+
+(cd ${NEWDIR}/src && find . -name '*.go' -print) | while read f; do
+ skip=false
+ case "$f" in
+ ./cmd/buildid/* | ./cmd/cgo/* | ./cmd/go/* | ./cmd/gofmt/* | ./cmd/test2json/* | ./cmd/vet/* | ./cmd/internal/browser/* | ./cmd/internal/buildid/* | ./cmd/internal/codesign/* | ./cmd/internal/edit/* | ./cmd/internal/objabi/* | ./cmd/internal/quoted/* | ./cmd/internal/test2json/* | ./cmd/internal/sys/* | ./cmd/internal/traceviewer/* | ./cmd/vendor/golang.org/x/tools/* | ./cmd/vendor/golang.org/x/mod/* | ./cmd/vendor/golang.org/x/xerrors/* | ./cmd/vendor/golang.org/x/crypto/ed25519 | ./cmd/vendor/golang.org/x/sync/semaphore)
+ ;;
+ ./cmd/*)
+ skip=true
+ ;;
+ ./runtime/race/*)
+ skip=true
+ ;;
+ esac
+ if test "$skip" = "true"; then
continue
fi
- oldfile=${OLDDIR}/src/pkg/$f
- newfile=${NEWDIR}/src/pkg/$f
+
+ oldfile=${OLDDIR}/src/$f
+ newfile=${NEWDIR}/src/$f
+ libgofile=go/`echo $f | sed -e 's|cmd/vendor/|/|' | sed -e 's|/vendor/|/|'`
+ merge $f ${oldfile} ${newfile} ${libgofile}
+done
+
+(cd ${NEWDIR}/src && find . -name 'go.mod' -print) | while read f; do
+ oldfile=${OLDDIR}/src/$f
+ newfile=${NEWDIR}/src/$f
+ libgofile=go/`echo $f | sed -e 's|cmd/vendor/|/|' | sed -e 's|/vendor/|/|'`
+ merge $f ${oldfile} ${newfile} ${libgofile}
+done
+
+(cd ${NEWDIR}/src && find . -name 'modules.txt' -print) | while read f; do
+ oldfile=${OLDDIR}/src/$f
+ newfile=${NEWDIR}/src/$f
libgofile=go/$f
merge $f ${oldfile} ${newfile} ${libgofile}
done
-(cd ${NEWDIR}/src/pkg && find . -name testdata -print) | while read d; do
- oldtd=${OLDDIR}/src/pkg/$d
- newtd=${NEWDIR}/src/pkg/$d
- libgotd=go/$d
+(cd ${NEWDIR}/src && find . -name testdata -print) | while read d; do
+ skip=false
+ case "$d" in
+ ./cmd/buildid/* | ./cmd/cgo/* | ./cmd/go/* | ./cmd/gofmt/* | ./cmd/test2json/* | ./cmd/vet/* | ./cmd/internal/browser/* | ./cmd/internal/buildid/* | ./cmd/internal/codesign/* | ./cmd/internal/diff/* | ./cmd/internal/edit/* | ./cmd/internal/objabi/* | ./cmd/internal/test2json/* | ./cmd/internal/sys/* | ./cmd/internal/traceviewer/* | ./cmd/vendor/golang.org/x/tools/*)
+ ;;
+ ./cmd/*)
+ skip=true
+ ;;
+ ./runtime/race/* | ./runtime/cgo/*)
+ skip=true
+ ;;
+ esac
+ if test "$skip" = "true"; then
+ continue
+ fi
+
+ oldtd=${OLDDIR}/src/$d
+ newtd=${NEWDIR}/src/$d
+ libgotd=go/`echo $d | sed -e 's|cmd/vendor/|/|' | sed -e 's|/vendor/|/|'`
if ! test -d ${oldtd}; then
+ echo "merge.sh: $d: NEWDIR"
continue
fi
- (cd ${oldtd} && hg status -A .) | while read f; do
- if test "`basename $f`" = ".hgignore"; then
+ (cd ${oldtd} && git ls-files .) | while read f; do
+ if test "`basename -- $f`" = ".gitignore"; then
continue
fi
- f=`echo $f | sed -e 's/^..//'`
name=$d/$f
oldfile=${oldtd}/$f
newfile=${newtd}/$f
libgofile=${libgotd}/$f
merge ${name} ${oldfile} ${newfile} ${libgofile}
done
+ (cd ${newtd} && git ls-files .) | while read f; do
+ if test "`basename -- $f`" = ".gitignore"; then
+ continue
+ fi
+ oldfile=${oldtd}/$f
+ if ! test -f ${oldfile}; then
+ name=$d/$f
+ newfile=${newtd}/$f
+ libgofile=${libgotd}/$f
+ merge ${name} ${oldfile} ${newfile} ${libgofile}
+ fi
+ done
done
-runtime="goc2c.c mcache.c mcentral.c mfinal.c mfixalloc.c mgc0.c mheap.c msize.c malloc.h malloc.goc mprof.goc"
-for f in $runtime; do
- oldfile=${OLDDIR}/src/pkg/runtime/$f
- newfile=${NEWDIR}/src/pkg/runtime/$f
- libgofile=runtime/$f
+(cd ${NEWDIR}/misc/cgo && find . -type f -print) | while read f; do
+ oldfile=${OLDDIR}/misc/cgo/$f
+ newfile=${NEWDIR}/misc/cgo/$f
+ libgofile=misc/cgo/$f
merge $f ${oldfile} ${newfile} ${libgofile}
done
-(cd ${OLDDIR}/src/pkg && find . -name '*.go' -print) | while read f; do
- oldfile=${OLDDIR}/src/pkg/$f
- newfile=${NEWDIR}/src/pkg/$f
+(cd ${OLDDIR}/src && find . -name '*.go' -print) | while read f; do
+ oldfile=${OLDDIR}/src/$f
+ newfile=${NEWDIR}/src/$f
libgofile=go/$f
if test -f ${newfile}; then
continue
fi
echo "merge.sh: ${libgofile}: REMOVED"
rm -f ${libgofile}
- hg rm ${libgofile}
+done
+
+(cd ${OLDDIR}/misc/cgo && find . -type f -print) | while read f; do
+ oldfile=${OLDDIR}/misc/cgo/$f
+ newfile=${NEWDIR}/misc/cgo/$f
+ libgofile=misc/cgo/$f
+ if test -f ${newfile}; then
+ continue
+ fi
+ if ! test -f ${libgofile}; then
+ continue
+ fi
+ echo "merge.sh: ${libgofile}: REMOVED"
+ rm -f ${libgofile}
done
(echo ${new_rev}; sed -ne '2,$p' MERGE) > MERGE.tmp
projects / thirdparty / gcc.git / blobdiff