Remove the keeps and shallow options from the repos section.

Author: domchen

DEPS

@@ -20,10 +20,7 @@
       {
         "url": "https://${GIT_DOMAIN}/Tencent/tgfx.git",
         "commit": "5948d72a0a5320a1ea055f23bc8312b07ab6d72c",
-        "dir": "third_party/tgfx",
-        "keeps": [
-          "third_party"
-        ]
+        "dir": "third_party/tgfx"
       }
     ]
   },

README.md

@@ -44,8 +44,7 @@ Here is an example of DEPS file:
       {
         "url": "https://${GIT_DOMAIN}/webmproject/libwebp.git",
         "commit": "1fe3162541ab2f5ce69aca2e2b593fab60520d34",
-        "dir": "third_party/libwebp",
-        "shallow": false
+        "dir": "third_party/libwebp"
       },
       {
         "url": "https://${GIT_DOMAIN}/libjpeg-turbo/libjpeg-turbo.git",
@@ -55,10 +54,7 @@ Here is an example of DEPS file:
       {
         "url": "https://${GIT_DOMAIN}/Tencent/tgfx.git",
         "commit": "5948d72a0a5320a1ea055f23bc8312b07ab6d72c",
-        "dir": "third_party/tgfx",
-        "keeps": [
-          "third_party"
-        ]
+        "dir": "third_party/tgfx"
       }
     ]
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "depsync",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "author": "Dom Chen",
   "homepage": "http://www.idom.me/",
   "description": "Automatically synchronize the dependencies of a project by the DEPS configuration file.",

src/Config.js

@@ -84,22 +84,6 @@ function parseRepos(repos, vars, projectPath) {
         item.commit = formatString(item.commit, vars);
         item.dir = formatString(item.dir, vars);
         item.dir = path.resolve(projectPath, item.dir);
-        let shallow = item.shallow;
-        if (typeof shallow == "string") {
-            shallow = formatString(shallow, vars);
-            item.shallow = (shallow !== "false");
-        } else if (typeof shallow != "boolean") {
-            item.shallow = true;
-        }
-        let keeps = item.keeps;
-        item.keeps = [];
-        if (keeps instanceof Array) {
-            for (let keep of keeps) {
-                keep = formatString(keep, vars);
-                keep = path.resolve(item.dir, keep);
-                item.keeps.push(keep);
-            }
-        }
         list.push(item);
     }
     return list;

src/tasks/DepsTask.js

@@ -51,20 +51,9 @@ DepsTask.prototype.run = function (callback) {
     let tasks = [];
     for (let item of config.repos) {
         let shallowFile = path.join(item.dir, ".git", "shallow");
-        let wasShallow = fs.existsSync(shallowFile);
-        let commit = "";
-        if (wasShallow) {
-            let commits = Utils.readFile(shallowFile).split("\n");
-            if (commits.length > 0) {
-                commit = commits[commits.length - 1].trim();
-            }
-        } else {
-            let fetchHeadFile = path.join(item.dir, ".git", "FETCH_HEAD");
-            commit = Utils.readFile(fetchHeadFile).substring(0, 40);
-        }
-        let repoDirty = false;
-        if (commit !== item.commit || wasShallow !== item.shallow) {
-            repoDirty = true;
+        let commit = Utils.readFile(shallowFile).substring(0, 40);
+        let repoDirty = commit !== item.commit;
+        if (repoDirty) {
             tasks.push(new RepoTask(item));
         }
         if (repoDirty || fs.existsSync(this.unfinishFile)) {

src/tasks/RepoTask.js

@@ -66,36 +66,26 @@ RepoTask.prototype.run = function (callback) {
     if (this.username && this.password) {
         url = AddLoginInfo(url, this.username, this.password);
     }
-    let shallowFile = path.join(item.dir, ".git", "shallow");
-    let wasShallow = fs.existsSync(shallowFile);
     let lfsDir = path.join(item.dir, ".git", "lfs");
     let indexFile = path.join(item.dir, ".git", "index");
     let tempLFSDir = path.join(item.dir + ".git", "lfs");
     let tempIndexFile = path.join(item.dir + ".git", "index");
-    if (wasShallow !== item.shallow || item.shallow) {
-        Utils.movePath(lfsDir, tempLFSDir);
-        Utils.movePath(indexFile, tempIndexFile);
-        Utils.deletePath(path.join(item.dir + ".git"));
-    }
-    let fetchHeadFile = path.join(item.dir, ".git", "FETCH_HEAD");
-    if (!fs.existsSync(fetchHeadFile)) {
+    Utils.movePath(lfsDir, tempLFSDir);
+    Utils.movePath(indexFile, tempIndexFile);
+    Utils.deletePath(path.join(item.dir, ".git"));
+    if (!fs.existsSync(item.dir)) {
         Utils.createDirectory(item.dir);
-        Utils.exec("git init -q", item.dir);
-        Utils.exec("git remote add origin " + url, item.dir);
-    }
-    if (item.shallow) {
-        Utils.exec("git fetch --depth 1 origin " + item.commit, item.dir);
-        Utils.movePath(tempLFSDir, lfsDir);
-        Utils.movePath(tempIndexFile, indexFile);
-        Utils.deleteEmptyDir(path.dirname(tempIndexFile));
-    } else {
-        Utils.exec("git fetch origin " + item.commit, item.dir);
     }
+    Utils.exec("git init -q", item.dir);
+    Utils.exec("git remote add origin " + url, item.dir);
+    Utils.exec("git fetch --depth 1 origin " + item.commit, item.dir);
+    Utils.movePath(tempLFSDir, lfsDir);
+    Utils.movePath(tempIndexFile, indexFile);
+    Utils.deleteEmptyDir(path.dirname(tempIndexFile));
     process.env["GIT_LFS_SKIP_SMUDGE"] = "1";
-    Utils.exec("git reset --hard FETCH_HEAD && git clean -f", item.dir);
-    if (item.shallow) {
-        Utils.writeFile(shallowFile, item.commit);
-    }
+    Utils.exec("git reset --hard FETCH_HEAD && git clean -f -q", item.dir);
+    let shallowFile = path.join(item.dir, ".git", "shallow");
+    Utils.writeFile(shallowFile, item.commit + "\n");
     let lfsConfig = path.join(item.dir, ".gitattributes");
     if (fs.existsSync(lfsConfig)) {
         Utils.exec("git lfs prune", item.dir);

src/tasks/SubRepoTask.js

@@ -53,7 +53,7 @@ SubRepoTask.prototype.run = function (callback) {
         }
         let result = Utils.execSafe("git lfs fsck", repoPath);
         if (result.indexOf("Git LFS fsck OK") === -1) {
-            Utils.log("【depsync】downloading git lfs objects for: " + repoPath);
+            Utils.log("【depsync】downloading git lfs objects to: " + repoPath);
             Utils.exec("git lfs pull", repoPath, false);
         }
     }