From 5ca326af83b90531d4d0c502bb1beabbe1b48c55 Mon Sep 17 00:00:00 2001
From: Amine Hilaly <hilalyamine@gmail.com>
Date: Tue, 13 Aug 2019 19:51:14 +0200
Subject: bridge/core: add context.Context to ImportAll and ExportAll
 signatures

bridge/core: add ImportResult objects to stream import events

bridge/core: launchpad support asynchronous import

bridge/github: cancellable export and import functions

bridge/gitlab: cancellable export and import functions

commands: bridge pull/push gracefull kill

bridge/github: fix github import

bridge/github: use simple context for imports

bridge/core: name parameters in interfaces

github/core: Add EventError to export and import events types

bridge/gitlab: add context support in gitlab requests functions

bridge/gitlab: remove imported events count from importer logic

bridge/github: remove imported events count from importer logic

bridge/github: add context support in query and muration requets

bridge/github: fix bug duplicate editions after multiple calls

bridge/core: import import and export events String methods
bridge/gitlab: fix error handling in note import events

commands/bridge: Add statistics about imports and exports

bridge/gitlab: properly handle context cancellation

bridge/github: improve error handling

bridge: break iterators on context cancel or timeout

bridge: add context timeout support

bridge: improve event formating and error handling

commands: handle interrupt and switch cases

bridge/github: add export mutation timeouts

bridge: fix race condition bug in the github and gitlab importers
bridge/github: improve context error handling
---
 entity/merge.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'entity/merge.go')

diff --git a/entity/merge.go b/entity/merge.go
index 7c3e71c8..3ce8edac 100644
--- a/entity/merge.go
+++ b/entity/merge.go
@@ -13,6 +13,7 @@ const (
 	MergeStatusInvalid
 	MergeStatusUpdated
 	MergeStatusNothing
+	MergeStatusError
 )
 
 type MergeResult struct {
@@ -39,6 +40,8 @@ func (mr MergeResult) String() string {
 		return "updated"
 	case MergeStatusNothing:
 		return "nothing to do"
+	case MergeStatusError:
+		return fmt.Sprintf("merge error on %s: %s", mr.Id, mr.Err.Error())
 	default:
 		panic("unknown merge status")
 	}
@@ -46,8 +49,9 @@ func (mr MergeResult) String() string {
 
 func NewMergeError(err error, id Id) MergeResult {
 	return MergeResult{
-		Err: err,
-		Id:  id,
+		Err:    err,
+		Id:     id,
+		Status: MergeStatusError,
 	}
 }
 
-- 
cgit