hg/stx-libscm: mercurial/HGCommand.st@0f39ccf22d5a (annotated)

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

author	Claus Gittinger <cg@exept.de>
	Sun, 13 Apr 2014 16:02:07 +0100
branch	cvs_MAIN
changeset 496	0f39ccf22d5a
parent 494	25ef8b23d6a8
child 511	ad2f56473052
permissions	-rw-r--r--