Merge pull request #171 from UziTech/rebase-pull

Rebase on pull
UziTech · Dec 20, 2019 · 49f1fe3 · 49f1fe3
2 parents a1a1248 + 50a6ee7
commit 49f1fe3
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/lib/commands/pull.js b/lib/commands/pull.js
@@ -12,9 +12,10 @@ export default {
 	},
 	async command(filePaths, statusBar, git = gitCmd, notifications = Notifications, title = "Pull") {
 		const root = await helper.getRoot(filePaths, git);
+		const rebase = atom.config.get("git-menu.rebaseOnPull");
 		await helper.checkGitLock(root);
 		statusBar.show("Pulling...");
-		const result = await git.pull(root, false);
+		const result = await git.pull(root, rebase, false);
 		notifications.addGit(title, result);
 		helper.refreshAtom(root);
 		return {

diff --git a/lib/config.js b/lib/config.js
@@ -30,9 +30,16 @@ export default {
 		default: true,
 		order: 3,
 	},
+	rebaseOnPull: {
+		type: "boolean",
+		title: "Rebase on Pull",
+		description: "Rebase instead of merge on Pull and Sync",
+		default: false,
+		order: 4,
+	},
 	confirmationDialogs: {
 		type: "object",
-		order: 4,
+		order: 5,
 		properties: Object.keys(commands).reduce((prev, cmd, idx) => {
 			if (commands[cmd].confirm) {
 				const label = commands[cmd].label || commands[cmd].confirm.label;
@@ -64,7 +71,7 @@ export default {
 	},
 	contextMenuItems: {
 		type: "object",
-		order: 5,
+		order: 6,
 		properties: Object.keys(commands).reduce((prev, cmd, idx) => {
 			if (commands[cmd].label) {
 				prev[cmd] = {

diff --git a/lib/git-cmd.js b/lib/git-cmd.js
@@ -260,14 +260,16 @@ export default {
 	/**
 	 * Pull commits from remote repo
 	 * @param {string} cwd Current Working Directory
+	 * @param {bool} [rebase=false] Add --rebase flag
 	 * @param {bool} [force=false] Add --force flag
 	 * @param {bool} verbose Not add the --quiet flag
 	 * @return {Promise} {string} The result of the command
 	 */
-	pull(cwd, force = false, verbose = isVerbose()) {
+	pull(cwd, rebase = false, force = false, verbose = isVerbose()) {
 		const verboseArg = (verbose ? "--verbose" : "--quiet");
 		const forceArg = (force ? "--force" : "");
-		return this.cmd(cwd, ["pull", verboseArg, forceArg]);
+		const rebaseArg = (rebase ? "--rebase" : "");
+		return this.cmd(cwd, ["pull", verboseArg, forceArg, rebaseArg]);
 	},
 
 	/**

diff --git a/spec/commands/commit-spec.js b/spec/commands/commit-spec.js
@@ -203,7 +203,7 @@ describe("commit", function () {
 		it("should call git.pull", async function () {
 			spyOn(this.git, "pull").and.callThrough();
 			await commit.command(this.filePaths, statusBar, this.git, Notifications, this.dialog);
-			expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false);
+			expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false, false);
 		});
 
 		it("should show git notification for pull results", async function () {

diff --git a/spec/commands/commit-staged-spec.js b/spec/commands/commit-staged-spec.js
@@ -186,7 +186,7 @@ describe("commit-staged", function () {
 		it("should call git.pull", async function () {
 			spyOn(this.git, "pull").and.callThrough();
 			await commitStaged.command(this.filePaths, statusBar, this.git, Notifications, this.dialog);
-			expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false);
+			expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false, false);
 		});
 
 		it("should show git notification for pull results", async function () {

diff --git a/spec/commands/pull-spec.js b/spec/commands/pull-spec.js
@@ -30,7 +30,14 @@ describe("pull", function () {
 	it("should call git.pull", async function () {
 		spyOn(this.git, "pull").and.callThrough();
 		await pull.command(this.filePaths, statusBar, this.git, Notifications);
-		expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false);
+		expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, false, false);
+	});
+
+	it("should call git.pull with rebase config", async function () {
+		spyOn(this.git, "pull").and.callThrough();
+		atom.config.set("git-menu.rebaseOnPull", true);
+		await pull.command(this.filePaths, statusBar, this.git, Notifications);
+		expect(this.git.pull).toHaveBeenCalledWith(this.gitRoot, true, false);
 	});
 
 	it("should show git notification for pull results", async function () {