lib/scmhelpers: reorder SCM detection waterfall
This reduces the need to invoke subprocessespull/1909/head
parent
8c0860588d
commit
9c1dbbcf12
|
|
@ -104,18 +104,18 @@ function scm {
|
||||||
SCM=$SCM_NONE
|
SCM=$SCM_NONE
|
||||||
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then
|
elif [[ -f .git/HEAD ]] && [[ -x "$GIT_EXE" ]]; then
|
||||||
SCM=$SCM_GIT
|
SCM=$SCM_GIT
|
||||||
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then
|
|
||||||
SCM=$SCM_GIT
|
|
||||||
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then
|
|
||||||
SCM=$SCM_P4
|
|
||||||
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then
|
elif [[ -d .hg ]] && [[ -x "$HG_EXE" ]]; then
|
||||||
SCM=$SCM_HG
|
SCM=$SCM_HG
|
||||||
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then
|
|
||||||
SCM=$SCM_HG
|
|
||||||
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then
|
elif [[ -d .svn ]] && [[ -x "$SVN_EXE" ]]; then
|
||||||
SCM=$SCM_SVN
|
SCM=$SCM_SVN
|
||||||
|
elif [[ -x "$GIT_EXE" ]] && [[ -n "$(git rev-parse --is-inside-work-tree 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_GIT
|
||||||
|
elif [[ -x "$HG_EXE" ]] && [[ -n "$(hg root 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_HG
|
||||||
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2> /dev/null)" ]]; then
|
elif [[ -x "$SVN_EXE" ]] && [[ -n "$(svn info --show-item wc-root 2> /dev/null)" ]]; then
|
||||||
SCM=$SCM_SVN
|
SCM=$SCM_SVN
|
||||||
|
elif [[ -x "$P4_EXE" ]] && [[ -n "$(p4 set P4CLIENT 2> /dev/null)" ]]; then
|
||||||
|
SCM=$SCM_P4
|
||||||
else
|
else
|
||||||
SCM=$SCM_NONE
|
SCM=$SCM_NONE
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue