|
210
|
1 |
"
|
|
|
2 |
COPYRIGHT (c) 2012-2013 by Jan Vrany
|
|
|
3 |
All Rights Reserved
|
|
|
4 |
|
|
|
5 |
This software is furnished under a license and may be used
|
|
|
6 |
only in accordance with the terms of that license and with the
|
|
|
7 |
inclusion of the above copyright notice. This software may not
|
|
|
8 |
be provided or otherwise made available to, or used by, any
|
|
|
9 |
other person. No title to or ownership of the software is
|
|
|
10 |
hereby transferred.
|
|
|
11 |
"
|
|
177
|
12 |
"{ Package: 'stx:libscm/mercurial' }"
|
|
|
13 |
|
|
|
14 |
Object subclass:#HGMergeInfo
|
|
|
15 |
instanceVariableNames:'numUpdated numMerged numRemoved numUnresolved'
|
|
|
16 |
classVariableNames:''
|
|
|
17 |
poolDictionaries:''
|
|
|
18 |
category:'SCM-Mercurial-Core'
|
|
|
19 |
!
|
|
|
20 |
|
|
210
|
21 |
!HGMergeInfo class methodsFor:'documentation'!
|
|
|
22 |
|
|
|
23 |
copyright
|
|
|
24 |
"
|
|
|
25 |
COPYRIGHT (c) 2012-2013 by Jan Vrany
|
|
|
26 |
All Rights Reserved
|
|
|
27 |
|
|
|
28 |
This software is furnished under a license and may be used
|
|
|
29 |
only in accordance with the terms of that license and with the
|
|
|
30 |
inclusion of the above copyright notice. This software may not
|
|
|
31 |
be provided or otherwise made available to, or used by, any
|
|
|
32 |
other person. No title to or ownership of the software is
|
|
|
33 |
hereby transferred.
|
|
|
34 |
"
|
|
|
35 |
! !
|
|
177
|
36 |
|
|
|
37 |
!HGMergeInfo methodsFor:'accessing'!
|
|
|
38 |
|
|
|
39 |
numMerged
|
|
|
40 |
^ numMerged
|
|
|
41 |
!
|
|
|
42 |
|
|
|
43 |
numRemoved
|
|
|
44 |
^ numRemoved
|
|
|
45 |
!
|
|
|
46 |
|
|
|
47 |
numUnresolved
|
|
|
48 |
^ numUnresolved
|
|
|
49 |
!
|
|
|
50 |
|
|
|
51 |
numUpdated
|
|
|
52 |
^ numUpdated
|
|
|
53 |
! !
|
|
|
54 |
|
|
|
55 |
!HGMergeInfo methodsFor:'initialization'!
|
|
|
56 |
|
|
|
57 |
setNumMerged:anInteger
|
|
|
58 |
numMerged := anInteger.
|
|
|
59 |
|
|
|
60 |
"Created: / 14-01-2013 / 15:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
61 |
!
|
|
|
62 |
|
|
|
63 |
setNumRemoved:anInteger
|
|
|
64 |
numRemoved := anInteger.
|
|
|
65 |
|
|
|
66 |
"Created: / 14-01-2013 / 15:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
67 |
!
|
|
|
68 |
|
|
|
69 |
setNumUnresolved:anInteger
|
|
|
70 |
numUnresolved := anInteger.
|
|
|
71 |
|
|
|
72 |
"Created: / 14-01-2013 / 15:44:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
73 |
!
|
|
|
74 |
|
|
|
75 |
setNumUpdated:anInteger
|
|
|
76 |
numUpdated := anInteger.
|
|
|
77 |
|
|
|
78 |
"Created: / 14-01-2013 / 15:44:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
79 |
! !
|
|
|
80 |
|
|
|
81 |
!HGMergeInfo class methodsFor:'documentation'!
|
|
|
82 |
|
|
|
83 |
version_HG
|
|
|
84 |
|
|
|
85 |
^ '$Changeset: <not expanded> $'
|
|
|
86 |
! !
|
|
210
|
87 |
|