src/TortoiseMerge/RightView.cpp

   1 // TortoiseGitMerge - a Diff/Patch program
   2
   3 // Copyright (C) 2006-2013 - TortoiseSVN
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #include "stdafx.h"
  20 #include "resource.h"
  21 #include "AppUtils.h"
  22 #if 0
  23 #include "IconBitmapUtils.h"
  24 #endif
  25
  26 #include "RightView.h"
  27 #include "BottomView.h"
  28
  29 IMPLEMENT_DYNCREATE(CRightView, CBaseView)
  30
  31 CRightView::CRightView(void)
  32 {
  33         m_pwndRight = this;
  34         m_pState = &m_AllState.right;
  35         m_nStatusBarID = ID_INDICATOR_RIGHTVIEW;
  36 }
  37
  38 CRightView::~CRightView(void)
  39 {
  40 }
  41
  42 void CRightView::UseBothLeftFirst()
  43 {
  44         if (!IsLeftViewGood())
  45                 return;
  46         int nFirstViewLine = 0; // first view line in selection
  47         int nLastViewLine  = 0; // last view line in selection
  48
  49         if (!IsWritable())
  50                 return;
  51         if (!GetViewSelection(nFirstViewLine, nLastViewLine))
  52                 return;
  53
  54         int nNextViewLine = nLastViewLine + 1; // first view line after selected block
  55
  56         CUndo::GetInstance().BeginGrouping();
  57
  58         // right original become added
  59         for (int viewLine = nFirstViewLine; viewLine <= nLastViewLine; viewLine++)
  60         {
  61                 if (!IsStateEmpty(GetViewState(viewLine)))
  62                 {
  63                         SetViewState(viewLine, DIFFSTATE_YOURSADDED);
  64                 }
  65         }
  66         SaveUndoStep();
  67
  68         for (int viewLine = nFirstViewLine; viewLine <= nLastViewLine; viewLine++)
  69         {
  70                 viewdata line = m_pwndLeft->GetViewData(viewLine);
  71                 if (IsStateEmpty(line.state))
  72                 {
  73                         line.state = DIFFSTATE_EMPTY;
  74                 }
  75                 else
  76                 {
  77                         line.state = DIFFSTATE_THEIRSADDED;
  78                 }
  79                 InsertViewData(viewLine, line);
  80         }
  81
  82         // now insert an empty block in left view
  83         int nCount = nLastViewLine - nFirstViewLine + 1;
  84         m_pwndLeft->InsertViewEmptyLines(nNextViewLine, nCount);
  85         SaveUndoStep();
  86
  87         // clean up
  88         int nRemovedLines = CleanEmptyLines();
  89         SaveUndoStep();
  90         UpdateViewLineNumbers();
  91         SaveUndoStep();
  92
  93         CUndo::GetInstance().EndGrouping();
  94
  95         // final clean up
  96         ClearSelection();
  97         SetupAllViewSelection(nFirstViewLine, 2*nLastViewLine - nFirstViewLine - nRemovedLines + 1);
  98         BuildAllScreen2ViewVector();
  99         m_pwndLeft->SetModified();
 100         SetModified();
 101         RefreshViews();
 102 }
 103
 104 void CRightView::UseBothRightFirst()
 105 {
 106         if (!IsLeftViewGood())
 107                 return;
 108         int nFirstViewLine = 0; // first view line in selection
 109         int nLastViewLine  = 0; // last view line in selection
 110
 111         if (!IsWritable())
 112                 return;
 113         if (!GetViewSelection(nFirstViewLine, nLastViewLine))
 114                 return;
 115
 116         int nNextViewLine = nLastViewLine + 1; // first view line after selected block
 117
 118         CUndo::GetInstance().BeginGrouping();
 119
 120         // right original become added
 121         for (int viewLine = nFirstViewLine; viewLine <= nLastViewLine; viewLine++)
 122         {
 123                 if (!IsStateEmpty(GetViewState(viewLine)))
 124                 {
 125                         SetViewState(viewLine, DIFFSTATE_ADDED);
 126                 }
 127         }
 128         SaveUndoStep();
 129
 130         // your block is done, now insert their block
 131         int viewindex = nNextViewLine;
 132         for (int viewLine = nFirstViewLine; viewLine <= nLastViewLine; viewLine++)
 133         {
 134                 viewdata line = m_pwndLeft->GetViewData(viewLine);
 135                 if (IsStateEmpty(line.state))
 136                 {
 137                         line.state = DIFFSTATE_EMPTY;
 138                 }
 139                 else
 140                 {
 141                         line.state = DIFFSTATE_THEIRSADDED;
 142                 }
 143                 InsertViewData(viewindex++, line);
 144         }
 145         SaveUndoStep();
 146
 147         // now insert an empty block in left view
 148         int nCount = nLastViewLine - nFirstViewLine + 1;
 149         m_pwndLeft->InsertViewEmptyLines(nFirstViewLine, nCount);
 150         SaveUndoStep();
 151
 152         // clean up
 153         int nRemovedLines = CleanEmptyLines();
 154         SaveUndoStep();
 155         UpdateViewLineNumbers();
 156         SaveUndoStep();
 157
 158         CUndo::GetInstance().EndGrouping();
 159
 160         // final clean up
 161         ClearSelection();
 162         SetupAllViewSelection(nFirstViewLine, 2*nLastViewLine - nFirstViewLine - nRemovedLines + 1);
 163         BuildAllScreen2ViewVector();
 164         m_pwndLeft->SetModified();
 165         SetModified();
 166         RefreshViews();
 167 }
 168
 169 void CRightView::UseLeftBlock()
 170 {
 171         int nFirstViewLine = 0;
 172         int nLastViewLine  = 0;
 173
 174         if (!IsWritable())
 175                 return;
 176         if (!GetViewSelection(nFirstViewLine, nLastViewLine))
 177                 return;
 178
 179         return UseBlock(nFirstViewLine, nLastViewLine);
 180 }
 181
 182 void CRightView::UseLeftFile()
 183 {
 184         int nFirstViewLine = 0;
 185         int nLastViewLine = GetViewCount()-1;
 186
 187         if (!IsWritable())
 188                 return;
 189         return UseBlock(nFirstViewLine, nLastViewLine);
 190 }
 191
 192
 193 void CRightView::AddContextItems(CIconMenu& popup, DiffStates state)
 194 {
 195         const bool bShow = HasSelection() && (state != DIFFSTATE_UNKNOWN);
 196
 197         if (IsBottomViewGood())
 198         {
 199                 if (bShow)
 200                         popup.AppendMenuIcon(POPUPCOMMAND_USEYOURBLOCK, IDS_VIEWCONTEXTMENU_USETHISBLOCK);
 201                 popup.AppendMenuIcon(POPUPCOMMAND_USEYOURFILE, IDS_VIEWCONTEXTMENU_USETHISFILE);
 202                 if (bShow)
 203                 {
 204                         popup.AppendMenuIcon(POPUPCOMMAND_USEYOURANDTHEIRBLOCK, IDS_VIEWCONTEXTMENU_USEYOURANDTHEIRBLOCK);
 205                         popup.AppendMenuIcon(POPUPCOMMAND_USETHEIRANDYOURBLOCK, IDS_VIEWCONTEXTMENU_USETHEIRANDYOURBLOCK);
 206                 }
 207         }
 208         else
 209         {
 210                 if (bShow)
 211                         popup.AppendMenuIcon(POPUPCOMMAND_USELEFTBLOCK, IDS_VIEWCONTEXTMENU_USEOTHERBLOCK);
 212                 popup.AppendMenuIcon(POPUPCOMMAND_USELEFTFILE, IDS_VIEWCONTEXTMENU_USEOTHERFILE);
 213                 if (bShow)
 214                 {
 215                         popup.AppendMenuIcon(POPUPCOMMAND_USEBOTHRIGHTFIRST, IDS_VIEWCONTEXTMENU_USEBOTHTHISFIRST);
 216                         popup.AppendMenuIcon(POPUPCOMMAND_USEBOTHLEFTFIRST, IDS_VIEWCONTEXTMENU_USEBOTHTHISLAST);
 217                 }
 218         }
 219
 220         CBaseView::AddContextItems(popup, state);
 221 }
 222
 223
 224 void CRightView::UseBlock(int nFirstViewLine, int nLastViewLine)
 225 {
 226         if (!IsLeftViewGood())
 227                 return;
 228         if (!IsWritable())
 229                 return;
 230         CUndo::GetInstance().BeginGrouping();
 231
 232         for (int viewLine = nFirstViewLine; viewLine <= nLastViewLine; viewLine++)
 233         {
 234                 viewdata line = m_pwndLeft->GetViewData(viewLine);
 235                 if ((line.ending != EOL_NOENDING)||(viewLine < (GetViewCount()-1)))
 236                         line.ending = lineendings;
 237                 switch (line.state)
 238                 {
 239                 case DIFFSTATE_CONFLICTEMPTY:
 240                 case DIFFSTATE_UNKNOWN:
 241                 case DIFFSTATE_EMPTY:
 242                         line.state = DIFFSTATE_EMPTY;
 243                         break;
 244                 case DIFFSTATE_ADDED:
 245                 case DIFFSTATE_MOVED_TO:
 246                 case DIFFSTATE_MOVED_FROM:
 247                 case DIFFSTATE_CONFLICTADDED:
 248                 case DIFFSTATE_CONFLICTED:
 249                 case DIFFSTATE_CONFLICTED_IGNORED:
 250                 case DIFFSTATE_IDENTICALADDED:
 251                 case DIFFSTATE_NORMAL:
 252                 case DIFFSTATE_THEIRSADDED:
 253                 case DIFFSTATE_YOURSADDED:
 254                         break;
 255                 case DIFFSTATE_IDENTICALREMOVED:
 256                 case DIFFSTATE_REMOVED:
 257                 case DIFFSTATE_THEIRSREMOVED:
 258                 case DIFFSTATE_YOURSREMOVED:
 259                         line.state = DIFFSTATE_ADDED;
 260                         break;
 261                 default:
 262                         break;
 263                 }
 264                 SetViewData(viewLine, line);
 265         }
 266         // make sure previous (non empty) line have EOL set
 267         for (int nCheckViewLine = nFirstViewLine-1; nCheckViewLine > 0; nCheckViewLine--)
 268         {
 269                 if (!IsViewLineEmpty(nCheckViewLine))
 270                 {
 271                         if (GetViewLineEnding(nCheckViewLine) == EOL_NOENDING)
 272                         {
 273                                 SetViewLineEnding(nCheckViewLine, lineendings);
 274                         }
 275                         break;
 276                 }
 277         }
 278         SaveUndoStep();
 279
 280         int nRemovedLines = CleanEmptyLines();
 281         SaveUndoStep();
 282         UpdateViewLineNumbers();
 283         SaveUndoStep();
 284
 285         CUndo::GetInstance().EndGrouping();
 286
 287         if (nRemovedLines)
 288         {
 289                 // some lines are gone update selection
 290                 ClearSelection();
 291                 SetupAllViewSelection(nFirstViewLine, nLastViewLine - nRemovedLines);
 292         }
 293         BuildAllScreen2ViewVector();
 294         m_pwndLeft->SetModified();
 295         SetModified();
 296         RefreshViews();
 297 }