Tools__ChangeSetDiffInfo.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 28 Aug 2013 12:52:38 +0100
branchjv
changeset 13465 1f1e8b6710c8
parent 12431 9f0c59c742d5
child 13673 0e02e5ca25cd
permissions -rw-r--r--
Bugfix Tools::CodeView2::GutterView - do not redraw gutter if its not shown. This actually fixes DNU when CodeView2 is used in diff view. Then the second gutter is not shown and #yOfTextViewLine: returns nil (bad) which leads to DNU.

"
 COPYRIGHT (c) 2006 by eXept Software AG
              All Rights Reserved

 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
"
"{ Package: 'stx:libtool' }"

"{ NameSpace: Tools }"

Object subclass:#ChangeSetDiffInfo
	instanceVariableNames:'specBase specA specB specMerge diffset same'
	classVariableNames:''
	poolDictionaries:''
	category:'Interface-Diff'
!

!ChangeSetDiffInfo class methodsFor:'documentation'!

copyright
"
 COPYRIGHT (c) 2006 by eXept Software AG
              All Rights Reserved

 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
"
! !

!ChangeSetDiffInfo class methodsFor:'instance creation'!

specA: specA specB: specB

    ^self specA: specA specB: specB specBase: nil

    "Created: / 20-03-2012 / 11:17:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!

specA: specA specB: specB specBase: specBase

    ^self specA: specA specB: specB specBase: specBase specMerge: nil

    "Created: / 20-03-2012 / 11:19:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!

specA: specA specB: specB specBase: specBase specMerge: specMerge

    ^self new 
        specA: specA; 
        specB: specB; 
        specBase: specBase;
        specMerge: specMerge

    "Created: / 20-03-2012 / 11:19:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !

!ChangeSetDiffInfo methodsFor:'accessing'!

diffset
    ^ diffset
!

same
    ^ same
!

specA
    ^ specA
!

specA:something
    specA := something.
!

specB
    ^ specB
!

specB:something
    specB := something.
!

specBase
    ^ specBase
!

specBase:something
    specBase := something.
!

specMerge
    ^ specMerge
!

specMerge:something
    specMerge := something.
!

specMergeFile
    ^ specMerge file

    "Created: / 20-03-2012 / 15:04:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !

!ChangeSetDiffInfo methodsFor:'queries'!

isDiff2

    ^specBase isNil

    "Created: / 20-03-2012 / 10:22:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!

isDiff3

    ^specBase notNil

    "Created: / 20-03-2012 / 10:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!

isMerge

    ^
"/    specBase notNil and:[
        specMerge notNil
"/    ]

    "Created: / 20-03-2012 / 10:23:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !

!ChangeSetDiffInfo methodsFor:'read / write'!

read
    "Reads changesets and generates diffset and 'same' change list"

    | diff |
    diff := ChangeSetDiff new.
    diff
        versionA: specA changeSet
        versionB: specB changeSet
        versionBase: (specBase notNil ifTrue:[specBase changeSet] ifFalse:[nil]).
    diffset := diff diffset.
    same := diff same.

    "Created: / 19-03-2012 / 22:10:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !

!ChangeSetDiffInfo class methodsFor:'documentation'!

version_HG

    ^ '$Changeset: <not expanded> $'
!

version_SVN
    ^ '$Id: Tools__ChangeSetDiffInfo.st 8036 2012-08-03 15:14:04Z vranyj1 $'
! !