wip2

Signed-off-by: David Pordomingo <[email protected]>

Author: dpordomingo

_examples/common_test.go

@@ -28,6 +28,7 @@ var args = map[string][]string{
 	"showcase":    {defaultURL, tempFolder()},
 	"tag":         {cloneRepository(defaultURL, tempFolder())},
 	"pull":        {createRepositoryWithRemote(tempFolder(), defaultURL)},
+	"merge":       {cloneRepository(defaultURL, tempFolder()), "HEAD~2", "HEAD"},
 	"merge_base":  {cloneRepository(defaultURL, tempFolder()), "--is-ancestor", "HEAD~3", "HEAD^"},
 	"log_local":   {cloneRepository(defaultURL, tempFolder())},
 }

_examples/merge/help-long.msg.go

@@ -5,17 +5,17 @@ NAME:
    %_COMMAND_NAME_% - Join two commits
 
 SYNOPSIS:
-  usage: %_COMMAND_NAME_% <path> <baseCommitRev> <commitRev> [-m <msg>] [--ff-only]
+  usage: %_COMMAND_NAME_% <path> <baseCommitRev> <targetCommitRev> [-m <msg>] [--ff-only]
                            [--no-ff] [--no-commit] [--allow-unrelated-histories]
      or: %_COMMAND_NAME_% --help
 
  params:
-    <path>           Path to the git repository
-    <baseCommitRev>  Git revision of the commit that will be the base of the merge
-    <commitRev>      Git revision of the commit that will be merged over the base
+    <path>             Path to the git repository
+    <baseCommitRev>    Git revision of the commit that will be the base of the merge
+    <targetCommitRev>  Git revision of the commit that will be merged over the base
 
 DESCRIPTION:
-    %_COMMAND_NAME_% Incorporates changes from the passed <commitRev> over <baseCommitRev> and moves the HEAD of the repo to the merge commit.
+    %_COMMAND_NAME_% Incorporates changes from the passed <targetCommitRev> over <baseCommitRev> and moves the HEAD of the repo to the merge commit.
 
 OPTIONS:
     If no options passed, the merge commit will be avoided if it could be considered as a fast-forward, and if needed, it will be used a default merge commit message.
@@ -32,16 +32,11 @@ OPTIONS:
     [NOT IMPLEMENTED]
     Create a merge commit even when the merge resolves as a fast-forward.
 
---no-commit
-    [NOT IMPLEMENTED]
-    With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to
-    inspect and further tweak the merge result before committing.
-
 --allow-unrelated-histories
     [NOT IMPLEMENTED]
     By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be
     used to override this safety when merging histories of two projects that started their lives independently.
-    
+
 DISCUSSION:
     Assume the following history exists and the current branch is "master":
 

_examples/merge/main.go

@@ -21,14 +21,14 @@ const (
 	cmdDesc = "Performs the merge between two commits, and moves HEAD into the merge commit:"
 
 	helpShortMsg = `
-  usage: %_COMMAND_NAME_% <path> <baseCommitRev> <commitRev> [-m <msg>] [--ff-only]
-                           [--no-ff] [--no-commit] [--allow-unrelated-histories]
+  usage: %_COMMAND_NAME_% <path> <baseCommitRev> <targetCommitRev> [-m <msg>]
+                            [--ff-only] [--no-ff] [--allow-unrelated-histories]
      or: %_COMMAND_NAME_% --help
 
  params:
-    <path>           Path to the git repository
-    <baseCommitRev>  Git revision of the commit that will be the base of the merge
-    <commitRev>      Git revision of the commit that will be merged over the base
+    <path>             Path to the git repository
+    <baseCommitRev>    Git revision of the commit that will be the base of the merge
+    <targetCommitRev>  Git revision of the commit that will be merged over the base
 
 options:
     (no options)   Performs the regular merge, as fast-forward if possible
@@ -38,7 +38,6 @@ options:
 [NOT IMPLEMENTED]
     -m <msg>       Uses the passed <msg> for the merge commit message
     --no-ff        Create a merge commit even when it could be a fast-forward
-    --no-commit    Performs the merge in the worktree and do not create a commit
     --allow-unrelated-histories
                    Lets the merge to operate with commits not sharing its history
 `
@@ -74,8 +73,6 @@ func main() {
 				mergeOptions.NoFF = true
 			case "--ff-only":
 				mergeOptions.FFOnly = true
-			case "--no-commit":
-				mergeOptions.NoCommit = true
 			case "--allow-unrelated-histories":
 				mergeOptions.AllowUnrelated = true
 			case "-m":
@@ -91,6 +88,10 @@ func main() {
 		}
 	}
 
+	if mergeOptions.NoFF && mergeOptions.FFOnly {
+		utils.WrongSyntaxAndExit("--no-ff is not compatible with --ff-only")
+	}
+
 	// Open a git repository from current directory
 	repo, err := git.PlainOpen(path)
 	utils.ExitIfError(err, utils.ExitCodeCouldNotOpenRepository)
@@ -120,7 +121,6 @@ func main() {
 		fmt.Println("Already up to date.")
 		return
 	case git.ErrNotImplementedUnrelated,
-		git.ErrNotImplementedNoCommit,
 		git.ErrNotImplementedNoFF,
 		git.ErrNotImplementedMessage:
 		utils.ExitIfError(err, exitCodeFeatureNotImplemented, "unimplemented feature")

merge.go

@@ -21,8 +21,8 @@ const (
 var (
 	// ErrSameCommit returned when passed commits are the same
 	ErrSameCommit = errors.New("passed commits are the same")
-	// ErrAlreadyUpToDate returned when the second is behind first
-	ErrAlreadyUpToDate = errors.New("second is behind first")
+	// ErrAlreadyUpToDate returned when the target is behind base
+	ErrAlreadyUpToDate = errors.New("target is behind base")
 	// ErrHasConflicts returned when conflicts found
 	ErrHasConflicts = errors.New("conflicts found")
 	// ErrNoCommonHistory returned when no shared history
@@ -34,8 +34,6 @@ var (
 
 	// ExitCodeUnexpected returned when commit merge is required
 	ErrNotImplementedNoFF = errors.New("no fast-forward merge is not implemented")
-	// ErrNotImplementedNoCommit returned when no-commit is required
-	ErrNotImplementedNoCommit = errors.New("no commit merge is not implemented")
 	// ErrNotImplementedUnrelated returned
 	ErrNotImplementedUnrelated = errors.New("unrelated merge is not implemented")
 	// ErrNotImplementedMessage returned
@@ -46,20 +44,17 @@ var (
 type MergeOptions struct {
 	NoFF           bool   // NoFF when set to true, Merge will always create a merge commit
 	FFOnly         bool   // FFOnly causes the Merge fail if it is not a fast forward
-	NoCommit       bool   // NoCommit leaves the changes in the worktree without commit them
 	AllowUnrelated bool   // AllowUnrelated performs the merge even with unrelated histories
 	Message        string // Message text to be used for the message
 }
 
-// Merge merges the second commit over the first one, and moves `HEAD` to the merge.
-// If `NoCommit` option was passed, the changes required for the merge will be
-// left in the worktree, and the merge commit won't be created.
+// Merge merges the target commit over the base one, and moves `HEAD` to the merge.
 // It returns the merge commit, and an error if the HEAD was not moved or
 // when the merge operation could not be done.
 func Merge(
 	repo *Repository,
-	first *object.Commit,
-	second *object.Commit,
+	base *object.Commit,
+	target *object.Commit,
 	options *MergeOptions,
 ) (*object.Commit, error) {
 	if options == nil {
@@ -80,35 +75,35 @@ func Merge(
 		return nil, ErrWorktreeNotClean
 	}
 
-	if first.Hash == second.Hash {
+	if base.Hash == target.Hash {
 		return nil, ErrSameCommit
 	}
 
-	ancestors, err := MergeBase(first, second)
+	ancestors, err := MergeBase(base, target)
 	if err != nil {
 		return nil, err
 	}
 
 	if len(ancestors) == 0 {
 		if options.AllowUnrelated {
-			return merge(first, second, nil, options.NoCommit, options.Message)
+			return merge(base, target, nil, options.Message)
 		}
 
 		return nil, ErrNoCommonHistory
 	}
 
 	for _, ancestor := range ancestors {
-		if ancestor.Hash == first.Hash {
+		if ancestor.Hash == base.Hash {
 			if options.NoFF {
 				// TODO(dpordomingo): there is a special case;
 				// if asked with `--no-ff` it should be created an empty merge-commit.
 				return nil, ErrNotImplementedNoFF
 			}
 
-			return second, nil
+			return target, nil
 		}
 
-		if ancestor.Hash == second.Hash {
+		if ancestor.Hash == target.Hash {
 			return nil, ErrAlreadyUpToDate
 		}
 	}
@@ -119,22 +114,18 @@ func Merge(
 		return nil, ErrNonFastForwardUpdate
 	}
 
-	return merge(first, second, mergeBase, options.NoCommit, options.Message)
+	return merge(base, target, mergeBase, options.Message)
 }
 
-func merge(
-	first, second, mergeBase *object.Commit,
-	noCommit bool,
-	msg string,
-) (*object.Commit, error) {
+func merge(base, target, mergeBase *object.Commit, msg string) (*object.Commit, error) {
 
 	if mergeBase == nil {
 		// TODO(dpordomingo): handle --no-commit flag
 		return nil, ErrNotImplementedUnrelated
 	}
 
 	var trees []*object.Tree
-	for _, commit := range []*object.Commit{first, second} {
+	for _, commit := range []*object.Commit{base, target} {
 		tree, err := commit.Tree()
 		if err != nil {
 			return nil, err
@@ -149,11 +140,6 @@ func merge(
 	}
 	fmt.Println(changes)
 
-	if noCommit {
-		// TODO(dpordomingo): handle --no-commit flag
-		return nil, ErrNotImplementedNoCommit
-	}
-
 	if msg != "" {
 		// TODO(dpordomingo): handle -m option
 		return nil, ErrNotImplementedMessage