aboutsummaryrefslogtreecommitdiffstats
path: root/entity
diff options
context:
space:
mode:
authorAmine Hilaly <hilalyamine@gmail.com>2019-08-13 19:51:14 +0200
committerAmine Hilaly <hilalyamine@gmail.com>2019-08-18 00:14:22 +0200
commit5ca326af83b90531d4d0c502bb1beabbe1b48c55 (patch)
tree6b7a32f2db9ab7321e9965c0ef4c715c6c517178 /entity
parent6428352bd14828f670206b60862de7f71c52d235 (diff)
downloadgit-bug-5ca326af83b90531d4d0c502bb1beabbe1b48c55.tar.gz
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
Diffstat (limited to 'entity')
-rw-r--r--entity/merge.go8
1 files changed, 6 insertions, 2 deletions
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,
}
}