Skip to content

Commit

Permalink
Merge branch 'stash-deleted-2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@novalis
novalis committed Aug 25, 2021
2 parents ff40b77 + c3e9e53 commit 3c498c9
Show file tree
Hide file tree
Showing 5 changed files with 207 additions and 39 deletions.
4 changes: 4 additions & 0 deletions node/lib/cmd/stash.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ function cleanSubs(status, includeUntracked) {
for (let subName in subs) {
const sub = subs[subName];
const wd = sub.workdir;
if (sub.index === null) {
// This sub was deleted
return false;
}
if (sub.commit.sha !== sub.index.sha) {
// The submodule has a commit which is staged in the meta repo's
// index
Expand Down
3 changes: 2 additions & 1 deletion node/lib/util/repo_status.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,8 @@ class Submodule {
*/
isCommittable () {
return !(this.isNew() &&
null === this.d_index.sha &&
(null === this.d_index ||
null === this.d_index.sha) &&
(null === this.d_workdir ||
null === this.d_workdir.status.headCommit &&
this.d_workdir.status.isIndexClean()));
Expand Down
18 changes: 17 additions & 1 deletion node/lib/util/rm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,23 @@ exports.rmPaths = co.wrap(function *(repo, paths, options) {
}
if (stat !== null) {
if (stat.isDirectory()) {
yield fs.rmdir(fullpath);
try {
yield fs.rmdir(fullpath);
} catch (e) {
if ("ENOTEMPTY" === e.code) {
// Repo still exists for some reason --
// perhaps it was reported as deleted
// because it's not in the index, but it
// does exist on disk. For safety, do not
// delete it; this is a weird case.
console.error(
`Could not remove ${fullpath} -- it's not
empty. If you are sure it is not needed, you can remove it yourself.`
);
} else {
throw e;
}
}
} else {
yield fs.unlink(fullpath);
}
Expand Down
217 changes: 182 additions & 35 deletions node/lib/util/stash_util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
const assert = require("chai").assert;
const co = require("co");
const colors = require("colors");
const fs = require("fs-promise");
const NodeGit = require("nodegit");

const CloseUtil = require("./close_util");
const ConfigUtil = require("./config_util");
const DiffUtil = require("./diff_util");
const GitUtil = require("./git_util");
Expand All @@ -44,11 +46,19 @@ const RepoStatus = require("./repo_status");
const SparseCheckoutUtil = require("./sparse_checkout_util");
const StatusUtil = require("./status_util");
const SubmoduleUtil = require("./submodule_util");
const SubmoduleConfigUtil = require("./submodule_config_util");
const SubmoduleRebaseUtil = require("./submodule_rebase_util");
const TreeUtil = require("./tree_util");
const UserError = require("./user_error");

const Commit = NodeGit.Commit;
const Change = TreeUtil.Change;
const FILEMODE = NodeGit.TreeEntry.FILEMODE;

const MAGIC_DELETED_SHA = NodeGit.Oid.fromString(
"de1e7ed0de1e7ed0de1e7ed0de1e7ed0de1e7ed0");

const GITMODULES = SubmoduleConfigUtil.modulesFileName;

/**
* Return the IDs of tress reflecting the current state of the index and
Expand Down Expand Up @@ -107,6 +117,62 @@ exports.makeLogMessage = co.wrap(function *(repo) {
WIP on ${branchDesc}: ${GitUtil.shortSha(head.id().tostrS())} ${message}`;
});


function getNewGitModuleSha(diff) {
const numDeltas = diff.numDeltas();
for (let i = 0; i < numDeltas; ++i) {
const delta = diff.getDelta(i);
// We assume that the user hasn't deleted the .gitmodules file.
// That would be bonkers.
const file = delta.newFile();
const path = file.path();
if (path === GITMODULES) {
return delta.newFile().id();
}
}
// diff does not include .gitmodules
return null;
}


const stashGitModules = co.wrap(function *(repo, headTree) {
assert.instanceOf(repo, NodeGit.Repository);

const result = {};
// RepoStatus throws away the diff new sha, and rather than hack
// it, since it's used all over the codebase, we'll just redo the
// diffs for this one file.

const workdirToTreeDiff =
yield NodeGit.Diff.treeToWorkdir(repo,
headTree,
{pathspec: [GITMODULES]});


const newWorkdir = getNewGitModuleSha(workdirToTreeDiff);
if (newWorkdir !== null) {
result.workdir = newWorkdir;
}

const indexToTreeDiff =
yield NodeGit.Diff.treeToIndex(repo,
headTree,
yield repo.index(),
{pathspec: [GITMODULES]});

const newIndex = getNewGitModuleSha(indexToTreeDiff);
if (newIndex !== null) {
result.staged = newIndex;
}

yield NodeGit.Checkout.tree(repo, headTree, {
paths: [GITMODULES],
checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE,
});

return result;
});

/**
* Save the state of the submodules in the specified, `repo` having the
* specified `status` and clean the sub-repositories to match their respective
Expand Down Expand Up @@ -149,6 +215,8 @@ exports.save = co.wrap(function *(repo, status, includeUntracked, message) {
const subRepos = {}; // name to submodule open repo

const sig = yield ConfigUtil.defaultSignature(repo);
const head = yield repo.getHeadCommit();
const headTree = yield head.getTree();

// First, we process the submodules. If a submodule is open and dirty,
// we'll create the stash commits in its repo, populate `subResults` with
Expand Down Expand Up @@ -178,34 +246,42 @@ report this. Continuing stash anyway.`);

if (null === wd) {
// closed submodule
if (sub.commit.sha === sub.index.sha) {
// ... with no staged changes
return; // RETURN
}
// This is a case that regular git stash doesn't really have
// to handle. In a normal stash commit, the tree points
// to the working directory tree, but here, there is no working
// directory. But if there were, we would want to have
// this commit checked out.

const subRepo = yield SubmoduleUtil.getRepo(repo, name);
if (sub.index === null || sub.index.sha === null) {
// deleted submodule
stashId = MAGIC_DELETED_SHA;
yield NodeGit.Checkout.tree(repo, headTree, {
paths: [name],
checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE,
});
} else {
if (sub.commit.sha === sub.index.sha) {
// ... with no staged changes
return; // RETURN
}
// This is a case that regular git stash doesn't really have
// to handle. In a normal stash commit, the tree points
// to the working directory tree, but here, there is no working
// directory. But if there were, we would want to have
// this commit checked out.

const subCommit = yield Commit.lookup(subRepo, sub.commit.sha);
const indexCommit = yield Commit.lookup(subRepo, sub.index.sha);
const indexTree = yield indexCommit.getTree();
stashId = yield Commit.create(subRepo,
null,
sig,
sig,
null,
"stash",
indexTree,
4,
[subCommit,
indexCommit,
indexCommit,
indexCommit]);
const subRepo = yield SubmoduleUtil.getRepo(repo, name);

const subCommit = yield Commit.lookup(subRepo, sub.commit.sha);
const indexCommit = yield Commit.lookup(subRepo, sub.index.sha);
const indexTree = yield indexCommit.getTree();
stashId = yield Commit.create(subRepo,
null,
sig,
sig,
null,
"stash",
indexTree,
4,
[subCommit,
indexCommit,
indexCommit,
indexCommit]);
}
} else {
// open submodule
if (sub.commit.sha !== sub.index.sha &&
Expand Down Expand Up @@ -318,13 +394,42 @@ commit to have two parents`);
subResults[name] = stashId.tostrS();
// Record the values we've created.

subChanges[name] = new TreeUtil.Change(
stashId,
NodeGit.TreeEntry.FILEMODE.COMMIT);
subChanges[name] = new TreeUtil.Change(stashId, FILEMODE.COMMIT);
}));

const head = yield repo.getHeadCommit();
const headTree = yield head.getTree();
const parents = [head];

const gitModulesChanges = yield stashGitModules(repo, headTree);
if (gitModulesChanges) {
if (gitModulesChanges.workdir) {
subChanges[GITMODULES] = new Change(gitModulesChanges.workdir,
FILEMODE.BLOB);
}
if (gitModulesChanges.staged) {
const indexChanges = {};
Object.assign(indexChanges, subChanges);

indexChanges[GITMODULES] = new Change(gitModulesChanges.staged,
FILEMODE.BLOB);


const indexTree = yield TreeUtil.writeTree(repo, headTree,
indexChanges);
const indexParent = yield Commit.create(repo,
null,
sig,
sig,
null,
"stash",
indexTree,
1,
[head]);

const indexParentCommit = yield Commit.lookup(repo, indexParent);
parents.push(indexParentCommit);
}
}

const subsTree = yield TreeUtil.writeTree(repo, headTree, subChanges);
const stashId = yield Commit.create(repo,
null,
Expand All @@ -333,8 +438,8 @@ commit to have two parents`);
null,
"stash",
subsTree,
1,
[head]);
parents.length,
parents);

const stashSha = stashId.tostrS();

Expand Down Expand Up @@ -438,19 +543,63 @@ exports.apply = co.wrap(function *(repo, id, reinstateIndex) {
assert.isString(id);

const commit = yield repo.getCommit(id);
const repoIndex = yield repo.index();

// TODO: patch libgit2/nodegit: the commit object returned from `parent`
// isn't properly configured with a `repo` object, and attempting to use it
// in `getSubmodulesForCommit` will fail, so we have to look it up.

const parentId = (yield commit.parent(0)).id();
const parent = yield repo.getCommit(parentId);
const parentTree = yield parent.getTree();

const baseSubs = yield SubmoduleUtil.getSubmodulesForCommit(repo,
parent,
null);

let indexSubs = baseSubs;
if (commit.parentcount() > 1) {
const parent2Id = (yield commit.parent(1)).id();
const parent2 = yield repo.getCommit(parent2Id);
indexSubs = yield SubmoduleUtil.getSubmodulesForCommit(repo,
parent2,
null);
}

const newSubs = yield SubmoduleUtil.getSubmodulesForCommit(repo,
commit,
null);

const toDelete = [];
yield Object.keys(baseSubs).map(co.wrap(function *(name) {
if (newSubs[name] === undefined) {
if (fs.existsSync(name)) {
// sub deleted in working tree
toDelete.push(name);
}
}
}));

CloseUtil.close(repo, repo.workdir(), toDelete, false);
for (const name of toDelete) {
yield fs.rmdir(name);
}

yield Object.keys(baseSubs).map(co.wrap(function *(name) {
if (indexSubs[name] === undefined) {
// sub deleted in the index
yield repoIndex.removeByPath(name);
}
}));

// apply gitmodules diff
const headTree = yield commit.getTree();
yield NodeGit.Checkout.tree(repo, headTree, {
paths: [GITMODULES],
baseline: parentTree,
checkoutStrategy: NodeGit.Checkout.STRATEGY.MERGE,
});

const opener = new Open.Opener(repo, null);
let result = {};
const index = {};
Expand Down Expand Up @@ -550,8 +699,6 @@ for debugging, is:`, e);
}
}));

const repoIndex = yield repo.index();

if (null !== result) {
for (let name of Object.keys(index)) {
const entry = new NodeGit.IndexEntry();
Expand Down
4 changes: 2 additions & 2 deletions node/lib/util/status_util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ exports.getSubmoduleStatus = co.wrap(function *(repo,
commit = new Submodule.Commit(commitSha, commitUrl);
}

// A null indexUrl indicates that the submodule was removed. If that is
// the case, we're done.
// A null indexUrl indicates that the submodule doesn't exist in
// the staged .gitmodules.

if (null === indexUrl) {
return new Submodule({ commit: commit }); // RETURN
Expand Down

0 comments on commit 3c498c9

Please sign in to comment.