mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-14 02:58:08 -05:00
Code Issues Packages Projects Releases 165 Wiki Activity

isolate Everything up-to-date error to merge

Browse Source
This commit is contained in:
Stephanie You
2024-01-24 16:51:29 -08:00
parent 3a2323ab9e
commit 2a7d288e48
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/log.go
+2 -2
View File
@@ -317,7 +317,7 @@ func logCompact(pager *outputpager.Pager, apr *argparser.ArgParseResults, commit
if apr.Contains(cli.StatFlag) {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 {
diffStats := make(map[string]*merge.MergeStats)
diffStats, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
diffStats, _, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
if err != nil {
return err
}
@@ -335,7 +335,7 @@ func logDefault(pager *outputpager.Pager, apr *argparser.ArgParseResults, commit
if apr.Contains(cli.StatFlag) {
if comm.parentHashes != nil && len(comm.parentHashes) == 1 {
diffStats := make(map[string]*merge.MergeStats)
diffStats, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
diffStats, _, err := calculateMergeStats(queryist, sqlCtx, diffStats, comm.parentHashes[0], comm.commitHash)
if err != nil {
return err
}
go/cmd/dolt/commands/merge.go
+13 -8
View File
@@ -356,9 +356,10 @@ func printMergeStats(fastForward bool,
}
if noConflicts {
mergeStats, err = calculateMergeStats(queryist, sqlCtx, mergeStats, fromRef, toRef)
upToDate := false
mergeStats, upToDate, err = calculateMergeStats(queryist, sqlCtx, mergeStats, fromRef, toRef)
if err != nil {
if err == doltdb.ErrUpToDate || err.Error() == "error: unable to get diff summary from HEAD^1 to HEAD: invalid ancestor spec" {
if err.Error() == "error: unable to get diff summary from HEAD^1 to HEAD: invalid ancestor spec" {
cli.Println(doltdb.ErrUpToDate.Error())
return 0
}
@@ -366,6 +367,10 @@ func printMergeStats(fastForward bool,
cli.Println(err.Error())
return 1
}
if upToDate {
cli.Println(doltdb.ErrUpToDate.Error())
return 0
}
}
if !apr.Contains(cli.NoCommitFlag) && !apr.Contains(cli.NoFFParam) && !fastForward && noConflicts {
@@ -435,11 +440,11 @@ func calculateMergeConflicts(queryist cli.Queryist, sqlCtx *sql.Context, mergeSt
}
// calculateMergeStats calculates the table operations and row operations that occurred during the merge. Returns a map of
// table name to MergeStats.
func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats map[string]*merge.MergeStats, fromRef, toRef string) (map[string]*merge.MergeStats, error) {
// table name to MergeStats and a bool representing whether all tables were unmodified.
func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats map[string]*merge.MergeStats, fromRef, toRef string) (map[string]*merge.MergeStats, bool, error) {
diffSummaries, err := getDiffSummariesBetweenRefs(queryist, sqlCtx, fromRef, toRef)
if err != nil {
return nil, err
return nil, false, err
}
diffStats := make(map[string]diffStatistics)
@@ -468,7 +473,7 @@ func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats
}
tableStats, err := getTableDiffStats(queryist, sqlCtx, summary.TableName, fromRef, toRef)
if err != nil {
return nil, err
return nil, false, err
}
if tableStats != nil && len(tableStats) > 0 {
diffStats[tableStats[0].TableName] = tableStats[0]
@@ -481,7 +486,7 @@ func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats
}
if allUnmodified {
return nil, doltdb.ErrUpToDate
return nil, true, nil
}
// get row stats
@@ -491,7 +496,7 @@ func calculateMergeStats(queryist cli.Queryist, sqlCtx *sql.Context, mergeStats
mergeStats[tableName].Modifications = int(diffStat.RowsModified)
}
return mergeStats, nil
return mergeStats, false, nil
}
// printSuccessStats returns whether there are conflicts or constraint violations.