Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Mac compatibility #63

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve Mac compatibility #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion git-remote-hg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
#
# Copyright (c) 2012 Felipe Contreras
#
Expand Down
2 changes: 1 addition & 1 deletion test/bidi.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ then
test_done
fi

if ! python2 -c 'import mercurial' > /dev/null 2>&1
if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
Expand Down
8 changes: 4 additions & 4 deletions test/hg-git.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ then
test_done
fi

if ! python2 -c 'import mercurial' > /dev/null 2>&1
if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
fi

if python2 -c 'import hggit' > /dev/null 2>&1
if python -c 'import hggit' > /dev/null 2>&1
then
hggit=hggit
elif python2 -c 'import hgext.git' > /dev/null 2>&1
elif python -c 'import hgext.git' > /dev/null 2>&1
then
hggit=hgext.git
else
skip_all='skipping remote-hg tests; hg-git not available'
test_done
fi

hg_version=$(python2 -c 'from mercurial import util; print util.version()')
hg_version=$(python -c 'from mercurial import util; print util.version()')

case $hg_version in
3.0*+*)
Expand Down
2 changes: 1 addition & 1 deletion test/main.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ then
test_done
fi

if ! python2 -c 'import mercurial' > /dev/null 2>&1
if ! python -c 'import mercurial' > /dev/null 2>&1
then
skip_all='skipping remote-hg tests; mercurial not available'
test_done
Expand Down