author | Claus Gittinger <cg@exept.de> |
Wed, 19 Feb 2020 21:08:02 +0100 | |
branch | cvs_MAIN |
changeset 898 | 38201b0a1248 |
parent 884 | 0862261e6add |
child 900 | 14eba1ab21c1 |
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 |
! ! |
672 | 15 |
|
163
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 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
18 |
hasHGWorkingCopyNotSelected |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
19 |
^ self hasHGWorkingCopySelected not |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
20 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
21 |
"Created: / 13-02-2014 / 12:01:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
22 |
! ! |
672 | 23 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
24 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
25 |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
26 |
hasHGWorkingCopySelected |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
27 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
28 |
^ self hgMenusAreShown |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
29 |
and:[((Smalltalk at:#HGRepository) discover:self currentDirectoryDisplayed) notNil] |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
30 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
31 |
"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
|
32 |
! ! |
672 | 33 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
34 |
!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
|
35 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
36 |
hgBranches |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
37 |
self hgExecuteCommand: 'branches' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
38 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
39 |
"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
|
40 |
! ! |
672 | 41 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
42 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
43 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
44 |
hgClone |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
45 |
| selectedDirectories dialog repoUrlHolder repoDirHolder repodirName repoDir | |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
46 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
47 |
selectedDirectories := self currentSelectedDirectories. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
48 |
repoUrlHolder := nil asValue. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
49 |
repoDirHolder := (selectedDirectories size = 1 and:[ selectedDirectories anElement directoryContents isEmpty]) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
50 |
ifTrue:[ selectedDirectories anElement baseName asValue ] |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
51 |
ifFalse:[ nil asValue ]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
52 |
dialog := DialogBox new. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
53 |
dialog title: (resources string: 'Clone repository...'). |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
54 |
dialog addLabelledInputField:(resources string: 'Repository URL:') |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
55 |
adjust:#left |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
56 |
on:repoUrlHolder |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
57 |
tabable:true |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
58 |
separateAtX:0.3. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
59 |
dialog addLabelledInputField:(resources string: 'Directory:') |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
60 |
adjust:#left |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
61 |
on:repoDirHolder |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
62 |
tabable:true |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
63 |
separateAtX:0.3. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
64 |
dialog addAbortButton; addOkButton. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
65 |
dialog open. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
66 |
dialog accepted ifFalse:[ ^ self ]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
67 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
68 |
repoUrlHolder value isEmptyOrNil ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
69 |
Dialog warn: (resources string: 'Empty repository URL') |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
70 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
71 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
72 |
repoDir := self currentDirectoryDisplayed / repoDirHolder value. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
73 |
repoDir exists ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
74 |
repoDir isDirectory ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
75 |
repoDir directoryContents notEmpty ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
76 |
Dialog error: (resources string:'Cannot clone repository. Directory %1 is not empty.' with: repodirName). |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
77 |
^ self. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
78 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
79 |
] ifFalse:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
80 |
Dialog error: (resources string:'Cannot clone repository. %1 is not an empty directory' with: repodirName). |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
81 |
^ self. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
82 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
83 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
84 |
ProgressIndicator |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
85 |
displayBusyIndicator: (resources string: 'Cloning %1 to %2...' with: repoUrlHolder value with: repoDirHolder value) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
86 |
at:(Screen default center) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
87 |
during:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
88 |
HGRepository clone: repoUrlHolder value to: repoDir. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
89 |
self updateCurrentDirectory |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
90 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
91 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
92 |
"Created: / 13-02-2014 / 11:57:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
93 |
"Modified: / 13-02-2014 / 16:11:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
94 |
! ! |
672 | 95 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
96 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
97 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
98 |
hgCloneEnabled |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
99 |
^ self hasHGWorkingCopyNotSelected |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
100 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
101 |
"Created: / 13-02-2014 / 11:57:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
102 |
! ! |
672 | 103 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
104 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
105 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
106 |
hgCommit |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
107 |
| wc task | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
108 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
109 |
wc := self currentHgRepository workingCopy. |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
267
diff
changeset
|
110 |
task := wc commitTask. |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
111 |
HGCommitDialog new |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
112 |
task: task; |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
113 |
open |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
114 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
115 |
"Created: / 11-01-2013 / 19:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
282
fb71143ed353
Fixes for commiting from filebrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
267
diff
changeset
|
116 |
"Modified: / 01-04-2013 / 12:56:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
117 |
! ! |
672 | 118 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
119 |
!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
|
120 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
121 |
hgEditConfig: file |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
122 |
self |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
123 |
applicationNamed:#FileApplicationNoteBook |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
124 |
ifPresentDo:[:appl | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
125 |
appl openTextEditorForFile: file pathName |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
126 |
]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
127 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
128 |
"Created: / 04-04-2013 / 19:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
129 |
! ! |
672 | 130 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
131 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
132 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
133 |
hgEditConfigRepository |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
134 |
| repo | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
135 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
136 |
repo := self currentHgRepository. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
137 |
self hgEditConfig: repo path / '.hg' / 'hgrc' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
138 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
139 |
"Modified: / 04-04-2013 / 19:42:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
140 |
! ! |
672 | 141 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
142 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
143 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
144 |
hgEditConfigUser |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
145 |
self hgEditConfig: Filename homeDirectory / '.hgrc' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
146 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
147 |
"Modified: / 04-04-2013 / 19:42:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
148 |
! ! |
672 | 149 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
150 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
151 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
152 |
hgExecuteCommand: command |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
153 |
"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
|
154 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
155 |
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
|
156 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
157 |
"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
|
158 |
! ! |
672 | 159 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
160 |
!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
|
161 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
162 |
hgExecuteCommand: command objects: givenObjects |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
163 |
"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
|
164 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
165 |
| objects workdir objectsAsString executionBlock | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
166 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
167 |
objects := givenObjects. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
168 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
169 |
(self isKindOf: FileBrowserV2) ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
170 |
workdir := self currentDirectoryDisplayed. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
171 |
workdir isDirectory ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
172 |
workdir := workdir directory |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
173 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
174 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
175 |
(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
|
176 |
workdir := objects anElement |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
177 |
] ifFalse:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
178 |
workdir := Filename currentDirectory. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
179 |
] |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
180 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
181 |
|
676 | 182 |
objectsAsString := |
183 |
String streamContents:[:s| |
|
184 |
objects size == 1 ifTrue:[ |
|
185 |
workdir asString = objects anElement asString ifTrue:[ |
|
186 |
s nextPut:$. |
|
187 |
] ifFalse:[ |
|
188 |
s nextPutAll: objects anElement asString. |
|
189 |
] |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
190 |
] ifFalse:[ |
884
0862261e6add
class: XML::XMLSchemaInspector::History
Claus Gittinger <cg@exept.de>
parents:
852
diff
changeset
|
191 |
objects |
0862261e6add
class: XML::XMLSchemaInspector::History
Claus Gittinger <cg@exept.de>
parents:
852
diff
changeset
|
192 |
do:[:each| |
0862261e6add
class: XML::XMLSchemaInspector::History
Claus Gittinger <cg@exept.de>
parents:
852
diff
changeset
|
193 |
s nextPut:$"; nextPutAll:each asString; nextPut:$" |
0862261e6add
class: XML::XMLSchemaInspector::History
Claus Gittinger <cg@exept.de>
parents:
852
diff
changeset
|
194 |
] |
676 | 195 |
separatedBy:[s space] |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
196 |
] |
676 | 197 |
]. |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
198 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
199 |
executionBlock := [:stream | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
200 |
| cmd | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
201 |
|
373
64da1201fcb0
Fix in filebrowser menus: quote hg command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
371
diff
changeset
|
202 |
cmd := '"%1" --noninteractive %2 %3' |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
203 |
bindWith: HGCommand hgCommand |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
204 |
with: command |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
205 |
with: objectsAsString. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
206 |
stream nextPutAll: cmd; cr; cr. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
207 |
(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
|
208 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
209 |
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
|
210 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
211 |
"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
|
212 |
! ! |
672 | 213 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
214 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
215 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
216 |
hgHeads |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
217 |
self hgExecuteCommand: 'heads' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
218 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
219 |
"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
|
220 |
! ! |
672 | 221 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
222 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
223 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
224 |
hgInit |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
225 |
| selectedDirectories initial repodirName repodir | |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
226 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
227 |
selectedDirectories := self currentSelectedDirectories. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
228 |
initial := (selectedDirectories size = 1 and:[ selectedDirectories anElement directoryContents isEmpty]) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
229 |
ifTrue:[ selectedDirectories anElement baseName ] |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
230 |
ifFalse:[ 'repository' ]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
231 |
repodirName := Dialog request: (resources string: 'Enter name of the repository to create') initialAnswer: initial. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
232 |
repodir := self currentDirectoryDisplayed / repodirName. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
233 |
repodir exists ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
234 |
repodir isDirectory ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
235 |
repodir directoryContents notEmpty ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
236 |
Dialog error: (resources string:'Cannot initialize repository. Directory %1 is not empty.' with: repodirName). |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
237 |
^ self. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
238 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
239 |
] ifFalse:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
240 |
Dialog error: (resources string:'Cannot initialize repository. %1 is not an empty directory' with: repodirName). |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
241 |
^ self. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
242 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
243 |
]. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
244 |
HGRepository init: repodir. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
245 |
self updateCurrentDirectory |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
246 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
247 |
"Created: / 13-02-2014 / 11:59:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
248 |
"Modified: / 13-02-2014 / 16:19:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
249 |
! ! |
672 | 250 |
|
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
251 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
252 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
253 |
hgInitEnabled |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
254 |
^ self hasHGWorkingCopyNotSelected |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
255 |
|
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
256 |
"Created: / 13-02-2014 / 11:59:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
257 |
! ! |
672 | 258 |
|
405
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
259 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
260 |
|
405
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
261 |
hgLog |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
262 |
| browser | |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
263 |
|
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
264 |
self withWaitCursorDo:[ |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
265 |
browser := HGChangesetBrowser new. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
266 |
browser repository: self currentHgRepository. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
267 |
browser open. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
268 |
] |
405
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
269 |
|
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
270 |
"Created: / 25-03-2014 / 09:31:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
271 |
"Modified: / 17-04-2014 / 09:51:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
405
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
272 |
! ! |
672 | 273 |
|
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
274 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
275 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
276 |
hgMenuMerge |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
277 |
| menu repo wc heads | |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
278 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
279 |
menu := Menu new. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
280 |
repo := self currentHgRepository. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
281 |
wc := repo workingCopy. |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
282 |
heads := repo log: 'head() and !! closed() and !! p1() and !! ancestor(p1())' limit: nil. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
283 |
heads do:[:head| |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
284 |
| item label | |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
285 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
286 |
"/ label := head branch name , ' - ' , head id printString. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
287 |
label := HGChangesetPresenter new changeset: head. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
288 |
item := MenuItem |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
289 |
label: label |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
290 |
itemValue: [self hgMerge:head ]. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
291 |
menu addItem: item. |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
292 |
]. |
898 | 293 |
menu addItemLabel:'Revision...' value:[ self hgMergeWithRevision ]. |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
294 |
^menu. |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
295 |
|
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
296 |
"Created: / 14-12-2012 / 19:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
297 |
"Modified: / 28-03-2014 / 00:34:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
298 |
! ! |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
299 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
300 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
301 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
302 |
hgMenuPull |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
303 |
| menu repo remotes | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
304 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
305 |
menu := Menu new. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
306 |
repo := self currentHgRepository. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
307 |
remotes := repo remotes. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
308 |
remotes notEmptyOrNil ifTrue:[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
309 |
remotes do:[:remote| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
310 |
menu addItem: (MenuItem new |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
311 |
label: remote displayString; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
312 |
value:[ self hgPullFrom: remote repository: repo]; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
313 |
yourself). |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
314 |
]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
315 |
menu addSeparator. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
316 |
]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
317 |
menu addItem: |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
318 |
(MenuItem new |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
319 |
label: (resources string: 'From...'); |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
320 |
value: [self hgPullFromURLRepository: repo]; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
321 |
yourself). |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
322 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
323 |
^menu. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
324 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
325 |
"Created: / 04-04-2013 / 19:16:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
326 |
! ! |
672 | 327 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
328 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
329 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
330 |
hgMenuPush |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
331 |
| menu repo remotes | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
332 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
333 |
menu := Menu new. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
334 |
repo := self currentHgRepository. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
335 |
remotes := repo remotes. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
336 |
remotes notEmptyOrNil ifTrue:[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
337 |
remotes do:[:remote| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
338 |
menu addItem: (MenuItem new |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
339 |
label: remote displayString; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
340 |
value:[ self hgPushTo: remote repository: repo]; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
341 |
yourself). |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
342 |
]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
343 |
menu addSeparator. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
344 |
]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
345 |
menu addItem: |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
346 |
(MenuItem new |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
347 |
label: (resources string: 'To...'); |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
348 |
value: [self hgPushToURLRepository: repo]; |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
349 |
yourself). |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
350 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
351 |
^menu. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
352 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
353 |
"Created: / 04-04-2013 / 19:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
354 |
! ! |
672 | 355 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
356 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
357 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
358 |
hgMenuUpdate |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
359 |
| menu repo wc heads | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
360 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
361 |
menu := Menu new. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
362 |
repo := self currentHgRepository. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
363 |
wc := repo workingCopy. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
364 |
heads := repo log: 'head() and !! closed() and !! p1()' limit: nil. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
365 |
heads do:[:head| |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
366 |
| item label | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
367 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
368 |
"/ label := head branch name , ' - ' , head id printString. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
369 |
label := HGChangesetPresenter new changeset: head. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
370 |
item := MenuItem |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
371 |
label: label |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
372 |
itemValue: [self hgUpdate: head ]. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
373 |
menu addItem: item. |
420
5333985dc917
Fixed menu enablement bug in AbstractFileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
414
diff
changeset
|
374 |
]. |
5333985dc917
Fixed menu enablement bug in AbstractFileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
414
diff
changeset
|
375 |
menu addSeparator. |
898 | 376 |
menu addItemLabel:'Revision...' value: [ self hgUpdateToRevision ]. |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
377 |
^menu. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
378 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
379 |
"Created: / 28-03-2014 / 00:00:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
420
5333985dc917
Fixed menu enablement bug in AbstractFileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
414
diff
changeset
|
380 |
"Modified: / 14-04-2014 / 11:49:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
381 |
! ! |
672 | 382 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
383 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
384 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
385 |
hgMerge:anHGChangeset |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
386 |
| repo wc appl stream | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
387 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
388 |
appl := self openCommandResultApplication. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
389 |
stream := appl resultStream. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
390 |
appl changeTabTo:((resources string:'Merging with %1') |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
391 |
bindWith:anHGChangeset id printString). |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
392 |
[ |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
393 |
repo := self currentHgRepository. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
394 |
wc := repo workingCopy. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
395 |
stream |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
396 |
nextPutAll:(resources string:'Mercurial > hg merge'); |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
397 |
space; |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
398 |
nextPutLine:anHGChangeset id printString. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
399 |
wc merge:anHGChangeset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
400 |
stream |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
401 |
nextPutAll:(resources string:'done'); |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
402 |
cr. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
403 |
(wc conflicts asSortedCollection:[:a :b | a pathName < b pathName ]) do:[:each | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
404 |
each isUnresolved ifTrue:[ |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
405 |
| merger | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
406 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
407 |
stream nextPutAll:((resources string:'Resolving conflicts %1...') |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
408 |
bindWith:each pathNameRelative). |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
409 |
merger := HGMergeTool for:each. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
410 |
merger premerge ifTrue:[ |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
411 |
stream nextPutLine:(resources string:'resolved'). |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
412 |
each markResolved. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
413 |
] ifFalse:[ |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
414 |
stream nextPutLine:(resources string:'UNRESOLVED') |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
415 |
] |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
416 |
] |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
417 |
]. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
418 |
stream nextPutAll:(resources string:'Merge finisged.') |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
419 |
] forkAt:Processor userBackgroundPriority |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
420 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
421 |
"Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
422 |
"Modified: / 04-04-2013 / 19:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
423 |
! ! |
672 | 424 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
425 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
426 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
427 |
hgMergeWithRevision |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
428 |
| repo cs revset dialog | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
429 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
430 |
repo := self currentHgRepository. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
431 |
revset := '!! ancestor(p1())' asHGRevset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
432 |
dialog := HGChangesetDialog new. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
433 |
dialog repository: repo. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
434 |
dialog revset: revset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
435 |
dialog open ifFalse:[ ^ self ]. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
436 |
cs := dialog changeset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
437 |
self hgMerge: cs. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
438 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
439 |
"Created: / 28-03-2014 / 00:34:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
440 |
! ! |
672 | 441 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
442 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
443 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
444 |
hgPullFrom: remote repository:repo |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
445 |
| appl stream| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
446 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
447 |
appl := self openCommandResultApplication. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
448 |
stream := appl resultStream. |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
449 |
appl changeTabTo:((resources string: 'Pulling from %1') bindWith: remote asString). |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
450 |
[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
451 |
stream nextPutAll:(resources string: 'Mercurial > hg pull'); space; nextPutLine: remote name. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
452 |
[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
453 |
| summary | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
454 |
summary := repo pull: remote. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
455 |
summary printOn: stream. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
456 |
stream cr. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
457 |
] on: Notification do:[:ex| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
458 |
stream nextPutLine: ex messageText. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
459 |
ex proceed. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
460 |
] |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
461 |
] forkAt: Processor userBackgroundPriority |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
462 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
463 |
"Created: / 04-04-2013 / 19:27:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
464 |
"Modified: / 18-03-2014 / 12:10:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
465 |
! ! |
672 | 466 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
467 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
468 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
469 |
hgPullFromURLRepository:repo |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
470 |
| url options | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
471 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
472 |
options := repo remotes collect:[:r|r url asString]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
473 |
url := Dialog |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
474 |
request:'Enter an URL from which to pull:' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
475 |
initialAnswer:'http://...' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
476 |
list: options. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
477 |
url notEmptyOrNil ifTrue:[ |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
478 |
self hgPullFrom: (HGRemote url: url) repository: repo. |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
479 |
] |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
480 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
481 |
"Created: / 04-04-2013 / 19:16:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
482 |
"Modified: / 18-03-2014 / 12:09:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
483 |
! ! |
672 | 484 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
485 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
486 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
487 |
hgPushTo: remote repository:repo |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
488 |
| appl stream| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
489 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
490 |
appl := self openCommandResultApplication. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
491 |
stream := appl resultStream. |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
492 |
appl changeTabTo:((resources string: 'Pushing to %1') bindWith: remote asString). |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
493 |
[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
494 |
stream nextPutAll:(resources string: 'Mercurial > hg push'); space; nextPutLine: remote name. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
495 |
[ |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
496 |
| summary | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
497 |
summary := repo push: remote. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
498 |
summary printOn: stream. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
499 |
stream cr. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
500 |
] on: Notification do:[:ex| |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
501 |
stream nextPutLine: ex messageText. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
502 |
ex proceed. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
503 |
] |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
504 |
] forkAt: Processor userBackgroundPriority |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
505 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
506 |
"Created: / 04-04-2013 / 19:23:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
507 |
"Modified: / 18-03-2014 / 12:10:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
508 |
! ! |
672 | 509 |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
510 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
511 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
512 |
hgPushToURLRepository:repo |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
513 |
| url options | |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
514 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
515 |
options := repo remotes collect:[:r|r url asString]. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
516 |
url := Dialog |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
517 |
request:'Enter an URL where to push:' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
518 |
initialAnswer:'http://...' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
519 |
list: options. |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
520 |
url notEmptyOrNil ifTrue:[ |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
521 |
self hgPushTo: (HGRemote url: url) repository: repo. |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
522 |
] |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
523 |
|
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
524 |
"Created: / 04-04-2013 / 19:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
401
218a20c7e54a
Bugfix in file browser menu HG -> Push -> To...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
396
diff
changeset
|
525 |
"Modified: / 18-03-2014 / 12:09:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
180 | 526 |
! ! |
672 | 527 |
|
180 | 528 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
529 |
||
530 |
hgResolve |
|
531 |
| wc prefixsz files | |
|
532 |
||
533 |
wc := self currentHgRepository workingCopy. |
|
534 |
prefixsz := wc pathName size + 1. |
|
535 |
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
|
536 |
(files size == 1 and:[files anElement isDirectory]) ifTrue:[ |
180 | 537 |
files := wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]. |
538 |
files := files select:[:e|e isUnresolved]. |
|
539 |
] ifFalse:[ |
|
540 |
files := files collect:[:file| |
|
541 |
| path | |
|
542 |
path := file pathName. |
|
543 |
path := path copyFrom: prefixsz. |
|
544 |
wc / path. |
|
545 |
]. |
|
546 |
]. |
|
547 |
files do:[:entry| |
|
548 |
(HGMergeTool for: entry) merge ifTrue:[ |
|
549 |
entry markResolved. |
|
550 |
]. |
|
551 |
] |
|
552 |
||
181
a31ede5ff957
Bugfix: resolve only one file when file is selected.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
180
diff
changeset
|
553 |
"Modified: / 16-01-2013 / 09:19:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
180 | 554 |
! ! |
672 | 555 |
|
180 | 556 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
557 |
||
558 |
hgResolveList |
|
559 |
self hgExecuteCommand: 'resolve --list' objects: #() |
|
560 |
||
561 |
"Modified: / 14-01-2013 / 21:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
562 |
! ! |
|
672 | 563 |
|
180 | 564 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
565 |
||
566 |
hgResolveListUnresolved |
|
567 |
| repo wc appl stream| |
|
568 |
||
569 |
appl := self openCommandResultApplication. |
|
570 |
stream := appl resultStream. |
|
571 |
appl changeTabTo:(resources string: 'Unresolved conflicts'). |
|
572 |
repo := self currentHgRepository. |
|
573 |
wc := repo workingCopy. |
|
574 |
(wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
|
575 |
each isUnresolved ifTrue:[ |
|
576 |
stream nextPutLine: each pathNameRelative |
|
577 |
]. |
|
578 |
]. |
|
579 |
||
580 |
"Modified: / 15-01-2013 / 10:47:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
581 |
! ! |
|
672 | 582 |
|
180 | 583 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
584 |
||
585 |
hgResolveMark |
|
586 |
self hgExecuteCommand: 'resolve --mark' objects: self currentSelectedObjects. |
|
587 |
||
588 |
"Created: / 14-01-2013 / 21:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
589 |
! ! |
|
672 | 590 |
|
180 | 591 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
592 |
||
593 |
hgRevert |
|
594 |
self hgExecuteCommand: 'revert' |
|
595 |
||
596 |
"Created: / 15-01-2013 / 09:23:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
597 |
! ! |
|
672 | 598 |
|
180 | 599 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
600 |
||
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
601 |
hgStatus |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
602 |
self hgExecuteCommand: 'status' |
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 |
"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
|
605 |
! ! |
672 | 606 |
|
180 | 607 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
608 |
||
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
609 |
hgSummary |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
610 |
self hgExecuteCommand: 'summary' objects: #() |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
611 |
|
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
612 |
"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
|
613 |
! ! |
672 | 614 |
|
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
615 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
616 |
|
180 | 617 |
hgUpdate |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
618 |
^ self hgUpdate: nil. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
619 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
620 |
"Created: / 15-01-2013 / 09:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
621 |
"Modified: / 28-03-2014 / 00:20:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
622 |
! ! |
672 | 623 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
624 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
625 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
626 |
hgUpdate: changesetOrNil |
262
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
627 |
| executionBlock workdir | |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
628 |
|
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
629 |
(self isKindOf: FileBrowserV2) ifTrue:[ |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
630 |
workdir := self currentDirectoryDisplayed. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
631 |
workdir isDirectory ifFalse:[ |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
632 |
workdir := workdir directory |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
633 |
]. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
634 |
] ifFalse:[ |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
635 |
(self currentSelectedObjects size == 1 and:[self currentSelectedObjects anElement isDirectory]) ifTrue:[ |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
636 |
workdir := self currentSelectedObjects anElement |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
637 |
] ifFalse:[ |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
638 |
workdir := Filename currentDirectory. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
639 |
] |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
640 |
]. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
641 |
|
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
642 |
executionBlock := [:stream | |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
643 |
| cmd | |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
644 |
|
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
645 |
cmd := '%1 --noninteractive %2 %3' |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
646 |
bindWith: HGCommand hgCommand |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
647 |
with: 'update' |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
648 |
with: (changesetOrNil isNil ifTrue:[''] ifFalse:['-r ' , changesetOrNil id printString]). |
262
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
649 |
stream nextPutAll: cmd; cr; cr. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
650 |
(self getExecutionBlockForCommand:cmd inDirectory: workdir) value:stream. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
651 |
]. |
46cbd12953cd
Improvements in HG commands in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
212
diff
changeset
|
652 |
self makeExecutionResultProcessFor:executionBlock withName:'Mercurial> hg update' |
180 | 653 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
654 |
"Created: / 28-03-2014 / 00:19:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
180 | 655 |
! ! |
672 | 656 |
|
180 | 657 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
658 |
||
659 |
hgUpdateClean |
|
660 |
self hgExecuteCommand: 'update -C' objects: #() |
|
661 |
||
662 |
"Created: / 15-01-2013 / 09:23:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
663 |
! ! |
|
672 | 664 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
665 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
180 | 666 |
|
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
667 |
hgUpdateToRevision |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
668 |
| repo cs revset dialog | |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
669 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
670 |
repo := self currentHgRepository. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
671 |
revset := '!! p1()' asHGRevset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
672 |
dialog := HGChangesetDialog new. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
673 |
dialog repository: repo. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
674 |
dialog revset: revset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
675 |
dialog open ifFalse:[ ^ self ]. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
676 |
cs := dialog changeset. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
677 |
self hgUpdate: cs. |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
678 |
|
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
679 |
"Created: / 28-03-2014 / 00:33:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
680 |
! ! |
672 | 681 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
682 |
!AbstractFileBrowser class methodsFor:'menu specs-scm'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
683 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
684 |
hgMenu |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
685 |
"This resource specification was automatically generated |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
686 |
by the MenuEditor of ST/X." |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
687 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
688 |
"Do not manually edit this!! If it is corrupted, |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
689 |
the MenuEditor may not be able to read the specification." |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
690 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
691 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
692 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
693 |
MenuEditor new openOnClass:AbstractFileBrowser andSelector:#hgMenu |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
694 |
(Menu new fromLiteralArrayEncoding:(AbstractFileBrowser hgMenu)) startUp |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
695 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
696 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
697 |
<resource: #menu> |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
698 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
699 |
^ |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
700 |
#(Menu |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
701 |
( |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
702 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
703 |
enabled: hasHGWorkingCopySelected |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
704 |
label: 'Commit' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
705 |
itemValue: hgCommit |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
706 |
labelImage: (ResourceRetriever HGIconLibrary commit 'Commit') |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
707 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
708 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
709 |
label: '-' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
710 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
711 |
(MenuItem |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
712 |
enabled: hasHGWorkingCopySelected |
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
713 |
label: 'Summary' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
714 |
itemValue: hgSummary |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
715 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
716 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
717 |
enabled: hasHGWorkingCopySelected |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
718 |
label: 'Status' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
719 |
itemValue: hgStatus |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
720 |
) |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
721 |
(MenuItem |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
722 |
label: '-' |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
723 |
) |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
724 |
(MenuItem |
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
725 |
enabled: hasHGWorkingCopySelected |
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
726 |
label: 'Browse Revision History' |
405
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
727 |
itemValue: hgLog |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
728 |
) |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
729 |
(MenuItem |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
730 |
label: '-' |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
731 |
) |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
732 |
(MenuItem |
9906c030ae1d
More work on Mercurial revision log browser and revision selection dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
402
diff
changeset
|
733 |
enabled: hasHGWorkingCopySelected |
205
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
734 |
label: 'Branches' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
735 |
itemValue: hgBranches |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
736 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
737 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
738 |
enabled: hasHGWorkingCopySelected |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
739 |
label: 'Heads' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
740 |
itemValue: hgHeads |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
741 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
742 |
(MenuItem |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
743 |
label: '-' |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
744 |
) |
e8dbcfa7eb62
More menu items in FileBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
181
diff
changeset
|
745 |
(MenuItem |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
746 |
enabled: hasHGWorkingCopySelected |
180 | 747 |
label: 'Update' |
748 |
itemValue: hgUpdate |
|
749 |
) |
|
750 |
(MenuItem |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
751 |
enabled: hasHGWorkingCopySelected |
410
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
752 |
label: 'Update To Revision' |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
753 |
submenuChannel: hgMenuUpdate |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
754 |
) |
34ca0972c5ba
Added 'Update To Revision' menu item to file browser and fixed issue #32.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
409
diff
changeset
|
755 |
(MenuItem |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
756 |
enabled: hasHGWorkingCopySelected |
180 | 757 |
label: 'Revert' |
758 |
itemValue: hgRevert |
|
759 |
) |
|
760 |
(MenuItem |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
761 |
enabled: hasHGWorkingCopySelected |
180 | 762 |
label: 'Revert all Changes' |
763 |
itemValue: hgUpdateClean |
|
764 |
) |
|
765 |
(MenuItem |
|
766 |
label: '-' |
|
767 |
) |
|
768 |
(MenuItem |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
769 |
enabled: hasHGWorkingCopySelected |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
770 |
label: 'Push' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
771 |
submenuChannel: hgMenuPush |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
772 |
) |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
773 |
(MenuItem |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
774 |
enabled: hasHGWorkingCopySelected |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
775 |
label: 'Pull' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
776 |
submenuChannel: hgMenuPull |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
777 |
) |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
778 |
(MenuItem |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
779 |
label: '-' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
780 |
) |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
781 |
(MenuItem |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
782 |
enabled: hasHGWorkingCopySelected |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
783 |
label: 'Merge...' |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
784 |
submenuChannel: hgMenuMerge |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
785 |
labelImage: (ResourceRetriever HGIconLibrary merge 'Merge...') |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
786 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
787 |
(MenuItem |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
788 |
enabled: hasHGWorkingCopySelected |
180 | 789 |
label: 'Resolve' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
790 |
itemValue: hgResolve |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
791 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
792 |
(MenuItem |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
793 |
enabled: hasHGWorkingCopySelected |
180 | 794 |
label: 'Mark as Resolved' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
795 |
itemValue: hgResolveMark |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
796 |
) |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
797 |
(MenuItem |
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
798 |
enabled: hasHGWorkingCopySelected |
180 | 799 |
label: 'Mark as Unresolved' |
178
1ed827252fee
More work on merging. Not yet finished.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
174
diff
changeset
|
800 |
itemValue: hgResolveUnmark |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
801 |
) |
180 | 802 |
(MenuItem |
803 |
label: '-' |
|
804 |
) |
|
805 |
(MenuItem |
|
806 |
enabled: hasHGWorkingCopySelected |
|
807 |
label: 'Show Conflicts' |
|
808 |
itemValue: hgResolveList |
|
809 |
) |
|
810 |
(MenuItem |
|
811 |
enabled: hasHGWorkingCopySelected |
|
812 |
label: 'Show Unresolved' |
|
813 |
itemValue: hgResolveListUnresolved |
|
814 |
) |
|
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
815 |
(MenuItem |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
816 |
label: '-' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
817 |
) |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
818 |
(MenuItem |
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
819 |
enabled: hgCloneEnabled |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
820 |
label: 'Clone...' |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
821 |
itemValue: hgClone |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
822 |
) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
823 |
(MenuItem |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
824 |
enabled: hgInitEnabled |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
825 |
label: 'Create...' |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
826 |
itemValue: hgInit |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
827 |
) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
828 |
(MenuItem |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
829 |
label: '-' |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
830 |
) |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
831 |
(MenuItem |
284
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
832 |
enabled: hasHGWorkingCopySelected |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
833 |
label: 'Edit Repository Config (.hg/hgrc)' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
834 |
itemValue: hgEditConfigRepository |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
835 |
) |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
836 |
(MenuItem |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
837 |
label: 'Edit User Config (~/.hgrc)' |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
838 |
itemValue: hgEditConfigUser |
0aa0e7137e65
Added push/pull menu to file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
282
diff
changeset
|
839 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
840 |
) |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
841 |
nil |
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
842 |
nil |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
843 |
) |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
844 |
! ! |
672 | 845 |
|
88 | 846 |
!Annotation class methodsFor:'instance creation'! |
847 |
||
852 | 848 |
HGRevision:aString |
760 | 849 |
"Used by Mercurial to internally store revision info. |
850 |
Should never appear in source code!!" |
|
88 | 851 |
|
852 | 852 |
^HGRevisionAnnotation revision:aString |
88 | 853 |
|
854 |
"Created: / 20-11-2012 / 23:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
760 | 855 |
"Modified (comment): / 16-07-2017 / 13:20:52 / cg" |
852 | 856 |
"Modified (format): / 29-07-2018 / 14:55:31 / Claus Gittinger" |
88 | 857 |
! ! |
672 | 858 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
859 |
!ByteArray methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
860 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
861 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
862 |
^ HGChangesetId fromBytes:self. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
863 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
864 |
"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
|
865 |
! ! |
672 | 866 |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
867 |
!CharacterArray methodsFor:'converting'! |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
868 |
|
372
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
869 |
asHGChangesetId |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
870 |
^ HGChangesetId fromString:self. |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
871 |
|
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
872 |
"Created: / 16-11-2012 / 21:24:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5acd6d915c77
Added HGRevset to fetch revision log using hg revsets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
367
diff
changeset
|
873 |
! ! |
672 | 874 |
|
398
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
875 |
!CharacterArray methodsFor:'converting'! |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
876 |
|
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
877 |
asHGRevset |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
878 |
^ HGRevset fromString:self. |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
879 |
|
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
880 |
"Created: / 11-03-2014 / 20:51:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
881 |
! ! |
672 | 882 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
883 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
884 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
885 |
hasHGSupport |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
886 |
"/ use Smalltalk-at to trick the dependency/prerequisite generator |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
887 |
^ (Smalltalk at: #'HGSourceCodeManager' ifAbsent:nil) notNil |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
888 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
889 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
890 |
ConfigurableFeatures hasGitSupport |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
891 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
892 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
893 |
"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
|
894 |
! ! |
672 | 895 |
|
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
896 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
897 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
898 |
hasHGSupportEnabled |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
899 |
^ self hasSCMSupportEnabledFor:#'HGSourceCodeManager' |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
900 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
901 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
902 |
self hasGitSupportEnabled |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
903 |
" |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
904 |
|
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
905 |
"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
|
906 |
! ! |
672 | 907 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
908 |
!Integer methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
909 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
910 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
911 |
^ (HGChangesetId new:0) revno:self. |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
912 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
913 |
"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
|
914 |
! ! |
672 | 915 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
916 |
!Object methodsFor:'converting'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
917 |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
918 |
asHGChangesetId |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
919 |
HGError |
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
920 |
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
|
921 |
|
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
922 |
"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
|
923 |
! ! |
672 | 924 |
|
88 | 925 |
!Object methodsFor:'converting'! |
926 |
||
927 |
asHGRevision |
|
103
04731ef44417
HGNodeId renamed to HGChangesetId
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
102
diff
changeset
|
928 |
^self asHGChangesetId |
88 | 929 |
|
930 |
"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
|
931 |
"Modified: / 27-11-2012 / 17:56:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 932 |
! ! |
672 | 933 |
|
398
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
934 |
!Object methodsFor:'converting'! |
88 | 935 |
|
398
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
936 |
asHGRevset |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
937 |
^self shouldNotImplement |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
938 |
|
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
939 |
"Created: / 11-03-2014 / 20:50:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
65dc8645e496
Added HGChangesetList, a pluggable component to display list of changesets.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
940 |
! ! |
672 | 941 |
|
212
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
942 |
!Object methodsFor:'testing'! |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
943 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
944 |
isHGChangeset |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
945 |
"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
|
946 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
947 |
^false |
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
948 |
|
8ec5884fba41
Fixed bugs introduced on 2013-01-22.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
205
diff
changeset
|
949 |
"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
|
950 |
! ! |
672 | 951 |
|
88 | 952 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
953 |
||
954 |
hgBinaryRevision |
|
955 |
||
956 |
" |
|
957 |
Answers Mercurial revision from which the package was compiled. |
|
958 |
If no binary revision is available, returns nil." |
|
959 |
||
960 |
||
961 |
| revInfo | |
|
962 |
||
91 | 963 |
self binaryRevisionString notNil ifTrue:[ |
964 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
|
88 | 965 |
revInfo notNil ifTrue:[ |
966 |
^revInfo changesetId |
|
967 |
]. |
|
968 |
]. |
|
969 |
^nil |
|
970 |
||
971 |
||
972 |
" |
|
973 |
stx_libbasic hgBinaryRevision |
|
974 |
stx_libsvn hgBinaryRevision |
|
975 |
stx_libscm_mercurial hgBinaryRevision |
|
976 |
||
977 |
" |
|
978 |
||
979 |
"Created: / 20-11-2012 / 23:58:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
980 |
! ! |
|
672 | 981 |
|
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
982 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
983 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
984 |
hgEnsureCopyrightMethod |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
985 |
"If true, then #copyright method is automatically compiled in each class |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
986 |
(but iff project definition defines it) |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
987 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
988 |
Default is true (compile such method) but if the repository is mirror of CVS and |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
989 |
you want to merge back to CVS at some point, you may want to not compile them |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
990 |
to keep changes against CVS minimal" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
991 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
992 |
^true "default" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
993 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
994 |
"Created: / 09-10-2013 / 11:48:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
995 |
! ! |
672 | 996 |
|
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
997 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
998 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
999 |
hgEnsureVersion_HGMethod |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1000 |
"If true, then #version_HG method is automatically compiled in each class. |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1001 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1002 |
Default is true (compile such method) but if the repository is mirror of CVS and |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1003 |
you want to merge back to CVS at some point, you may want to not compile them |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1004 |
to keep changes against CVS minimal. |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1005 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1006 |
If false, version_HG is compiled only in classes that has been modified |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1007 |
and commited. |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1008 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1009 |
Note that Mercurial can live without them |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1010 |
just fine" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1011 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1012 |
^true "default" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1013 |
|
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1014 |
"Created: / 09-10-2013 / 11:50:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1015 |
! ! |
672 | 1016 |
|
88 | 1017 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
1018 |
||
1019 |
hgLogicalRevision |
|
1020 |
||
1021 |
" |
|
1022 |
Answers Mercurial revision on which is this package based on logically. |
|
1023 |
||
1024 |
Revision is computed as follows: |
|
1025 |
1) Look, if receiver's version_HG method has a (hidden) annotation HGRevision:, |
|
1026 |
if so, return its value. |
|
1027 |
2) If receiver's binary revision is not nil, return it. |
|
1028 |
3) Look into a package directory and if there is a Mercurial repository, |
|
1029 |
return working copy's revision" |
|
1030 |
||
1031 |
| versionMethod versionAnnotation revInfo pkgDir repoDir repo | |
|
1032 |
||
1033 |
"1 --- " |
|
1034 |
||
102
16bc16d9e6d5
Update logical revision on commit,
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
93
diff
changeset
|
1035 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
88 | 1036 |
versionMethod notNil ifTrue:[ |
1037 |
versionAnnotation := versionMethod annotationAt: #HGRevision:. |
|
1038 |
versionAnnotation notNil ifTrue:[ |
|
1039 |
^versionAnnotation revision |
|
1040 |
]. |
|
174
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
1041 |
] ifFalse:[ |
0d293012a897
Fixed commit to freshly created repository.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
173
diff
changeset
|
1042 |
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
|
1043 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
88 | 1044 |
]. |
1045 |
||
1046 |
"2 --- " |
|
91 | 1047 |
self binaryRevisionString notNil ifTrue:[ |
1048 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
|
88 | 1049 |
revInfo notNil ifTrue:[ |
1050 |
^revInfo changesetId |
|
1051 |
]. |
|
1052 |
]. |
|
1053 |
||
1054 |
"3 --- " |
|
1055 |
pkgDir := Smalltalk getPackageDirectoryForPackage: self package. |
|
1056 |
pkgDir notNil ifTrue:[ |
|
1057 |
repoDir := HGRepository discover: pkgDir. |
|
1058 |
repoDir notNil ifTrue:[ |
|
170
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
1059 |
| id | |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
1060 |
|
88 | 1061 |
repo := HGRepository on: repoDir. |
170
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
1062 |
id := repo workingCopy changeset id. |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
1063 |
versionMethod annotateWith: (HGRevisionAnnotation revision: id). |
e0bdc6f35bf9
Bugfix in ProjectDefinition>>hgLogicalRevision.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
163
diff
changeset
|
1064 |
^id |
88 | 1065 |
] |
1066 |
]. |
|
1067 |
||
1068 |
"4 --- " |
|
1069 |
self breakPoint: #jv. |
|
1070 |
^nil |
|
1071 |
||
1072 |
||
1073 |
" |
|
1074 |
stx_libbasic hgLogicalRevision |
|
1075 |
stx_libsvn hgLogicalRevision |
|
1076 |
stx_libscm_mercurial hgLogicalRevision |
|
1077 |
||
1078 |
" |
|
1079 |
||
1080 |
"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
|
1081 |
"Modified: / 14-01-2013 / 13:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 | 1082 |
! ! |
672 | 1083 |
|
379
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1084 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
88 | 1085 |
|
379
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1086 |
hgLogicalRevision: anHGChangesetId |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1087 |
" |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1088 |
Set Mercurial revision on which is this package based on logically. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1089 |
To be called only from Mercurial support upon commit from image. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1090 |
" |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1091 |
|
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1092 |
| versionMethod | |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1093 |
|
386
207f07c898fa
Fix in ProjectDefinition>>hgLogicalRevision:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
379
diff
changeset
|
1094 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
379
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1095 |
versionMethod isNil ifTrue:[ |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1096 |
self class compile:(self class |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1097 |
versionMethodTemplateForSourceCodeManager:HGSourceCodeManager) |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1098 |
classified:'documentation'. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1099 |
versionMethod := self class compiledMethodAt:HGSourceCodeManager nameOfVersionMethodInClasses. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1100 |
versionMethod setPackage:self package. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1101 |
]. |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1102 |
versionMethod annotateWith: |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1103 |
(HGRevisionAnnotation revision: anHGChangesetId) |
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1104 |
|
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1105 |
"Created: / 20-02-2014 / 00:06:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
386
207f07c898fa
Fix in ProjectDefinition>>hgLogicalRevision:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
379
diff
changeset
|
1106 |
"Modified: / 27-02-2014 / 22:16:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
379
8a13fa172b54
Upon commit, update logical revision of all packages that belongs to the same repository...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1107 |
! ! |
672 | 1108 |
|
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1109 |
!ProjectDefinition class methodsFor:'description - actions - hg'! |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1110 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1111 |
hgPostLoad |
505 | 1112 |
"possibly update an version_HG" |
1113 |
||
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1114 |
<postLoad> |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1115 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1116 |
| dir repo versionMethod | |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1117 |
|
505 | 1118 |
HGRepository notNil ifTrue:[ |
1119 |
self binaryRevisionString isNil ifTrue:[ |
|
1120 |
dir := Smalltalk getPackageDirectoryForPackage: self package. |
|
1121 |
dir notNil ifTrue:[ |
|
1122 |
dir := HGRepository discover: dir. |
|
1123 |
dir notNil ifTrue:[ |
|
1124 |
repo := HGRepository on: dir. |
|
1125 |
versionMethod := HGSourceCodeManager ensureVersionMethodInClass: self package: self package. |
|
1126 |
versionMethod annotateWith: |
|
1127 |
(HGRevisionAnnotation revision: repo workingCopy changesetId) |
|
1128 |
]. |
|
1129 |
] |
|
1130 |
]. |
|
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1131 |
]. |
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1132 |
|
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1133 |
"Created: / 26-11-2012 / 13:06:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1134 |
"Modified: / 07-02-2014 / 10:59:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
107
c92f7674485e
Fixed test StXTests>>test_commit_03c
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
103
diff
changeset
|
1135 |
! ! |
672 | 1136 |
|
353
456532e0478c
Added more support for HG mirrors of CVS repos.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
303
diff
changeset
|
1137 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
288
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1138 |
|
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1139 |
hgRemoveContainesForDeletedClasses |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1140 |
"If true, then containers for removed classes are __AUTOMATICALLY__ removed from the |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1141 |
repositoru. If false, obsolete containes are kept. |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1142 |
|
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1143 |
Default is true (remove obsolete containers) but if the repository is mirror of CVS and |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1144 |
you want to merge back to CVS at some point, you may want to return false to avoid deletions |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1145 |
of obsolete files. Usefull when branching off an old CVS repo with loads of mess." |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1146 |
|
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1147 |
^true "default" |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1148 |
|
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1149 |
"Created: / 21-05-2013 / 16:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
577f8935661d
Added ProjectDefinition>>hgRemoveContainesForDeletedClasses config methd.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
286
diff
changeset
|
1150 |
! ! |
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1151 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1152 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1153 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1154 |
commonMenuHGBrowseTemporaryWorkingCopy |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1155 |
self selectedProjectsForHG value do:[:package| |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1156 |
| pkg | |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1157 |
|
396
3c9d047e3841
Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1158 |
pkg := HGPackageWorkingCopy named: package. |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1159 |
pkg notNil ifTrue:[ |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1160 |
pkg temporaryWorkingCopy browse |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1161 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1162 |
]. |
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1163 |
|
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1164 |
"Created: / 11-01-2013 / 18:47:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
396
3c9d047e3841
Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1165 |
"Modified: / 05-03-2014 / 21:45:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1166 |
! ! |
672 | 1167 |
|
173
c72794df7ae3
Implemented commit menu item in file browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
170
diff
changeset
|
1168 |
!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
|
1169 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1170 |
commonMenuHGBrowseWorkingCopy |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1171 |
self selectedProjectsForHG value do:[:package| |
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
1172 |
| pkg | |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1173 |
|
396
3c9d047e3841
Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1174 |
pkg := HGPackageWorkingCopy named: package. |
162
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
1175 |
pkg notNil ifTrue:[ |
108fc9ee061e
Added HGWorkingCopyBrowser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
161
diff
changeset
|
1176 |
pkg repository workingCopy browse |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1177 |
]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1178 |
]. |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1179 |
|
396
3c9d047e3841
Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1180 |
"Modified: / 05-03-2014 / 21:45:25 / 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
|
1181 |
! ! |
672 | 1182 |
|
409
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1183 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1184 |
|
409
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1185 |
commonMenuHGPush:repository to: remote |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1186 |
self |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1187 |
showMessage: (resources string: 'Pushing to %1' with: remote url asString) |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1188 |
while: [ |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1189 |
[ |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1190 |
[ |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1191 |
repository push: remote |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1192 |
] on: HGPushWouldCreateNewHeadError do:[:ex1 | |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1193 |
(Dialog confirm: (resources string: 'Push would create a new head (%1)\\Push anyway?' with: ex1 parameter) withCRs) ifTrue:[ |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1194 |
repository push: remote force: true. |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1195 |
]. |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1196 |
]. |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1197 |
] on: HGError do:[:ex2 | |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1198 |
self inlineMessageApp |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1199 |
reset; |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1200 |
beWarning; |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1201 |
message: (resources string: 'Push failed: %1' with: ex2 description); |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1202 |
addButtonOK. |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1203 |
] |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1204 |
] |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1205 |
inBackground: true. |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1206 |
|
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1207 |
"Created: / 26-03-2014 / 15:21:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1208 |
! ! |
672 | 1209 |
|
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1210 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-hg'! |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1211 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1212 |
commonMenuHGPushSlice |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1213 |
| menu push submenu packages package remotes default | |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1214 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1215 |
menu := Menu new. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1216 |
push := MenuItem new |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1217 |
label: (resources string: 'Push...'); |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1218 |
yourself. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1219 |
menu addItem: push. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1220 |
|
396
3c9d047e3841
Introduced a SCMAbstractPackageWorkingCopy and SCMAbstractPackageRevision...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
395
diff
changeset
|
1221 |
packages := self selectedProjectsForHG value collect:[:id|HGPackageWorkingCopy named:id string]. |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1222 |
((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
|
1223 |
push enabled: false. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1224 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1225 |
]. |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1226 |
|
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1227 |
package := packages anElement. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1228 |
remotes := package repository remotes. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1229 |
remotes isEmpty ifTrue:[ |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1230 |
push enabled: false. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1231 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1232 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1233 |
"/ default := package repository remoteDefault. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1234 |
"/ default notNil ifTrue:[ |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1235 |
"/ menu addItem: (MenuItem new |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1236 |
"/ 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
|
1237 |
"/ value:[package repository push: default]; |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1238 |
"/ yourself). |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1239 |
"/ ]. |
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1240 |
(remotes size ~~ 1 or:[remotes anElement ~~ default]) ifTrue:[ |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1241 |
submenu := Menu new. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1242 |
push submenu: submenu. |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1243 |
remotes do:[:remote| |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1244 |
submenu addItem: (MenuItem new |
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1245 |
label: remote displayString; |
409
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1246 |
value:[self commonMenuHGPush: package repository to: remote ]; |
489
333ee1b27613
Updated to rev f271ddd2b5e0
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
488
diff
changeset
|
1247 |
yourself). |
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1248 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1249 |
]. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1250 |
^menu. |
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1251 |
|
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1252 |
"Created: / 10-12-2012 / 03:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
409
20e6f5c4f3b2
FIx for issue #11 - Add user feedback when pushing from system browser
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
405
diff
changeset
|
1253 |
"Modified: / 26-03-2014 / 15:22:18 / 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
|
1254 |
! ! |
672 | 1255 |
|
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1256 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
161
ed22df640210
Bugfix: added lost NewSystemBrowser>>commonMenuHGPushSlice.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
154
diff
changeset
|
1257 |
|
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1258 |
projectMenuHGBrowseRevisionHistory |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1259 |
self selectedProjectsForHG value do:[:package| |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1260 |
| pkg | |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1261 |
|
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1262 |
pkg := HGPackageWorkingCopy named: package. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1263 |
pkg notNil ifTrue:[ |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1264 |
| browser | |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1265 |
|
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1266 |
self withWaitCursorDo:[ |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1267 |
browser := HGChangesetBrowser new. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1268 |
browser repository: pkg repository. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1269 |
browser open. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1270 |
] |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1271 |
]. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1272 |
]. |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1273 |
|
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1274 |
"Created: / 17-04-2014 / 09:41:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1275 |
! ! |
672 | 1276 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1277 |
!Tools::NewSystemBrowser methodsFor:'aspects-navigation-hg'! |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1278 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1279 |
selectedProjectsForHG |
672 | 1280 |
|sel| |
1281 |
||
1282 |
(sel := self selectedProjects value) notNil |
|
1283 |
ifTrue:[^sel]. |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1284 |
|
672 | 1285 |
(sel := self selectedClasses value) notNil |
1286 |
ifTrue:[^(sel collect:[:cls|cls package]) asSet]. |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1287 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1288 |
^nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1289 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1290 |
"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
|
1291 |
! ! |
672 | 1292 |
|
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1293 |
!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
|
1294 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1295 |
classMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1296 |
"This resource specification was automatically generated |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1297 |
by the MenuEditor of ST/X." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1298 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1299 |
"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
|
1300 |
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
|
1301 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1302 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1303 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1304 |
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
|
1305 |
(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
|
1306 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1307 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1308 |
<resource: #menu> |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1309 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1310 |
^ |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1311 |
#(Menu |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1312 |
( |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1313 |
(MenuItem |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1314 |
label: 'Push Slice' |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1315 |
submenuChannel: commonMenuHGPushSlice |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1316 |
isMenuSlice: true |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1317 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1318 |
(MenuItem |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1319 |
label: 'Browse package working copy' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1320 |
itemValue: commonMenuHGBrowseWorkingCopy |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1321 |
) |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1322 |
(MenuItem |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1323 |
label: 'Browse temporary working copy (for commits & merges)' |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1324 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1325 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1326 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1327 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1328 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1329 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1330 |
|
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1331 |
"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
|
1332 |
! ! |
672 | 1333 |
|
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1334 |
!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
|
1335 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1336 |
projectMenuSCMExtra_HG |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1337 |
"This resource specification was automatically generated |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1338 |
by the MenuEditor of ST/X." |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1339 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1340 |
"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
|
1341 |
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
|
1342 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1343 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1344 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1345 |
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
|
1346 |
(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
|
1347 |
" |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1348 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1349 |
<resource: #menu> |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1350 |
|
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1351 |
^ |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1352 |
#(Menu |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1353 |
( |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1354 |
(MenuItem |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1355 |
label: 'Push Slice' |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1356 |
submenuChannel: commonMenuHGPushSlice |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1357 |
isMenuSlice: true |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1358 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1359 |
(MenuItem |
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1360 |
label: 'Browse Revision History' |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1361 |
itemValue: projectMenuHGBrowseRevisionHistory |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1362 |
) |
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1363 |
(MenuItem |
735 | 1364 |
label: 'Browse Package''s Working Copy' |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1365 |
itemValue: commonMenuHGBrowseWorkingCopy |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1366 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1367 |
(MenuItem |
735 | 1368 |
label: 'Browse Temporary Working Copy (for commits & merges)' |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1369 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1370 |
) |
154
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1371 |
) |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1372 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1373 |
nil |
c1221bf5f357
Added 'Push' menu to system browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
151
diff
changeset
|
1374 |
) |
163
21bc6994087d
Experimental HGWorkingCopyBrowser - unfinished!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
162
diff
changeset
|
1375 |
|
424
c9dd088e6620
Added 'Browse Revision History' menu item to package menu in browser.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
420
diff
changeset
|
1376 |
"Modified: / 17-04-2014 / 09:41:29 / 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
|
1377 |
! ! |
672 | 1378 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1379 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1380 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1381 |
hgAutopush |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1382 |
"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
|
1383 |
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
|
1384 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1385 |
^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
|
1386 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1387 |
"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
|
1388 |
! ! |
672 | 1389 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1390 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1391 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1392 |
hgAutopush: aBoolean |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1393 |
"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
|
1394 |
to an upstream repository (autopush)" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1395 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1396 |
^self at: #hgAutopush put: aBoolean. |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1397 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1398 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1399 |
UserPreferences current hgAutopush |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1400 |
UserPreferences current hgAutopush: true |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1401 |
UserPreferences current hgAutopush: false |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1402 |
" |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1403 |
|
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1404 |
"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
|
1405 |
! ! |
672 | 1406 |
|
151
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1407 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
527a1e85aef8
Support for 'autopush' in commit dialog.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
115
diff
changeset
|
1408 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1409 |
hgCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1410 |
"Returns path svn executable" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1411 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1412 |
| cmd | |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1413 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1414 |
cmd := self at:#hgCommand ifAbsent:[ nil ]. |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1415 |
^cmd isEmptyOrNil ifTrue:[ nil ] ifFalse:[ cmd ] |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1416 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1417 |
"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
|
1418 |
! ! |
672 | 1419 |
|
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1420 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1421 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1422 |
hgCommand: aString |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1423 |
"Set the command to 'hg' executable" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1424 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1425 |
self at:#hgCommand put: aString. |
378
5c36325d6f60
Better `hg` command configuration handling and validation.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
373
diff
changeset
|
1426 |
HGCommand hgCommand: nil. |
80
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1427 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1428 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1429 |
UserPreferences current hgCommand |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1430 |
UserPreferences current hgCommand:'hg' |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1431 |
UserPreferences current hgCommand:nil |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1432 |
" |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1433 |
|
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1434 |
"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
|
1435 |
! ! |
8f300696b26b
Added configurable path to 'hg' command.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
69
diff
changeset
|
1436 |
|
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1437 |
!stx_libscm_mercurial class methodsFor:'documentation'! |
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1438 |
|
672 | 1439 |
extensionsVersion_CVS |
1440 |
^ '$Header$' |
|
1441 |
! ! |
|
1442 |
||
1443 |
!stx_libscm_mercurial class methodsFor:'documentation'! |
|
1444 |
||
69
17045d49309f
Refactoring: preparation for accessing changeset contents.
vranyj1@bd9d3459-6c23-4dd9-91de-98eeebb81177
parents:
diff
changeset
|
1445 |
extensionsVersion_HG |
115
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
1446 |
|
b1ed2d29054b
version_HG changed to return string.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
107
diff
changeset
|
1447 |
^ '$Changeset: <not expanded> $' |
303
aee999e9dc25
Bugfixes in push parsing.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
302
diff
changeset
|
1448 |
! ! |
512
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
511
diff
changeset
|
1449 |