author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 05 Mar 2014 10:04:25 +0000 | |
changeset 395 | fc0607653d8a |
parent 372 | 5acd6d915c77 |
parent 391 | f05648d15add |
child 399 | abafe12d47d6 |
permissions | -rw-r--r-- |
210 | 1 |
" |
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
2 |
stx:libscm - a new source code management library for Smalltalk/X |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
3 |
Copyright (C) 2012-2013 Jan Vrany |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
4 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
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:
300
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:
300
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:
300
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:
300
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:
300
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:
300
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:
300
diff
changeset
|
13 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
14 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
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:
300
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:
300
diff
changeset
|
17 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 18 |
" |
34 | 19 |
"{ Package: 'stx:libscm/mercurial' }" |
20 |
||
21 |
Object subclass:#HGCommand |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
22 |
instanceVariableNames:'workingDirectory result error errors blocker errorReader |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
23 |
outputReader' |
256 | 24 |
classVariableNames:'HGExecutable HGVersion' |
25 |
poolDictionaries:'HGDebugFlags' |
|
34 | 26 |
category:'SCM-Mercurial-Internal' |
27 |
! |
|
28 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
29 |
HGCommand subclass:#add |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
30 |
instanceVariableNames:'paths' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
31 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
32 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
33 |
privateIn:HGCommand |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
34 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
35 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
36 |
HGCommand subclass:#branches |
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
37 |
instanceVariableNames:'active closed' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
38 |
classVariableNames:'' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
39 |
poolDictionaries:'' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
40 |
privateIn:HGCommand |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
41 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
42 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
43 |
HGCommand subclass:#cat |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
44 |
instanceVariableNames:'path revision destination' |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
45 |
classVariableNames:'' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
46 |
poolDictionaries:'' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
47 |
privateIn:HGCommand |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
48 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
49 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
50 |
HGCommand subclass:#clone |
88 | 51 |
instanceVariableNames:'url path update' |
34 | 52 |
classVariableNames:'' |
53 |
poolDictionaries:'' |
|
54 |
privateIn:HGCommand |
|
55 |
! |
|
56 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
57 |
HGCommand subclass:#commit |
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
58 |
instanceVariableNames:'message files author date' |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
59 |
classVariableNames:'' |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
60 |
poolDictionaries:'' |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
61 |
privateIn:HGCommand |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
62 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
63 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
64 |
HGCommand subclass:#heads |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
65 |
instanceVariableNames:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
66 |
classVariableNames:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
67 |
poolDictionaries:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
68 |
privateIn:HGCommand |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
69 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
70 |
|
366
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
71 |
HGCommand subclass:#help |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
72 |
instanceVariableNames:'topic' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
73 |
classVariableNames:'' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
74 |
poolDictionaries:'' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
75 |
privateIn:HGCommand |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
76 |
! |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
77 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
78 |
HGCommand subclass:#init |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
79 |
instanceVariableNames:'path' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
80 |
classVariableNames:'' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
81 |
poolDictionaries:'' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
82 |
privateIn:HGCommand |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
83 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
84 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
85 |
HGCommand subclass:#locate |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
86 |
instanceVariableNames:'revision' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
87 |
classVariableNames:'' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
88 |
poolDictionaries:'' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
89 |
privateIn:HGCommand |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
90 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
91 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
92 |
HGCommand subclass:#log |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
93 |
instanceVariableNames:'start stop path childrenOnly idsOnly revsets limit' |
34 | 94 |
classVariableNames:'' |
95 |
poolDictionaries:'' |
|
96 |
privateIn:HGCommand |
|
97 |
! |
|
98 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
99 |
HGCommand subclass:#merge |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
100 |
instanceVariableNames:'revision tool' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
101 |
classVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
102 |
poolDictionaries:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
103 |
privateIn:HGCommand |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
104 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
105 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
106 |
HGCommand subclass:#mv |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
107 |
instanceVariableNames:'source destination' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
108 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
109 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
110 |
privateIn:HGCommand |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
111 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
112 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
113 |
HGCommand subclass:#pull |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
114 |
instanceVariableNames:'url' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
115 |
classVariableNames:'' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
116 |
poolDictionaries:'' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
117 |
privateIn:HGCommand |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
118 |
! |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
119 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
120 |
HGCommand subclass:#push |
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
121 |
instanceVariableNames:'url force' |
34 | 122 |
classVariableNames:'' |
123 |
poolDictionaries:'' |
|
124 |
privateIn:HGCommand |
|
125 |
! |
|
126 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
127 |
HGCommand subclass:#remove |
354
16b9a63fa668
Made HGWorkingCopyFile>>remove forced, i.e., it removes the file even if there are changes to it)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
341
diff
changeset
|
128 |
instanceVariableNames:'force paths' |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
129 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
130 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
131 |
privateIn:HGCommand |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
132 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
133 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
134 |
HGCommand subclass:#resolve |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
135 |
instanceVariableNames:'tool mark unmark files' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
136 |
classVariableNames:'' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
137 |
poolDictionaries:'' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
138 |
privateIn:HGCommand |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
139 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
140 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
141 |
HGCommand subclass:#resolve__list |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
142 |
instanceVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
143 |
classVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
144 |
poolDictionaries:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
145 |
privateIn:HGCommand |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
146 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
147 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
148 |
HGCommand subclass:#showconfig |
142
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
149 |
instanceVariableNames:'key' |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
150 |
classVariableNames:'' |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
151 |
poolDictionaries:'' |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
152 |
privateIn:HGCommand |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
153 |
! |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
154 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
155 |
HGCommand subclass:#status |
36 | 156 |
instanceVariableNames:'path' |
157 |
classVariableNames:'' |
|
158 |
poolDictionaries:'' |
|
159 |
privateIn:HGCommand |
|
160 |
! |
|
161 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
162 |
HGCommand subclass:#update |
88 | 163 |
instanceVariableNames:'revision' |
164 |
classVariableNames:'' |
|
165 |
poolDictionaries:'' |
|
166 |
privateIn:HGCommand |
|
167 |
! |
|
168 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
169 |
HGCommand subclass:#version |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
170 |
instanceVariableNames:'executable' |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
171 |
classVariableNames:'' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
172 |
poolDictionaries:'' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
173 |
privateIn:HGCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
174 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
175 |
|
34 | 176 |
!HGCommand class methodsFor:'documentation'! |
177 |
||
210 | 178 |
copyright |
179 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
180 |
stx:libscm - a new source code management library for Smalltalk/X |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
181 |
Copyright (C) 2012-2013 Jan Vrany |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
182 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
183 |
This library is free software; you can redistribute it and/or |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
184 |
modify it under the terms of the GNU Lesser General Public |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
185 |
License as published by the Free Software Foundation; either |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
186 |
version 2.1 of the License. |
210 | 187 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
188 |
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:
300
diff
changeset
|
189 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
190 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
191 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
192 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
193 |
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:
300
diff
changeset
|
194 |
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:
300
diff
changeset
|
195 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 196 |
" |
197 |
! |
|
198 |
||
34 | 199 |
documentation |
200 |
" |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
201 |
A wrapper for hg command line tool. Individual commands are wrapped in |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
202 |
my private classes. |
34 | 203 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
204 |
HGCommand is part of internal implementation and subject to change. |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
205 |
Therefore it should not be used by user code. Use classed and APIs in |
34 | 206 |
SCM-Mercurial-Core instead. |
207 |
||
208 |
[author:] |
|
209 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
|
210 |
||
211 |
[instance variables:] |
|
212 |
||
213 |
[class variables:] |
|
214 |
||
215 |
[see also:] |
|
216 |
||
217 |
" |
|
218 |
! ! |
|
219 |
||
220 |
!HGCommand class methodsFor:'accessing'! |
|
221 |
||
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
222 |
hgCommand |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
223 |
"Returns absolute path to hg executable to use" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
224 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
225 |
HGExecutable isNil ifTrue:[ |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
226 |
| executable | |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
227 |
executable := UserPreferences current hgCommand. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
228 |
executable isNil ifTrue:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
229 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
230 |
"/ | h | |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
231 |
"/ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
232 |
"/ h := Win32OperatingSystem registryEntry |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
233 |
"/ key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
234 |
"/ h notNil ifTrue:[HGExecutable := h valueNamed:'']. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
235 |
"/ HGExecutable notEmptyOrNil ifTrue:[^HGExecutable] |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
236 |
executable := OperatingSystem pathOfCommand:'hg'. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
237 |
] ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
238 |
OperatingSystem isUNIXlike ifTrue:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
239 |
executable := OperatingSystem pathOfCommand:'hg'. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
240 |
] |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
241 |
]. |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
242 |
]. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
243 |
executable := self hgCommandValidate: executable. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
244 |
HGExecutable := executable. |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
245 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
246 |
^ HGExecutable |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
247 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
248 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
249 |
HGExecutable := nil. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
250 |
self basicNew executable |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
251 |
" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
252 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
253 |
"Created: / 19-11-2012 / 21:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
254 |
"Modified: / 21-02-2014 / 08:54:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
255 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
256 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
257 |
hgCommand: command |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
258 |
HGExecutable := command |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
259 |
|
231
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
260 |
" |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
261 |
HGCommand hgCommand: '/usr/src/mercurial-2.4/hg' |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
262 |
HGCommand hgCommand: '/usr/bin/hg' |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
263 |
" |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
264 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
265 |
"Created: / 19-11-2012 / 21:49:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
231
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
266 |
"Modified (comment): / 03-03-2013 / 12:24:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
267 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
268 |
|
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
269 |
hgCommandValidate: executable |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
270 |
"/ Given a `executable`, checks whether it is a valid hg binary. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
271 |
"/ Returns absolute path to hg binary or raise an |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
272 |
"/ HGInvalidExecutableError or HGInvalidVersionError |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
273 |
"/ if `executable` is not valid hg binary. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
274 |
"/ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
275 |
| path version | |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
276 |
|
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
277 |
path := executable asFilename. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
278 |
path isAbsolute ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
279 |
path := path asAbsoluteFilename. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
280 |
path exists ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
281 |
"/ Also try to find specified command along PATH, maybe somebody |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
282 |
"/ just typed 'hg' in... |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
283 |
(executable includes: Filename separator) ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
284 |
path := (OperatingSystem pathOfCommand: executable). |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
285 |
path isNil ifTrue:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
286 |
HGInvalidExecutableError raiseErrorString:('''hg'' executable (%1) not found!!' bindWith: executable). |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
287 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
288 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
289 |
^ path |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
290 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
291 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
292 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
293 |
path exists ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
294 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) does not exists!!' bindWith: path pathName). |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
295 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
296 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
297 |
path isDirectory ifTrue:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
298 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is actually a directory!!' bindWith: path pathName). |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
299 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
300 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
301 |
path isExecutable ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
302 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is cannot be executed!!' bindWith: path pathName). |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
303 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
304 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
305 |
[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
306 |
version := self hgVersionOf: path pathName. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
307 |
] on: Error do:[:ex | |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
308 |
HGInvalidExecutableError newException |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
309 |
parameter: ex; |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
310 |
messageText: 'Failed to check version: ', ex description; |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
311 |
raise. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
312 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
313 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
314 |
(self hgVersionIsSupported: version) ifFalse:[ |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
315 |
HGInvalidVersionError newException |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
316 |
parameter: version; |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
317 |
messageText: ('Unsuported Mercurial version (%1)' bindWith: (version asStringWith:$.)); |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
318 |
raise. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
319 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
320 |
]. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
321 |
^ path pathName |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
322 |
|
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
323 |
"Created: / 21-02-2014 / 08:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
324 |
"Modified: / 21-02-2014 / 10:31:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
325 |
! |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
326 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
327 |
hgVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
328 |
"Return mercurial version installed on this compiter" |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
329 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
330 |
HGVersion isNil ifTrue:[ |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
331 |
HGVersion := self hgVersionOf: self hgCommand |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
332 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
333 |
^ HGVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
334 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
335 |
" |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
336 |
HGCommand hgVersion |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
337 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
338 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
339 |
"Created: / 19-11-2012 / 20:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
340 |
"Modified: / 21-01-2013 / 05:07:58 / jv" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
341 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
342 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
343 |
hgVersionIsSupported |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
344 |
^ self hgVersionIsSupported:self hgVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
345 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
346 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
347 |
HGCommand mercurialVersionIsSupported" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
348 |
"Created: / 19-11-2012 / 20:34:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
349 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
350 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
351 |
hgVersionIsSupported:version |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
352 |
^ self hgVersionsSupported |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
353 |
anySatisfy:[:vsn | |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
354 |
((vsn at:1) == #'*' or:[ (vsn at:1) == (version at:1) ]) |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
355 |
and:[ |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
356 |
((vsn at:2) == #'*' or:[ (vsn at:2) == (version at:2) ]) |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
357 |
and:[ ((vsn at:3) == #'*' or:[ (vsn at:1) == (version at:3) ]) ] |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
358 |
] |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
359 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
360 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
361 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
362 |
HGCommand mercurialVersionIsSupported: #(2 3 2) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
363 |
HGCommand mercurialVersionIsSupported: #(2 0 1) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
364 |
HGCommand mercurialVersionIsSupported: #(1 9 1) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
365 |
HGCommand mercurialVersionIsSupported: #(1 0 0) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
366 |
HGCommand mercurialVersionIsSupported: #(2 4 nil)" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
367 |
"Created: / 19-11-2012 / 20:31:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
368 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
369 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
370 |
hgVersionOf: hgcommand |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
371 |
"Return mercurial version installed on this compiter" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
372 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
373 |
^version new |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
374 |
executable: hgcommand; |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
375 |
execute |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
376 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
377 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
378 |
HGCommand hgVersion |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
379 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
380 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
381 |
"Created: / 21-01-2013 / 05:05:01 / jv" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
382 |
! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
383 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
384 |
hgVersionsSupported |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
385 |
"Return a list of mercurial version supported bu this |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
386 |
implementation" |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
387 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
388 |
^ #( #(1 9 #'*') |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
389 |
#(2 #'*' #'*') ) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
390 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
391 |
"Created: / 19-11-2012 / 20:26:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
392 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
393 |
|
34 | 394 |
verbose |
395 |
||
396 |
^ UserPreferences current hgVerbose |
|
397 |
||
398 |
"Created: / 19-03-2008 / 12:29:47 / janfrog" |
|
399 |
"Modified: / 19-03-2009 / 14:00:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
400 |
"Modified (format): / 27-12-2011 / 16:00:06 / dundee" |
|
401 |
"Modified: / 17-10-2012 / 13:05:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
402 |
! |
|
403 |
||
404 |
verbose:aBoolean |
|
405 |
||
406 |
UserPreferences current hgVerbose:aBoolean |
|
407 |
||
408 |
"Created: / 19-03-2008 / 12:29:59 / janfrog" |
|
409 |
"Modified: / 19-03-2009 / 14:00:59 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
410 |
"Modified (format): / 27-12-2011 / 16:00:13 / dundee" |
|
411 |
"Modified: / 17-10-2012 / 13:05:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
412 |
! ! |
|
413 |
||
414 |
!HGCommand class methodsFor:'commands'! |
|
415 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
416 |
add |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
417 |
^add new |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
418 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
419 |
"Created: / 15-11-2012 / 00:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
420 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
421 |
|
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
422 |
branches |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
423 |
^branches new |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
424 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
425 |
"Created: / 27-11-2012 / 19:56:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
426 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
427 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
428 |
cat |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
429 |
^cat new |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
430 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
431 |
"Created: / 17-11-2012 / 00:16:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
432 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
433 |
|
34 | 434 |
clone |
435 |
^clone new |
|
436 |
||
437 |
"Created: / 01-10-2012 / 00:09:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
438 |
! |
|
439 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
440 |
commit |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
441 |
^commit new |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
442 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
443 |
"Created: / 12-11-2012 / 22:40:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
444 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
445 |
|
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
446 |
heads |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
447 |
^heads new |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
448 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
449 |
"Created: / 27-11-2012 / 21:32:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
450 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
451 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
452 |
init |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
453 |
^init new |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
454 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
455 |
"Created: / 13-02-2014 / 12:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
456 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
457 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
458 |
locate |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
459 |
^locate new |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
460 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
461 |
"Created: / 16-11-2012 / 22:36:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
462 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
463 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
464 |
log |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
465 |
^log new |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
466 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
467 |
"Created: / 13-11-2012 / 09:00:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
468 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
469 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
470 |
merge |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
471 |
^merge new |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
472 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
473 |
"Created: / 14-01-2013 / 16:03:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
474 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
475 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
476 |
mv |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
477 |
^mv new |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
478 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
479 |
"Created: / 15-11-2012 / 00:22:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
480 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
481 |
|
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
482 |
pull |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
483 |
^pull new |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
484 |
|
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
485 |
"Created: / 27-11-2012 / 23:30:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
486 |
! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
487 |
|
34 | 488 |
push |
489 |
^push new |
|
490 |
||
491 |
"Created: / 30-09-2012 / 23:46:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
36 | 492 |
! |
493 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
494 |
remove |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
495 |
^remove new |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
496 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
497 |
"Created: / 15-11-2012 / 00:06:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
498 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
499 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
500 |
resolve |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
501 |
^resolve new |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
502 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
503 |
"Created: / 14-01-2013 / 18:20:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
504 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
505 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
506 |
resolve__list |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
507 |
^resolve__list new |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
508 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
509 |
"Created: / 14-01-2013 / 16:42:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
510 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
511 |
|
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
512 |
showconfig |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
513 |
^showconfig new |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
514 |
|
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
515 |
"Created: / 06-12-2012 / 20:24:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
516 |
! |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
517 |
|
36 | 518 |
status |
519 |
^status new |
|
520 |
||
521 |
"Created: / 23-10-2012 / 11:10:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 | 522 |
! |
523 |
||
524 |
update |
|
525 |
^update new |
|
526 |
||
527 |
"Created: / 21-11-2012 / 00:23:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
34 | 528 |
! ! |
529 |
||
530 |
!HGCommand class methodsFor:'commands-shortcuts'! |
|
531 |
||
532 |
clone: url to: stringOfFilename |
|
533 |
self clone |
|
534 |
url: url; |
|
535 |
path: stringOfFilename asFilename asAbsoluteFilename pathName; |
|
536 |
execute |
|
537 |
||
538 |
"Created: / 01-10-2012 / 00:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
539 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
540 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
541 |
init: aStringOrFilename |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
542 |
^ self init path: aStringOrFilename; yourself |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
543 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
544 |
"Created: / 13-02-2014 / 12:37:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 545 |
! ! |
546 |
||
547 |
!HGCommand methodsFor:'accessing'! |
|
548 |
||
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
549 |
result |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
550 |
^ result |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
551 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
552 |
|
34 | 553 |
workingDirectory |
554 |
^workingDirectory notNil ifTrue:[ |
|
555 |
workingDirectory |
|
556 |
] ifFalse: [ |
|
557 |
Filename currentDirectory pathName |
|
558 |
] |
|
559 |
||
560 |
"Created: / 11-05-2011 / 08:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
561 |
"Modified (format): / 27-12-2011 / 15:54:08 / dundee" |
|
562 |
"Modified: / 01-10-2012 / 14:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
563 |
! |
|
564 |
||
565 |
workingDirectory:aStringOrFilename |
|
566 |
aStringOrFilename asFilename isDirectory ifFalse:[ |
|
567 |
self error:'Working directory does not exist'. |
|
568 |
^self. |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
569 |
]. |
34 | 570 |
workingDirectory := aStringOrFilename asString. |
571 |
||
572 |
"Modified: / 01-10-2012 / 14:38:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
238
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
573 |
! |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
574 |
|
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
575 |
workingDirectoryOrNil |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
576 |
^workingDirectory |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
577 |
|
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
578 |
"Created: / 04-03-2013 / 10:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 579 |
! ! |
580 |
||
235
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
581 |
!HGCommand methodsFor:'accessing-internal'! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
582 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
583 |
blocker |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
584 |
^ blocker |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
585 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
586 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
587 |
errorReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
588 |
^ errorReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
589 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
590 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
591 |
errors |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
592 |
^ errors |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
593 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
594 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
595 |
outputReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
596 |
^ outputReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
597 |
! ! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
598 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
599 |
!HGCommand methodsFor:'error reporting'! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
600 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
601 |
propagate: anException |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
602 |
"Propagates the error to the process that invoked #execute. |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
603 |
Used by sub-processes to signal errors to the caller" |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
604 |
|
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
605 |
self assert: anException isException. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
606 |
|
256 | 607 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
608 |
Logger log: 'cmd: propagating: ' , anException class name , ' - ', anException description severity: #trace facility: 'HG'. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
609 |
]. |
368
00c2d0fda82b
Minor improvements in debugging support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
610 |
Debug ifTrue:[ |
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
378
diff
changeset
|
611 |
anException isNotification ifFalse:[ |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
378
diff
changeset
|
612 |
thisContext fullPrintAllOn: Transcript. |
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
378
diff
changeset
|
613 |
]. |
368
00c2d0fda82b
Minor improvements in debugging support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
614 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
615 |
errors nextPut: anException. |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
616 |
|
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
617 |
"Created: / 04-02-2013 / 21:29:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
378
diff
changeset
|
618 |
"Modified: / 05-03-2014 / 00:08:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
619 |
! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
620 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
621 |
signal |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
622 |
"Signal all propagated exceptions to the caller" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
623 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
624 |
| ex | |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
625 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
626 |
[ (ex := errors nextOrNil) notNil ] whileTrue:[ |
256 | 627 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
628 |
Logger log: 'cmd: signalling: ' , ex description severity: #trace facility: 'HG'. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
629 |
]. |
341
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
630 |
(ex isNotification or:[ex isResumable == true]) ifTrue:[ |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
631 |
ex raiseRequest |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
632 |
] ifFalse:[ |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
633 |
ex raise |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
634 |
] |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
635 |
]. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
636 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
637 |
"Created: / 04-02-2013 / 21:33:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
341
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
638 |
"Modified: / 21-08-2013 / 08:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
639 |
! ! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
640 |
|
34 | 641 |
!HGCommand methodsFor:'executing'! |
642 |
||
643 |
execute |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
644 |
| stdoutPipe stdout stderrPipe stderr pid environment status args spin | |
34 | 645 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
646 |
self initialize. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
647 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
648 |
stdoutPipe := NonPositionableExternalStream makePipe. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
649 |
stdout := stdoutPipe first. |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
650 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
651 |
stderrPipe := NonPositionableExternalStream makePipe. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
652 |
stderr := stderrPipe first. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
653 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
654 |
environment := OperatingSystem isUNIXlike |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
655 |
ifTrue:[OperatingSystem getEnvironment copy] |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
656 |
ifFalse:[environment := Dictionary new]. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
657 |
environment at: 'HGEDITOR' put: 'true'. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
658 |
|
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
659 |
environment at:'LANG' put:'C'. |
34 | 660 |
|
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
661 |
args := self arguments. |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
662 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
663 |
args := String streamContents:[:s| |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
664 |
args |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
665 |
do:[:each | s nextPut:$"; nextPutAll: each; nextPut: $"] |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
666 |
separatedBy: [ s space ] |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
667 |
] |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
668 |
]. |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
669 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
670 |
|
34 | 671 |
Processor monitor:[ |
256 | 672 |
Trace ifTrue:[ |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
673 |
Logger log: 'cmd: executing: ' , (args isString ifTrue:[args] ifFalse:[args asStringWith:' ']) severity: #trace facility: 'HG'. |
207
fce7e7b62741
HGCommand: added tracing of executed commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
674 |
]. |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
675 |
pid := OperatingSystem exec:(self executable) withArguments:args |
34 | 676 |
environment:environment |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
677 |
fileDescriptors:{0 . stdoutPipe second fileDescriptor . stderrPipe second fileDescriptor} |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
678 |
fork:true |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
679 |
newPgrp:false |
34 | 680 |
inDirectory:self workingDirectory |
681 |
] action:[:stat | |
|
256 | 682 |
Trace ifTrue:[ |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
683 |
Logger log: 'cmd: command finished' severity: #trace facility: 'HG'. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
684 |
]. |
34 | 685 |
status := stat. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
686 |
blocker signal. |
34 | 687 |
]. |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
688 |
|
34 | 689 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
690 |
stdoutPipe second close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
691 |
stderrPipe second close. |
34 | 692 |
pid isNil ifTrue:[ |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
693 |
stdout close. |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
694 |
stderr close. |
36 | 695 |
HGCommandError raiseErrorString: 'cannot execute hg command'. |
34 | 696 |
^ self. |
697 |
]. |
|
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
698 |
OperatingSystem isUNIXlike ifTrue:[ |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
699 |
"/JV: Q: Why this is necessary? |
260
9740c721a8a3
Fix in HGCommand (readWait)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
258
diff
changeset
|
700 |
stdout readWaitWithTimeoutMs: 10. |
9740c721a8a3
Fix in HGCommand (readWait)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
258
diff
changeset
|
701 |
stderr readWaitWithTimeoutMs: 10. |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
702 |
Debug ifTrue:[ |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
703 |
stdout := stdout contents asString readStream. |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
704 |
stderr := stderr contents asString readStream. |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
705 |
] |
38
c3d02ed6a645
- HGWorkingCopyFile
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
37
diff
changeset
|
706 |
]. |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
707 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
708 |
self spawnErrorReaderOn: stderr. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
709 |
self spawnOutputReaderOn: stdout. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
710 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
711 |
spin := SemaphoreSet with: blocker with: errors readSemaphore. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
712 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
713 |
[ |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
714 |
[ spin wait ~~ blocker ] whileTrue:[ self signal ] |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
715 |
] ensure:[ |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
716 |
stderr close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
717 |
stdout close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
718 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
719 |
self signal. |
256 | 720 |
Trace ifTrue:[ |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
721 |
Logger log: 'returning' severity: #trace facility: 'HG'. |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
722 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
723 |
^self status: status result: result |
34 | 724 |
|
725 |
"Created: / 11-05-2011 / 07:45:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
726 |
"Modified: / 17-12-2011 / 19:22:00 / dundee" |
|
727 |
"Modified (format): / 27-12-2011 / 15:53:54 / dundee" |
|
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
728 |
"Modified: / 14-11-2012 / 13:41:57 / jv" |
260
9740c721a8a3
Fix in HGCommand (readWait)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
258
diff
changeset
|
729 |
"Modified: / 13-03-2013 / 00:08:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
234
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
730 |
! |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
731 |
|
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
732 |
executeOnRepository: anHGRepository |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
733 |
workingDirectory isNil ifTrue:[ |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
734 |
workingDirectory := anHGRepository pathName |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
735 |
]. |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
736 |
^self execute. |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
737 |
|
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
738 |
"Created: / 03-03-2013 / 20:34:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
739 |
! ! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
740 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
741 |
!HGCommand methodsFor:'initialization'! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
742 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
743 |
initialize |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
744 |
"Invoked when a new instance is created." |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
745 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
746 |
"/ please change as required (and remove this comment) |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
747 |
"/ workingDirectory := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
748 |
"/ result := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
749 |
"/ error := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
750 |
"/ workers := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
751 |
"/ errors := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
752 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
753 |
errors := SharedQueue new. |
233
d9a8bb2aaa0b
Log command works using command server.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
232
diff
changeset
|
754 |
blocker := (Semaphore new:-2) name: 'Waiting for hg command to finish'. |
d9a8bb2aaa0b
Log command works using command server.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
232
diff
changeset
|
755 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
756 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
757 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
758 |
"/ super initialize. -- commented since inherited method does nothing |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
759 |
|
233
d9a8bb2aaa0b
Log command works using command server.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
232
diff
changeset
|
760 |
"Modified: / 03-03-2013 / 19:50:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 761 |
! ! |
762 |
||
763 |
!HGCommand methodsFor:'private'! |
|
764 |
||
765 |
arguments |
|
766 |
||
767 |
^ OrderedCollection streamContents:[:s | |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
768 |
s nextPut: self executable. |
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
769 |
s nextPut: '--noninteractive'. |
34 | 770 |
self argumentsGlobalOn:s. |
771 |
s nextPut:self command. |
|
772 |
self argumentsCommandOn:s. |
|
773 |
]. |
|
774 |
||
775 |
"Created: / 11-05-2011 / 07:58:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
776 |
"Modified (format): / 27-12-2011 / 15:47:23 / dundee" |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
777 |
"Modified: / 16-12-2012 / 00:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 778 |
! |
779 |
||
780 |
argumentsCommandOn:stream |
|
781 |
"Called to get command specific options" |
|
782 |
||
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
783 |
self subclassResponsibility |
34 | 784 |
|
785 |
"Created: / 11-05-2011 / 07:58:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
786 |
"Modified (format): / 27-12-2011 / 15:46:59 / dundee" |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
787 |
"Modified: / 16-11-2012 / 22:31:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 788 |
! |
789 |
||
790 |
argumentsGlobalOn:arg |
|
791 |
"Called to get global options" |
|
792 |
||
793 |
"Created: / 11-05-2011 / 07:58:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
794 |
"Modified (format): / 27-12-2011 / 15:47:10 / dundee" |
|
795 |
"Modified: / 30-09-2012 / 23:43:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
796 |
! |
|
797 |
||
798 |
command |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
799 |
"Returns the hg 'command' option, i.e. commit, |
34 | 800 |
push, pull, ..." |
801 |
||
802 |
^self class nameWithoutPrefix |
|
803 |
||
804 |
" |
|
805 |
HGCommand::push basicNew command |
|
806 |
" |
|
807 |
||
808 |
"Created: / 11-05-2011 / 07:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
809 |
"Modified (format): / 27-12-2011 / 15:47:17 / dundee" |
|
810 |
"Modified: / 30-09-2012 / 23:37:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
811 |
"Modified (comment): / 08-02-2014 / 11:41:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 812 |
! |
813 |
||
814 |
executable |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
815 |
^ self class hgCommand |
34 | 816 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
817 |
"Modified: / 19-11-2012 / 21:48:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 818 |
! |
819 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
820 |
parseError:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
821 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
34 | 822 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
823 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
824 |
^ (self parserOn: stream) parseError. |
34 | 825 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
826 |
"Created: / 04-02-2013 / 11:59:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
827 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
828 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
829 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
830 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
831 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
832 |
|
34 | 833 |
^ self subclassResponsibility |
834 |
||
835 |
"Created: / 11-05-2011 / 07:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
836 |
"Created: / 17-12-2011 / 17:02:41 / dundee" |
|
837 |
"Modified (comment): / 17-10-2012 / 13:14:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
838 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
839 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
840 |
parserOn: aStream |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
841 |
"Returns an HGCommandParser initialized on given stream." |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
842 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
843 |
^HGCommandParser for: self on: aStream |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
844 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
845 |
"Created: / 04-02-2013 / 12:17:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
846 |
"Modified: / 04-02-2013 / 14:14:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
847 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
848 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
849 |
spawn:block name: name |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
850 |
"Spawn a new background thread executing given block" |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
851 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
852 |
| worker | |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
853 |
|
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
854 |
worker := [ |
256 | 855 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
856 |
Logger log: 'cmd: worker ''', name , ''' spawned' severity: #trace facility: 'HG'. |
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
857 |
]. |
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
858 |
block on: Error do:[:ex|self propagate:ex] |
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
859 |
] newProcess. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
860 |
worker addExitAction:[ |
256 | 861 |
Trace ifTrue:[ |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
862 |
Logger log: 'cmd: worker ''', name , ''' finished' severity: #trace facility: 'HG'. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
863 |
]. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
864 |
blocker notNil ifTrue:[blocker signal]. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
865 |
]. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
866 |
worker resume. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
867 |
worker name: name. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
868 |
^worker |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
869 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
870 |
"Created: / 03-03-2013 / 16:56:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
871 |
"Modified: / 05-03-2013 / 19:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
872 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
873 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
874 |
spawnErrorReaderOn: stderr |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
875 |
errorReader isNil ifTrue:[ |
243
c665ef80dacc
Raise priority of stderr parser proces when spawning command (not using command server).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
241
diff
changeset
|
876 |
errorReader := self spawn: [ self parseError: stderr ] name: 'Error reader'. |
c665ef80dacc
Raise priority of stderr parser proces when spawning command (not using command server).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
241
diff
changeset
|
877 |
errorReader priority: errorReader priority + 1. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
878 |
]. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
879 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
880 |
"Created: / 03-03-2013 / 16:59:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
243
c665ef80dacc
Raise priority of stderr parser proces when spawning command (not using command server).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
241
diff
changeset
|
881 |
"Modified: / 06-03-2013 / 11:42:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
882 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
883 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
884 |
spawnOutputReaderOn: stdout |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
885 |
outputReader isNil ifTrue:[ |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
886 |
outputReader := self spawn: [ result := self parseOutput: stdout ] name: 'Output reader'. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
887 |
] |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
888 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
889 |
"Created: / 03-03-2013 / 17:00:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
890 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
891 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
892 |
status: status result: res |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
893 |
"Called when hg command finishes, passing it's status and result from parser" |
251
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
894 |
|
247
bf5bfe409ff8
Bugfix for commiting to an empty repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
243
diff
changeset
|
895 |
status success ifFalse:[ |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
896 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
897 |
]. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
898 |
^res |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
899 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
900 |
"Created: / 15-11-2012 / 17:04:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
251
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
901 |
"Modified: / 08-03-2013 / 22:32:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 902 |
! ! |
903 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
904 |
!HGCommand::add methodsFor:'accessing'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
905 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
906 |
paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
907 |
^ paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
908 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
909 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
910 |
paths:something |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
911 |
paths := something. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
912 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
913 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
914 |
!HGCommand::add methodsFor:'private'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
915 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
916 |
argumentsCommandOn:stream |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
917 |
"Called to get command specific options" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
918 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
919 |
paths isEmptyOrNil ifTrue:[ |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
920 |
self error: 'No paths given' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
921 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
922 |
stream nextPutAll: paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
923 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
924 |
"Created: / 15-11-2012 / 00:05:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
925 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
926 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
927 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
928 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
929 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
930 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
931 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
932 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
933 |
"Modified: / 15-11-2012 / 00:38:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
934 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
935 |
|
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
936 |
!HGCommand::branches methodsFor:'accessing'! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
937 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
938 |
active |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
939 |
^ active |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
940 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
941 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
942 |
active:aBoolean |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
943 |
active := aBoolean. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
944 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
945 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
946 |
closed |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
947 |
^ closed |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
948 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
949 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
950 |
closed:aBoolean |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
951 |
closed := aBoolean. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
952 |
! ! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
953 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
954 |
!HGCommand::branches methodsFor:'private'! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
955 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
956 |
argumentsCommandOn:stream |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
957 |
"Called to get command specific options" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
958 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
959 |
active == true ifTrue:[ |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
960 |
stream nextPut:'--active' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
961 |
]. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
962 |
closed == true ifTrue:[ |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
963 |
stream nextPut:'--closed' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
964 |
]. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
965 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
966 |
"Created: / 27-11-2012 / 19:54:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
967 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
968 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
969 |
argumentsGlobalOn:stream |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
970 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
971 |
stream nextPut:'--debug' "/to get full node ids |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
972 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
973 |
"Created: / 27-11-2012 / 19:54:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
974 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
975 |
|
228
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
976 |
parseError:stream |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
977 |
^ (self parserOn: stream) parseErrorBranches. |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
978 |
|
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
979 |
"Created: / 06-02-2013 / 19:20:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
980 |
! |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
981 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
982 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
983 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
984 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
985 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
986 |
^ (self parserOn:stream) parseCommandBranches |
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
987 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
988 |
"Created: / 27-11-2012 / 19:55:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
989 |
! ! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
990 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
991 |
!HGCommand::cat methodsFor:'accessing'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
992 |
|
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
993 |
destination |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
994 |
^ destination |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
995 |
! |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
996 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
997 |
destination:aStringOrFilename |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
998 |
destination := aStringOrFilename. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
999 |
! |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1000 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1001 |
path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1002 |
^ path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1003 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1004 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1005 |
path:something |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1006 |
path := something. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1007 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1008 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1009 |
revision |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1010 |
^ revision |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1011 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1012 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1013 |
revision:something |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1014 |
revision := something. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1015 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1016 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1017 |
!HGCommand::cat methodsFor:'executing'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1018 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1019 |
execute |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1020 |
" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1021 |
A hacked version of #execute that returns a open read |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1022 |
stream to read directly from 'hg cat' stdout... |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1023 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1024 |
" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1025 |
|
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1026 |
| pipe output pid environment sema args sout exec | |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1027 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1028 |
pipe := NonPositionableExternalStream makePipe. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1029 |
output := pipe first. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1030 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1031 |
OperatingSystem isUNIXlike ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1032 |
environment := OperatingSystem getEnvironment copy. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1033 |
] ifFalse:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1034 |
environment := Dictionary new. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1035 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1036 |
environment at:'LANG' put:'C'. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1037 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1038 |
args := self arguments. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1039 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1040 |
args := String streamContents:[:s| |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1041 |
args |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1042 |
do:[:each | s nextPut:$"; nextPutAll: each; nextPut: $"] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1043 |
separatedBy: [ s space ] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1044 |
] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1045 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1046 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1047 |
sout := destination notNil |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1048 |
ifTrue:[destination asFilename writeStream] |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1049 |
ifFalse:[pipe second]. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1050 |
sema := Semaphore new name: 'Waiting for hg command to finish'. |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1051 |
exec := [ |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1052 |
pid := OperatingSystem exec:(self executable) withArguments:args |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1053 |
environment:environment |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1054 |
fileDescriptors:{0 . sout fileDescriptor . pipe second fileDescriptor} |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1055 |
fork:true |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1056 |
newPgrp:false |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1057 |
inDirectory:self workingDirectory. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1058 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1059 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1060 |
destination notNil ifTrue:[ |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1061 |
Processor |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1062 |
monitor:exec |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1063 |
action:[:stat | |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1064 |
sema signal. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1065 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1066 |
] ifFalse:[ |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1067 |
exec value |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1068 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1069 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1070 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1071 |
pipe second close. |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1072 |
sout close. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1073 |
pid isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1074 |
HGCommandError raiseErrorString: 'cannot execute hg command'. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1075 |
output close. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1076 |
^ self. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1077 |
]. |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1078 |
^destination notNil |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1079 |
ifTrue:[sema wait. nil] |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1080 |
ifFalse:[output]. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1081 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1082 |
"Created: / 17-11-2012 / 00:13:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1083 |
"Modified: / 04-12-2012 / 10:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1084 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1085 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1086 |
!HGCommand::cat methodsFor:'private'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1087 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1088 |
argumentsCommandOn:stream |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1089 |
"Called to get command specific options" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1090 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1091 |
path isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1092 |
self error:'No path specified' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1093 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1094 |
revision isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1095 |
self error:'No revision specified' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1096 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1097 |
stream nextPut:'--rev'; nextPut: revision asString. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1098 |
stream nextPut:path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1099 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1100 |
"Modified: / 17-11-2012 / 00:09:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1101 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1102 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1103 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1104 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1105 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1106 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1107 |
^ self shouldImplement |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1108 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1109 |
|
34 | 1110 |
!HGCommand::clone methodsFor:'accessing'! |
1111 |
||
1112 |
path |
|
1113 |
^ path |
|
1114 |
! |
|
1115 |
||
1116 |
path:something |
|
1117 |
path := something. |
|
1118 |
! |
|
1119 |
||
1120 |
url |
|
1121 |
^ url |
|
1122 |
! |
|
1123 |
||
1124 |
url:something |
|
1125 |
url := something. |
|
1126 |
! ! |
|
1127 |
||
1128 |
!HGCommand::clone methodsFor:'private'! |
|
1129 |
||
1130 |
argumentsCommandOn:stream |
|
1131 |
"Called to get command specific options" |
|
88 | 1132 |
update == false ifTrue:[ |
1133 |
stream nextPut:'--noupdate'. |
|
1134 |
]. |
|
1135 |
stream nextPut: url; nextPut: path. |
|
34 | 1136 |
|
1137 |
"Created: / 01-10-2012 / 00:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 | 1138 |
"Modified: / 21-11-2012 / 00:17:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1139 |
! |
1140 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1141 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
1142 |
"superclass Command says that I am responsible to implement this method" |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1143 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1144 |
^ nil |
34 | 1145 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1146 |
"Modified: / 14-11-2012 / 22:42:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1147 |
! ! |
1148 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1149 |
!HGCommand::commit methodsFor:'accessing'! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1150 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1151 |
author |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1152 |
^ author |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1153 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1154 |
|
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1155 |
author:aString |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1156 |
author := aString. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1157 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1158 |
|
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1159 |
date |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1160 |
^ date |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1161 |
! |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1162 |
|
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1163 |
date:aTimestampOrString |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1164 |
date := aTimestampOrString. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1165 |
! |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1166 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1167 |
files |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1168 |
^ files |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1169 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1170 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1171 |
files:something |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1172 |
files := something. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1173 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1174 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1175 |
message |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1176 |
^ message |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1177 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1178 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1179 |
message:something |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1180 |
message := something. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1181 |
! ! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1182 |
|
34 | 1183 |
!HGCommand::commit methodsFor:'private'! |
1184 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1185 |
argumentsCommandOn:stream |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1186 |
"Called to get command specific options" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1187 |
|
73
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1188 |
author notNil ifTrue:[ |
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1189 |
stream nextPut:'--user'; nextPut: author |
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1190 |
]. |
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1191 |
date notNil ifTrue:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1192 |
stream nextPut:'--date'. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1193 |
date isTimestamp ifTrue:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1194 |
stream nextPut: (date printStringFormat: '%(year)-%(month)-%(day) %H:%m:%S') |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1195 |
] ifFalse:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1196 |
stream nextPut: date asString |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1197 |
] |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1198 |
]. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1199 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1200 |
stream nextPut:'-m'; nextPut: message. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1201 |
files notNil ifTrue:[ |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1202 |
stream nextPutAll: files |
49
ffb879bfafe7
- stx_libscm_mercurial
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
40
diff
changeset
|
1203 |
]. |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1204 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1205 |
"Created: / 12-11-2012 / 22:38:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1206 |
"Modified: / 07-12-2012 / 15:32:51 / jv" |
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1207 |
"Modified: / 01-02-2013 / 14:49:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1208 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1209 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1210 |
parseError:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1211 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1212 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1213 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1214 |
^ (self parserOn: stream) parseErrorCommit. |
34 | 1215 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1216 |
"Created: / 04-02-2013 / 12:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1217 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1218 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1219 |
parseOutput:stream |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1220 |
"superclass HGCommand says that I am responsible to implement this method" |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1221 |
"Nothing to do" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1222 |
"Modified: / 12-11-2012 / 22:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1223 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1224 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1225 |
status: status result: result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1226 |
"Called when hg command finishes, passing it's status and result from parser" |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1227 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1228 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1229 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1230 |
]. |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1231 |
^result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1232 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1233 |
"Created: / 15-11-2012 / 17:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1234 |
! ! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1235 |
|
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1236 |
!HGCommand::heads methodsFor:'private'! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1237 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1238 |
argumentsCommandOn:stream |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1239 |
"Called to get command specific options" |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1240 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1241 |
stream |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1242 |
nextPut:'--template'; |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1243 |
nextPut:HGCommandParser templateHeads. |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1244 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1245 |
"Created: / 27-11-2012 / 21:30:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1246 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1247 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1248 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1249 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1250 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1251 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1252 |
^ (self parserOn:stream) parseCommandHeads |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1253 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1254 |
"Created: / 27-11-2012 / 21:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
251
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1255 |
! |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1256 |
|
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1257 |
status: status result: res |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1258 |
"Called when hg command finishes, passing it's status and result from parser" |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1259 |
status code == 1 ifTrue:[ |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1260 |
^#() |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1261 |
]. |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1262 |
status success ifFalse:[ |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1263 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1264 |
]. |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1265 |
^res |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1266 |
|
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1267 |
"Created: / 15-11-2012 / 17:04:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1268 |
"Modified: / 08-03-2013 / 19:35:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1269 |
! ! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1270 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1271 |
!HGCommand::init methodsFor:'accessing'! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1272 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1273 |
path |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1274 |
^ path |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1275 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1276 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1277 |
path:aStringOrFilename |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1278 |
path := aStringOrFilename. |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1279 |
! ! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1280 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1281 |
!HGCommand::init methodsFor:'private'! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1282 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1283 |
argumentsCommandOn:stream |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1284 |
stream nextPut: path asFilename asAbsoluteFilename pathName |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1285 |
"Created: / 13-02-2014 / 12:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1286 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1287 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1288 |
parseOutput:stream |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1289 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1290 |
etc." |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1291 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1292 |
^ nil |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1293 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1294 |
"Created: / 13-02-2014 / 12:36:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1295 |
! ! |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1296 |
!HGCommand::locate methodsFor:'accessing'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1297 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1298 |
revision |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1299 |
^ revision |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1300 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1301 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1302 |
revision:rev |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1303 |
revision := rev. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1304 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1305 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1306 |
!HGCommand::locate methodsFor:'private'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1307 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1308 |
argumentsCommandOn:stream |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1309 |
"Called to get command specific options" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1310 |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1311 |
"/stream nextPut:'--print0'. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1312 |
revision notNil ifTrue:[ |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1313 |
stream nextPut: '--rev'; nextPut: revision printString. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1314 |
]. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1315 |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1316 |
"Modified: / 16-12-2012 / 00:09:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1317 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1318 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1319 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1320 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1321 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1322 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1323 |
^ (self parserOn:stream) parseCommandLocate |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1324 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1325 |
"Modified: / 16-11-2012 / 22:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1326 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1327 |
|
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1328 |
!HGCommand::log methodsFor:'accessing'! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1329 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1330 |
childrenOnly |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1331 |
^ childrenOnly |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1332 |
! |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1333 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1334 |
childrenOnly:aBoolean |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1335 |
childrenOnly := aBoolean. |
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1336 |
! |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1337 |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1338 |
idsOnly |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1339 |
^ idsOnly |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1340 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1341 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1342 |
idsOnly:aBoolean |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1343 |
idsOnly := aBoolean. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1344 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1345 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1346 |
limit |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1347 |
^ limit |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1348 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1349 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1350 |
limit:anInteger |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1351 |
limit := anInteger. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1352 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1353 |
|
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1354 |
path |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1355 |
^ path |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1356 |
! |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1357 |
|
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1358 |
path:aString |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1359 |
path := aString. |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1360 |
! |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1361 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1362 |
revset: revset |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1363 |
revsets isNil ifTrue:[revsets := OrderedCollection new]. |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1364 |
revsets add: revset. |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1365 |
|
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1366 |
"Created: / 22-01-2013 / 16:16:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1367 |
! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1368 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1369 |
revsets: aCollection |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1370 |
revsets isNil ifTrue:[ |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1371 |
revsets := aCollection |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1372 |
] ifFalse:[ |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1373 |
revsets addAll: aCollection |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1374 |
]. |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1375 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1376 |
"Created: / 22-01-2013 / 16:21:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1377 |
! ! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1378 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1379 |
!HGCommand::log methodsFor:'private'! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1380 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1381 |
argumentsCommandOn:stream |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1382 |
"Called to get command specific options" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1383 |
|
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1384 |
| template | |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1385 |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1386 |
template := HGCommandParser templateLog. |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1387 |
path isNil ifTrue:[ |
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1388 |
revsets isEmptyOrNil ifTrue:[ |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1389 |
self error:'No revisions given'. |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1390 |
]. |
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1391 |
revsets do:[:revset| |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1392 |
stream nextPut:'--rev'. |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1393 |
stream nextPut:revset asString |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1394 |
]. |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1395 |
] ifFalse:[ |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1396 |
stream nextPut: '--follow'. |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1397 |
]. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1398 |
idsOnly == true ifTrue:[ |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1399 |
template := HGCommandParser templateLogIdsOnly. |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1400 |
]. |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1401 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1402 |
childrenOnly == true ifTrue:[ |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1403 |
template := HGCommandParser templateLogChildren. |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1404 |
]. |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1405 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1406 |
stream |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1407 |
nextPut:'--debug'; |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1408 |
nextPut:'--template'; |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1409 |
nextPut:template. |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1410 |
limit notNil ifTrue:[ |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1411 |
stream |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1412 |
nextPut: '-l'; |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1413 |
nextPut: limit printString |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1414 |
]. |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1415 |
|
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1416 |
path notNil ifTrue:[ |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1417 |
stream nextPut: path. |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1418 |
]. |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1419 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1420 |
"Created: / 13-11-2012 / 09:05:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1421 |
"Modified: / 08-02-2014 / 22:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1422 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1423 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1424 |
parseError:stream |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1425 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1426 |
etc." |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1427 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1428 |
^ (self parserOn: stream) parseErrorLog. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1429 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1430 |
"Created: / 09-02-2014 / 10:22:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1431 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1432 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1433 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1434 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1435 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1436 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1437 |
childrenOnly == true ifTrue:[ |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1438 |
^ (self parserOn:stream) parseCommandLogChildren. |
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1439 |
]. |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1440 |
^ idsOnly ~~ true |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1441 |
ifTrue:[ (self parserOn:stream) parseCommandLog ] |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1442 |
ifFalse:[ (self parserOn:stream) parseCommandLogIdsOnly ] |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1443 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1444 |
"Created: / 13-11-2012 / 09:05:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1445 |
"Modified: / 08-02-2014 / 22:12:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1446 |
! ! |
1447 |
||
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1448 |
!HGCommand::merge methodsFor:'accessing'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1449 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1450 |
revision |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1451 |
^ revision |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1452 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1453 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1454 |
revision:something |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1455 |
revision := something. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1456 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1457 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1458 |
tool |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1459 |
^ tool |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1460 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1461 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1462 |
tool:aString |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1463 |
tool := aString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1464 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1465 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1466 |
!HGCommand::merge methodsFor:'private'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1467 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1468 |
argumentsCommandOn:stream |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1469 |
"Called to get command specific options" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1470 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1471 |
revision notNil ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1472 |
stream nextPut:'--rev'; nextPut: revision asString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1473 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1474 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1475 |
revision notNil ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1476 |
stream nextPut:'--tool'; nextPut: tool asString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1477 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1478 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1479 |
"Modified: / 14-01-2013 / 15:40:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1480 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1481 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1482 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1483 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1484 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1485 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1486 |
^ (self parserOn:stream) parseCommandMerge |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1487 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1488 |
"Modified: / 14-01-2013 / 16:00:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1489 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1490 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1491 |
status: status result: result |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1492 |
"Called when hg command finishes, passing it's status and result from parser" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1493 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1494 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1495 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1496 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1497 |
^result |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1498 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1499 |
"Created: / 14-01-2013 / 16:05:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1500 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1501 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1502 |
!HGCommand::mv methodsFor:'accessing'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1503 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1504 |
destination |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1505 |
^ destination |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1506 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1507 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1508 |
destination:something |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1509 |
destination := something. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1510 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1511 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1512 |
source |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1513 |
^ source |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1514 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1515 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1516 |
source:something |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1517 |
source := something. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1518 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1519 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1520 |
!HGCommand::mv methodsFor:'private'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1521 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1522 |
argumentsCommandOn:stream |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1523 |
"Called to get command specific options" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1524 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1525 |
source isNil ifTrue:[ |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1526 |
self error:'No source' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1527 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1528 |
source asFilename exists ifFalse:[ |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1529 |
self error:('(Source does not exist (%1)' bindWith: source) |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1530 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1531 |
destination isNil ifTrue:[ |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1532 |
self error:'No destination' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1533 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1534 |
stream nextPut: source asString; nextPut: destination. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1535 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1536 |
"Created: / 15-11-2012 / 00:21:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1537 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1538 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1539 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1540 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1541 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1542 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1543 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1544 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1545 |
"Modified: / 15-11-2012 / 00:38:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1546 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1547 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1548 |
!HGCommand::pull methodsFor:'accessing'! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1549 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1550 |
url |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1551 |
^ url |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1552 |
! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1553 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1554 |
url:aString |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1555 |
url := aString. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1556 |
! ! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1557 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1558 |
!HGCommand::pull methodsFor:'private'! |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1559 |
|
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1560 |
argumentsCommandOn:stream |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1561 |
"Called to get command specific options" |
34 | 1562 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1563 |
url notNil ifTrue:[ |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1564 |
stream nextPut: url. |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1565 |
]. |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1566 |
|
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1567 |
"Created: / 30-09-2012 / 23:44:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1568 |
"Modified: / 15-11-2012 / 09:56:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1569 |
! |
1570 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1571 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
1572 |
"superclass HGCommand says that I am responsible to implement this method" |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1573 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1574 |
^ (self parserOn:stream) parseCommandPull |
34 | 1575 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1576 |
"Modified: / 04-02-2013 / 15:35:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1577 |
! ! |
1578 |
||
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1579 |
!HGCommand::push methodsFor:'accessing'! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1580 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1581 |
force |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1582 |
^ force |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1583 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1584 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1585 |
force:something |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1586 |
force := something. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1587 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1588 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1589 |
url |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1590 |
^ url |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1591 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1592 |
|
206
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1593 |
url:remote |
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1594 |
url := remote. |
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1595 |
! ! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1596 |
|
34 | 1597 |
!HGCommand::push methodsFor:'private'! |
1598 |
||
1599 |
argumentsCommandOn:stream |
|
1600 |
"Called to get command specific options" |
|
1601 |
||
206
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1602 |
|
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1603 |
stream nextPut: (url ? 'default'). |
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1604 |
|
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1605 |
force == true ifTrue:[ |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1606 |
stream nextPut:'--force' |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1607 |
] |
34 | 1608 |
|
1609 |
"Created: / 30-09-2012 / 23:44:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
206
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1610 |
"Modified: / 29-01-2013 / 15:42:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1611 |
! |
1612 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1613 |
parseError:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1614 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1615 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1616 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1617 |
^ (self parserOn: stream) parseErrorPush. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1618 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1619 |
"Created: / 04-02-2013 / 12:53:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1620 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1621 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1622 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
1623 |
"superclass HGCommand says that I am responsible to implement this method" |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1624 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1625 |
^ (self parserOn:stream) parseCommandPush |
34 | 1626 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
1627 |
"Modified: / 10-12-2012 / 02:15:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1628 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1629 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1630 |
status: status result: result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1631 |
"Called when hg command finishes, passing it's status and result from parser" |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1632 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1633 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1634 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1635 |
]. |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1636 |
^result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1637 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1638 |
"Created: / 15-11-2012 / 17:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1639 |
! ! |
1640 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1641 |
!HGCommand::remove methodsFor:'accessing'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1642 |
|
357
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1643 |
force |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1644 |
^ force |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1645 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1646 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1647 |
force:something |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1648 |
force := something. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1649 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1650 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1651 |
paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1652 |
^ paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1653 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1654 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1655 |
paths:something |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1656 |
paths := something. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1657 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1658 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1659 |
!HGCommand::remove methodsFor:'private'! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1660 |
|
357
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1661 |
argumentsCommandOn:stream |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1662 |
"Called to get command specific options" |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1663 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1664 |
force == true ifTrue:[ |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1665 |
stream nextPut: '-f'. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1666 |
]. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1667 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1668 |
paths isEmptyOrNil ifTrue:[ |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1669 |
self error: 'No paths given' |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1670 |
]. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1671 |
stream nextPutAll: paths |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1672 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1673 |
"Created: / 15-11-2012 / 00:05:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1674 |
"Modified: / 11-10-2013 / 18:27:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1675 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
1676 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1677 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1678 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1679 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1680 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1681 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1682 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1683 |
"Modified: / 15-11-2012 / 00:38:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1684 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1685 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1686 |
!HGCommand::resolve class methodsFor:'initialization'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1687 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1688 |
initialize |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1689 |
"Invoked at system start or when the class is dynamically loaded." |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1690 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1691 |
"/ please change as required (and remove this comment) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1692 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1693 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1694 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1695 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1696 |
!HGCommand::resolve methodsFor:'accessing'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1697 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1698 |
files |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1699 |
^ files |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1700 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1701 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1702 |
files:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1703 |
files := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1704 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1705 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1706 |
mark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1707 |
^ mark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1708 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1709 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1710 |
mark:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1711 |
mark := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1712 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1713 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1714 |
tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1715 |
^ tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1716 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1717 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1718 |
tool:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1719 |
tool := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1720 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1721 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1722 |
unmark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1723 |
^ unmark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1724 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1725 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1726 |
unmark:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1727 |
unmark := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1728 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1729 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1730 |
!HGCommand::resolve methodsFor:'private'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1731 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1732 |
argumentsCommandOn:stream |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1733 |
"Called to get command specific options" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1734 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1735 |
tool notNil ifTrue:[ |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1736 |
stream nextPut:'--tool'; nextPut: tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1737 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1738 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
1739 |
mark == true ifTrue:[ |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1740 |
self assert: (unmark isNil or:[unmark not]). |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1741 |
stream nextPut: '--mark'. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1742 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1743 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
1744 |
unmark == true ifTrue:[ |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1745 |
self assert: (mark isNil or:[mark not]). |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1746 |
stream nextPut: '--unmark'. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1747 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1748 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1749 |
files do:[:f|stream nextPut: f]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1750 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
1751 |
"Modified: / 26-06-2013 / 07:45:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1752 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1753 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1754 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1755 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1756 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1757 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1758 |
^ nil |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1759 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1760 |
"Modified: / 14-01-2013 / 19:27:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1761 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1762 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1763 |
status: status result: result |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1764 |
"Called when hg command finishes, passing it's status and result from parser" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1765 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1766 |
status code == 0 ifTrue:[ ^ true ]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1767 |
status code == 1 ifTrue:[ ^ false]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1768 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1769 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code). |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1770 |
^false |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1771 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1772 |
"Created: / 14-01-2013 / 19:27:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1773 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1774 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1775 |
!HGCommand::resolve__list methodsFor:'private'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1776 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1777 |
argumentsCommandOn:stream |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1778 |
"Called to get command specific options" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1779 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1780 |
stream nextPut: '--list' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1781 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1782 |
"Modified: / 14-01-2013 / 16:43:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1783 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1784 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1785 |
command |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1786 |
^'resolve' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1787 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1788 |
"Created: / 14-01-2013 / 16:50:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1789 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1790 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1791 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1792 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1793 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1794 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1795 |
^ (self parserOn:stream) parseCommandResolveList |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1796 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1797 |
"Modified: / 14-01-2013 / 16:43:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1798 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1799 |
|
142
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1800 |
!HGCommand::showconfig methodsFor:'accessing'! |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1801 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1802 |
argumentsCommandOn:stream |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1803 |
"Called to get command specific options" |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1804 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1805 |
key notNil ifTrue:[ |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1806 |
stream nextPut: key |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1807 |
]. |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1808 |
|
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1809 |
"Created: / 06-12-2012 / 15:53:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
1810 |
! |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
1811 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1812 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1813 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
1814 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1815 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1816 |
^ (self parserOn:stream) parseCommandShowConfig |
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
1817 |
|
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
1818 |
"Created: / 06-12-2012 / 21:45:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
142
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1819 |
! ! |
67e8c5ab8db2
Initial support for config parsing (not yet integrated). UI improvements in commit dialog (comparing).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
141
diff
changeset
|
1820 |
|
36 | 1821 |
!HGCommand::status methodsFor:'accessing'! |
1822 |
||
1823 |
path |
|
1824 |
^ path |
|
1825 |
! |
|
1826 |
||
1827 |
path:aString |
|
1828 |
path := aString. |
|
1829 |
! ! |
|
1830 |
||
1831 |
!HGCommand::status methodsFor:'private'! |
|
1832 |
||
1833 |
argumentsCommandOn:stream |
|
1834 |
"Called to get command specific options" |
|
1835 |
||
1836 |
stream nextPut:'-A'. |
|
1837 |
path notNil ifTrue:[stream nextPut: path] |
|
1838 |
||
1839 |
"Created: / 23-10-2012 / 11:09:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1840 |
! |
|
1841 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1842 |
parseOutput:stream |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1843 |
^ (self parserOn:stream) parseCommandStatus |
36 | 1844 |
|
1845 |
"Modified: / 23-10-2012 / 11:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1846 |
! ! |
|
1847 |
||
88 | 1848 |
!HGCommand::update methodsFor:'accessing'! |
1849 |
||
1850 |
revision |
|
1851 |
^ revision |
|
1852 |
! |
|
1853 |
||
1854 |
revision:something |
|
1855 |
revision := something. |
|
1856 |
! ! |
|
1857 |
||
1858 |
!HGCommand::update methodsFor:'private'! |
|
1859 |
||
1860 |
argumentsCommandOn:stream |
|
1861 |
"Called to get command specific options" |
|
1862 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
95
diff
changeset
|
1863 |
revision notNil ifTrue:[ |
88 | 1864 |
stream nextPut:'--rev'; nextPut: revision asString. |
1865 |
]. |
|
1866 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
95
diff
changeset
|
1867 |
"Modified: / 23-11-2012 / 23:08:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 1868 |
! |
1869 |
||
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1870 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1871 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
88 | 1872 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1873 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1874 |
^ (self parserOn:stream) parseCommandUpdate |
88 | 1875 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1876 |
"Modified: / 14-01-2013 / 16:00:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 1877 |
! ! |
1878 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1879 |
!HGCommand::version methodsFor:'accessing'! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1880 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1881 |
executable |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1882 |
^ executable notNil |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1883 |
ifTrue:[executable] |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1884 |
ifFalse:[self class hgCommand] |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1885 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1886 |
"Modified (format): / 21-01-2013 / 05:06:54 / jv" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1887 |
! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1888 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1889 |
executable:aString |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1890 |
executable := aString. |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1891 |
! ! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1892 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1893 |
!HGCommand::version methodsFor:'private'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1894 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1895 |
arguments |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1896 |
|
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
1897 |
^ Array with: self executable with: '--version' |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1898 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1899 |
"Created: / 19-11-2012 / 20:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
1900 |
"Modified: / 21-02-2014 / 00:20:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1901 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1902 |
|
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1903 |
parseOutput:stream |
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1904 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1905 |
etc." |
227
3df8f12dcece
Bugfix: HGCommand - args is string on Windows, so do not make one when tracing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
216
diff
changeset
|
1906 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1907 |
^ (self parserOn:stream) parseCommandVersion |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1908 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1909 |
"Created: / 19-11-2012 / 20:02:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1910 |
! ! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
1911 |
|
34 | 1912 |
!HGCommand class methodsFor:'documentation'! |
1913 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1914 |
version_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
1915 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
1916 |
^ '$Changeset: <not expanded> $' |
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1917 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1918 |
|
34 | 1919 |
version_SVN |
228
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
1920 |
^ 'Id:: ' |
34 | 1921 |
! ! |
38
c3d02ed6a645
- HGWorkingCopyFile
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
37
diff
changeset
|
1922 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
1923 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
1924 |
HGCommand::resolve initialize! |