/// <summary>
/// Merge Changeset.
/// </summary>
public JsonResult MergeChangeset(JsonMergeCandidateChangeset model)
{
try
{
model.status = _sourceRepository.MergeJsonChangeset(model);
if (model.status.numFailures == 0 && model.status.numConflicts == 0 && model.autoCommit)
{
model.mergedChangeset = _sourceRepository.JsonCommitChangeset(model, null);
}
return(new JsonDotNetResult(model));
}
catch (BaseException ex)
{
_logger.Log(ex);
if (model.status == null)
{
model.status = new JsonMergeStatus();
}
model.status.numFailures++;
model.status.message += ex.FriendlyMessage;
}
catch (Exception ex)
{
_logger.Log(ex);
if (model.status == null)
{
model.status = new JsonMergeStatus();
}
model.status.numFailures++;
model.status.message += ex.Message;
}
return(new JsonDotNetResult(model));
}
/// <summary>
/// Commit Changeset.
/// </summary>
public JsonResult CommitPending(JsonMergeCandidateChangeset model)
{
try
{
model.mergedChangeset = _sourceRepository.JsonCommitPending(null, model.workItems);
return(new JsonDotNetResult(model));
}
catch (BaseException ex)
{
_logger.Log(ex);
if (model.status == null)
{
model.status = new JsonMergeStatus();
}
model.status.numFailures++;
model.status.message += ex.FriendlyMessage;
}
catch (Exception ex)
{
_logger.Log(ex);
if (model.status == null)
{
model.status = new JsonMergeStatus();
}
model.status.numFailures++;
model.status.message += ex.Message;
}
return(new JsonDotNetResult(model));
}
/// <summary>
/// commits pending changes for a changeset that have been merged for the specified target and maps to the desired view model
/// </summary>
/// <param name="changeset"></param>
/// <param name="comment"></param>
public JsonChangeset JsonCommitChangeset(JsonMergeCandidateChangeset changeset, string comment)
{
return(JsonCommitChangeset(changeset, changeset.environment, comment));
}
/// <summary>
/// merges changeset for the specified environment
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public JsonMergeStatus MergeJsonChangeset(JsonMergeCandidateChangeset model)
{
var result = BLL.Source.MergeChangeset(SourceDataAccess, (Changeset)model, (MergeEnvironment)model.environment);
return(result != null ? new JsonMergeStatus(result) : null);
}
