1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401
|
/* -*- c-file-style: "xxdiff" -*- */
/******************************************************************************\
* $RCSfile$
*
* Copyright (C) 1999-2003 Martin Blais <blais@furius.ca>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
******************************************************************************/
#ifndef INCL_XXDIFF_DIFFS
#define INCL_XXDIFF_DIFFS
/*==============================================================================
* EXTERNAL DECLARATIONS
*============================================================================*/
#ifndef INCL_XXDIFF_LINE
#include <line.h>
#endif
#ifndef INCL_XXDIFF_DEFS
#include <defs.h>
#endif
#ifndef INCL_XXDIFF_RESOURCES
#include <resources.h>
#endif
#ifndef INCL_QT_QOBJECT
#include <QObject>
#define INCL_QT_QOBJECT
#endif
#ifndef INCL_STD_VECTOR
#include <vector>
#define INCL_STD_VECTOR
#endif
#ifndef INCL_STD_MEMORY
#include <memory>
#define INCL_STD_MEMORY
#endif
#ifndef INCL_STD_IOSFWD
#include <iosfwd>
#define INCL_STD_IOSFWD
#endif
/*==============================================================================
* FORWARD DECLARATIONS
*============================================================================*/
class QTextStream;
XX_NAMESPACE_BEGIN
/*==============================================================================
* FORWARD DECLARATIONS
*============================================================================*/
class XxBuffer;
/*==============================================================================
* CLASS XxDiffs
*============================================================================*/
// <summary> a class to build the diffs data structure </summary>
class XxDiffs : public QObject {
Q_OBJECT
public:
/*----- types and enumerations -----*/
struct SearchResult {
/*----- member functions -----*/
// Construtor for invalid search result.
SearchResult();
// Constructor.
SearchResult( const XxDln lineNo, const XxFln fline[3] );
// Returns true if valid.
bool isValid() const;
/*----- data members -----*/
XxDln _lineNo;
XxFln _fline[3];
};
/*----- member functions -----*/
// Constructor which builds an empty diffs.
XxDiffs();
// Constructor.
// Validate checks that the line numbers are sequential.
//
// Important note: the given lines array must have a dummy line inserted at
// index 0. In other words, display line 1 should be at index 1. This is
// simply to avoid subtracting 1 in a bunch of places and to follow the
// external convention for display line numbers.
XxDiffs(
std::vector<XxLine>& lines,
bool isDirectoryDiff = false,
bool validate = true
);
// Destructor.
virtual ~XxDiffs();
// Returns the number of display lines.
XxDln getNbLines() const;
// Returns the number of lines that have selected content (i.e. either just
// have content, or have a selected side with content). Counts the number of
// times we encountered new unselected changes (for merged view).
XxDln getNbLinesWithContent( uint& unselectedChanges ) const;
// For a specific file, returns the number of lines with text for that
// file. We cannot trust the number of lines that the buffer returns, since
// not all lines from that buffer may be displayed.
XxFln getNbLinesWithText( const XxFno fno ) const;
// Moves backwards nbLines lines from a specified starting line of the diffs,
// counting only visible lines according to the current selection, counting
// unselected changes (undecided regions) as unselChangesLines lines each.
// Talk about a specialized function! This one is for the merged view
// scrollbar resizing. It returns the line number of the top visible line.
XxDln moveBackwardsVisibleLines(
XxDln startingLine,
uint nbLines,
uint unselChangesLines
) const;
// Returns a display line. Remember that lines start counting at 1. Note:
// be careful with the non-const version, if you change the line's state
// yourself, you need to call for a redraw.
const XxLine& getLine( const XxDln lineno ) const;
// Given a file line number in a specific file, returns the display line no.
XxDln getDisplayLine(
const XxFln rdline,
const XxBuffer& buffer,
const XxFno fno
) const;
// Applies a selection to a line.
void selectLine( XxDln lineNo, XxLine::Selection selection );
// Applies a selection to a set of lines whose type is contiguous.
void selectRegion( XxDln lineNo, XxLine::Selection selection );
// Applies a selection globally.
void selectGlobal( XxLine::Selection selection );
// Applies a selection globally, to unselected regions only.
void selectGlobalUnselected( XxLine::Selection selection );
// Returns the extents and type of a region that contains a certain line no.
// <group>
XxLine::Type findRegion(
XxDln lineNo,
XxDln& regionStart,
XxDln& regionEnd
) const;
// </group>
// Returns the extents and type of a region that contains a certain line
// no. and that has the same selection properties.
// <group>
XxLine::Type findRegionWithSel(
XxDln lineNo,
XxDln& regionStart,
XxDln& regionEnd
) const;
// </group>
// Splits, swaps or joins two neighboring compatible regions. More
// precisely: if the region which contains the given line contains text
// everywhere, it is split in a certain direction; if the region which
// contains the given line contains text only on one side AND has a
// neighboring region which has text only on the other side, then the regions
// are swapped in order; and if those regions have already been swapped, they
// are joined again. Return true if the operation was a join.
bool splitSwapJoin( XxDln lineNo, uint nbFiles );
// Searches for the next/previous difference region. Returns -1 if not
// found.
// <group>
XxDln findNextDifference( XxDln lineNo ) const;
XxDln findPreviousDifference( XxDln lineNo ) const;
// </group>
// Searches for the next/previous unselected region. Returns -1 if not
// found.
// <group>
XxDln findNextUnselected( XxDln lineNo ) const;
XxDln findPreviousUnselected( XxDln lineNo ) const;
// </group>
// Finds the next line (file) with changes. Returns -1 if not ofund.
XxDln findNextNonSameLine( XxDln lineNo ) const;
// Returns the number of non-blank lines between start and end.
uint getNbFileLines(
XxFno no,
XxDln start,
XxDln end
) const;
// Returns the closest (floor) file line for the given display line. The
// actuallyEmpty parameter is set to true if that line is actually empty for
// that file no.
XxFln getBufferLine(
XxFno no,
XxDln lineNo,
bool& actuallyEmpty
) const;
// Dirty bit management. The diffs become dirty if selection changes.
// <group>
void clearDirty();
bool isDirty() const;
// </group>
// Returns true if is at least one line that has been selected.
bool isSomeSelected() const;
// Returns true if there exists selections other than for the given file,
// meaning that there exists at least one line which has some side selected
// that is other than the given file and that does not also include the given
// file.
bool hasSelectionsOtherThan( XxFno no ) const;
// Returns false if there are still some unselected lines.
bool isAllSelected() const;
// Counts the remaining unselected hunks.
uint countRemainingUnselected() const;
// Save merged with selected regions. If there are still some unselected
// regions it will return false but save anyway.
bool save(
const XxResources& resources,
QTextStream& os,
const std::auto_ptr<XxBuffer>* files,
const bool useConditionals,
const bool removeEmptyConditionals,
const QString conditionals[3]
) const;
// Save selected lines with an appropriate prefix. Returns true if there
// were some regions saved (false thus means an empty file).
bool saveSelectedOnly(
QTextStream& os,
const std::auto_ptr<XxBuffer>* files
) const;
// Searches for the occurence of the search text in the files and sets the
// diff lines where the text appears in either, and for each diff line, in
// which file the line is found.
void search(
const QString& searchText,
const int nbFiles,
const std::auto_ptr<XxBuffer>* files
);
// Returns the search results.
const std::vector<SearchResult>& getSearchResults() const;
// Finds the next/previous search results.
// <group>
SearchResult findNextSearch( XxDln lineNo ) const;
SearchResult findPreviousSearch( XxDln lineNo ) const;
// </group>
// Initialize horizontal diffs for lines.
void initializeHorizontalDiffs(
const XxResources& resources,
const std::auto_ptr<XxBuffer>* files,
const bool force = false
);
// Flags diff hunks that are equal except for whitespace and line breaks with
// the ignore-display flag.
void computeIgnoreDisplay(
const int nbFiles,
const std::auto_ptr<XxBuffer>* files
);
// Automatically merge by performing selections on file1, assuming order
// "mine older yours", and leaving conflicts unselected.
//
// Return result as diff3 merge feature would.
int merge( uint nbFiles );
// Check if all selections are of the specified no. If so return true.
bool checkSelections( const XxLine::Selection sel ) const;
// Returns true if this diffs is a directory diffs.
bool isDirectoryDiff() const;
// Re-index the buffers so that the lines they believe they have seem to be
// contiguous, and adjust the diffs accordingly. This method modifies both
// the buffers as well as this instance. This is used for unmerge.
//
// file3 can be null.
void reindex(
const std::auto_ptr<XxBuffer>& file1,
const std::auto_ptr<XxBuffer>& file2,
const std::auto_ptr<XxBuffer>& file3
);
// Dump debug output.
std::ostream& dump( std::ostream& ) const;
signals:
/*----- member functions -----*/
void changed();
void nbLinesChanged();
private:
enum SaveState { IF = 0, ELSIF = 1, END = 3 };
/*----- member functions -----*/
// This is simply a non-const version of getLine(). It barfs with MIPSpro
// 7.3 if it overloads the public const version so the name had to be
// changed.
XxLine& getLineNC( const XxDln lineno );
// Split region into a new set of lines. Push new lines onto given vector.
// This is a convenience method.
void splitTwoRegions(
std::vector<XxLine>& newLines,
XxDln start,
XxDln end,
XxFno s1,
XxFno s2
) const;
// Make really sure the line numbers are sequential. This is zealous and
// that's how I like it. Self-defensive programming.
void validateLineNumbers() const;
// Save a chunk. Function created to factorize code used twice by save()
void saveChunk(
QTextStream& os,
const std::auto_ptr<XxBuffer>* files,
const bool useConditionals,
const bool removeEmptyConditionals,
const QString conditionals[3],
const QString tags[4],
const uint unselBegin,
const uint unselEnd
) const;
/*----- data members -----*/
// list of line descriptors
std::vector< XxLine > _lines;
std::vector< SearchResult > _searchResults;
XxHordiff _lastInitializedDiffType;
uint _lastInitializedContext;
bool _isDirectoryDiff;
bool _dirty;
};
XX_NAMESPACE_END
#include <diffs.inline.h>
#endif
|