hg/stx-libscm: mercurial/HGCommand.st@3df8f12dcece (annotated)

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

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Wed, 06 Feb 2013 08:19:24 -0800
changeset 227	3df8f12dcece
parent 216	0a3821d4bdb6
child 228	e00b7d71e234
permissions	-rw-r--r--