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

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Fri, 11 Oct 2013 18:31:01 +0100
changeset 354	16b9a63fa668
parent 341	170c1aa67b03
child 355	464159221141
permissions	-rw-r--r--