author | Claus Gittinger <cg@exept.de> |
Wed, 29 Aug 2018 12:46:21 +0200 | |
branch | cvs_MAIN |
changeset 856 | 4d897e8ab998 |
parent 698 | ca7eb44d2203 |
permissions | -rw-r--r-- |
210 | 1 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
2 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
3 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
4 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
5 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
6 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
7 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
8 |
version 2.1 of the License. |
210 | 9 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
10 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
11 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
12 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
13 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
14 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
15 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
16 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 18 |
" |
177 | 19 |
"{ Package: 'stx:libscm/mercurial' }" |
20 |
||
633 | 21 |
"{ NameSpace: Smalltalk }" |
22 |
||
177 | 23 |
Object subclass:#HGMergeInfo |
24 |
instanceVariableNames:'numUpdated numMerged numRemoved numUnresolved' |
|
25 |
classVariableNames:'' |
|
26 |
poolDictionaries:'' |
|
27 |
category:'SCM-Mercurial-Core' |
|
28 |
! |
|
29 |
||
210 | 30 |
!HGMergeInfo class methodsFor:'documentation'! |
31 |
||
32 |
copyright |
|
33 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
34 |
stx:libscm - a new source code management library for Smalltalk/X |
509
f92210d4585b
Updated copyright notice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
35 |
Copyright (C) 2012-2015 Jan Vrany |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
36 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
37 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
38 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
39 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
40 |
version 2.1 of the License. |
210 | 41 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
42 |
This library is distributed in the hope that it will be useful, |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
43 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
44 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
45 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
46 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
47 |
You should have received a copy of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
48 |
License along with this library; if not, write to the Free Software |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
49 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 50 |
" |
51 |
! ! |
|
177 | 52 |
|
53 |
!HGMergeInfo methodsFor:'accessing'! |
|
54 |
||
55 |
numMerged |
|
56 |
^ numMerged |
|
57 |
! |
|
58 |
||
59 |
numRemoved |
|
60 |
^ numRemoved |
|
61 |
! |
|
62 |
||
63 |
numUnresolved |
|
64 |
^ numUnresolved |
|
65 |
! |
|
66 |
||
67 |
numUpdated |
|
68 |
^ numUpdated |
|
69 |
! ! |
|
70 |
||
71 |
!HGMergeInfo methodsFor:'initialization'! |
|
72 |
||
73 |
setNumMerged:anInteger |
|
74 |
numMerged := anInteger. |
|
75 |
||
76 |
"Created: / 14-01-2013 / 15:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
77 |
! |
|
78 |
||
79 |
setNumRemoved:anInteger |
|
80 |
numRemoved := anInteger. |
|
81 |
||
82 |
"Created: / 14-01-2013 / 15:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
83 |
! |
|
84 |
||
85 |
setNumUnresolved:anInteger |
|
86 |
numUnresolved := anInteger. |
|
87 |
||
88 |
"Created: / 14-01-2013 / 15:44:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
89 |
! |
|
90 |
||
91 |
setNumUpdated:anInteger |
|
92 |
numUpdated := anInteger. |
|
93 |
||
94 |
"Created: / 14-01-2013 / 15:44:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
95 |
! ! |
|
96 |
||
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
97 |
!HGMergeInfo methodsFor:'printing & storing'! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
98 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
99 |
printOn:aStream |
698 | 100 |
"append a printed representation of the receiver to the argument, aStream" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
101 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
102 |
super printOn:aStream. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
103 |
aStream nextPutAll:'numUpdated: '. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
104 |
numUpdated printOn:aStream. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
105 |
aStream nextPutAll:'numMerged: '. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
106 |
numMerged printOn:aStream. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
107 |
aStream nextPutAll:'numRemoved: '. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
108 |
numRemoved printOn:aStream. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
109 |
aStream nextPutAll:'numUnresolved: '. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
110 |
numUnresolved printOn:aStream. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
111 |
! ! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
112 |
|
177 | 113 |
!HGMergeInfo class methodsFor:'documentation'! |
114 |
||
633 | 115 |
version |
116 |
^ '$Header$' |
|
117 |
! |
|
118 |
||
119 |
version_CVS |
|
120 |
^ '$Header$' |
|
121 |
! |
|
122 |
||
177 | 123 |
version_HG |
124 |
||
125 |
^ '$Changeset: <not expanded> $' |
|
126 |
! ! |
|
210 | 127 |