view tests/run-tests @ 1335:bea6356b8bca

git -> hg conversion script

contrib/convert-repo changes:
- do not print verbose output so that error messages are seen more easily
- Output the date as integer and not as floating point number.
- Do not require a ".git" subdirectory to work on, but use the GIT_DIR
  environment var to specify the git repository.

Change is otherwise compatible to the current version and I have tested it
by converting the kernel and several git respositories from kernel.org.
(Btw, the udev test dir contains a /sys dir with entries which should not
be normal dirs and not be normal files. ;-)

Thanks again for mercurial,

Florian La Roche



--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -28,26 +28,18 @@
         self.path = path

     def getheads(self):
-        h = file(self.path + "/.git/HEAD").read()[:-1]
-        return [h]
+        return [file(self.path + "/HEAD").read()[:-1]]

     def catfile(self, rev, type):
         if rev == "0" * 40: raise IOError()
-        path = os.getcwd()
-        os.chdir(self.path)
-        fh = os.popen("git-cat-file %s %s 2>/dev/null" % (type, rev))
-        os.chdir(path)
+        fh = os.popen("GIT_DIR=%s git-cat-file %s %s 2>/dev/null" % (self.path, type, rev))
         return fh.read()

     def getfile(self, name, rev):
         return self.catfile(rev, "blob")

     def getchanges(self, version):
-        path = os.getcwd()
-        os.chdir(self.path)
-        fh = os.popen("git-diff-tree --root -m -r %s" % (version))
-        os.chdir(path)
-
+        fh = os.popen("GIT_DIR=%s git-diff-tree --root -m -r %s" % (self.path, version))
         changes = []
         for l in fh:
             if "\t" not in l: continue
@@ -83,9 +75,9 @@

     def gettags(self):
         tags = {}
-        for f in os.listdir(self.path + "/.git/refs/tags"):
+        for f in os.listdir(self.path + "/refs/tags"):
             try:
-                h = file(self.path + "/.git/refs/tags/" + f).read().strip()
+                h = file(self.path + "/refs/tags/" + f).read().strip()
                 tags[f] = h
             except:
                 pass
@@ -99,8 +91,7 @@

     def getheads(self):
         h = self.repo.changelog.heads()
-        h = [ hg.hex(x) for x in h ]
-        return h
+        return [ hg.hex(x) for x in h ]

     def putfile(self, f, e, data):
         self.repo.wfile(f, "w").write(data)
@@ -155,12 +146,12 @@
         newlines.sort()

         if newlines != oldlines:
-            print "updating tags"
+            #print "updating tags"
             f = self.repo.wfile(".hgtags", "w")
             f.write("".join(newlines))
             f.close()
             if not oldlines: self.repo.add([".hgtags"])
-            date = "%s 0" % time.mktime(time.gmtime())
+            date = "%s 0" % int(time.mktime(time.gmtime()))
             self.repo.rawcommit([".hgtags"], "update tags", "convert-repo",
                                 date, self.repo.changelog.tip(), hg.nullid)

@@ -262,7 +253,7 @@
             num -= 1
             if c in self.map: continue
             desc = self.commitcache[c][3].splitlines()[0]
-            print num, desc
+            #print num, desc
             self.copy(c)

         tags = self.source.gettags()
@@ -275,6 +266,8 @@
         self.dest.puttags(ctags)

 gitpath, hgpath, mapfile = sys.argv[1:]
+if os.path.isdir(gitpath + "/.git"):
+    gitpath += "/.git"

 c = convert(convert_git(gitpath), convert_mercurial(hgpath), mapfile)
 c.convert()
_______________________________________________
Mercurial mailing list
[e-mail]
http://selenic.com/mailman/listinfo/mercurial

#!/bin/sh -e

LANG="C"; export LANG
LC_CTYPE="C"; export LC_CTYPE
LC_NUMERIC="C"; export LC_NUMERIC
LC_TIME="C"; export LC_TIME
LC_COLLATE="C"; export LC_COLLATE
LC_MONETARY="C"; export LC_MONETARY
LC_MESSAGES="C"; export LC_MESSAGES
LC_PAPER="C"; export LC_PAPER
LC_NAME="C"; export LC_NAME
LC_ADDRESS="C"; export LC_ADDRESS
LC_TELEPHONE="C"; export LC_TELEPHONE
LC_MEASUREMENT="C"; export LC_MEASUREMENT
LC_IDENTIFICATION="C"; export LC_IDENTIFICATION
LC_ALL=""; export LC_ALL
TZ=GMT; export TZ
HGEDITOR=true; export HGEDITOR
HGMERGE=true; export HGMERGE
HGUSER="test"; export HGUSER

umask 022

tests=0
failed=0

HGTMP=""
cleanup_exit() {
    rm -rf "$HGTMP"
}

# Remove temporary files even if we get interrupted
trap "cleanup_exit" 0 # normal exit
trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM

HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
(umask 077 && mkdir "$HGTMP") || {
    echo "Could not create temporary directory! Exiting." 1>&2
    exit 1
}

TESTDIR="$PWD"

if [ -d /usr/lib64 ]; then
    lib=lib64
else
    lib=lib
fi

INST="$HGTMP/install"
cd ..
if ${PYTHON-python} setup.py install --home="$INST" > tests/install.err 2>&1
then
    rm tests/install.err
else
    cat tests/install.err
    exit 1
fi
cd "$TESTDIR"

PATH="$INST/bin:$PATH"; export PATH
PYTHONPATH="$INST/$lib/python"; export PYTHONPATH


run_one() {
    rm -f "$1.err"

    mkdir "$HGTMP/$1"
    cd "$HGTMP/$1"
    fail=0
    HOME="$HGTMP/$1"; export HOME
    OUT="$HGTMP/$1.out"
    OUTOK="$TESTDIR/$1.out"
    ERR="$TESTDIR/$1.err"

    if "$TESTDIR/$1" > "$OUT" 2>&1; then
	: no error
    else
	echo "$1 failed with error code $?"
	fail=1
    fi

    if [ -s "$OUT" -a ! -s "$OUTOK" ] ; then
	cp "$OUT" "$ERR"
	echo
	echo "$1 generated unexpected output:"
	cat "$ERR"
	fail=1
    elif [ -r "$OUTOK" ]; then
	if diff -u "$OUTOK" "$OUT" > /dev/null; then
	    : no differences
	else
	    cp "$OUT" "$ERR"
	    echo
	    echo "$1 output changed:"
	    diff -u "$OUTOK" "$ERR" || true
	    fail=1
	fi
    fi

    cd "$TESTDIR"
    rm -f "$HGTMP/$1.out"
    rm -rf "$HGTMP/$1"
    return $fail
}

# list of prerequisite programs
# stuff from coreutils (cat, rm, etc) are not tested
prereqs="python merge diff grep unzip md5sum gunzip sed"
missing=''
for pre in $prereqs ; do
    if type $pre > /dev/null 2>&1 ; then
        : prereq exists
    else
        missing="$pre $missing"
    fi
done

if [ "$missing" != ''  ] ; then
    echo "ERROR: the test suite needs some programs to execute correctly."
    echo "The following programs are missing: "
    for pre in $missing; do
        echo "   $pre"
    done
    exit 1
fi

TESTS="$*"
if [ -z "$TESTS" ] ; then
    TESTS=`ls test-* | grep -v "[.~]"`
fi

for f in $TESTS ; do
    echo -n "."
    run_one $f || failed=`expr $failed + 1`
    tests=`expr $tests + 1`
done

echo
echo "Ran $tests tests, $failed failed."

if [ $failed -gt 0 ] ; then
    exit 1
fi
exit 0