author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 01 Feb 2013 14:05:02 +0000 | |
changeset 212 | 8ec5884fba41 |
parent 205 | e8dbcfa7eb62 |
child 262 | 46cbd12953cd |
permissions | -rw-r--r-- |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1 |
"{ Package: 'stx:libscm/mercurial' }"! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
2 |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
3 |
!AbstractFileBrowser methodsFor:'aspects-hg'! |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
4 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
5 |
currentHgRepository |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
6 |
| root | |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
7 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
8 |
root := HGRepository discover: self currentDirectoryDisplayed. |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
9 |
root isNil ifTrue:[ ^ self ]. |
180 | 10 |
^HGRepository on: root cached: true |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
11 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
12 |
"Created: / 14-12-2012 / 19:22:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
180 | 13 |
"Modified: / 15-01-2013 / 10:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
14 |
! ! |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
15 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
16 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
17 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
18 |
hasHGWorkingCopySelected |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
19 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
20 |
^ self hgMenusAreShown |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
21 |
and:[((Smalltalk at:#HGRepository) discover:self currentDirectoryDisplayed) notNil] |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
22 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
23 |
"Created: / 14-12-2012 / 18:26:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
24 |
! ! |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
25 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
26 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
27 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
28 |
hgBranches |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
29 |
self hgExecuteCommand: 'branches' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
30 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
31 |
"Created: / 25-01-2013 / 20:14:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
32 |
! ! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
33 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
34 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
35 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
36 |
hgCommit |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
37 |
| wc task | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
38 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
39 |
wc := self currentHgRepository workingCopy. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
40 |
task := HGCommitTask new temporaryWorkingCopy: wc. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
41 |
HGCommitDialog new |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
42 |
task: task; |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
43 |
open |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
44 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
45 |
"Created: / 11-01-2013 / 19:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
46 |
"Modified: / 12-01-2013 / 13:57:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
47 |
! ! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
48 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
49 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
50 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
51 |
hgExecuteCommand: command |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
52 |
"Executes svn command on currently selected objects" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
53 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
54 |
self hgExecuteCommand: command objects: self currentSelectedObjects. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
55 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
56 |
"Created: / 12-01-2013 / 12:08:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
57 |
! ! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
58 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
59 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
60 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
61 |
hgExecuteCommand: command objects: givenObjects |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
62 |
"Executes svn command on given objects (files/dirs)" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
63 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
64 |
| objects workdir objectsAsString executionBlock | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
65 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
66 |
objects := givenObjects. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
67 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
68 |
(self isKindOf: FileBrowserV2) ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
69 |
workdir := self currentDirectoryDisplayed. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
70 |
workdir isDirectory ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
71 |
workdir := workdir directory |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
72 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
73 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
74 |
(objects size == 1 and:[objects anElement isDirectory]) ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
75 |
workdir := objects anElement |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
76 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
77 |
workdir := Filename currentDirectory. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
78 |
] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
79 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
80 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
81 |
objectsAsString := String streamContents:[:s| |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
82 |
objects size == 1 ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
83 |
workdir asString = objects anElement asString ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
84 |
s nextPut:$. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
85 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
86 |
s nextPutAll: objects anElement asString. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
87 |
] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
88 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
89 |
objects do:[:each|s nextPut:$"; nextPutAll:each asString; nextPut:$"] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
90 |
separatedBy:[s space] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
91 |
] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
92 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
93 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
94 |
executionBlock := [:stream | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
95 |
| cmd | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
96 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
97 |
cmd := '%1 --noninteractive %2 %3' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
98 |
bindWith: HGCommand hgCommand |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
99 |
with: command |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
100 |
with: objectsAsString. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
101 |
stream nextPutAll: cmd; cr; cr. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
102 |
(self getExecutionBlockForCommand:cmd inDirectory: workdir) value:stream. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
103 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
104 |
self makeExecutionResultProcessFor:executionBlock withName:'Mercurial> hg ', command. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
105 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
106 |
"Created: / 12-01-2013 / 12:09:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
107 |
! ! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
108 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
109 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
110 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
111 |
hgHeads |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
112 |
self hgExecuteCommand: 'heads' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
113 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
114 |
"Created: / 25-01-2013 / 20:14:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
115 |
! ! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
116 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
117 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
118 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
119 |
hgMenuMerge |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
120 |
| menu repo wc cs | |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
121 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
122 |
menu := Menu new. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
123 |
repo := self currentHgRepository. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
124 |
wc := repo workingCopy. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
125 |
cs := wc changeset. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
126 |
repo branches do:[:branch| |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
127 |
branch heads do:[:head| |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
128 |
head ~~ cs ifTrue:[ |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
129 |
| item | |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
130 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
131 |
item := MenuItem |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
132 |
label: (head branch name , ' - ' , head id printString) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
133 |
itemValue: [self hgMenuMerge: head ]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
134 |
menu addItem: item. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
135 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
136 |
] |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
137 |
]. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
138 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
139 |
^menu. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
140 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
141 |
"Created: / 14-12-2012 / 19:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
142 |
! ! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
143 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
144 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
145 |
|
180 | 146 |
hgMenuMerge:anHGChangeset |
147 |
| repo wc appl stream| |
|
148 |
||
149 |
appl := self openCommandResultApplication. |
|
150 |
stream := appl resultStream. |
|
151 |
appl changeTabTo:((resources string: 'Merging with %1') bindWith: anHGChangeset id printString). |
|
152 |
||
153 |
[ |
|
154 |
repo := self currentHgRepository. |
|
155 |
wc := repo workingCopy. |
|
156 |
stream nextPutAll:(resources string: 'Running ''hg merge''...'). |
|
157 |
wc merge: anHGChangeset. |
|
158 |
stream nextPutAll:(resources string: 'done'); cr. |
|
159 |
(wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
|
160 |
each isUnresolved ifTrue:[ |
|
161 |
| merger | |
|
162 |
||
163 |
stream nextPutAll: ((resources string: 'Resolving conflicts %1...') bindWith: each pathNameRelative). |
|
164 |
merger := HGMergeTool for: each. |
|
165 |
merger premerge ifTrue:[ |
|
166 |
stream nextPutLine:(resources string: 'resolved'). |
|
167 |
each markResolved. |
|
168 |
] ifFalse:[ |
|
169 |
stream nextPutLine:(resources string: 'UNRESOLVED') |
|
170 |
] |
|
171 |
] |
|
172 |
] |
|
173 |
] forkAt: Processor userBackgroundPriority |
|
174 |
||
175 |
"Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
176 |
"Modified: / 15-01-2013 / 10:48:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
177 |
! ! |
|
178 |
||
179 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
180 |
||
181 |
hgResolve |
|
182 |
| wc prefixsz files | |
|
183 |
||
184 |
wc := self currentHgRepository workingCopy. |
|
185 |
prefixsz := wc pathName size + 1. |
|
186 |
files := self currentSelectedObjects. |
|
181
a31ede5ff957
Bugfix: resolve only one file when file is selected.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
180
diff
changeset
|
187 |
(files size == 1 and:[files anElement isDirectory]) ifTrue:[ |
180 | 188 |
files := wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]. |
189 |
files := files select:[:e|e isUnresolved]. |
|
190 |
] ifFalse:[ |
|
191 |
files := files collect:[:file| |
|
192 |
| path | |
|
193 |
path := file pathName. |
|
194 |
path := path copyFrom: prefixsz. |
|
195 |
wc / path. |
|
196 |
]. |
|
197 |
]. |
|
198 |
files do:[:entry| |
|
199 |
(HGMergeTool for: entry) merge ifTrue:[ |
|
200 |
entry markResolved. |
|
201 |
]. |
|
202 |
] |
|
203 |
||
181
a31ede5ff957
Bugfix: resolve only one file when file is selected.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
180
diff
changeset
|
204 |
"Modified: / 16-01-2013 / 09:19:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
180 | 205 |
! ! |
206 |
||
207 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
208 |
||
209 |
hgResolveList |
|
210 |
self hgExecuteCommand: 'resolve --list' objects: #() |
|
211 |
||
212 |
"Modified: / 14-01-2013 / 21:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
213 |
! ! |
|
214 |
||
215 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
216 |
||
217 |
hgResolveListUnresolved |
|
218 |
| repo wc appl stream| |
|
219 |
||
220 |
appl := self openCommandResultApplication. |
|
221 |
stream := appl resultStream. |
|
222 |
appl changeTabTo:(resources string: 'Unresolved conflicts'). |
|
223 |
repo := self currentHgRepository. |
|
224 |
wc := repo workingCopy. |
|
225 |
(wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
|
226 |
each isUnresolved ifTrue:[ |
|
227 |
stream nextPutLine: each pathNameRelative |
|
228 |
]. |
|
229 |
]. |
|
230 |
||
231 |
"Modified: / 15-01-2013 / 10:47:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
232 |
! ! |
|
233 |
||
234 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
235 |
||
236 |
hgResolveMark |
|
237 |
self hgExecuteCommand: 'resolve --mark' objects: self currentSelectedObjects. |
|
238 |
||
239 |
"Created: / 14-01-2013 / 21:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
240 |
! ! |
|
241 |
||
242 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
243 |
||
244 |
hgRevert |
|
245 |
self hgExecuteCommand: 'revert' |
|
246 |
||
247 |
"Created: / 15-01-2013 / 09:23:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
248 |
! ! |
|
249 |
||
250 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
251 |
||
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
252 |
hgStatus |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
253 |
self hgExecuteCommand: 'status' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
254 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
255 |
"Modified: / 12-01-2013 / 12:09:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
256 |
! ! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
257 |
|
180 | 258 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
259 |
||
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
260 |
hgSummary |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
261 |
self hgExecuteCommand: 'summary' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
262 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
263 |
"Created: / 25-01-2013 / 17:40:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
264 |
! ! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
265 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
266 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
267 |
|
180 | 268 |
hgUpdate |
269 |
self hgExecuteCommand: 'update' |
|
270 |
||
271 |
"Created: / 15-01-2013 / 09:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
272 |
! ! |
|
273 |
||
274 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
|
275 |
||
276 |
hgUpdateClean |
|
277 |
self hgExecuteCommand: 'update -C' objects: #() |
|
278 |
||
279 |
"Created: / 15-01-2013 / 09:23:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
280 |
! ! |
|
281 |
||
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
282 |
!AbstractFileBrowser class methodsFor:'menu specs-scm'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
283 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
284 |
hgMenu |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
285 |
"This resource specification was automatically generated |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
286 |
by the MenuEditor of ST/X." |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
287 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
288 |
"Do not manually edit this!! If it is corrupted, |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
289 |
the MenuEditor may not be able to read the specification." |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
290 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
291 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
292 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
293 |
MenuEditor new openOnClass:AbstractFileBrowser andSelector:#hgMenu |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
294 |
(Menu new fromLiteralArrayEncoding:(AbstractFileBrowser hgMenu)) startUp |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
295 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
296 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
297 |
<resource: #menu> |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
298 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
299 |
^ |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
300 |
#(Menu |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
301 |
( |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
302 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
303 |
enabled: hasHGWorkingCopySelected |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
304 |
label: 'Commit' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
305 |
itemValue: hgCommit |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
306 |
labelImage: (ResourceRetriever HGIconLibrary commit 'Commit') |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
307 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
308 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
309 |
label: '-' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
310 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
311 |
(MenuItem |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
312 |
enabled: hasHGWorkingCopySelected |
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
313 |
label: 'Summary' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
314 |
itemValue: hgSummary |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
315 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
316 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
317 |
enabled: hasHGWorkingCopySelected |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
318 |
label: 'Status' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
319 |
itemValue: hgStatus |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
320 |
) |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
321 |
(MenuItem |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
322 |
label: '-' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
323 |
) |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
324 |
(MenuItem |
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
325 |
enabled: hasHGWorkingCopySelected |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
326 |
label: 'Branches' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
327 |
itemValue: hgBranches |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
328 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
329 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
330 |
enabled: hasHGWorkingCopySelected |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
331 |
label: 'Heads' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
332 |
itemValue: hgHeads |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
333 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
334 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
335 |
label: '-' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
336 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
337 |
(MenuItem |
180 | 338 |
label: 'Update' |
339 |
itemValue: hgUpdate |
|
340 |
) |
|
341 |
(MenuItem |
|
342 |
label: 'Revert' |
|
343 |
itemValue: hgRevert |
|
344 |
) |
|
345 |
(MenuItem |
|
346 |
label: 'Revert all Changes' |
|
347 |
itemValue: hgUpdateClean |
|
348 |
) |
|
349 |
(MenuItem |
|
350 |
label: '-' |
|
351 |
) |
|
352 |
(MenuItem |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
353 |
enabled: hasHGWorkingCopySelected |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
354 |
label: 'Merge...' |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
355 |
submenuChannel: hgMenuMerge |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
356 |
labelImage: (ResourceRetriever HGIconLibrary merge 'Merge...') |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
357 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
358 |
(MenuItem |
180 | 359 |
label: 'Resolve' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
360 |
itemValue: hgResolve |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
361 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
362 |
(MenuItem |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
363 |
enabled: hasHGWorkingCopySelected |
180 | 364 |
label: 'Mark as Resolved' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
365 |
itemValue: hgResolveMark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
366 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
367 |
(MenuItem |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
368 |
enabled: hasHGWorkingCopySelected |
180 | 369 |
label: 'Mark as Unresolved' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
370 |
itemValue: hgResolveUnmark |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
371 |
) |
180 | 372 |
(MenuItem |
373 |
label: '-' |
|
374 |
) |
|
375 |
(MenuItem |
|
376 |
enabled: hasHGWorkingCopySelected |
|
377 |
label: 'Show Conflicts' |
|
378 |
itemValue: hgResolveList |
|
379 |
) |
|
380 |
(MenuItem |
|
381 |
enabled: hasHGWorkingCopySelected |
|
382 |
label: 'Show Unresolved' |
|
383 |
itemValue: hgResolveListUnresolved |
|
384 |
) |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
385 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
386 |
nil |
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
387 |
nil |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
388 |
) |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
389 |
! ! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
390 |
|
88 | 391 |
!Annotation class methodsFor:'instance creation'! |
392 |
||
393 |
HGRevision: aString |
|
394 |
"Used by Mercurial to internally store revision info. Should never appear in source code!!" |
|
395 |
||
396 |
^HGRevisionAnnotation revision: aString |
|
397 |
||
398 |
"Created: / 20-11-2012 / 23:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
399 |
! ! |
|
400 |
||
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
401 |
!ByteArray methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
402 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
403 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
404 |
^ HGChangesetId fromBytes:self. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
405 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
406 |
"Created: / 16-11-2012 / 21:33:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
407 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
408 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
409 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
410 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
411 |
hasHGSupport |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
412 |
"/ use Smalltalk-at to trick the dependency/prerequisite generator |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
413 |
^ (Smalltalk at: #'HGSourceCodeManager' ifAbsent:nil) notNil |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
414 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
415 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
416 |
ConfigurableFeatures hasGitSupport |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
417 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
418 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
419 |
"Created: / 14-12-2012 / 15:38:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
420 |
! ! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
421 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
422 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
423 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
424 |
hasHGSupportEnabled |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
425 |
^ self hasSCMSupportEnabledFor:#'HGSourceCodeManager' |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
426 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
427 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
428 |
self hasGitSupportEnabled |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
429 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
430 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
431 |
"Created: / 14-12-2012 / 15:38:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
432 |
! ! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
433 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
434 |
!Integer methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
435 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
436 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
437 |
^ (HGChangesetId new:0) revno:self. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
438 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
439 |
"Created: / 16-11-2012 / 21:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
440 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
441 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
442 |
!Object methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
443 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
444 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
445 |
HGError |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
446 |
raiseErrorString:'Cannot convert arbitrary object to Mercurial nodeid' |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
447 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
448 |
"Created: / 16-11-2012 / 21:23:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
449 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
450 |
|
88 | 451 |
!Object methodsFor:'converting'! |
452 |
||
453 |
asHGRevision |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
454 |
^self asHGChangesetId |
88 | 455 |
|
456 |
"Created: / 20-11-2012 / 23:32:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
457 |
"Modified: / 27-11-2012 / 17:56:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 458 |
! ! |
459 |
||
212
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
460 |
!Object methodsFor:'testing'! |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
461 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
462 |
isHGChangeset |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
463 |
"Return true, if receiver is sort an Mercurial changeset." |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
464 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
465 |
^false |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
466 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
467 |
"Created: / 01-02-2013 / 13:42:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
468 |
! ! |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
469 |
|
88 | 470 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
471 |
||
472 |
hgBinaryRevision |
|
473 |
||
474 |
" |
|
475 |
Answers Mercurial revision from which the package was compiled. |
|
476 |
If no binary revision is available, returns nil." |
|
477 |
||
478 |
||
479 |
| revInfo | |
|
480 |
||
91 | 481 |
self binaryRevisionString notNil ifTrue:[ |
482 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
|
88 | 483 |
revInfo notNil ifTrue:[ |
484 |
^revInfo changesetId |
|
485 |
]. |
|
486 |
]. |
|
487 |
^nil |
|
488 |
||
489 |
||
490 |
" |
|
491 |
stx_libbasic hgBinaryRevision |
|
492 |
stx_libsvn hgBinaryRevision |
|
493 |
stx_libscm_mercurial hgBinaryRevision |
|
494 |
||
495 |
" |
|
496 |
||
497 |
"Created: / 20-11-2012 / 23:58:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
498 |
! ! |
|
499 |
||
500 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
|
501 |
||
502 |
hgLogicalRevision |
|
503 |
||
504 |
" |
|
505 |
Answers Mercurial revision on which is this package based on logically. |
|
506 |
||
507 |
Revision is computed as follows: |
|
508 |
1) Look, if receiver's version_HG method has a (hidden) annotation HGRevision:, |
|
509 |
if so, return its value. |
|
510 |
2) If receiver's binary revision is not nil, return it. |
|
511 |
3) Look into a package directory and if there is a Mercurial repository, |
|
512 |
return working copy's revision" |
|
513 |
||
514 |
| versionMethod versionAnnotation revInfo pkgDir repoDir repo | |
|
515 |
||
516 |
"1 --- " |
|
517 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
93
diff
changeset
|
518 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
88 | 519 |
versionMethod notNil ifTrue:[ |
520 |
versionAnnotation := versionMethod annotationAt: #HGRevision:. |
|
521 |
versionAnnotation notNil ifTrue:[ |
|
522 |
^versionAnnotation revision |
|
523 |
]. |
|
174
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
524 |
] ifFalse:[ |
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
525 |
HGSourceCodeManager compileVersionMethod:HGSourceCodeManager nameOfVersionMethodInClasses of:self for:'$Changeset: <not expanded> $'. |
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
526 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
88 | 527 |
]. |
528 |
||
529 |
"2 --- " |
|
91 | 530 |
self binaryRevisionString notNil ifTrue:[ |
531 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
|
88 | 532 |
revInfo notNil ifTrue:[ |
533 |
^revInfo changesetId |
|
534 |
]. |
|
535 |
]. |
|
536 |
||
537 |
"3 --- " |
|
538 |
pkgDir := Smalltalk getPackageDirectoryForPackage: self package. |
|
539 |
pkgDir notNil ifTrue:[ |
|
540 |
repoDir := HGRepository discover: pkgDir. |
|
541 |
repoDir notNil ifTrue:[ |
|
170
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
542 |
| id | |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
543 |
|
88 | 544 |
repo := HGRepository on: repoDir. |
170
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
545 |
id := repo workingCopy changeset id. |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
546 |
versionMethod annotateWith: (HGRevisionAnnotation revision: id). |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
547 |
^id |
88 | 548 |
] |
549 |
]. |
|
550 |
||
551 |
"4 --- " |
|
552 |
self breakPoint: #jv. |
|
553 |
^nil |
|
554 |
||
555 |
||
556 |
" |
|
557 |
stx_libbasic hgLogicalRevision |
|
558 |
stx_libsvn hgLogicalRevision |
|
559 |
stx_libscm_mercurial hgLogicalRevision |
|
560 |
||
561 |
" |
|
562 |
||
563 |
"Created: / 20-11-2012 / 23:54:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
174
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
564 |
"Modified: / 14-01-2013 / 13:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 565 |
! ! |
566 |
||
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
567 |
!ProjectDefinition class methodsFor:'description - actions - hg'! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
568 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
569 |
hgPostLoad |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
570 |
<postLoad> |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
571 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
572 |
| dir repo versionMethod | |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
573 |
"Eventually update an version_HG" |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
574 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
575 |
self binaryRevisionString isNil ifTrue:[ |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
576 |
dir := Smalltalk getPackageDirectoryForPackage: self package. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
577 |
dir := HGRepository discover: dir. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
578 |
dir notNil ifTrue:[ |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
579 |
repo := HGRepository on: dir. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
580 |
versionMethod := HGSourceCodeManager ensureVersionMethodInClass: self package: self package. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
581 |
versionMethod annotateWith: |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
582 |
(HGRevisionAnnotation revision: repo workingCopy changeset id) |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
583 |
]. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
584 |
]. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
585 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
586 |
"Created: / 26-11-2012 / 13:06:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
587 |
"Modified: / 27-11-2012 / 22:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
588 |
! ! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
589 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
590 |
!String methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
591 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
592 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
593 |
^ HGChangesetId fromString:self. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
594 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
595 |
"Created: / 16-11-2012 / 21:24:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
596 |
! ! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
597 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
598 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
599 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
600 |
commonMenuHGBrowseTemporaryWorkingCopy |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
601 |
self selectedProjectsForHG value do:[:package| |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
602 |
| pkg | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
603 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
604 |
pkg := HGPackageModel named: package. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
605 |
pkg notNil ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
606 |
pkg temporaryWorkingCopy browse |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
607 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
608 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
609 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
610 |
"Created: / 11-01-2013 / 18:47:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
611 |
! ! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
612 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
613 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
614 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
615 |
commonMenuHGBrowseWorkingCopy |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
616 |
self selectedProjectsForHG value do:[:package| |
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
617 |
| pkg | |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
618 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
619 |
pkg := HGPackageModel named: package. |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
620 |
pkg notNil ifTrue:[ |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
621 |
pkg repository workingCopy browse |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
622 |
]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
623 |
]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
624 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
625 |
"Modified: / 14-12-2012 / 17:51:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
626 |
! ! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
627 |
|
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
628 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-hg'! |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
629 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
630 |
commonMenuHGPushSlice |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
631 |
| menu push submenu packages package remotes default | |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
632 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
633 |
menu := Menu new. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
634 |
push := MenuItem new |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
635 |
label: (resources string: 'Push...'); |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
636 |
yourself. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
637 |
menu addItem: push. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
638 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
639 |
packages := self selectedProjectsForHG value collect:[:id|HGPackageModel named:id]. |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
640 |
((packages size ~~ 1) or:[packages anElement isNil]) ifTrue:[ |
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
641 |
push enabled: false. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
642 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
643 |
]. |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
644 |
|
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
645 |
package := packages anElement. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
646 |
remotes := package repository remotes. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
647 |
remotes isEmpty ifTrue:[ |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
648 |
push enabled: false. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
649 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
650 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
651 |
"/ default := package repository remoteDefault. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
652 |
"/ default notNil ifTrue:[ |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
653 |
"/ menu addItem: (MenuItem new |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
654 |
"/ label:((resources string: 'Push to ') , 'default' asText allBold); |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
655 |
"/ value:[package repository push: default]; |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
656 |
"/ yourself). |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
657 |
"/ ]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
658 |
(remotes size ~~ 1 or:[remotes anElement ~~ default]) ifTrue:[ |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
659 |
submenu := Menu new. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
660 |
push submenu: submenu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
661 |
remotes do:[:remote| |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
662 |
submenu addItem: (MenuItem new |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
663 |
label: remote displayString; |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
664 |
value:[package repository push: remote]; |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
665 |
yourself). |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
666 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
667 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
668 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
669 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
670 |
"Created: / 10-12-2012 / 03:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
671 |
"Modified: / 14-12-2012 / 18:09:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
672 |
! ! |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
673 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
674 |
!Tools::NewSystemBrowser methodsFor:'aspects-navigation-hg'! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
675 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
676 |
selectedProjectsForHG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
677 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
678 |
self selectedProjects value notNil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
679 |
ifTrue:[^self selectedProjects value]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
680 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
681 |
self selectedClasses value notNil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
682 |
ifTrue:[^(self selectedClasses value collect:[:cls|cls package]) asSet]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
683 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
684 |
^nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
685 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
686 |
"Created: / 10-12-2012 / 03:58:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
687 |
! ! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
688 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
689 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-SCM-class'! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
690 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
691 |
classMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
692 |
"This resource specification was automatically generated |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
693 |
by the MenuEditor of ST/X." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
694 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
695 |
"Do not manually edit this!! If it is corrupted, |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
696 |
the MenuEditor may not be able to read the specification." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
697 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
698 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
699 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
700 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
701 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classMenuSCMExtra_HG)) startUp |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
702 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
703 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
704 |
<resource: #menu> |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
705 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
706 |
^ |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
707 |
#(Menu |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
708 |
( |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
709 |
(MenuItem |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
710 |
label: 'Push Slice' |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
711 |
submenuChannel: commonMenuHGPushSlice |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
712 |
isMenuSlice: true |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
713 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
714 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
715 |
label: 'Browse package working copy' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
716 |
itemValue: commonMenuHGBrowseWorkingCopy |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
717 |
) |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
718 |
(MenuItem |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
719 |
label: 'Browse temporary working copy (for commits & merges)' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
720 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
721 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
722 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
723 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
724 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
725 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
726 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
727 |
"Modified: / 14-12-2012 / 18:05:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
728 |
! ! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
729 |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
730 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-SCM-project'! |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
731 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
732 |
projectMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
733 |
"This resource specification was automatically generated |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
734 |
by the MenuEditor of ST/X." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
735 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
736 |
"Do not manually edit this!! If it is corrupted, |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
737 |
the MenuEditor may not be able to read the specification." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
738 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
739 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
740 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
741 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#projectMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
742 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser projectMenuSCMExtra_HG)) startUp |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
743 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
744 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
745 |
<resource: #menu> |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
746 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
747 |
^ |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
748 |
#(Menu |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
749 |
( |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
750 |
(MenuItem |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
751 |
label: 'Push Slice' |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
752 |
submenuChannel: commonMenuHGPushSlice |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
753 |
isMenuSlice: true |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
754 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
755 |
(MenuItem |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
756 |
label: 'Browse package working copy' |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
757 |
itemValue: commonMenuHGBrowseWorkingCopy |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
758 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
759 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
760 |
label: 'Browse temporary working copy (for commits & merges)' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
761 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
762 |
) |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
763 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
764 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
765 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
766 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
767 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
768 |
"Modified: / 14-12-2012 / 18:05:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
769 |
! ! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
770 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
771 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
772 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
773 |
hgAutopush |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
774 |
"Return true, if changes should be automatically pushed |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
775 |
to an upstream repository (autopush), false otherwise" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
776 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
777 |
^self at: #hgAutopush ifAbsent:[ false "or true?" ]. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
778 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
779 |
"Created: / 10-12-2012 / 01:23:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
780 |
! ! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
781 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
782 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
783 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
784 |
hgAutopush: aBoolean |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
785 |
"Set whether changes should be automatically pushed |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
786 |
to an upstream repository (autopush)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
787 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
788 |
^self at: #hgAutopush put: aBoolean. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
789 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
790 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
791 |
UserPreferences current hgAutopush |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
792 |
UserPreferences current hgAutopush: true |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
793 |
UserPreferences current hgAutopush: false |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
794 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
795 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
796 |
"Created: / 10-12-2012 / 01:24:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
797 |
! ! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
798 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
799 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
800 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
801 |
hgCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
802 |
"Returns path svn executable" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
803 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
804 |
| cmd | |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
805 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
806 |
cmd := self at:#hgCommand ifAbsent:[ nil ]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
807 |
^cmd isEmptyOrNil ifTrue:[ nil ] ifFalse:[ cmd ] |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
808 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
809 |
"Created: / 19-11-2012 / 21:39:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
810 |
! ! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
811 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
812 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
813 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
814 |
hgCommand: aString |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
815 |
"Set the command to 'hg' executable" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
816 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
817 |
self at:#hgCommand put: aString. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
818 |
HGCommand hgCommand: aString. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
819 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
820 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
821 |
UserPreferences current hgCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
822 |
UserPreferences current hgCommand:'hg' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
823 |
UserPreferences current hgCommand:nil |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
824 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
825 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
826 |
"Created: / 19-11-2012 / 21:39:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
827 |
! ! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
828 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
829 |
!stx_libscm_mercurial class methodsFor:'documentation'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
830 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
831 |
extensionsVersion_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
832 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
833 |
^ '$Changeset: <not expanded> $' |
93
2579830f6b61
Tests fixed. Not-yet-supported tests marked as skipped.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
91
diff
changeset
|
834 |
! ! |