8238918: idea.sh should work with both mercurial and git repos

Reviewed-by: erikj, mcimadamore, ehelin, lancea
This commit is contained in:
Roger Riggs 2020-02-12 09:38:59 -05:00
parent 411766b6bb
commit a239c475cf
2 changed files with 15 additions and 2 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -113,6 +113,18 @@ if [ "x$SPEC" = "x" ] ; then
echo "FATAL: SPEC is empty" >&2; exit 1 echo "FATAL: SPEC is empty" >&2; exit 1
fi fi
if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
VCS_TYPE="hg4idea"
fi
if [ -d "$TOPLEVEL_DIR/.git" ] ; then
VCS_TYPE="Git"
fi
if [ "x$VCS_TYPE" = "x" ] ; then
echo "FATAL: VCS_TYPE is empty" >&2; exit 1
fi
### Replace template variables ### Replace template variables
NUM_REPLACEMENTS=0 NUM_REPLACEMENTS=0
@ -137,6 +149,7 @@ add_replacement() {
} }
add_replacement "###MODULE_NAMES###" "$MODULE_NAMES" add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
add_replacement "###VCS_TYPE###" "$VCS_TYPE"
SPEC_DIR=`dirname $SPEC` SPEC_DIR=`dirname $SPEC`
if [ "x$CYGPATH" = "x" ]; then if [ "x$CYGPATH" = "x" ]; then
add_replacement "###BUILD_DIR###" "$SPEC_DIR" add_replacement "###BUILD_DIR###" "$SPEC_DIR"

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="###ROOT_DIR###" vcs="hg4idea" /> <mapping directory="###ROOT_DIR###" vcs="###VCS_TYPE###" />
</component> </component>
</project> </project>