Merge pull request #75 from paliarush/Unversioned-Files-After-Ee-Linking

Unversioned files after ee linking

Author: paliarush

CHANGELOG.md

@@ -12,8 +12,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+ - After EE is linked, EE versions of composer.lock and composer.json are replaced back with CE versions (thus are not marked by git as modified)
+
 ### Fixed
 
+ - Fixed issue with some files marked as unversioned in git after EE linking
  - It is now possible to use spaces in path to vagrant project on Windows. On OSX and Linux hosts it works in non-NFS mode, in NFS mode it does not work because of [bug in vagrant](mitchellh/vagrant#7540)
  - Fixed issue with MySQL being down after VM power off
 

etc/config.yaml.dist

@@ -1,5 +1,5 @@
 repository_url:
-  # [To apply changes: init-project -fc]
+  # [To apply changes: init_project.sh -fc]
   # git@github.com:magento/magento2ce.git OR custom one
   ce: "git@github.com:magento/magento2.git"
   # git@github.com:magento/magento2ee.git OR custom one
@@ -9,7 +9,7 @@ repository_url:
   # git@github.com:magento/magento2-sample-data-ee.git OR custom one
   ee_sample_data: ""
 guest:
-  # [To apply changes: init-project -f]
+  # [To apply changes: init_project.sh -f]
   # NFS will be used for folder synchronization on *nix and OSX hosts by default.
   use_nfs: 1
   # Default is 2Gb, around 3Gb is necessary to run functional tests.
@@ -30,7 +30,7 @@ environment:
 magento:
   # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f]
   install_sample_data: 0
-  # [To apply changes: init-project -f]
+  # [To apply changes: init_project.sh -f]
   host_name: "magento2.vagrant2"
   # [To apply changes: m-reinstall]
   admin_frontname: "admin"

m-switch-to-ce

@@ -31,8 +31,9 @@ else
         exit 0
     fi
 
-    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=unlink --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}"
+    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=unlink --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true
 
+    # TODO: Remove after some time. For now this is left for backward compatibility
     cd ${magento_ce_dir}
     git checkout composer.json
     git checkout composer.lock

m-switch-to-ee

@@ -31,9 +31,8 @@ else
         exit 0
     fi
 
-    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}"
+    ${php_executable} -f ${magento_ee_dir}/dev/tools/build-ee.php -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true
 
-    cp ${magento_ee_dir}/composer.json ${magento_ce_dir}/composer.json
     cp ${magento_ee_dir}/composer.lock ${magento_ce_dir}/composer.lock
 
     if [[ ${host_os} == "Windows" ]] || [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs") == 0 ]]; then
@@ -55,6 +54,9 @@ bash "${vagrant_dir}/scripts/host/relink_sample_data.sh"
 bash "${vagrant_dir}/m-clear-cache"
 bash "${vagrant_dir}/m-composer" install
 
+cd ${magento_ce_dir}
+git checkout composer.lock
+
 echo "Magento installation..."
 if [[ ${host_os} == "Windows" ]] || [[ $(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs") == 0 ]]; then
     read -p "Wait while Magento2 code is uploaded in PhpStorm and press any key to continue..." -n1 -s

scripts/host/relink_sample_data.sh

@@ -19,21 +19,21 @@ fi
 
 # As a precondition, disable CE sample data
 if [[ -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" ]]; then
-    ${php_executable} -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}"
+    ${php_executable} -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" --exclude=true
     set +x
     echo "CE Sample data disabled"
     set -x
 fi
 # As a precondition, disable EE sample data
 if [[ -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" ]]; then
-    "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}"
+    "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=unlink --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" --exclude=true
     set +x
     echo "EE Sample data disabled"
     set -x
 fi
 
 if [[ ${install_ee} -eq 1 ]]; then
-    "${php_executable}" -f "${magento_ee_dir}/dev/tools/build-ee.php" -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}"
+    "${php_executable}" -f "${magento_ee_dir}/dev/tools/build-ee.php" -- --command=link --ee-source="${magento_ee_dir}" --ce-source="${magento_ce_dir}" --exclude=true
 fi
 
 if [[ ${install_sample_data} -eq 1 ]]; then
@@ -49,7 +49,7 @@ if [[ ${install_sample_data} -eq 1 ]]; then
         set +x
         echo "CE Sample data enabled"
         set -x
-        "${php_executable}" -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}"
+        "${php_executable}" -f "${magento_ce_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ce_sample_data_dir}" --exclude=true
     fi
 
     if [[ ${install_ee} -eq 1 ]]; then
@@ -65,7 +65,7 @@ if [[ ${install_sample_data} -eq 1 ]]; then
             set +x
             echo "EE Sample data enabled"
             set -x
-            "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}"
+            "${php_executable}" -f "${magento_ee_sample_data_dir}/dev/tools/build-sample-data.php" -- --command=link --ce-source="${magento_ce_dir}" --sample-data-source="${magento_ee_sample_data_dir}" --exclude=true
         fi
     fi
 fi