private bool CheckForRemoteRevision(string filename) { if (string.IsNullOrEmpty(Module.GetConflictedFileNames(filename)[2])) { string caption = string.Format(fileModifiedLocallyAndDelededRemotelyLong.Text, filename, GetLocalSideString(), GetRemoteSideString()); using (var frm = new FormModifiedDeletedCreated(string.Format(keepModifiedButtonText.Text + " ({0})", GetLocalSideString()), string.Format(deleteFileButtonText.Text + " ({0})", GetRemoteSideString()), keepBaseButtonText.Text, caption)) { frm.ShowDialog(this); if (frm.KeepBase) //base { ChooseBaseOnConflict(GetFileName()); } if (frm.KeepLocal) //delete { ChooseLocalOnConflict(GetFileName()); } if (frm.KeepRemote) //remote { Module.RunGitCmd("rm -- \"" + filename + "\""); } } return(false); } return(true); }
private void BinairyFilesChooseLocalBaseRemote(string filename) { string caption = string.Format(fileBinairyChooseLocalBaseRemote.Text, filename, GetLocalSideString(), GetRemoteSideString()); using (var frm = new FormModifiedDeletedCreated(string.Format(chooseLocalButtonText.Text + " ({0})", GetLocalSideString()), string.Format(chooseRemoteButtonText.Text + " ({0})", GetRemoteSideString()), keepBaseButtonText.Text, caption)) { frm.ShowDialog(this); if (frm.KeepBase) //base { ChooseBaseOnConflict(GetFileName()); } if (frm.KeepLocal) //local { ChooseLocalOnConflict(GetFileName()); } if (frm.KeepRemote) //remote { ChooseRemoteOnConflict(GetFileName()); } } }
private bool CheckForLocalRevision(ConflictData item) { if (!string.IsNullOrEmpty(item.Local.Filename)) { return(true); } string caption = string.Format(fileDeletedLocallyAndModifiedRemotelyLong.Text, item.Filename, GetLocalSideString(), GetRemoteSideString()); using (var frm = new FormModifiedDeletedCreated(string.Format(deleteFileButtonText.Text + " ({0})", GetLocalSideString()), string.Format(keepModifiedButtonText.Text + " ({0})", GetRemoteSideString()), keepBaseButtonText.Text, caption)) { frm.ShowDialog(this); if (frm.KeepBase) //base { ChooseBaseOnConflict(item.Filename); } if (frm.KeepLocal) //delete { Module.RunGitCmd("rm -- \"" + item.Filename + "\""); } if (frm.KeepRemote) //remote { ChooseRemoteOnConflict(item.Filename); } } return(false); }
private void BinairyFilesChooseLocalBaseRemote(ConflictData item) { string caption = string.Format(_fileBinairyChooseLocalBaseRemote.Text, item.Local.Filename, GetLocalSideString(), GetRemoteSideString()); using (var frm = new FormModifiedDeletedCreated(string.Format(_chooseLocalButtonText.Text + " ({0})", GetLocalSideString()), string.Format(_chooseRemoteButtonText.Text + " ({0})", GetRemoteSideString()), _keepBaseButtonText.Text, caption)) { frm.ShowDialog(this); if (frm.KeepBase) { // base ChooseBaseOnConflict(item.Filename); } if (frm.KeepLocal) { // local ChooseLocalOnConflict(item.Filename); } if (frm.KeepRemote) { // remote ChooseRemoteOnConflict(item.Filename); } } }
private bool CheckForBaseRevision(ConflictData item) { if (!string.IsNullOrEmpty(item.Base.Filename)) return true; string caption = string.Format(fileCreatedLocallyAndRemotelyLong.Text, item.Filename, GetLocalSideString(), GetRemoteSideString()); using (var frm = new FormModifiedDeletedCreated(string.Format(chooseLocalButtonText.Text + " ({0})", GetLocalSideString()), string.Format(chooseRemoteButtonText.Text + " ({0})", GetRemoteSideString()), deleteFileButtonText.Text, caption)) { frm.ShowDialog(this); if (frm.KeepBase) // delete Module.RunGitCmd("rm -- \"" + item.Filename + "\""); if (frm.KeepLocal) // local ChooseLocalOnConflict(item.Filename); if (frm.KeepRemote) // remote ChooseRemoteOnConflict(item.Filename); } return false; }