"

COPYRIGHT (c) 2020 LabWare

stx:libscm - a new source code management library for Smalltalk/X

This library is free software; you can redistribute it and/or

modify it under the terms of the GNU Lesser General Public

License as published by the Free Software Foundation; either

version 2.1 of the License. 

This library 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

Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public

License along with this library; if not, write to the Free Software

Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

"

"{ Package: 'stx:libscm/mercurial' }"

"{ NameSpace: Smalltalk }"

SCMMergeTool subclass:#HGMergeTool

	instanceVariableNames:''

	classVariableNames:''

	poolDictionaries:''

	category:'SCM-Mercurial-StX-Tools'

!

!HGMergeTool class methodsFor:'documentation'!

copyright

"

COPYRIGHT (c) 2020 LabWare

stx:libscm - a new source code management library for Smalltalk/X

This library is free software; you can redistribute it and/or

modify it under the terms of the GNU Lesser General Public

License as published by the Free Software Foundation; either

version 2.1 of the License. 

This library 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

Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public

License along with this library; if not, write to the Free Software

Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

"

! !

!HGMergeTool methodsFor:'merging'!

merge: local revision: otherRevString

    | repo localRev baseRev otherRev localPath base other |

    repo := HGRepository discover: local.

    repo isNil ifTrue: [

        self error: 'Cannot find Mercurial repository for: ', local pathName.

        ^ self.

    ].

    repo := HGRepository on: repo.

    otherRev := repo changesetsMatching: otherRevString.

    otherRev isEmpty ifTrue:[

        self error: 'No revisions matching ', otherRevString.

        ^ self.

    ].

    otherRev size > 1 ifTrue: [

        self error: 'Multiple matching ', otherRevString.

        ^ self.

    ].

    otherRev := otherRev first.

    localRev := repo workingCopy changeset.

    baseRev := repo changesetsMatching: ('children(ancestor(%1,%2)) and ancestors(%1)' bindWith: localRev id printStringWithoutNumber with: otherRev id printStringWithoutNumber).

    baseRev isEmpty ifTrue:[

        self error: 'Cannot find base revision'.

        ^ self.

    ].

    baseRev size > 1 ifTrue: [

        self error: 'Multiple base revisions found, probably a bug!!'.

        ^ self.

    ].

    baseRev := baseRev first.

    localPath := local pathName copyFrom: repo pathName size + 2.

    base := baseRev / localPath.

    other := otherRev / localPath.

    ^ self base: base local: local other: other output: local.

    "

    HGMergeTool new merge:'/home/jv/Projects/SmalltalkX/sources/jv1_x32_lin/build/stx/libbasic/String.st' asFilename revision: 'default'

    "

    "Created: / 27-08-2020 / 09:34:57 / Jan Vrany <jan.vrany@labware.com>"

    "Modified: / 27-08-2020 / 11:35:11 / Jan Vrany <jan.vrany@labware.com>"

! !

!HGMergeTool class methodsFor:'documentation'!

version_HG

    ^ '$Changeset: <not expanded> $'

! !