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

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Sun, 03 Mar 2013 20:45:13 +0000
branch	hg-command-server-support
changeset 234	a9ef61b902ae
parent 233	d9a8bb2aaa0b
child 235	3d8ef499d7d9
permissions	-rw-r--r--