equal
deleted
inserted
replaced
931 > ssh="$PYTHON" "$TESTDIR/dummyssh" |
931 > ssh="$PYTHON" "$TESTDIR/dummyssh" |
932 > EOF |
932 > EOF |
933 |
933 |
934 $ cat >> $TESTTMP/locktester.py <<EOF |
934 $ cat >> $TESTTMP/locktester.py <<EOF |
935 > import os |
935 > import os |
936 > from mercurial import extensions, bundle2, util |
936 > from mercurial import extensions, bundle2, error |
937 > def checklock(orig, repo, *args, **kwargs): |
937 > def checklock(orig, repo, *args, **kwargs): |
938 > if repo.svfs.lexists("lock"): |
938 > if repo.svfs.lexists("lock"): |
939 > raise util.Abort("Lock should not be taken") |
939 > raise error.Abort("Lock should not be taken") |
940 > return orig(repo, *args, **kwargs) |
940 > return orig(repo, *args, **kwargs) |
941 > def extsetup(ui): |
941 > def extsetup(ui): |
942 > extensions.wrapfunction(bundle2, 'processbundle', checklock) |
942 > extensions.wrapfunction(bundle2, 'processbundle', checklock) |
943 > EOF |
943 > EOF |
944 |
944 |