author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Mon, 01 Dec 2014 20:46:48 +0000 | |
changeset 480 | 24031f33e1e6 |
parent 477 | 594a42a4d8fc |
child 509 | f92210d4585b |
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 |
419 | 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' |
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
24 |
classVariableNames:'HGCommandString HGExecutable HGExecutableArguments HGVersion |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
25 |
HGVersionIsGreaterThan_2_4' |
256 | 26 |
poolDictionaries:'HGDebugFlags' |
34 | 27 |
category:'SCM-Mercurial-Internal' |
28 |
! |
|
29 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
30 |
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
|
31 |
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
|
32 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
33 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
34 |
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
|
35 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
36 |
|
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
37 |
HGCommand subclass:#bookmark |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
38 |
instanceVariableNames:'revision name' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
39 |
classVariableNames:'' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
40 |
poolDictionaries:'' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
41 |
privateIn:HGCommand |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
42 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
43 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
44 |
HGCommand subclass:#bookmark_delete |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
45 |
instanceVariableNames:'revision name' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
46 |
classVariableNames:'' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
47 |
poolDictionaries:'' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
48 |
privateIn:HGCommand |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
49 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
50 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
51 |
HGCommand subclass:#branches |
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
52 |
instanceVariableNames:'active closed' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
53 |
classVariableNames:'' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
54 |
poolDictionaries:'' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
55 |
privateIn:HGCommand |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
56 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
57 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
58 |
HGCommand subclass:#cat |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
59 |
instanceVariableNames:'path revision destination' |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
60 |
classVariableNames:'' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
61 |
poolDictionaries:'' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
62 |
privateIn:HGCommand |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
63 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
64 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
65 |
HGCommand subclass:#clone |
88 | 66 |
instanceVariableNames:'url path update' |
34 | 67 |
classVariableNames:'' |
68 |
poolDictionaries:'' |
|
69 |
privateIn:HGCommand |
|
70 |
! |
|
71 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
72 |
HGCommand subclass:#commit |
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
73 |
instanceVariableNames:'message files author date' |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
74 |
classVariableNames:'' |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
75 |
poolDictionaries:'' |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
76 |
privateIn:HGCommand |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
77 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
78 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
79 |
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
|
80 |
instanceVariableNames:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
81 |
classVariableNames:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
82 |
poolDictionaries:'' |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
83 |
privateIn:HGCommand |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
84 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
85 |
|
366
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
86 |
HGCommand subclass:#help |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
87 |
instanceVariableNames:'topic' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
88 |
classVariableNames:'' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
89 |
poolDictionaries:'' |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
90 |
privateIn:HGCommand |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
91 |
! |
9da938d1e76a
Added support for `hg help` command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
357
diff
changeset
|
92 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
93 |
HGCommand subclass:#init |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
94 |
instanceVariableNames:'path' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
95 |
classVariableNames:'' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
96 |
poolDictionaries:'' |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
97 |
privateIn:HGCommand |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
98 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
99 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
100 |
HGCommand subclass:#locate |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
101 |
instanceVariableNames:'revision' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
102 |
classVariableNames:'' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
103 |
poolDictionaries:'' |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
104 |
privateIn:HGCommand |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
105 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
106 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
107 |
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
|
108 |
instanceVariableNames:'start stop path childrenOnly idsOnly revsets limit' |
34 | 109 |
classVariableNames:'' |
110 |
poolDictionaries:'' |
|
111 |
privateIn:HGCommand |
|
112 |
! |
|
113 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
114 |
HGCommand subclass:#merge |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
115 |
instanceVariableNames:'revision tool' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
116 |
classVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
117 |
poolDictionaries:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
118 |
privateIn:HGCommand |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
119 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
120 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
121 |
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
|
122 |
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
|
123 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
124 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
125 |
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
|
126 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
127 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
128 |
HGCommand subclass:#pull |
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
129 |
instanceVariableNames:'url' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
130 |
classVariableNames:'' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
131 |
poolDictionaries:'' |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
132 |
privateIn:HGCommand |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
133 |
! |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
134 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
135 |
HGCommand subclass:#push |
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
136 |
instanceVariableNames:'url force' |
34 | 137 |
classVariableNames:'' |
138 |
poolDictionaries:'' |
|
139 |
privateIn:HGCommand |
|
140 |
! |
|
141 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
142 |
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
|
143 |
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
|
144 |
classVariableNames:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
145 |
poolDictionaries:'' |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
146 |
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
|
147 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
148 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
149 |
HGCommand subclass:#resolve |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
150 |
instanceVariableNames:'tool mark unmark files' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
151 |
classVariableNames:'' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
152 |
poolDictionaries:'' |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
153 |
privateIn:HGCommand |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
154 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
155 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
156 |
HGCommand subclass:#resolve__list |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
157 |
instanceVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
158 |
classVariableNames:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
159 |
poolDictionaries:'' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
160 |
privateIn:HGCommand |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
161 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
162 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
163 |
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
|
164 |
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
|
165 |
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
|
166 |
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
|
167 |
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
|
168 |
! |
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
|
169 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
170 |
HGCommand subclass:#status |
36 | 171 |
instanceVariableNames:'path' |
172 |
classVariableNames:'' |
|
173 |
poolDictionaries:'' |
|
174 |
privateIn:HGCommand |
|
175 |
! |
|
176 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
177 |
HGCommand subclass:#update |
88 | 178 |
instanceVariableNames:'revision' |
179 |
classVariableNames:'' |
|
180 |
poolDictionaries:'' |
|
181 |
privateIn:HGCommand |
|
182 |
! |
|
183 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
184 |
HGCommand subclass:#version |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
185 |
instanceVariableNames:'executable arguments' |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
186 |
classVariableNames:'' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
187 |
poolDictionaries:'' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
188 |
privateIn:HGCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
189 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
190 |
|
34 | 191 |
!HGCommand class methodsFor:'documentation'! |
192 |
||
210 | 193 |
copyright |
194 |
" |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
195 |
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
|
196 |
Copyright (C) 2012-2013 Jan Vrany |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
197 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
198 |
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
|
199 |
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
|
200 |
License as published by the Free Software Foundation; either |
419 | 201 |
version 2.1 of the License. |
210 | 202 |
|
335
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
203 |
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
|
204 |
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
|
205 |
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
|
206 |
Lesser General Public License for more details. |
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
207 |
|
7e19ab19148b
Changed license to LGPL2.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
300
diff
changeset
|
208 |
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
|
209 |
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
|
210 |
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
210 | 211 |
" |
212 |
! |
|
213 |
||
34 | 214 |
documentation |
215 |
" |
|
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
|
216 |
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
|
217 |
my private classes. |
34 | 218 |
|
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
|
219 |
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
|
220 |
Therefore it should not be used by user code. Use classed and APIs in |
34 | 221 |
SCM-Mercurial-Core instead. |
222 |
||
223 |
[author:] |
|
224 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
|
225 |
||
226 |
[instance variables:] |
|
227 |
||
228 |
[class variables:] |
|
229 |
||
230 |
[see also:] |
|
231 |
||
232 |
" |
|
233 |
! ! |
|
234 |
||
235 |
!HGCommand class methodsFor:'accessing'! |
|
236 |
||
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
237 |
hgCommand |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
238 |
"Returns hg command to use" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
239 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
240 |
| command | |
450
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
241 |
HGCommandString notNil ifTrue:[ |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
242 |
command := HGCommandString |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
243 |
] ifFalse:[ |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
244 |
command := UserPreferences current hgCommand. |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
245 |
command notNil ifTrue:[ |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
246 |
command := command asString. |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
247 |
] |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
248 |
]. |
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
249 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
250 |
command isNil ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
251 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
252 |
"/ | h | |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
253 |
"/ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
254 |
"/ h := Win32OperatingSystem registryEntry |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
255 |
"/ key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
256 |
"/ h notNil ifTrue:[HGExecutable := h valueNamed:'']. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
257 |
"/ HGExecutable notEmptyOrNil ifTrue:[^HGExecutable] |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
258 |
command := OperatingSystem pathOfCommand:'hg'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
259 |
] ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
260 |
OperatingSystem isUNIXlike ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
261 |
command := OperatingSystem pathOfCommand:'hg'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
262 |
] |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
263 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
264 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
265 |
^ command |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
266 |
|
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 |
HGExecutable := nil. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
269 |
self basicNew executable |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
270 |
" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
271 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
272 |
"Created: / 19-11-2012 / 21:48:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
273 |
"Modified: / 17-07-2014 / 11:21:28 / 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
|
274 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
275 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
276 |
hgCommand: command |
450
8fd38c29ee22
Oops, make sure comand in HGCommand class>>hgCommand: is a String
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
449
diff
changeset
|
277 |
HGCommandString := command notNil ifTrue:[ command asString ] ifFalse:[ nil ]. |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
278 |
HGExecutable := HGExecutableArguments := HGVersion := HGVersionIsGreaterThan_2_4 := nil. |
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
279 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
280 |
|
231
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
281 |
" |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
282 |
HGCommand hgCommand: '/usr/src/mercurial-2.4/hg' |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
283 |
HGCommand hgCommand: '/usr/bin/hg' |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
284 |
HGCommand hgCommand: 'hg' |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
285 |
HGCommand hgCommand: nil |
231
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
286 |
" |
eb0f01855893
Initial version of HGCommandServer
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
228
diff
changeset
|
287 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
288 |
"Created: / 19-11-2012 / 21:49:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
289 |
"Modified: / 01-12-2014 / 20:38:39 / 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
|
290 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
291 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
292 |
hgCommandValidate: command |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
293 |
"Given a `command`, checks whether it is a valid hg command. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
294 |
Returns absolute path to hg binary and global arguments (if any) |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
295 |
or raise an HGInvalidExecutableError or HGInvalidVersionError |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
296 |
if `command` is not valid hg command." |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
297 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
298 |
| tokens executable executableAsFilename arguments version | |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
299 |
|
449
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
300 |
command asFilename exists ifTrue:[ |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
301 |
executable := command. |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
302 |
arguments := #(). |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
303 |
] ifFalse:[ |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
304 |
tokens := (HGCommandParser on: command readStream) parseShellCommand. |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
305 |
executable := tokens first. |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
306 |
arguments := tokens copyFrom: 2. |
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
307 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
308 |
executableAsFilename := executable asFilename. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
309 |
executableAsFilename isAbsolute ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
310 |
executableAsFilename := executableAsFilename asAbsoluteFilename. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
311 |
executableAsFilename exists ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
312 |
executable := executableAsFilename pathName. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
313 |
] ifFalse:[ |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
314 |
"/ 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
|
315 |
"/ just typed 'hg' in... |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
316 |
executable := (OperatingSystem pathOfCommand: executable). |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
317 |
executable isNil ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
318 |
HGInvalidExecutableError raiseErrorString:('''hg'' executable (%1) not found!!' bindWith: command). |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
319 |
^ nil |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
320 |
] ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
321 |
executableAsFilename := executable asFilename. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
322 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
323 |
] |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
324 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
325 |
executableAsFilename exists ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
326 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) does not exists!!' bindWith: executable). |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
327 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
328 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
329 |
executableAsFilename isDirectory ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
330 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is actually a directory!!' bindWith: executable). |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
331 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
332 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
333 |
executableAsFilename isExecutable ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
334 |
HGInvalidExecutableError raiseErrorString:('Specified ''hg'' executable (%1) is cannot be executed!!' bindWith: executable). |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
335 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
336 |
]. |
419 | 337 |
[ |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
338 |
version := self hgVersionOf: executable arguments: arguments. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
339 |
] on: Error do:[:ex | |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
340 |
HGInvalidExecutableError newException |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
341 |
parameter: ex; |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
342 |
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
|
343 |
raise. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
344 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
345 |
]. |
419 | 346 |
(self hgVersionIsSupported: version) ifFalse:[ |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
347 |
HGInvalidVersionError newException |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
348 |
parameter: version; |
449
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
349 |
messageText: ('Unsuported Mercurial version (%1)' bindWith: ((version collect:[:e|e printString]) asStringWith:$.)); |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
350 |
raise. |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
351 |
^ nil |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
352 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
353 |
^ { executable . arguments } |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
354 |
|
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
355 |
"Created: / 21-02-2014 / 08:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
356 |
"Modified: / 17-07-2014 / 15:10:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
449
d55058b5d58d
Try to be fool-proof: when configured command as whole exists as file, use it as it is.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
444
diff
changeset
|
357 |
"Modified: / 17-07-2014 / 20:00:56 / jv" |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
358 |
! |
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
359 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
360 |
hgVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
361 |
"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
|
362 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
363 |
HGVersion isNil ifTrue:[ |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
364 |
HGVersion := self hgVersionOf: self hgExecutable arguments: self hgExecutableArguments |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
365 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
366 |
^ HGVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
367 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
368 |
" |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
369 |
HGCommand hgVersion |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
370 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
371 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
372 |
"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
|
373 |
"Modified: / 21-01-2013 / 05:07:58 / jv" |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
374 |
"Modified: / 17-07-2014 / 15:09: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
|
375 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
376 |
|
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
377 |
hgVersion: versionA isGreaterOrEqualThan: versionB |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
378 |
1 to: (versionA size min: versionB size) do:[:i | |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
379 |
(versionA at: i) < (versionB at: i) ifTrue:[ |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
380 |
^ false. |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
381 |
]. |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
382 |
(versionA at: i) > (versionB at: i) ifTrue:[ |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
383 |
^ true. |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
384 |
]. |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
385 |
]. |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
386 |
^ versionA size >= versionB size |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
387 |
|
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
388 |
" |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
389 |
HGCommand hgVersion: #(3 0) isGreaterOrEqualThan: #(2 5). |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
390 |
HGCommand hgVersion: #(3 0) isGreaterOrEqualThan: #(2 5 1). |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
391 |
HGCommand hgVersion: #(3 0) isGreaterOrEqualThan: #(3 0). |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
392 |
HGCommand hgVersion: #(3 0 1) isGreaterOrEqualThan: #(3 0). |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
393 |
HGCommand hgVersion: #(3 0) isGreaterOrEqualThan: #(3 0 1). |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
394 |
HGCommand hgVersion: #(2 3) isGreaterOrEqualThan: #(2 4). |
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
395 |
" |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
396 |
|
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
397 |
"Created: / 04-11-2014 / 14:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
398 |
"Modified (comment): / 01-12-2014 / 20:37:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
399 |
! |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
400 |
|
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
401 |
hgVersionIsGreaterOrEqualThan: versionB |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
402 |
^ self hgVersion: self hgVersion isGreaterOrEqualThan: versionB |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
403 |
|
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
404 |
"Created: / 04-11-2014 / 14:16:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
405 |
! |
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
406 |
|
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
407 |
hgVersionIsGreaterOrEqualThan_2_4 |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
408 |
HGVersionIsGreaterThan_2_4 isNil ifTrue:[ |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
409 |
HGVersionIsGreaterThan_2_4 := self hgVersionIsGreaterOrEqualThan:#( 2 4 ). |
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
410 |
]. |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
411 |
^ HGVersionIsGreaterThan_2_4 |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
412 |
|
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
413 |
"Created: / 27-11-2014 / 23:16:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
480
24031f33e1e6
Oops, fixed bug introduced in fix 594a42a:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
477
diff
changeset
|
414 |
"Modified: / 01-12-2014 / 20:39:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
415 |
! |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
416 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
417 |
hgVersionIsSupported |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
418 |
^ self hgVersionIsSupported:self hgVersion |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
419 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
420 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
421 |
HGCommand mercurialVersionIsSupported" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
422 |
"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
|
423 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
424 |
|
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
|
425 |
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
|
426 |
^ 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
|
427 |
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
|
428 |
((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
|
429 |
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
|
430 |
((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
|
431 |
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
|
432 |
] |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
433 |
]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
434 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
435 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
436 |
HGCommand mercurialVersionIsSupported: #(2 3 2) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
437 |
HGCommand mercurialVersionIsSupported: #(2 0 1) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
438 |
HGCommand mercurialVersionIsSupported: #(1 9 1) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
439 |
HGCommand mercurialVersionIsSupported: #(1 0 0) |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
440 |
HGCommand mercurialVersionIsSupported: #(2 4 nil)" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
441 |
"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
|
442 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
443 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
444 |
hgVersionOf: executable arguments: arguments |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
445 |
"Return mercurial version if passed executable " |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
446 |
|
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
|
447 |
^version new |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
448 |
executable: executable; |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
449 |
arguments: arguments; |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
450 |
execute |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
451 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
452 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
453 |
HGCommand hgVersion |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
454 |
" |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
455 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
456 |
"Created: / 17-07-2014 / 15:08:28 / 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
|
457 |
! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
458 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
459 |
hgVersionsSupported |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
460 |
"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
|
461 |
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
|
462 |
|
445
69378a5c2a0f
Added Mercurial 3.x to supported versions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
463 |
^ #( |
69378a5c2a0f
Added Mercurial 3.x to supported versions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
464 |
(1 9 #'*') "1.9 - will wanish" |
69378a5c2a0f
Added Mercurial 3.x to supported versions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
465 |
(2 #'*' #'*') "2.x" |
69378a5c2a0f
Added Mercurial 3.x to supported versions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
466 |
(3 #'*' #'*') "3.x" |
69378a5c2a0f
Added Mercurial 3.x to supported versions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
467 |
) |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
468 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
469 |
"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
|
470 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
471 |
|
34 | 472 |
verbose |
473 |
||
474 |
^ UserPreferences current hgVerbose |
|
475 |
||
476 |
"Created: / 19-03-2008 / 12:29:47 / janfrog" |
|
477 |
"Modified: / 19-03-2009 / 14:00:50 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
478 |
"Modified (format): / 27-12-2011 / 16:00:06 / dundee" |
|
479 |
"Modified: / 17-10-2012 / 13:05:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
480 |
! |
|
481 |
||
482 |
verbose:aBoolean |
|
483 |
||
484 |
UserPreferences current hgVerbose:aBoolean |
|
485 |
||
486 |
"Created: / 19-03-2008 / 12:29:59 / janfrog" |
|
487 |
"Modified: / 19-03-2009 / 14:00:59 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
488 |
"Modified (format): / 27-12-2011 / 16:00:13 / dundee" |
|
489 |
"Modified: / 17-10-2012 / 13:05:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
490 |
! ! |
|
491 |
||
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
492 |
!HGCommand class methodsFor:'accessing-private'! |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
493 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
494 |
hgExecutable |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
495 |
"Returns absolute path to hg executable to use" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
496 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
497 |
HGExecutable isNil ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
498 |
| command executableAndArguments | |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
499 |
command := self hgCommand. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
500 |
command isNil ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
501 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
502 |
"/ | h | |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
503 |
"/ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
504 |
"/ h := Win32OperatingSystem registryEntry |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
505 |
"/ key:'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\svn.exe'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
506 |
"/ h notNil ifTrue:[HGExecutable := h valueNamed:'']. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
507 |
"/ HGExecutable notEmptyOrNil ifTrue:[^HGExecutable] |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
508 |
command := OperatingSystem pathOfCommand:'hg'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
509 |
] ifFalse:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
510 |
OperatingSystem isUNIXlike ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
511 |
command := OperatingSystem pathOfCommand:'hg'. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
512 |
] |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
513 |
]. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
514 |
]. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
515 |
executableAndArguments := self hgCommandValidate: command. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
516 |
HGExecutable := executableAndArguments first. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
517 |
HGExecutableArguments := executableAndArguments second. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
518 |
]. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
519 |
^ HGExecutable |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
520 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
521 |
" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
522 |
HGExecutable := nil. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
523 |
self basicNew executable |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
524 |
" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
525 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
526 |
"Created: / 17-07-2014 / 10:16:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
527 |
"Modified: / 17-07-2014 / 11:21:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
528 |
! |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
529 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
530 |
hgExecutableArguments |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
531 |
"Returns an array of (global) arguments to be passed hg executable" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
532 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
533 |
HGExecutableArguments isNil ifTrue:[ |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
534 |
HGExecutable := nil. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
535 |
self hgExecutable. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
536 |
]. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
537 |
^ HGExecutableArguments |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
538 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
539 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
540 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
541 |
" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
542 |
HGExecutable := nil. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
543 |
self basicNew executable |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
544 |
" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
545 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
546 |
"Created: / 17-07-2014 / 11:16:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
547 |
! ! |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
548 |
|
34 | 549 |
!HGCommand class methodsFor:'commands'! |
550 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
551 |
add |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
552 |
^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
|
553 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
554 |
"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
|
555 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
556 |
|
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
557 |
bookmark |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
558 |
"raise an error: this method should be implemented (TODO)" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
559 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
560 |
^ bookmark new |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
561 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
562 |
"Created: / 20-03-2014 / 17:25:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
563 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
564 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
565 |
bookmark_delete |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
566 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
567 |
^ bookmark_delete new |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
568 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
569 |
"Created: / 21-03-2014 / 01:14:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
570 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
571 |
|
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
572 |
branches |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
573 |
^branches new |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
574 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
575 |
"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
|
576 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
577 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
578 |
cat |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
579 |
^cat new |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
580 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
581 |
"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
|
582 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
583 |
|
34 | 584 |
clone |
585 |
^clone new |
|
586 |
||
587 |
"Created: / 01-10-2012 / 00:09:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
588 |
! |
|
589 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
590 |
commit |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
591 |
^commit new |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
592 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
593 |
"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
|
594 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
595 |
|
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
596 |
heads |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
597 |
^heads new |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
598 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
599 |
"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
|
600 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
601 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
602 |
init |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
603 |
^init new |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
604 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
605 |
"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
|
606 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
607 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
608 |
locate |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
609 |
^locate new |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
610 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
611 |
"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
|
612 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
613 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
614 |
log |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
615 |
^log new |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
616 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
617 |
"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
|
618 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
619 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
620 |
merge |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
621 |
^merge new |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
622 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
623 |
"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
|
624 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
625 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
626 |
mv |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
627 |
^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
|
628 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
629 |
"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
|
630 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
631 |
|
109
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
632 |
pull |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
633 |
^pull new |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
634 |
|
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
635 |
"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
|
636 |
! |
08c6eca6df25
Added warning about commiting new head to HGCommitDialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
637 |
|
34 | 638 |
push |
639 |
^push new |
|
640 |
||
641 |
"Created: / 30-09-2012 / 23:46:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
36 | 642 |
! |
643 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
644 |
remove |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
645 |
^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
|
646 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
647 |
"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
|
648 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
649 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
650 |
resolve |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
651 |
^resolve new |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
652 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
653 |
"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
|
654 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
655 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
656 |
resolve__list |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
657 |
^resolve__list new |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
658 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
659 |
"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
|
660 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
661 |
|
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
662 |
showconfig |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
663 |
^showconfig new |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
664 |
|
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
665 |
"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
|
666 |
! |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
667 |
|
36 | 668 |
status |
669 |
^status new |
|
670 |
||
671 |
"Created: / 23-10-2012 / 11:10:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 | 672 |
! |
673 |
||
674 |
update |
|
675 |
^update new |
|
676 |
||
677 |
"Created: / 21-11-2012 / 00:23:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
34 | 678 |
! ! |
679 |
||
680 |
!HGCommand class methodsFor:'commands-shortcuts'! |
|
681 |
||
682 |
clone: url to: stringOfFilename |
|
683 |
self clone |
|
684 |
url: url; |
|
685 |
path: stringOfFilename asFilename asAbsoluteFilename pathName; |
|
686 |
execute |
|
687 |
||
688 |
"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
|
689 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
690 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
691 |
init: aStringOrFilename |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
692 |
^ 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
|
693 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
694 |
"Created: / 13-02-2014 / 12:37:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 695 |
! ! |
696 |
||
697 |
!HGCommand methodsFor:'accessing'! |
|
698 |
||
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
699 |
result |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
700 |
^ result |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
701 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
702 |
|
34 | 703 |
workingDirectory |
704 |
^workingDirectory notNil ifTrue:[ |
|
705 |
workingDirectory |
|
706 |
] ifFalse: [ |
|
707 |
Filename currentDirectory pathName |
|
708 |
] |
|
709 |
||
710 |
"Created: / 11-05-2011 / 08:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
711 |
"Modified (format): / 27-12-2011 / 15:54:08 / dundee" |
|
712 |
"Modified: / 01-10-2012 / 14:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
713 |
! |
|
714 |
||
715 |
workingDirectory:aStringOrFilename |
|
716 |
aStringOrFilename asFilename isDirectory ifFalse:[ |
|
717 |
self error:'Working directory does not exist'. |
|
718 |
^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
|
719 |
]. |
34 | 720 |
workingDirectory := aStringOrFilename asString. |
721 |
||
722 |
"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
|
723 |
! |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
724 |
|
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
725 |
workingDirectoryOrNil |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
726 |
^workingDirectory |
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
727 |
|
aaf120ddecdb
Remover repository instvar deom command server to allow for GC.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
235
diff
changeset
|
728 |
"Created: / 04-03-2013 / 10:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 729 |
! ! |
730 |
||
235
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
731 |
!HGCommand methodsFor:'accessing-internal'! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
732 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
733 |
blocker |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
734 |
^ blocker |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
735 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
736 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
737 |
errorReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
738 |
^ errorReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
739 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
740 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
741 |
errors |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
742 |
^ errors |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
743 |
! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
744 |
|
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
745 |
outputReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
746 |
^ outputReader |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
747 |
! ! |
3d8ef499d7d9
Command server is now used by default.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
234
diff
changeset
|
748 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
749 |
!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
|
750 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
751 |
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
|
752 |
"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
|
753 |
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
|
754 |
|
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
755 |
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
|
756 |
|
256 | 757 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
758 |
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
|
759 |
]. |
419 | 760 |
Debug ifTrue:[ |
447
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
761 |
anException isNotification ifFalse:[ |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
762 |
| wasResumable | |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
763 |
|
419 | 764 |
anException suspendedContext notNil ifTrue:[ |
765 |
anException suspendedContext fullPrintAllOn: Transcript. |
|
766 |
]. |
|
447
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
767 |
"/ When debugging, open a debugger here so the user may check the |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
768 |
"/ stack and actual variable values in debugger. |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
769 |
Debugger enter. |
391
f05648d15add
Fix for issue #18 - circular class renames.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
378
diff
changeset
|
770 |
]. |
368
00c2d0fda82b
Minor improvements in debugging support.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
771 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
772 |
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
|
773 |
|
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
774 |
"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
|
775 |
"Modified: / 05-03-2014 / 00:08:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
447
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
776 |
"Modified: / 17-07-2014 / 08:21:15 / jv" |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
777 |
! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
778 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
779 |
signal |
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
780 |
"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
|
781 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
782 |
| ex | |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
783 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
784 |
[ (ex := errors nextOrNil) notNil ] whileTrue:[ |
256 | 785 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
786 |
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
|
787 |
]. |
341
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
788 |
(ex isNotification or:[ex isResumable == true]) ifTrue:[ |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
789 |
ex raiseRequest |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
790 |
] ifFalse:[ |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
791 |
ex raise |
170c1aa67b03
Fixes problem with StrictRaising.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
335
diff
changeset
|
792 |
] |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
793 |
]. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
794 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
795 |
"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
|
796 |
"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
|
797 |
! ! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
798 |
|
34 | 799 |
!HGCommand methodsFor:'executing'! |
800 |
||
801 |
execute |
|
437
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
802 |
| stdoutPipe stdout stderrPipe stderr pid environment status exe args spin | |
34 | 803 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
804 |
self initialize. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
805 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
806 |
stdoutPipe := NonPositionableExternalStream makePipe. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
807 |
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
|
808 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
809 |
stderrPipe := NonPositionableExternalStream makePipe. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
810 |
stderr := stderrPipe first. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
811 |
|
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
|
812 |
environment := OperatingSystem isUNIXlike |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
813 |
ifTrue:[OperatingSystem getEnvironment copy] |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
814 |
ifFalse:[environment := Dictionary new]. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
815 |
environment at: 'HGEDITOR' put: 'true'. |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
816 |
environment at:'LANG' put:'C'. |
417 | 817 |
environment at:'LC_MESSAGES' put:'C'. |
34 | 818 |
|
459
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
819 |
exe := self executable. |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
820 |
args := self arguments. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
821 |
|
470
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
822 |
"/ Empty arguments are not supported. They make no sense anyway, |
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
823 |
"/ perhaps except for commit message. But empty commit messages |
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
824 |
"/ aren't supported by Mercurial itself. |
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
825 |
"/ Just be defensive and make sure none of them is empty... |
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
826 |
args do:[:arg | self assert: arg notEmptyOrNil ]. |
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
827 |
|
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
828 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
459
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
829 |
(exe endsWith:'.bat') ifTrue:[ |
437
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
830 |
| cmd | |
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
831 |
cmd := OperatingSystem pathOfCommand:'cmd'. |
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
832 |
args := #( '/C' ) , args. |
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
833 |
exe := cmd. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
834 |
]. |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
835 |
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
|
836 |
args |
459
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
837 |
do:[:each | self quoteShellCommandParameter: each asForCmdOn: s ] |
52
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
838 |
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
|
839 |
] |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
840 |
]. |
281850dff0ac
HGCommand: changed: #execute: on Windows arguments must be passed as string.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
51
diff
changeset
|
841 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
842 |
|
34 | 843 |
Processor monitor:[ |
256 | 844 |
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
|
845 |
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
|
846 |
]. |
437
fa687128ae25
Allow to use hg.bat as Mercurial executable on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
419
diff
changeset
|
847 |
pid := OperatingSystem exec: exe withArguments:args |
34 | 848 |
environment:environment |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
849 |
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
|
850 |
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
|
851 |
newPgrp:false |
34 | 852 |
inDirectory:self workingDirectory |
853 |
] action:[:stat | |
|
256 | 854 |
Trace ifTrue:[ |
446
35a8e7b3ad1e
Print command status code when tracing command execution.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
445
diff
changeset
|
855 |
Logger log: 'cmd: command finished with code ' , stat code printString 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
|
856 |
]. |
34 | 857 |
status := stat. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
858 |
blocker signal. |
34 | 859 |
]. |
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
|
860 |
|
34 | 861 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
862 |
stdoutPipe second close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
863 |
stderrPipe second close. |
34 | 864 |
pid isNil ifTrue:[ |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
865 |
stdout close. |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
866 |
stderr close. |
36 | 867 |
HGCommandError raiseErrorString: 'cannot execute hg command'. |
34 | 868 |
^ self. |
869 |
]. |
|
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
870 |
OperatingSystem isUNIXlike ifTrue:[ |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
871 |
"/JV: Q: Why this is necessary? |
260
9740c721a8a3
Fix in HGCommand (readWait)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
258
diff
changeset
|
872 |
stdout readWaitWithTimeoutMs: 10. |
9740c721a8a3
Fix in HGCommand (readWait)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
258
diff
changeset
|
873 |
stderr readWaitWithTimeoutMs: 10. |
441
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
874 |
]. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
875 |
Debug ifTrue:[ |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
876 |
OperatingSystem isUNIXlike ifTrue:[ |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
877 |
stdout := stdout contents asString readStream. |
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
878 |
stderr := stderr contents asString readStream. |
441
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
879 |
] ifFalse:[ |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
880 |
| buffer | |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
881 |
|
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
882 |
buffer := (String new: 100) writeStream. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
883 |
[ stdout atEnd ] whileFalse:[ |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
884 |
buffer nextPut: stdout next. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
885 |
]. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
886 |
stdout := buffer contents readStream. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
887 |
buffer := String new writeStream. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
888 |
[ stderr atEnd ] whileFalse:[ |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
889 |
buffer nextPut: stderr next. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
890 |
]. |
032641fb1e6d
Fix for command debugging code on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
439
diff
changeset
|
891 |
stderr := buffer contents readStream. |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
892 |
] |
38
c3d02ed6a645
- HGWorkingCopyFile
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
37
diff
changeset
|
893 |
]. |
257
c1ab4d936e8e
Fix in HGCommand>>execute:.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
256
diff
changeset
|
894 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
895 |
self spawnErrorReaderOn: stderr. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
896 |
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
|
897 |
|
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
898 |
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
|
899 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
900 |
[ |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
901 |
[ 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
|
902 |
] ensure:[ |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
903 |
stderr close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
904 |
stdout close. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
905 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
906 |
self signal. |
256 | 907 |
Trace ifTrue:[ |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
908 |
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
|
909 |
]. |
216
0a3821d4bdb6
Error & notification handling & propagating unified. Fixes in push/pull error handling.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
215
diff
changeset
|
910 |
^self status: status result: result |
34 | 911 |
|
912 |
"Created: / 11-05-2011 / 07:45:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
913 |
"Modified: / 17-12-2011 / 19:22:00 / dundee" |
|
914 |
"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
|
915 |
"Modified: / 14-11-2012 / 13:41:57 / jv" |
470
9a901e620f0b
Make sure none of the arguments passed to hg command is empty.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
465
diff
changeset
|
916 |
"Modified: / 15-11-2014 / 00:10:42 / 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
|
917 |
! |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
918 |
|
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
919 |
executeOnRepository: anHGRepository |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
920 |
workingDirectory isNil ifTrue:[ |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
921 |
workingDirectory := anHGRepository pathName |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
922 |
]. |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
923 |
^self execute. |
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
924 |
|
a9ef61b902ae
Most commands are now executeb using executeInRepository:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
233
diff
changeset
|
925 |
"Created: / 03-03-2013 / 20:34:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
459
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
926 |
! |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
927 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
928 |
quoteShellCommandParameter: parameter asForCmdOn: stream |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
929 |
"Quotes the parameter as neccesary on Windows" |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
930 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
931 |
"/ Adapted version of ArgvQuote, |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
932 |
"/ see http://blogs.msdn.com/b/twistylittlepassagesallalike/archive/2011/04/23/everyone-quotes-arguments-the-wrong-way.aspx |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
933 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
934 |
| parameterS | |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
935 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
936 |
stream nextPut: $". |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
937 |
parameterS := parameter readStream. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
938 |
[ parameterS atEnd ] whileFalse:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
939 |
| numBackSlashes | |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
940 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
941 |
numBackSlashes := 0. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
942 |
|
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
943 |
[ parameterS atEnd not and:[ parameterS peek == $\ ] ] whileTrue:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
944 |
numBackSlashes := numBackSlashes + 1. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
945 |
parameterS next. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
946 |
]. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
947 |
parameterS atEnd ifTrue:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
948 |
"/ Escape all backslashes, but let the terminating |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
949 |
"/ double quotation mark we add below be interpreted |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
950 |
"/ as a metacharacter. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
951 |
stream next: numBackSlashes * 2 put: $\ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
952 |
] ifFalse:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
953 |
parameterS peek == $" ifTrue:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
954 |
"/ Escape all backslashes and the following |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
955 |
"/ double quotation mark. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
956 |
stream next: numBackSlashes * 2 put: $\. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
957 |
stream nextPut: $\. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
958 |
stream nextPut: $". |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
959 |
] ifFalse:[ |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
960 |
"/ Backslashes aren't special here. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
961 |
stream next: numBackSlashes put: $\. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
962 |
stream nextPut: parameterS peek. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
963 |
]. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
964 |
parameterS next. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
965 |
]. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
966 |
]. |
f46adbbf4138
Fixes for issue #5: Wrong argument quoting on Windows
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
453
diff
changeset
|
967 |
stream nextPut: $". |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
968 |
! ! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
969 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
970 |
!HGCommand methodsFor:'initialization'! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
971 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
972 |
initialize |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
973 |
"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
|
974 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
975 |
"/ 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
|
976 |
"/ workingDirectory := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
977 |
"/ result := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
978 |
"/ error := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
979 |
"/ workers := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
980 |
"/ errors := nil. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
981 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
982 |
errors := SharedQueue new. |
233
d9a8bb2aaa0b
Log command works using command server.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
232
diff
changeset
|
983 |
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
|
984 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
985 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
986 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
987 |
"/ 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
|
988 |
|
233
d9a8bb2aaa0b
Log command works using command server.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
232
diff
changeset
|
989 |
"Modified: / 03-03-2013 / 19:50:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 990 |
! ! |
991 |
||
992 |
!HGCommand methodsFor:'private'! |
|
993 |
||
994 |
arguments |
|
995 |
||
996 |
^ OrderedCollection streamContents:[:s | |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
997 |
s nextPut: self executable. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
998 |
s nextPutAll: self class hgExecutableArguments ? #(). |
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
999 |
s nextPut: '--noninteractive'. |
34 | 1000 |
self argumentsGlobalOn:s. |
1001 |
s nextPut:self command. |
|
1002 |
self argumentsCommandOn:s. |
|
1003 |
]. |
|
1004 |
||
1005 |
"Created: / 11-05-2011 / 07:58:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1006 |
"Modified (format): / 27-12-2011 / 15:47:23 / dundee" |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1007 |
"Modified: / 17-07-2014 / 15:25:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1008 |
! |
1009 |
||
1010 |
argumentsCommandOn:stream |
|
1011 |
"Called to get command specific options" |
|
1012 |
||
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1013 |
self subclassResponsibility |
34 | 1014 |
|
1015 |
"Created: / 11-05-2011 / 07:58:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1016 |
"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
|
1017 |
"Modified: / 16-11-2012 / 22:31:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1018 |
! |
1019 |
||
1020 |
argumentsGlobalOn:arg |
|
1021 |
"Called to get global options" |
|
1022 |
||
1023 |
"Created: / 11-05-2011 / 07:58:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1024 |
"Modified (format): / 27-12-2011 / 15:47:10 / dundee" |
|
1025 |
"Modified: / 30-09-2012 / 23:43:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1026 |
! |
|
1027 |
||
1028 |
command |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1029 |
"Returns the hg 'command' option, i.e. commit, |
34 | 1030 |
push, pull, ..." |
1031 |
||
1032 |
^self class nameWithoutPrefix |
|
1033 |
||
1034 |
" |
|
1035 |
HGCommand::push basicNew command |
|
1036 |
" |
|
1037 |
||
1038 |
"Created: / 11-05-2011 / 07:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1039 |
"Modified (format): / 27-12-2011 / 15:47:17 / dundee" |
|
1040 |
"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
|
1041 |
"Modified (comment): / 08-02-2014 / 11:41:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1042 |
! |
1043 |
||
1044 |
executable |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1045 |
^ self class hgExecutable |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1046 |
|
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1047 |
"Modified: / 17-07-2014 / 10:16:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1048 |
! |
1049 |
||
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
|
1050 |
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
|
1051 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
34 | 1052 |
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
|
1053 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1054 |
^ (self parserOn: stream) parseError. |
34 | 1055 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1056 |
"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
|
1057 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1058 |
|
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
|
1059 |
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
|
1060 |
"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
|
1061 |
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
|
1062 |
|
34 | 1063 |
^ self subclassResponsibility |
1064 |
||
1065 |
"Created: / 11-05-2011 / 07:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1066 |
"Created: / 17-12-2011 / 17:02:41 / dundee" |
|
1067 |
"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
|
1068 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1069 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1070 |
parserOn: aStream |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1071 |
"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
|
1072 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1073 |
^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
|
1074 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1075 |
"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
|
1076 |
"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
|
1077 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1078 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1079 |
spawn:block name: name |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1080 |
"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
|
1081 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1082 |
| worker | |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1083 |
|
419 | 1084 |
worker := [ |
256 | 1085 |
Trace ifTrue:[ |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
1086 |
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
|
1087 |
]. |
447
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
1088 |
block on: Error do:[:ex| |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
1089 |
self propagate:ex |
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
1090 |
] |
240
e04b6e515237
HGCommandServer>>execute: refactored & hopefully fixed.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
238
diff
changeset
|
1091 |
] newProcess. |
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1092 |
worker addExitAction:[ |
256 | 1093 |
Trace ifTrue:[ |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1094 |
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
|
1095 |
]. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1096 |
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
|
1097 |
]. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1098 |
worker resume. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1099 |
worker name: name. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1100 |
^worker |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1101 |
|
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1102 |
"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
|
1103 |
"Modified: / 05-03-2013 / 19:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
447
73e53f58ae31
When debugging, open a debugger on a process that actually raised (propagated:) the exception.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
446
diff
changeset
|
1104 |
"Modified (format): / 17-07-2014 / 07:31:58 / jv" |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1105 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1106 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1107 |
spawnErrorReaderOn: stderr |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1108 |
errorReader isNil ifTrue:[ |
463
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1109 |
errorReader := self spawn: [ |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1110 |
"/ Workaround for bug in PipeStream on Windows. |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1111 |
"/ Should be removed once PipeStreamTest>>testReadPipe6 gets fixed |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1112 |
stderr atEnd. |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1113 |
self parseError: stderr |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1114 |
] name: 'Error reader'. |
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
|
1115 |
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
|
1116 |
]. |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1117 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1118 |
"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
|
1119 |
"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
|
1120 |
! |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1121 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1122 |
spawnOutputReaderOn: stdout |
419 | 1123 |
outputReader isNil ifTrue:[ |
463
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1124 |
outputReader := self spawn: [ |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1125 |
"/ Workaround for bug in PipeStream on Windows. |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1126 |
"/ Should be removed once PipeStreamTest>>testReadPipe6 gets fixed |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1127 |
stdout atEnd. |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1128 |
result := self parseOutput: stdout |
3ba85719b2a3
Workaround for bug in PipeStream on Windows.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
459
diff
changeset
|
1129 |
] name: 'Output reader'. |
232
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1130 |
] |
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1131 |
|
718711b15cea
More work on command server. Not yet finished, though.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
231
diff
changeset
|
1132 |
"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
|
1133 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1134 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1135 |
status: status result: res |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1136 |
"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
|
1137 |
|
247
bf5bfe409ff8
Bugfix for commiting to an empty repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
243
diff
changeset
|
1138 |
status success ifFalse:[ |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1139 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1140 |
]. |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1141 |
^res |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1142 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1143 |
"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
|
1144 |
"Modified: / 08-03-2013 / 22:32:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1145 |
! ! |
1146 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1147 |
!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
|
1148 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1149 |
paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1150 |
^ paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1151 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1152 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1153 |
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
|
1154 |
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
|
1155 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1156 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1157 |
!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
|
1158 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1159 |
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
|
1160 |
"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
|
1161 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1162 |
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
|
1163 |
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
|
1164 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1165 |
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
|
1166 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1167 |
"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
|
1168 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1169 |
|
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
|
1170 |
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
|
1171 |
"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
|
1172 |
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
|
1173 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1174 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1175 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1176 |
"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
|
1177 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1178 |
|
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1179 |
!HGCommand::bookmark methodsFor:'accessing'! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1180 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1181 |
name |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1182 |
^ name |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1183 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1184 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1185 |
name:something |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1186 |
name := something. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1187 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1188 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1189 |
revision |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1190 |
^ revision |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1191 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1192 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1193 |
revision:something |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1194 |
revision := something. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1195 |
! ! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1196 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1197 |
!HGCommand::bookmark methodsFor:'private'! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1198 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1199 |
argumentsCommandOn:stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1200 |
revision notNil ifTrue:[ |
419 | 1201 |
stream |
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1202 |
nextPut: '-r'; |
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
1203 |
nextPut: (revision hasRevnoOnly ifTrue:[revision revno printString] ifFalse:[revision printStringWithoutNumber]). |
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1204 |
]. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1205 |
stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1206 |
nextPut: name. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1207 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1208 |
"Created: / 20-03-2014 / 17:26:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
465
adb48cfb1df7
Test fixes for bookmarks and Mercurial 2.5 and earlier.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
463
diff
changeset
|
1209 |
"Modified: / 04-11-2014 / 16:03:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1210 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1211 |
|
419 | 1212 |
parseError:stream |
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1213 |
^ (self parserOn: stream) parseErrorBookmark |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1214 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1215 |
"Created: / 20-03-2014 / 17:27:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1216 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1217 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1218 |
parseOutput:stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1219 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1220 |
etc." |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1221 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1222 |
^ nil |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1223 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1224 |
"Created: / 20-03-2014 / 17:27:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1225 |
! ! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1226 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1227 |
!HGCommand::bookmark_delete methodsFor:'accessing'! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1228 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1229 |
name |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1230 |
^ name |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1231 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1232 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1233 |
name:something |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1234 |
name := something. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1235 |
! ! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1236 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1237 |
!HGCommand::bookmark_delete methodsFor:'private'! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1238 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1239 |
argumentsCommandOn:stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1240 |
stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1241 |
nextPut: '--delete'; |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1242 |
nextPut: name. |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1243 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1244 |
"Created: / 20-03-2014 / 17:26:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1245 |
"Modified: / 21-03-2014 / 01:14:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1246 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1247 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1248 |
command |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1249 |
"Returns the hg 'command' option, i.e. commit, |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1250 |
push, pull, ..." |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1251 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1252 |
^ 'bookmark' |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1253 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1254 |
" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1255 |
HGCommand::push basicNew command |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1256 |
" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1257 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1258 |
"Created: / 21-03-2014 / 01:21:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1259 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1260 |
|
419 | 1261 |
parseError:stream |
403
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1262 |
^ (self parserOn: stream) parseErrorBookmark |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1263 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1264 |
"Created: / 20-03-2014 / 17:27:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1265 |
! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1266 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1267 |
parseOutput:stream |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1268 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1269 |
etc." |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1270 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1271 |
^ nil |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1272 |
|
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1273 |
"Created: / 20-03-2014 / 17:27:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1274 |
! ! |
237ed0ed6c49
Initial support for Mercurial bookmarks.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
399
diff
changeset
|
1275 |
|
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1276 |
!HGCommand::branches methodsFor:'accessing'! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1277 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1278 |
active |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1279 |
^ active |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1280 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1281 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1282 |
active:aBoolean |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1283 |
active := aBoolean. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1284 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1285 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1286 |
closed |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1287 |
^ closed |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1288 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1289 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1290 |
closed:aBoolean |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1291 |
closed := aBoolean. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1292 |
! ! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1293 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1294 |
!HGCommand::branches methodsFor:'private'! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1295 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1296 |
argumentsCommandOn:stream |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1297 |
"Called to get command specific options" |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1298 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1299 |
active == true ifTrue:[ |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1300 |
stream nextPut:'--active' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1301 |
]. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1302 |
closed == true ifTrue:[ |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1303 |
stream nextPut:'--closed' |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1304 |
]. |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1305 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1306 |
"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
|
1307 |
! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1308 |
|
419 | 1309 |
parseError:stream |
228
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
1310 |
^ (self parserOn: stream) parseErrorBranches. |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
1311 |
|
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
1312 |
"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
|
1313 |
! |
e00b7d71e234
Bugfix in parsing 'push' and 'branches' command output.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
227
diff
changeset
|
1314 |
|
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
|
1315 |
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
|
1316 |
"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
|
1317 |
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
|
1318 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1319 |
^ (self parserOn:stream) parseCommandBranches |
105
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1320 |
|
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1321 |
"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
|
1322 |
! ! |
25e8ff9d2a31
Added read-only support for branches.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
1323 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1324 |
!HGCommand::cat methodsFor:'accessing'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1325 |
|
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1326 |
destination |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1327 |
^ destination |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1328 |
! |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1329 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1330 |
destination:aStringOrFilename |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1331 |
destination := aStringOrFilename. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1332 |
! |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1333 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1334 |
path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1335 |
^ path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1336 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1337 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1338 |
path:something |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1339 |
path := something. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1340 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1341 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1342 |
revision |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1343 |
^ revision |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1344 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1345 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1346 |
revision:something |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1347 |
revision := something. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1348 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1349 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1350 |
!HGCommand::cat methodsFor:'executing'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1351 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1352 |
execute |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1353 |
" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1354 |
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
|
1355 |
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
|
1356 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1357 |
" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1358 |
|
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1359 |
| 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
|
1360 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1361 |
destination notNil ifTrue:[ |
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1362 |
^ super execute. |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1363 |
]. |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1364 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1365 |
pipe := NonPositionableExternalStream makePipe. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1366 |
output := pipe first. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1367 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1368 |
OperatingSystem isUNIXlike ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1369 |
environment := OperatingSystem getEnvironment copy. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1370 |
] ifFalse:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1371 |
environment := Dictionary new. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1372 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1373 |
environment at:'LANG' put:'C'. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1374 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1375 |
args := self arguments. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1376 |
OperatingSystem isMSWINDOWSlike ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1377 |
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
|
1378 |
args |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1379 |
do:[:each | s nextPut:$"; nextPutAll: each; nextPut: $"] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1380 |
separatedBy: [ s space ] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1381 |
] |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1382 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1383 |
|
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1384 |
sout := pipe second. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1385 |
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
|
1386 |
exec := [ |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1387 |
pid := OperatingSystem exec:(self executable) withArguments:args |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1388 |
environment:environment |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1389 |
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
|
1390 |
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
|
1391 |
newPgrp:false |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1392 |
inDirectory:self workingDirectory. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1393 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1394 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1395 |
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
|
1396 |
Processor |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1397 |
monitor:exec |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1398 |
action:[:stat | |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1399 |
sema signal. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1400 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1401 |
] ifFalse:[ |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1402 |
exec value |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1403 |
]. |
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1404 |
|
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1405 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1406 |
pipe second close. |
126
952efea00dd2
More SourceCodeManager API.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1407 |
sout close. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1408 |
pid isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1409 |
HGCommandError raiseErrorString: 'cannot execute hg command'. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1410 |
output close. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1411 |
^ self. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1412 |
]. |
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1413 |
^ output. |
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1414 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1415 |
"Created: / 17-11-2012 / 00:13:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1416 |
"Modified: / 06-07-2014 / 16:46:30 / 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
|
1417 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1418 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1419 |
!HGCommand::cat methodsFor:'private'! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1420 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1421 |
argumentsCommandOn:stream |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1422 |
"Called to get command specific options" |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1423 |
|
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1424 |
path isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1425 |
self error:'No path specified' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1426 |
]. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1427 |
revision isNil ifTrue:[ |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1428 |
self error:'No revision specified' |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1429 |
]. |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
1430 |
destination notNil ifTrue:[ |
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1431 |
stream nextPut: '-o'. |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1432 |
stream nextPut: destination asFilename pathName. |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1433 |
]. |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1434 |
|
71
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1435 |
stream nextPut:'--rev'; nextPut: revision asString. |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1436 |
stream nextPut:path |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1437 |
|
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1438 |
"Modified: / 06-07-2014 / 16:45:27 / 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
|
1439 |
! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1440 |
|
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
|
1441 |
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
|
1442 |
"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
|
1443 |
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
|
1444 |
|
439
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1445 |
"/ Nothing to do... |
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1446 |
|
7516fdf761f8
Fix in HGCommand::cat>>execute: use -o option rather than pipe command output to file.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
437
diff
changeset
|
1447 |
"Modified: / 06-07-2014 / 16:53:20 / 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
|
1448 |
! ! |
bd4cfb10a262
Basic support to access changeset content.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
69
diff
changeset
|
1449 |
|
34 | 1450 |
!HGCommand::clone methodsFor:'accessing'! |
1451 |
||
1452 |
path |
|
1453 |
^ path |
|
1454 |
! |
|
1455 |
||
1456 |
path:something |
|
1457 |
path := something. |
|
1458 |
! |
|
1459 |
||
1460 |
url |
|
1461 |
^ url |
|
1462 |
! |
|
1463 |
||
1464 |
url:something |
|
1465 |
url := something. |
|
1466 |
! ! |
|
1467 |
||
1468 |
!HGCommand::clone methodsFor:'private'! |
|
1469 |
||
1470 |
argumentsCommandOn:stream |
|
1471 |
"Called to get command specific options" |
|
88 | 1472 |
update == false ifTrue:[ |
1473 |
stream nextPut:'--noupdate'. |
|
1474 |
]. |
|
1475 |
stream nextPut: url; nextPut: path. |
|
34 | 1476 |
|
1477 |
"Created: / 01-10-2012 / 00:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 | 1478 |
"Modified: / 21-11-2012 / 00:17:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1479 |
! |
1480 |
||
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
|
1481 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
1482 |
"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
|
1483 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1484 |
^ nil |
34 | 1485 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1486 |
"Modified: / 14-11-2012 / 22:42:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1487 |
! ! |
1488 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1489 |
!HGCommand::commit methodsFor:'accessing'! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1490 |
|
146
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1491 |
author |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1492 |
^ author |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1493 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1494 |
|
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1495 |
author:aString |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1496 |
author := aString. |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1497 |
! |
1015b8f6dc1c
Added check for author signature before commit.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
145
diff
changeset
|
1498 |
|
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1499 |
date |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1500 |
^ date |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1501 |
! |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1502 |
|
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1503 |
date:aTimestampOrString |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1504 |
date := aTimestampOrString. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1505 |
! |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1506 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1507 |
files |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1508 |
^ files |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1509 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1510 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1511 |
files:something |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1512 |
files := something. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1513 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1514 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1515 |
message |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1516 |
^ message |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1517 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1518 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1519 |
message:something |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1520 |
message := something. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1521 |
! ! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1522 |
|
474
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1523 |
!HGCommand::commit methodsFor:'executing'! |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1524 |
|
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1525 |
execute |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1526 |
message isEmptyOrNil ifTrue:[ |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1527 |
^ HGCommitError raiseErrorString: 'empty commit message'. |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1528 |
]. |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1529 |
^ super execute |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1530 |
|
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1531 |
"Created: / 16-11-2014 / 23:50:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1532 |
! ! |
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1533 |
|
34 | 1534 |
!HGCommand::commit methodsFor:'private'! |
1535 |
||
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1536 |
argumentsCommandOn:stream |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1537 |
"Called to get command specific options" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1538 |
|
73
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1539 |
author notNil ifTrue:[ |
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1540 |
stream nextPut:'--user'; nextPut: author |
eb731ce2685e
Fixed HGStXTests>>test_commit_01
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
71
diff
changeset
|
1541 |
]. |
213
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1542 |
date notNil ifTrue:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1543 |
stream nextPut:'--date'. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1544 |
date isTimestamp ifTrue:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1545 |
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
|
1546 |
] ifFalse:[ |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1547 |
stream nextPut: date asString |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1548 |
] |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1549 |
]. |
d5a0f178e2c4
Add a date parameter to commit message.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
210
diff
changeset
|
1550 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1551 |
stream nextPut:'-m'; nextPut: message. |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1552 |
files notNil ifTrue:[ |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1553 |
stream nextPutAll: files |
49
ffb879bfafe7
- stx_libscm_mercurial
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
40
diff
changeset
|
1554 |
]. |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1555 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1556 |
"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
|
1557 |
"Modified: / 07-12-2012 / 15:32:51 / jv" |
474
f610e64874c8
Fix in commit command: raise HGCommitError when a commit message is empty (or nil)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
470
diff
changeset
|
1558 |
"Modified: / 16-11-2014 / 23:49:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1559 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1560 |
|
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
|
1561 |
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
|
1562 |
"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
|
1563 |
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
|
1564 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1565 |
^ (self parserOn: stream) parseErrorCommit. |
34 | 1566 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1567 |
"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
|
1568 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1569 |
|
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
|
1570 |
parseOutput:stream |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1571 |
"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
|
1572 |
"Nothing to do" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1573 |
"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
|
1574 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1575 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1576 |
status: status result: result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1577 |
"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
|
1578 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1579 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1580 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1581 |
]. |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1582 |
^result |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1583 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
1584 |
"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
|
1585 |
! ! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1586 |
|
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1587 |
!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
|
1588 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1589 |
argumentsCommandOn:stream |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1590 |
"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
|
1591 |
|
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
|
1592 |
stream |
106
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1593 |
nextPut:'--template'; |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1594 |
nextPut:HGCommandParser templateHeads. |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1595 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1596 |
"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
|
1597 |
! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1598 |
|
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
|
1599 |
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
|
1600 |
"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
|
1601 |
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
|
1602 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1603 |
^ (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
|
1604 |
|
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1605 |
"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
|
1606 |
! |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1607 |
|
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1608 |
status: status result: res |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1609 |
"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
|
1610 |
status code == 1 ifTrue:[ |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1611 |
^#() |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1612 |
]. |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1613 |
status success ifFalse:[ |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1614 |
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
|
1615 |
]. |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1616 |
^res |
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1617 |
|
8ad8b1147873
Bugfix: moved status:result to HGCommand::heads.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
247
diff
changeset
|
1618 |
"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
|
1619 |
"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
|
1620 |
! ! |
99be3b5a40da
Added support for heads (both repository and per-branch)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
105
diff
changeset
|
1621 |
|
371
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1622 |
!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
|
1623 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1624 |
path |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1625 |
^ path |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1626 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1627 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1628 |
path:aStringOrFilename |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1629 |
path := aStringOrFilename. |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1630 |
! ! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1631 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1632 |
!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
|
1633 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1634 |
argumentsCommandOn:stream |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1635 |
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
|
1636 |
"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
|
1637 |
! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1638 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1639 |
parseOutput:stream |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1640 |
"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
|
1641 |
etc." |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1642 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1643 |
^ nil |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1644 |
|
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1645 |
"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
|
1646 |
! ! |
f271ddd2b5e0
Added 'Clone...' and 'Create...' menu entries to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
368
diff
changeset
|
1647 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1648 |
!HGCommand::locate methodsFor:'accessing'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1649 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1650 |
revision |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1651 |
^ revision |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1652 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1653 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1654 |
revision:rev |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1655 |
revision := rev. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1656 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1657 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1658 |
!HGCommand::locate methodsFor:'private'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1659 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1660 |
argumentsCommandOn:stream |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1661 |
"Called to get command specific options" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1662 |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1663 |
"/stream nextPut:'--print0'. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1664 |
revision notNil ifTrue:[ |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1665 |
stream nextPut: '--rev'; nextPut: revision printString. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1666 |
]. |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1667 |
|
165
4f6432cf4240
Added support for lazy changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1668 |
"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
|
1669 |
! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1670 |
|
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
|
1671 |
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
|
1672 |
"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
|
1673 |
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
|
1674 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1675 |
^ (self parserOn:stream) parseCommandLocate |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1676 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1677 |
"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
|
1678 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
63
diff
changeset
|
1679 |
|
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1680 |
!HGCommand::log methodsFor:'accessing'! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1681 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1682 |
childrenOnly |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1683 |
^ childrenOnly |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1684 |
! |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1685 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1686 |
childrenOnly:aBoolean |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1687 |
childrenOnly := aBoolean. |
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1688 |
! |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1689 |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1690 |
idsOnly |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1691 |
^ idsOnly |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1692 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1693 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1694 |
idsOnly:aBoolean |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1695 |
idsOnly := aBoolean. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1696 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1697 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1698 |
limit |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1699 |
^ limit |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1700 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1701 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1702 |
limit:anInteger |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1703 |
limit := anInteger. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1704 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1705 |
|
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1706 |
path |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1707 |
^ path |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1708 |
! |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1709 |
|
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1710 |
path:aString |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1711 |
path := aString. |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1712 |
! |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1713 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1714 |
revset: revset |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1715 |
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
|
1716 |
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
|
1717 |
|
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1718 |
"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
|
1719 |
! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1720 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1721 |
revsets: aCollection |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1722 |
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
|
1723 |
revsets := aCollection |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1724 |
] ifFalse:[ |
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1725 |
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
|
1726 |
]. |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1727 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1728 |
"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
|
1729 |
! ! |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1730 |
|
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1731 |
!HGCommand::log methodsFor:'private'! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1732 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1733 |
argumentsCommandOn:stream |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1734 |
"Called to get command specific options" |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1735 |
|
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1736 |
| template | |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1737 |
|
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1738 |
template := HGCommand hgVersionIsGreaterOrEqualThan_2_4 |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1739 |
ifTrue:[ HGCommandParser templateLog ] |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1740 |
ifFalse:[ HGCommandParser templateLogForVersionLessThan2_4 ]. |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1741 |
|
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1742 |
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
|
1743 |
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
|
1744 |
self error:'No revisions given'. |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1745 |
]. |
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1746 |
revsets do:[:revset| |
399
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1747 |
| string | |
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1748 |
|
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1749 |
string := revset asString. |
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1750 |
string isEmptyOrNil ifTrue:[ string := ':' "All changes" ]. |
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1751 |
|
191
f0745f4cdc97
Performance optimization: lazily pre-load all unloaded changes at once.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
183
diff
changeset
|
1752 |
stream nextPut:'--rev'. |
399
abafe12d47d6
Initial version of HGChangesetBrowser, a tool for browsing commit history.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1753 |
stream nextPut:string |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1754 |
]. |
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1755 |
] ifFalse:[ |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1756 |
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
|
1757 |
]. |
419 | 1758 |
idsOnly == true ifTrue:[ |
1759 |
template := HGCommandParser templateLogIdsOnly. |
|
40
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1760 |
]. |
e3699c0b00f9
Baisc support for changesets (revision log)
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
39
diff
changeset
|
1761 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1762 |
childrenOnly == true ifTrue:[ |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1763 |
template := HGCommandParser templateLogChildren. |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1764 |
]. |
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1765 |
|
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1766 |
HGCommand hgVersionIsGreaterOrEqualThan_2_4 ifFalse:[ |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1767 |
stream nextPut:'--debug'. |
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1768 |
]. |
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
|
1769 |
stream |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1770 |
nextPut:'--template'; |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1771 |
nextPut:template. |
419 | 1772 |
limit notNil ifTrue:[ |
1773 |
stream |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1774 |
nextPut: '-l'; |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1775 |
nextPut: limit printString |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1776 |
]. |
136
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1777 |
|
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1778 |
path notNil ifTrue:[ |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1779 |
stream nextPut: path. |
2d1512dde043
Added HGWorkingCopyFile>>revisions.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
126
diff
changeset
|
1780 |
]. |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1781 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1782 |
"Created: / 13-11-2012 / 09:05:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
477
594a42a4d8fc
Oops, fixed bug introduced in 9f97cda: care for version < 2.4
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
476
diff
changeset
|
1783 |
"Modified: / 27-11-2014 / 23:24:01 / 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
|
1784 |
! |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1785 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1786 |
parseError:stream |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1787 |
"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
|
1788 |
etc." |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1789 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1790 |
^ (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
|
1791 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1792 |
"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
|
1793 |
! |
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1794 |
|
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
|
1795 |
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
|
1796 |
"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
|
1797 |
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
|
1798 |
|
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1799 |
childrenOnly == true ifTrue:[ |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1800 |
^ (self parserOn:stream) parseCommandLogChildren. |
137
379bd934f8d0
Make HGChangeset>>children dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
136
diff
changeset
|
1801 |
]. |
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
366
diff
changeset
|
1802 |
^ idsOnly ~~ true |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1803 |
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
|
1804 |
ifFalse:[ (self parserOn:stream) parseCommandLogIdsOnly ] |
39
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1805 |
|
10e693b3e034
- Support for commit
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
38
diff
changeset
|
1806 |
"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
|
1807 |
"Modified: / 08-02-2014 / 22:12:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1808 |
! ! |
1809 |
||
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1810 |
!HGCommand::merge methodsFor:'accessing'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1811 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1812 |
revision |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1813 |
^ revision |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1814 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1815 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1816 |
revision:something |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1817 |
revision := something. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1818 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1819 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1820 |
tool |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1821 |
^ tool |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1822 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1823 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1824 |
tool:aString |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1825 |
tool := aString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1826 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1827 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1828 |
!HGCommand::merge methodsFor:'private'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1829 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1830 |
argumentsCommandOn:stream |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1831 |
"Called to get command specific options" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1832 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1833 |
revision notNil ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1834 |
stream nextPut:'--rev'; nextPut: revision asString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1835 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1836 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1837 |
revision notNil ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1838 |
stream nextPut:'--tool'; nextPut: tool asString. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1839 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1840 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1841 |
"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
|
1842 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1843 |
|
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
|
1844 |
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
|
1845 |
"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
|
1846 |
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
|
1847 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1848 |
^ (self parserOn:stream) parseCommandMerge |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1849 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1850 |
"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
|
1851 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1852 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1853 |
status: status result: result |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1854 |
"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
|
1855 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1856 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1857 |
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
|
1858 |
]. |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1859 |
^result |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1860 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1861 |
"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
|
1862 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
1863 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1864 |
!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
|
1865 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1866 |
destination |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1867 |
^ destination |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1868 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1869 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1870 |
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
|
1871 |
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
|
1872 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1873 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1874 |
source |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1875 |
^ source |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1876 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1877 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1878 |
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
|
1879 |
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
|
1880 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1881 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1882 |
!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
|
1883 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1884 |
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
|
1885 |
"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
|
1886 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1887 |
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
|
1888 |
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
|
1889 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1890 |
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
|
1891 |
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
|
1892 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1893 |
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
|
1894 |
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
|
1895 |
]. |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1896 |
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
|
1897 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1898 |
"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
|
1899 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1900 |
|
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
|
1901 |
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
|
1902 |
"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
|
1903 |
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
|
1904 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1905 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1906 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1907 |
"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
|
1908 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
1909 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1910 |
!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
|
1911 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1912 |
url |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1913 |
^ url |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1914 |
! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1915 |
|
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1916 |
url:aString |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1917 |
url := aString. |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1918 |
! ! |
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1919 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1920 |
!HGCommand::pull methodsFor:'private'! |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1921 |
|
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1922 |
argumentsCommandOn:stream |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1923 |
"Called to get command specific options" |
34 | 1924 |
|
57
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1925 |
url notNil ifTrue:[ |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1926 |
stream nextPut: url. |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1927 |
]. |
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1928 |
|
47b14a8b7eb8
Some hacks to make basic Mercurial commit working
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
54
diff
changeset
|
1929 |
"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
|
1930 |
"Modified: / 15-11-2012 / 09:56:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1931 |
! |
1932 |
||
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
|
1933 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
1934 |
"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
|
1935 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1936 |
^ (self parserOn:stream) parseCommandPull |
34 | 1937 |
|
215
165ce6502156
Temporary commit: added notification propagation. Added Push/Pull info.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
214
diff
changeset
|
1938 |
"Modified: / 04-02-2013 / 15:35:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
453
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1939 |
! |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1940 |
|
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1941 |
status: status result: res |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1942 |
"Called when hg command finishes, passing it's status and result from parser" |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1943 |
|
475
f94b58d96d03
Fix for Mercurial 2.1: properly handle `hg pull` exit status.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
474
diff
changeset
|
1944 |
(status code == 1) ifTrue:[ |
f94b58d96d03
Fix for Mercurial 2.1: properly handle `hg pull` exit status.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
474
diff
changeset
|
1945 |
"/ For whatever reason, Mercurial 2.1 returns exit statis |
f94b58d96d03
Fix for Mercurial 2.1: properly handle `hg pull` exit status.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
474
diff
changeset
|
1946 |
"/ of 1 if no changes has been found. No other release does it. |
f94b58d96d03
Fix for Mercurial 2.1: properly handle `hg pull` exit status.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
474
diff
changeset
|
1947 |
HGCommand hgVersion = #(2 1 nil) ifTrue:[ ^ res ]. |
f94b58d96d03
Fix for Mercurial 2.1: properly handle `hg pull` exit status.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
474
diff
changeset
|
1948 |
]. |
453
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1949 |
(status code ~~ 0) ifTrue:[ |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1950 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1951 |
]. |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1952 |
res isNil ifTrue:[ |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1953 |
HGCommandError raiseErrorString: ('hg command failed (no output)' expandMacrosWith: status code) . |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1954 |
]. |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1955 |
^ res |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1956 |
|
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
1957 |
"Created: / 15-11-2012 / 17:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1958 |
! ! |
1959 |
||
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1960 |
!HGCommand::push methodsFor:'accessing'! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1961 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1962 |
force |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1963 |
^ force |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1964 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1965 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1966 |
force:something |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1967 |
force := something. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1968 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1969 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1970 |
url |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1971 |
^ url |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1972 |
! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1973 |
|
206
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1974 |
url:remote |
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1975 |
url := remote. |
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1976 |
! ! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1977 |
|
34 | 1978 |
!HGCommand::push methodsFor:'private'! |
1979 |
||
1980 |
argumentsCommandOn:stream |
|
1981 |
"Called to get command specific options" |
|
1982 |
||
206
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1983 |
|
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1984 |
stream nextPut: (url ? 'default'). |
7985d1be806a
Improvement HGRepository>>push:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
191
diff
changeset
|
1985 |
|
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1986 |
force == true ifTrue:[ |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1987 |
stream nextPut:'--force' |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
106
diff
changeset
|
1988 |
] |
34 | 1989 |
|
1990 |
"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
|
1991 |
"Modified: / 29-01-2013 / 15:42:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 1992 |
! |
1993 |
||
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
|
1994 |
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
|
1995 |
"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
|
1996 |
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
|
1997 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1998 |
^ (self parserOn: stream) parseErrorPush. |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
1999 |
|
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2000 |
"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
|
2001 |
! |
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2002 |
|
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
|
2003 |
parseOutput:stream |
63
77b0d42eebd0
Removed last bits of Git, hopefully
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
61
diff
changeset
|
2004 |
"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
|
2005 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2006 |
^ (self parserOn:stream) parseCommandPush |
34 | 2007 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
146
diff
changeset
|
2008 |
"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
|
2009 |
! |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2010 |
|
453
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
2011 |
status: status result: res |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2012 |
"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
|
2013 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2014 |
(status code ~~ 0 and:[status code ~~ 1]) ifTrue:[ |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2015 |
HGCommandError raiseErrorString: ('hg command failed (status %1)' expandMacrosWith: status code) . |
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2016 |
]. |
453
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
2017 |
res isNil ifTrue:[ |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
2018 |
HGCommandError raiseErrorString: ('hg command failed (no output)' expandMacrosWith: status code) . |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
2019 |
]. |
09a9ccac8aba
Fixed timing issues for push/pull commands.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
452
diff
changeset
|
2020 |
^ result |
61
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2021 |
|
fd129d0c603e
Fixes in committing
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
57
diff
changeset
|
2022 |
"Created: / 15-11-2012 / 17:06:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34 | 2023 |
! ! |
2024 |
||
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2025 |
!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
|
2026 |
|
357
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2027 |
force |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2028 |
^ force |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2029 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2030 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2031 |
force:something |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2032 |
force := something. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2033 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2034 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2035 |
paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2036 |
^ paths |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2037 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2038 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2039 |
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
|
2040 |
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
|
2041 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2042 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2043 |
!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
|
2044 |
|
357
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2045 |
argumentsCommandOn:stream |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2046 |
"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
|
2047 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2048 |
force == true ifTrue:[ |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2049 |
stream nextPut: '-f'. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2050 |
]. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2051 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2052 |
paths isEmptyOrNil ifTrue:[ |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2053 |
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
|
2054 |
]. |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2055 |
stream nextPutAll: paths |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2056 |
|
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2057 |
"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
|
2058 |
"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
|
2059 |
! |
4f4a12ecfc4f
Re-added accidentically removed HGCommand::remove>>argumentsCommandOn:/force/force:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
355
diff
changeset
|
2060 |
|
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
|
2061 |
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
|
2062 |
"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
|
2063 |
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
|
2064 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2065 |
^ nil |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2066 |
|
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2067 |
"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
|
2068 |
! ! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2069 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2070 |
!HGCommand::resolve class methodsFor:'initialization'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2071 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2072 |
initialize |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2073 |
"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
|
2074 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2075 |
"/ 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
|
2076 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2077 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2078 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2079 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2080 |
!HGCommand::resolve methodsFor:'accessing'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2081 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2082 |
files |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2083 |
^ files |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2084 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2085 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2086 |
files:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2087 |
files := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2088 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2089 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2090 |
mark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2091 |
^ mark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2092 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2093 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2094 |
mark:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2095 |
mark := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2096 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2097 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2098 |
tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2099 |
^ tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2100 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2101 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2102 |
tool:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2103 |
tool := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2104 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2105 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2106 |
unmark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2107 |
^ unmark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2108 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2109 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2110 |
unmark:something |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2111 |
unmark := something. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2112 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2113 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2114 |
!HGCommand::resolve methodsFor:'private'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2115 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2116 |
argumentsCommandOn:stream |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2117 |
"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
|
2118 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2119 |
tool notNil ifTrue:[ |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2120 |
stream nextPut:'--tool'; nextPut: tool |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2121 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2122 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
2123 |
mark == true ifTrue:[ |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2124 |
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
|
2125 |
stream nextPut: '--mark'. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2126 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2127 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
2128 |
unmark == true ifTrue:[ |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2129 |
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
|
2130 |
stream nextPut: '--unmark'. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2131 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2132 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2133 |
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
|
2134 |
|
300
724f9902f606
Bugfix in HGCommand::resolve.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
260
diff
changeset
|
2135 |
"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
|
2136 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2137 |
|
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
|
2138 |
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
|
2139 |
"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
|
2140 |
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
|
2141 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2142 |
^ nil |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2143 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2144 |
"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
|
2145 |
! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2146 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2147 |
status: status result: result |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2148 |
"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
|
2149 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2150 |
status code == 0 ifTrue:[ ^ true ]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2151 |
status code == 1 ifTrue:[ ^ false]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2152 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2153 |
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
|
2154 |
^false |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2155 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2156 |
"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
|
2157 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2158 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2159 |
!HGCommand::resolve__list methodsFor:'private'! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2160 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2161 |
argumentsCommandOn:stream |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2162 |
"Called to get command specific options" |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2163 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2164 |
stream nextPut: '--list' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2165 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2166 |
"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
|
2167 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2168 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2169 |
command |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2170 |
^'resolve' |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2171 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2172 |
"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
|
2173 |
! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2174 |
|
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
|
2175 |
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
|
2176 |
"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
|
2177 |
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
|
2178 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2179 |
^ (self parserOn:stream) parseCommandResolveList |
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2180 |
|
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2181 |
"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
|
2182 |
! ! |
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2183 |
|
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
|
2184 |
!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
|
2185 |
|
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
|
2186 |
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
|
2187 |
"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
|
2188 |
|
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
|
2189 |
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
|
2190 |
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
|
2191 |
]. |
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
|
2192 |
|
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
|
2193 |
"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
|
2194 |
! |
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
2195 |
|
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
|
2196 |
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
|
2197 |
"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
|
2198 |
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
|
2199 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2200 |
^ (self parserOn:stream) parseCommandShowConfig |
145
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
2201 |
|
1b8652185a8f
Added HGRepository>>config.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
142
diff
changeset
|
2202 |
"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
|
2203 |
! ! |
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
|
2204 |
|
36 | 2205 |
!HGCommand::status methodsFor:'accessing'! |
2206 |
||
2207 |
path |
|
2208 |
^ path |
|
2209 |
! |
|
2210 |
||
2211 |
path:aString |
|
2212 |
path := aString. |
|
2213 |
! ! |
|
2214 |
||
2215 |
!HGCommand::status methodsFor:'private'! |
|
2216 |
||
2217 |
argumentsCommandOn:stream |
|
2218 |
"Called to get command specific options" |
|
2219 |
||
2220 |
stream nextPut:'-A'. |
|
2221 |
path notNil ifTrue:[stream nextPut: path] |
|
2222 |
||
2223 |
"Created: / 23-10-2012 / 11:09:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2224 |
! |
|
2225 |
||
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
|
2226 |
parseOutput:stream |
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2227 |
^ (self parserOn:stream) parseCommandStatus |
36 | 2228 |
|
2229 |
"Modified: / 23-10-2012 / 11:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2230 |
! ! |
|
2231 |
||
88 | 2232 |
!HGCommand::update methodsFor:'accessing'! |
2233 |
||
2234 |
revision |
|
2235 |
^ revision |
|
2236 |
! |
|
2237 |
||
2238 |
revision:something |
|
2239 |
revision := something. |
|
2240 |
! ! |
|
2241 |
||
2242 |
!HGCommand::update methodsFor:'private'! |
|
2243 |
||
2244 |
argumentsCommandOn:stream |
|
2245 |
"Called to get command specific options" |
|
2246 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
95
diff
changeset
|
2247 |
revision notNil ifTrue:[ |
88 | 2248 |
stream nextPut:'--rev'; nextPut: revision asString. |
2249 |
]. |
|
2250 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
95
diff
changeset
|
2251 |
"Modified: / 23-11-2012 / 23:08:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 2252 |
! |
2253 |
||
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
|
2254 |
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
|
2255 |
"Parses output of 'hg' command, i.e. commit, log, update, checkout, |
88 | 2256 |
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
|
2257 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2258 |
^ (self parserOn:stream) parseCommandUpdate |
88 | 2259 |
|
177
1b0ddad9770e
Initial support for merging.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
165
diff
changeset
|
2260 |
"Modified: / 14-01-2013 / 16:00:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 2261 |
! ! |
2262 |
||
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2263 |
!HGCommand::version methodsFor:'accessing'! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2264 |
|
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
2265 |
arguments:something |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
2266 |
arguments := something. |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
2267 |
! |
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
2268 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2269 |
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
|
2270 |
^ executable notNil |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2271 |
ifTrue:[executable] |
451
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2272 |
ifFalse:[self class hgExecutable] |
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2273 |
|
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2274 |
"Modified: / 18-07-2014 / 11:12:35 / jv" |
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2275 |
! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2276 |
|
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2277 |
executable:aString |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2278 |
executable := aString. |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2279 |
! ! |
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2280 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2281 |
!HGCommand::version methodsFor:'private'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2282 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2283 |
arguments |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2284 |
|
451
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2285 |
^ (Array with: self executable) |
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2286 |
, (arguments notNil ifTrue: [ arguments ] ifFalse: [ HGCommand hgExecutableArguments ]) |
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2287 |
, #('--version') |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2288 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2289 |
"Created: / 19-11-2012 / 20:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
444
8987b87a562a
hg command setting refactored to allow command and arguments to be specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
441
diff
changeset
|
2290 |
"Modified: / 17-07-2014 / 15:11:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
451
396c55ca19d6
Fix in HGCommand::version: use default executable and/or arguments of none is specified.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
450
diff
changeset
|
2291 |
"Modified: / 18-07-2014 / 11:18:36 / jv" |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2292 |
! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2293 |
|
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
|
2294 |
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
|
2295 |
"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
|
2296 |
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
|
2297 |
|
214
175e450bb8dd
Better error handling in HGCommand (part 1).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
213
diff
changeset
|
2298 |
^ (self parserOn:stream) parseCommandVersion |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2299 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2300 |
"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
|
2301 |
! ! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
78
diff
changeset
|
2302 |
|
34 | 2303 |
!HGCommand class methodsFor:'documentation'! |
2304 |
||
418
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2305 |
version |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2306 |
^ '$Header: /cvs/stx/stx/libscm/mercurial/HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $' |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2307 |
! |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2308 |
|
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2309 |
version_CVS |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2310 |
^ '$Header: /cvs/stx/stx/libscm/mercurial/HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $' |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2311 |
! |
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2312 |
|
54
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2313 |
version_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
2314 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
109
diff
changeset
|
2315 |
^ '$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
|
2316 |
! |
66045198bfbc
More changes towards self hosting. Some work on model is still missing...
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
52
diff
changeset
|
2317 |
|
34 | 2318 |
version_SVN |
418
91d981298a96
avoid another error when notification is raised
Claus Gittinger
parents:
417
diff
changeset
|
2319 |
^ '$Id: HGCommand.st,v 1.4 2014/04/13 15:02:07 cg Exp $' |
34 | 2320 |
! ! |
38
c3d02ed6a645
- HGWorkingCopyFile
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
37
diff
changeset
|
2321 |
|
183
8f8315881c72
Bugfix in Settings (checking for Mercurial version).
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
179
diff
changeset
|
2322 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
177
diff
changeset
|
2323 |
HGCommand::resolve initialize! |