pj-nodegit 0.18.4 → 0.18.5

package/lib/index.js

@@ -0,0 +1,103 @@
+var util = require("util");
+var NodeGit = require("../");
+
+var Index = NodeGit.Index;
+
+var _addAll = Index.prototype.addAll;
+var _removeAll = Index.prototype.removeAll;
+var _updateAll = Index.prototype.updateAll;
+
+Index.prototype.addAll = function(pathspec, flags, matchedCallback) {
+  return _addAll.call(this, pathspec || "*", flags, matchedCallback, null);
+};
+
+/**
+ * Return an array of the entries in this index.
+ * @return {Array<IndexEntry>} an array of IndexEntrys
+ */
+Index.prototype.entries = function() {
+  var size = this.entryCount();
+  var result = [];
+
+  for (var i = 0; i < size; i++) {
+    result.push(this.getByIndex(i));
+  }
+
+  return result;
+};
+
+Index.prototype.removeAll = function(pathspec, matchedCallback) {
+  return _removeAll.call(this, pathspec || "*", matchedCallback, null);
+};
+
+Index.prototype.updateAll = function(pathspec, matchedCallback) {
+  return _updateAll.call(this, pathspec || "*", matchedCallback, null);
+};
+
+// Deprecated -----------------------------------------------------------------
+
+NodeGit.Index.CAP = {};
+Object.keys(NodeGit.Index.CAPABILITY).forEach((key) => {
+  Object.defineProperty(NodeGit.Index.CAP, key, {
+    get: util.deprecate(
+      () => NodeGit.Index.CAPABILITY[key],
+      `Use NodeGit.Index.CAPABILITY.${key} instead of ` +
+      `NodeGit.Index.CAP.${key}.`
+    )
+  });
+});
+
+NodeGit.Enums.INDXENTRY_FLAG = {};
+Object.defineProperty(NodeGit.Enums.INDXENTRY_FLAG, "IDXENTRY_EXTENDED", {
+  get: util.deprecate(
+    () => NodeGit.Index.ENTRY_FLAG.ENTRY_EXTENDED,
+    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_EXTENDED instead of " +
+    "NodeGit.Enums.INDXENTRY_FLAG.IDXENTRY_EXTENDED."
+  )
+});
+Object.defineProperty(NodeGit.Enums.INDXENTRY_FLAG, "IDXENTRY_VALID", {
+  get: util.deprecate(
+    () => NodeGit.Index.ENTRY_FLAG.ENTRY_VALID,
+    "Use NodeGit.Index.ENTRY_FLAG.ENTRY_VALID instead of " +
+    "NodeGit.Enums.INDXENTRY_FLAG.IDXENTRY_VALID."
+  )
+});
+
+NodeGit.Enums.IDXENTRY_EXTENDED_FLAG = {};
+var EXTENDED_FLAGS_MAP = {
+  IDXENTRY_INTENT_TO_ADD: "ENTRY_INTENT_TO_ADD",
+  IDXENTRY_SKIP_WORKTREE: "ENTRY_SKIP_WORKTREE",
+  S: "S",
+  IDXENTRY_UPTODATE: "ENTRY_UPTODATE"
+};
+Object.keys(EXTENDED_FLAGS_MAP).forEach((key) => {
+  const newKey = EXTENDED_FLAGS_MAP[key];
+  Object.defineProperty(NodeGit.Enums.IDXENTRY_EXTENDED_FLAG, key, {
+    get: util.deprecate(
+      () => NodeGit.Index.ENTRY_EXTENDED_FLAG[newKey],
+      `Use NodeGit.Index.ENTRY_EXTENDED_FLAG.${newKey} instead of ` +
+      `NodeGit.Enums.IDXENTRY_EXTENDED_FLAG.${key}.`
+    )
+  });
+});
+
+var DEPRECATED_EXTENDED_FLAGS = {
+  IDXENTRY_EXTENDED2: 32768,
+  IDXENTRY_UPDATE: 1,
+  IDXENTRY_REMOVE: 2,
+  IDXENTRY_ADDED: 8,
+  IDXENTRY_HASHED: 16,
+  IDXENTRY_UNHASHED: 32,
+  IDXENTRY_WT_REMOVE: 64,
+  IDXENTRY_CONFLICTED: 128,
+  IDXENTRY_UNPACKED: 256,
+  IDXENTRY_NEW_SKIP_WORKTREE: 512,
+};
+Object.keys(DEPRECATED_EXTENDED_FLAGS).forEach((key) => {
+  Object.defineProperty(NodeGit.Enums.IDXENTRY_EXTENDED_FLAG, key, {
+    get: util.deprecate(
+      () => DEPRECATED_EXTENDED_FLAGS[key],
+      "LibGit2 has removed this flag for public usage."
+    )
+  });
+});

package/lib/libgit2.js

@@ -0,0 +1,6 @@
+var NodeGit = require("../");
+
+var Libgit2 = NodeGit.Libgit2;
+
+Libgit2.OPT.SET_WINDOWS_LONGPATHS = 29;
+Libgit2.OPT.GET_WINDOWS_LONGPATHS = 30;

package/lib/merge.js

@@ -0,0 +1,72 @@
+var NodeGit = require("../");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+
+var Merge = NodeGit.Merge;
+var _commits = Merge.commits;
+var _merge = Merge.merge;
+var _file = Merge.file;
+
+/**
+ * Merge two files as they exist in the in-memory data structures, using
+ * the given common ancestor as the baseline. (git_merge_file)
+ *
+ * @param {MergeFileInput} ancestor The contents of the ancestor file
+ * @param {MergeFileInput} ours The contents of the file in "our" side
+ * @param {MergeFileInput} theirs The contents of the file in "theirs" side
+ * @param {MergeFileOptions} [options] The merge file options
+ * or `NULL` for defaults
+ */
+Merge.file = function(ancestor, ours, theirs, options) {
+  ancestor = normalizeOptions(ancestor, NodeGit.MergeFileInput);
+  ours = normalizeOptions(ours, NodeGit.MergeFileInput);
+  theirs = normalizeOptions(theirs, NodeGit.MergeFileInput);
+  options = normalizeOptions(options || {}, NodeGit.MergeFileOptions);
+  return _file.call(this, ancestor, ours, theirs, options);
+};
+
+/**
+ * Merge 2 commits together and create an new index that can
+ * be used to create a merge commit.
+ *
+ * @param {Repository} repo Repository that contains the given commits
+ * @param {Commit} ourCommit The commit that reflects the destination tree
+ * @param {Commit} theirCommit The commit to merge into ourCommit
+ * @param {MergeOptions} [options] The merge tree options (null for default)
+ */
+Merge.commits = function(repo, ourCommit, theirCommit, options) {
+  options = normalizeOptions(options, NodeGit.MergeOptions);
+
+  return Promise.all([
+    repo.getCommit(ourCommit),
+    repo.getCommit(theirCommit)
+  ]).then(function(commits) {
+    return _commits.call(this, repo, commits[0], commits[1], options);
+  });
+};
+
+/**
+ * Merge a commit into HEAD and writes the results to the working directory.
+ *
+ * @param {Repository} repo Repository that contains the given commits
+ * @param {AnnotatedCommit} theirHead The annotated commit to merge into HEAD
+ * @param {MergeOptions} [mergeOpts] The merge tree options (null for default)
+ * @param {CheckoutOptions} [checkoutOpts] The checkout options
+ *                                         (null for default)
+ */
+Merge.merge = function(repo, theirHead, mergeOpts, checkoutOpts) {
+  mergeOpts = normalizeOptions(mergeOpts || {}, NodeGit.MergeOptions);
+  checkoutOpts = normalizeOptions(checkoutOpts || {}, NodeGit.CheckoutOptions);
+
+  // Even though git_merge takes an array of annotated_commits, it expects
+  // exactly one to have been passed in or it will throw an error...  ¯\_(ツ)_/¯
+  var theirHeads = [theirHead];
+
+  return _merge.call(
+    this,
+    repo,
+    theirHeads,
+    theirHeads.length,
+    mergeOpts,
+    checkoutOpts
+  );
+};