author | Stefan Vogel <sv@exept.de> |
Fri, 31 Mar 2017 18:22:12 +0200 | |
branch | cvs_MAIN |
changeset 755 | ff5c8d7b2bd8 |
parent 512 | 61df05330245 |
permissions | -rw-r--r-- |
512
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1 |
"{ Package: 'stx:libscm/mercurial' }"! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
2 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
3 |
!AbstractFileBrowser methodsFor:'aspects-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
4 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
5 |
currentHgRepository |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
6 |
| root | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
7 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
8 |
root := HGRepository discover: self currentDirectoryDisplayed. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
9 |
root isNil ifTrue:[ ^ self ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
10 |
^HGRepository on: root cached: true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
11 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
12 |
"Created: / 14-12-2012 / 19:22:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
13 |
"Modified: / 15-01-2013 / 10:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
14 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
15 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
16 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
17 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
18 |
hasHGWorkingCopyNotSelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
19 |
^ self hasHGWorkingCopySelected not |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
20 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
21 |
"Created: / 13-02-2014 / 12:01:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
22 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
23 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
24 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
25 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
26 |
hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
27 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
28 |
^ self hgMenusAreShown |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
29 |
and:[((Smalltalk at:#HGRepository) discover:self currentDirectoryDisplayed) notNil] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
30 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
31 |
"Created: / 14-12-2012 / 18:26:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
32 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
33 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
34 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
35 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
36 |
hgBranches |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
37 |
self hgExecuteCommand: 'branches' objects: #() |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
38 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
39 |
"Created: / 25-01-2013 / 20:14:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
40 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
41 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
42 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
43 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
44 |
hgClone |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
45 |
| selectedDirectories dialog repoUrlHolder repoDirHolder repodirName repoDir | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
46 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
47 |
selectedDirectories := self currentSelectedDirectories. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
48 |
repoUrlHolder := nil asValue. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
49 |
repoDirHolder := (selectedDirectories size = 1 and:[ selectedDirectories anElement directoryContents isEmpty]) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
50 |
ifTrue:[ selectedDirectories anElement baseName asValue ] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
51 |
ifFalse:[ nil asValue ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
52 |
dialog := DialogBox new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
53 |
dialog title: (resources string: 'Clone repository...'). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
54 |
dialog addLabelledInputField:(resources string: 'Repository URL:') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
55 |
adjust:#left |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
56 |
on:repoUrlHolder |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
57 |
tabable:true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
58 |
separateAtX:0.3. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
59 |
dialog addLabelledInputField:(resources string: 'Directory:') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
60 |
adjust:#left |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
61 |
on:repoDirHolder |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
62 |
tabable:true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
63 |
separateAtX:0.3. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
64 |
dialog addAbortButton; addOkButton. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
65 |
dialog open. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
66 |
dialog accepted ifFalse:[ ^ self ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
67 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
68 |
repoUrlHolder value isEmptyOrNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
69 |
Dialog warn: (resources string: 'Empty repository URL') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
70 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
71 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
72 |
repoDir := self currentDirectoryDisplayed / repoDirHolder value. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
73 |
repoDir exists ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
74 |
repoDir isDirectory ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
75 |
repoDir directoryContents notEmpty ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
76 |
Dialog error: (resources string:'Cannot clone repository. Directory %1 is not empty.' with: repodirName). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
77 |
^ self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
78 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
79 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
80 |
Dialog error: (resources string:'Cannot clone repository. %1 is not an empty directory' with: repodirName). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
81 |
^ self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
82 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
83 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
84 |
ProgressIndicator |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
85 |
displayBusyIndicator: (resources string: 'Cloning %1 to %2...' with: repoUrlHolder value with: repoDirHolder value) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
86 |
at:(Screen default center) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
87 |
during:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
88 |
HGRepository clone: repoUrlHolder value to: repoDir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
89 |
self updateCurrentDirectory |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
90 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
91 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
92 |
"Created: / 13-02-2014 / 11:57:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
93 |
"Modified: / 13-02-2014 / 16:11:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
94 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
95 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
96 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
97 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
98 |
hgCloneEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
99 |
^ self hasHGWorkingCopyNotSelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
100 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
101 |
"Created: / 13-02-2014 / 11:57:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
102 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
103 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
104 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
105 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
106 |
hgCommit |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
107 |
| wc task | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
108 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
109 |
wc := self currentHgRepository workingCopy. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
110 |
task := wc commitTask. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
111 |
HGCommitDialog new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
112 |
task: task; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
113 |
open |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
114 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
115 |
"Created: / 11-01-2013 / 19:27:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
116 |
"Modified: / 01-04-2013 / 12:56:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
117 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
118 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
119 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
120 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
121 |
hgEditConfig: file |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
122 |
self |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
123 |
applicationNamed:#FileApplicationNoteBook |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
124 |
ifPresentDo:[:appl | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
125 |
appl openTextEditorForFile: file pathName |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
126 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
127 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
128 |
"Created: / 04-04-2013 / 19:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
129 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
130 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
131 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
132 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
133 |
hgEditConfigRepository |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
134 |
| repo | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
135 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
136 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
137 |
self hgEditConfig: repo path / '.hg' / 'hgrc' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
138 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
139 |
"Modified: / 04-04-2013 / 19:42:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
140 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
141 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
142 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
143 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
144 |
hgEditConfigUser |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
145 |
self hgEditConfig: Filename homeDirectory / '.hgrc' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
146 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
147 |
"Modified: / 04-04-2013 / 19:42:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
148 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
149 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
150 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
151 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
152 |
hgExecuteCommand: command |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
153 |
"Executes svn command on currently selected objects" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
154 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
155 |
self hgExecuteCommand: command objects: self currentSelectedObjects. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
156 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
157 |
"Created: / 12-01-2013 / 12:08:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
158 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
159 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
160 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
161 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
162 |
hgExecuteCommand: command objects: givenObjects |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
163 |
"Executes svn command on given objects (files/dirs)" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
164 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
165 |
| objects workdir objectsAsString executionBlock | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
166 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
167 |
objects := givenObjects. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
168 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
169 |
(self isKindOf: FileBrowserV2) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
170 |
workdir := self currentDirectoryDisplayed. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
171 |
workdir isDirectory ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
172 |
workdir := workdir directory |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
173 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
174 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
175 |
(objects size == 1 and:[objects anElement isDirectory]) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
176 |
workdir := objects anElement |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
177 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
178 |
workdir := Filename currentDirectory. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
179 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
180 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
181 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
182 |
objectsAsString := String streamContents:[:s| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
183 |
objects size == 1 ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
184 |
workdir asString = objects anElement asString ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
185 |
s nextPut:$. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
186 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
187 |
s nextPutAll: objects anElement asString. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
188 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
189 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
190 |
objects do:[:each|s nextPut:$"; nextPutAll:each asString; nextPut:$"] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
191 |
separatedBy:[s space] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
192 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
193 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
194 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
195 |
executionBlock := [:stream | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
196 |
| cmd | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
197 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
198 |
cmd := '%1 --noninteractive %2 %3' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
199 |
bindWith: HGCommand hgCommand |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
200 |
with: command |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
201 |
with: objectsAsString. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
202 |
stream nextPutAll: cmd; cr; cr. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
203 |
(self getExecutionBlockForCommand:cmd inDirectory: workdir) value:stream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
204 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
205 |
self makeExecutionResultProcessFor:executionBlock withName:'Mercurial> hg ', command. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
206 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
207 |
"Created: / 12-01-2013 / 12:09:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
208 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
209 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
210 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
211 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
212 |
hgHeads |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
213 |
self hgExecuteCommand: 'heads' objects: #() |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
214 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
215 |
"Created: / 25-01-2013 / 20:14:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
216 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
217 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
218 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
219 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
220 |
hgInit |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
221 |
| selectedDirectories initial repodirName repodir | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
222 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
223 |
selectedDirectories := self currentSelectedDirectories. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
224 |
initial := (selectedDirectories size = 1 and:[ selectedDirectories anElement directoryContents isEmpty]) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
225 |
ifTrue:[ selectedDirectories anElement baseName ] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
226 |
ifFalse:[ 'repository' ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
227 |
repodirName := Dialog request: (resources string: 'Enter name of the repository to create') initialAnswer: initial. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
228 |
repodir := self currentDirectoryDisplayed / repodirName. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
229 |
repodir exists ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
230 |
repodir isDirectory ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
231 |
repodir directoryContents notEmpty ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
232 |
Dialog error: (resources string:'Cannot initialize repository. Directory %1 is not empty.' with: repodirName). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
233 |
^ self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
234 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
235 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
236 |
Dialog error: (resources string:'Cannot initialize repository. %1 is not an empty directory' with: repodirName). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
237 |
^ self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
238 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
239 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
240 |
HGRepository init: repodir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
241 |
self updateCurrentDirectory |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
242 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
243 |
"Created: / 13-02-2014 / 11:59:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
244 |
"Modified: / 13-02-2014 / 16:19:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
245 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
246 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
247 |
!AbstractFileBrowser methodsFor:'menu-queries-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
248 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
249 |
hgInitEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
250 |
^ self hasHGWorkingCopyNotSelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
251 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
252 |
"Created: / 13-02-2014 / 11:59:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
253 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
254 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
255 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
256 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
257 |
hgMenuMerge |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
258 |
| menu repo wc cs | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
259 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
260 |
menu := Menu new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
261 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
262 |
wc := repo workingCopy. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
263 |
cs := wc changeset. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
264 |
repo branches do:[:branch| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
265 |
branch heads do:[:head| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
266 |
head ~~ cs ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
267 |
| item | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
268 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
269 |
item := MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
270 |
label: (head branch name , ' - ' , head id printString) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
271 |
itemValue: [self hgMenuMerge: head ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
272 |
menu addItem: item. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
273 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
274 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
275 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
276 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
277 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
278 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
279 |
"Created: / 14-12-2012 / 19:14:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
280 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
281 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
282 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
283 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
284 |
hgMenuMerge:anHGChangeset |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
285 |
| repo wc appl stream| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
286 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
287 |
appl := self openCommandResultApplication. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
288 |
stream := appl resultStream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
289 |
appl changeTabTo:((resources string: 'Merging with %1') bindWith: anHGChangeset id printString). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
290 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
291 |
[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
292 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
293 |
wc := repo workingCopy. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
294 |
stream nextPutAll:(resources string: 'Mercurial > hg merge'); space; nextPutLine: anHGChangeset id printString. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
295 |
wc merge: anHGChangeset. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
296 |
stream nextPutAll:(resources string: 'done'); cr. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
297 |
(wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
298 |
each isUnresolved ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
299 |
| merger | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
300 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
301 |
stream nextPutAll: ((resources string: 'Resolving conflicts %1...') bindWith: each pathNameRelative). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
302 |
merger := HGMergeTool for: each. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
303 |
merger premerge ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
304 |
stream nextPutLine:(resources string: 'resolved'). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
305 |
each markResolved. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
306 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
307 |
stream nextPutLine:(resources string: 'UNRESOLVED') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
308 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
309 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
310 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
311 |
stream nextPutAll:(resources string: 'Merge finisged.') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
312 |
] forkAt: Processor userBackgroundPriority |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
313 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
314 |
"Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
315 |
"Modified: / 04-04-2013 / 19:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
316 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
317 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
318 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
319 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
320 |
hgMenuPull |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
321 |
| menu repo remotes | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
322 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
323 |
menu := Menu new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
324 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
325 |
remotes := repo remotes. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
326 |
remotes notEmptyOrNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
327 |
remotes do:[:remote| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
328 |
menu addItem: (MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
329 |
label: remote displayString; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
330 |
value:[ self hgPullFrom: remote repository: repo]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
331 |
yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
332 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
333 |
menu addSeparator. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
334 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
335 |
menu addItem: |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
336 |
(MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
337 |
label: (resources string: 'From...'); |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
338 |
value: [self hgPullFromURLRepository: repo]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
339 |
yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
340 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
341 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
342 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
343 |
"Created: / 04-04-2013 / 19:16:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
344 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
345 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
346 |
!AbstractFileBrowser methodsFor:'menu-dynamic-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
347 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
348 |
hgMenuPush |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
349 |
| menu repo remotes | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
350 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
351 |
menu := Menu new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
352 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
353 |
remotes := repo remotes. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
354 |
remotes notEmptyOrNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
355 |
remotes do:[:remote| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
356 |
menu addItem: (MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
357 |
label: remote displayString; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
358 |
value:[ self hgPushTo: remote repository: repo]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
359 |
yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
360 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
361 |
menu addSeparator. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
362 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
363 |
menu addItem: |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
364 |
(MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
365 |
label: (resources string: 'To...'); |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
366 |
value: [self hgPushToURLRepository: repo]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
367 |
yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
368 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
369 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
370 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
371 |
"Created: / 04-04-2013 / 19:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
372 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
373 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
374 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
375 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
376 |
hgPullFrom: remote repository:repo |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
377 |
| appl stream| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
378 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
379 |
appl := self openCommandResultApplication. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
380 |
stream := appl resultStream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
381 |
appl changeTabTo:((resources string: 'Pulling from %1') bindWith: remote printString). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
382 |
[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
383 |
stream nextPutAll:(resources string: 'Mercurial > hg pull'); space; nextPutLine: remote name. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
384 |
[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
385 |
| summary | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
386 |
summary := repo pull: remote. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
387 |
summary printOn: stream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
388 |
stream cr. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
389 |
] on: Notification do:[:ex| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
390 |
stream nextPutLine: ex messageText. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
391 |
ex proceed. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
392 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
393 |
] forkAt: Processor userBackgroundPriority |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
394 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
395 |
"Created: / 04-04-2013 / 19:27:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
396 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
397 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
398 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
399 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
400 |
hgPullFromURLRepository:repo |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
401 |
| url options | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
402 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
403 |
options := repo remotes collect:[:r|r url asString]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
404 |
url := Dialog |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
405 |
request:'Enter an URL from which to pull:' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
406 |
initialAnswer:'http://...' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
407 |
list: options. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
408 |
url notEmptyOrNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
409 |
self hgPullFrom: url repository: repo. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
410 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
411 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
412 |
"Created: / 04-04-2013 / 19:16:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
413 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
414 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
415 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
416 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
417 |
hgPushTo: remote repository:repo |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
418 |
| appl stream| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
419 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
420 |
appl := self openCommandResultApplication. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
421 |
stream := appl resultStream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
422 |
appl changeTabTo:((resources string: 'Pushing to %1') bindWith: remote printString). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
423 |
[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
424 |
stream nextPutAll:(resources string: 'Mercurial > hg push'); space; nextPutLine: remote name. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
425 |
[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
426 |
| summary | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
427 |
summary := repo push: remote. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
428 |
summary printOn: stream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
429 |
stream cr. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
430 |
] on: Notification do:[:ex| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
431 |
stream nextPutLine: ex messageText. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
432 |
ex proceed. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
433 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
434 |
] forkAt: Processor userBackgroundPriority |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
435 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
436 |
"Created: / 04-04-2013 / 19:23:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
437 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
438 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
439 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
440 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
441 |
hgPushToURLRepository:repo |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
442 |
| url options | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
443 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
444 |
options := repo remotes collect:[:r|r url asString]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
445 |
url := Dialog |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
446 |
request:'Enter an URL where to push:' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
447 |
initialAnswer:'http://...' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
448 |
list: options. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
449 |
url notEmptyOrNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
450 |
self hgPushTo: url repository: repo. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
451 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
452 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
453 |
"Created: / 04-04-2013 / 19:15:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
454 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
455 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
456 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
457 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
458 |
hgResolve |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
459 |
| wc prefixsz files | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
460 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
461 |
wc := self currentHgRepository workingCopy. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
462 |
prefixsz := wc pathName size + 1. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
463 |
files := self currentSelectedObjects. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
464 |
(files size == 1 and:[files anElement isDirectory]) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
465 |
files := wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
466 |
files := files select:[:e|e isUnresolved]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
467 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
468 |
files := files collect:[:file| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
469 |
| path | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
470 |
path := file pathName. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
471 |
path := path copyFrom: prefixsz. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
472 |
wc / path. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
473 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
474 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
475 |
files do:[:entry| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
476 |
(HGMergeTool for: entry) merge ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
477 |
entry markResolved. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
478 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
479 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
480 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
481 |
"Modified: / 16-01-2013 / 09:19:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
482 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
483 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
484 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
485 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
486 |
hgResolveList |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
487 |
self hgExecuteCommand: 'resolve --list' objects: #() |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
488 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
489 |
"Modified: / 14-01-2013 / 21:55:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
490 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
491 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
492 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
493 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
494 |
hgResolveListUnresolved |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
495 |
| repo wc appl stream| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
496 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
497 |
appl := self openCommandResultApplication. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
498 |
stream := appl resultStream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
499 |
appl changeTabTo:(resources string: 'Unresolved conflicts'). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
500 |
repo := self currentHgRepository. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
501 |
wc := repo workingCopy. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
502 |
(wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
503 |
each isUnresolved ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
504 |
stream nextPutLine: each pathNameRelative |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
505 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
506 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
507 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
508 |
"Modified: / 15-01-2013 / 10:47:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
509 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
510 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
511 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
512 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
513 |
hgResolveMark |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
514 |
self hgExecuteCommand: 'resolve --mark' objects: self currentSelectedObjects. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
515 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
516 |
"Created: / 14-01-2013 / 21:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
517 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
518 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
519 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
520 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
521 |
hgRevert |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
522 |
self hgExecuteCommand: 'revert' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
523 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
524 |
"Created: / 15-01-2013 / 09:23:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
525 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
526 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
527 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
528 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
529 |
hgStatus |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
530 |
self hgExecuteCommand: 'status' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
531 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
532 |
"Modified: / 12-01-2013 / 12:09:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
533 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
534 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
535 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
536 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
537 |
hgSummary |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
538 |
self hgExecuteCommand: 'summary' objects: #() |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
539 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
540 |
"Created: / 25-01-2013 / 17:40:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
541 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
542 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
543 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
544 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
545 |
hgUpdate |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
546 |
| executionBlock workdir | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
547 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
548 |
(self isKindOf: FileBrowserV2) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
549 |
workdir := self currentDirectoryDisplayed. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
550 |
workdir isDirectory ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
551 |
workdir := workdir directory |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
552 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
553 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
554 |
(self currentSelectedObjects size == 1 and:[self currentSelectedObjects anElement isDirectory]) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
555 |
workdir := self currentSelectedObjects anElement |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
556 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
557 |
workdir := Filename currentDirectory. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
558 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
559 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
560 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
561 |
executionBlock := [:stream | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
562 |
| cmd | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
563 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
564 |
cmd := '%1 --noninteractive %2 %3' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
565 |
bindWith: HGCommand hgCommand |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
566 |
with: 'update' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
567 |
with: ''. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
568 |
stream nextPutAll: cmd; cr; cr. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
569 |
(self getExecutionBlockForCommand:cmd inDirectory: workdir) value:stream. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
570 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
571 |
self makeExecutionResultProcessFor:executionBlock withName:'Mercurial> hg update' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
572 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
573 |
"Created: / 15-01-2013 / 09:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
574 |
"Modified: / 13-03-2013 / 00:22:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
575 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
576 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
577 |
!AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
578 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
579 |
hgUpdateClean |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
580 |
self hgExecuteCommand: 'update -C' objects: #() |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
581 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
582 |
"Created: / 15-01-2013 / 09:23:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
583 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
584 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
585 |
!AbstractFileBrowser class methodsFor:'menu specs-scm'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
586 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
587 |
hgMenu |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
588 |
"This resource specification was automatically generated |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
589 |
by the MenuEditor of ST/X." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
590 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
591 |
"Do not manually edit this!! If it is corrupted, |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
592 |
the MenuEditor may not be able to read the specification." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
593 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
594 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
595 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
596 |
MenuEditor new openOnClass:AbstractFileBrowser andSelector:#hgMenu |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
597 |
(Menu new fromLiteralArrayEncoding:(AbstractFileBrowser hgMenu)) startUp |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
598 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
599 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
600 |
<resource: #menu> |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
601 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
602 |
^ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
603 |
#(Menu |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
604 |
( |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
605 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
606 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
607 |
label: 'Commit' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
608 |
itemValue: hgCommit |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
609 |
labelImage: (ResourceRetriever HGIconLibrary commit 'Commit') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
610 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
611 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
612 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
613 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
614 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
615 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
616 |
label: 'Summary' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
617 |
itemValue: hgSummary |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
618 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
619 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
620 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
621 |
label: 'Status' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
622 |
itemValue: hgStatus |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
623 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
624 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
625 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
626 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
627 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
628 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
629 |
label: 'Branches' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
630 |
itemValue: hgBranches |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
631 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
632 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
633 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
634 |
label: 'Heads' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
635 |
itemValue: hgHeads |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
636 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
637 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
638 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
639 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
640 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
641 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
642 |
label: 'Update' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
643 |
itemValue: hgUpdate |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
644 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
645 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
646 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
647 |
label: 'Revert' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
648 |
itemValue: hgRevert |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
649 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
650 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
651 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
652 |
label: 'Revert all Changes' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
653 |
itemValue: hgUpdateClean |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
654 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
655 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
656 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
657 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
658 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
659 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
660 |
label: 'Push' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
661 |
submenuChannel: hgMenuPush |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
662 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
663 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
664 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
665 |
label: 'Pull' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
666 |
submenuChannel: hgMenuPull |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
667 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
668 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
669 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
670 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
671 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
672 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
673 |
label: 'Merge...' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
674 |
submenuChannel: hgMenuMerge |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
675 |
labelImage: (ResourceRetriever HGIconLibrary merge 'Merge...') |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
676 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
677 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
678 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
679 |
label: 'Resolve' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
680 |
itemValue: hgResolve |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
681 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
682 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
683 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
684 |
label: 'Mark as Resolved' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
685 |
itemValue: hgResolveMark |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
686 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
687 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
688 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
689 |
label: 'Mark as Unresolved' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
690 |
itemValue: hgResolveUnmark |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
691 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
692 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
693 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
694 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
695 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
696 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
697 |
label: 'Show Conflicts' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
698 |
itemValue: hgResolveList |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
699 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
700 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
701 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
702 |
label: 'Show Unresolved' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
703 |
itemValue: hgResolveListUnresolved |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
704 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
705 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
706 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
707 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
708 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
709 |
enabled: hgCloneEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
710 |
label: 'Clone...' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
711 |
itemValue: hgClone |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
712 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
713 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
714 |
enabled: hgInitEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
715 |
label: 'Create...' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
716 |
itemValue: hgInit |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
717 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
718 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
719 |
label: '-' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
720 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
721 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
722 |
enabled: hasHGWorkingCopySelected |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
723 |
label: 'Edit Repository Config (.hg/hgrc)' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
724 |
itemValue: hgEditConfigRepository |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
725 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
726 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
727 |
label: 'Edit User Config (~/.hgrc)' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
728 |
itemValue: hgEditConfigUser |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
729 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
730 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
731 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
732 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
733 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
734 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
735 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
736 |
!Annotation class methodsFor:'instance creation'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
737 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
738 |
HGRevision: aString |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
739 |
"Used by Mercurial to internally store revision info. Should never appear in source code!!" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
740 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
741 |
^HGRevisionAnnotation revision: aString |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
742 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
743 |
"Created: / 20-11-2012 / 23:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
744 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
745 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
746 |
!ByteArray methodsFor:'converting'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
747 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
748 |
asHGChangesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
749 |
^ HGChangesetId fromBytes:self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
750 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
751 |
"Created: / 16-11-2012 / 21:33:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
752 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
753 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
754 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
755 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
756 |
hasHGSupport |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
757 |
"/ use Smalltalk-at to trick the dependency/prerequisite generator |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
758 |
^ (Smalltalk at: #'HGSourceCodeManager' ifAbsent:nil) notNil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
759 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
760 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
761 |
ConfigurableFeatures hasGitSupport |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
762 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
763 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
764 |
"Created: / 14-12-2012 / 15:38:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
765 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
766 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
767 |
!ConfigurableFeatures class methodsFor:'queries-features'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
768 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
769 |
hasHGSupportEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
770 |
^ self hasSCMSupportEnabledFor:#'HGSourceCodeManager' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
771 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
772 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
773 |
self hasGitSupportEnabled |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
774 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
775 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
776 |
"Created: / 14-12-2012 / 15:38:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
777 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
778 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
779 |
!Integer methodsFor:'converting'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
780 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
781 |
asHGChangesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
782 |
^ (HGChangesetId new:0) revno:self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
783 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
784 |
"Created: / 16-11-2012 / 21:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
785 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
786 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
787 |
!Object methodsFor:'converting'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
788 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
789 |
asHGChangesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
790 |
HGError |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
791 |
raiseErrorString:'Cannot convert arbitrary object to Mercurial nodeid' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
792 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
793 |
"Created: / 16-11-2012 / 21:23:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
794 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
795 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
796 |
!Object methodsFor:'converting'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
797 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
798 |
asHGRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
799 |
^self asHGChangesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
800 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
801 |
"Created: / 20-11-2012 / 23:32:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
802 |
"Modified: / 27-11-2012 / 17:56:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
803 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
804 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
805 |
!Object methodsFor:'testing'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
806 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
807 |
isHGChangeset |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
808 |
"Return true, if receiver is sort an Mercurial changeset." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
809 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
810 |
^false |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
811 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
812 |
"Created: / 01-02-2013 / 13:42:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
813 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
814 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
815 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
816 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
817 |
hgBinaryRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
818 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
819 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
820 |
Answers Mercurial revision from which the package was compiled. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
821 |
If no binary revision is available, returns nil." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
822 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
823 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
824 |
| revInfo | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
825 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
826 |
self binaryRevisionString notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
827 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
828 |
revInfo notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
829 |
^revInfo changesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
830 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
831 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
832 |
^nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
833 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
834 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
835 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
836 |
stx_libbasic hgBinaryRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
837 |
stx_libsvn hgBinaryRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
838 |
stx_libscm_mercurial hgBinaryRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
839 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
840 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
841 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
842 |
"Created: / 20-11-2012 / 23:58:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
843 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
844 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
845 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
846 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
847 |
hgEnsureCopyrightMethod |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
848 |
"If true, then #copyright method is automatically compiled in each class |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
849 |
(but iff project definition defines it) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
850 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
851 |
Default is true (compile such method) but if the repository is mirror of CVS and |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
852 |
you want to merge back to CVS at some point, you may want to not compile them |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
853 |
to keep changes against CVS minimal" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
854 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
855 |
^true "default" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
856 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
857 |
"Created: / 09-10-2013 / 11:48:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
858 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
859 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
860 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
861 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
862 |
hgEnsureVersion_HGMethod |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
863 |
"If true, then #version_HG method is automatically compiled in each class. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
864 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
865 |
Default is true (compile such method) but if the repository is mirror of CVS and |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
866 |
you want to merge back to CVS at some point, you may want to not compile them |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
867 |
to keep changes against CVS minimal. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
868 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
869 |
If false, version_HG is compiled only in classes that has been modified |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
870 |
and commited. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
871 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
872 |
Note that Mercurial can live without them |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
873 |
just fine" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
874 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
875 |
^true "default" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
876 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
877 |
"Created: / 09-10-2013 / 11:50:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
878 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
879 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
880 |
!ProjectDefinition class methodsFor:'accessing - hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
881 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
882 |
hgLogicalRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
883 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
884 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
885 |
Answers Mercurial revision on which is this package based on logically. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
886 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
887 |
Revision is computed as follows: |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
888 |
1) Look, if receiver's version_HG method has a (hidden) annotation HGRevision:, |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
889 |
if so, return its value. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
890 |
2) If receiver's binary revision is not nil, return it. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
891 |
3) Look into a package directory and if there is a Mercurial repository, |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
892 |
return working copy's revision" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
893 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
894 |
| versionMethod versionAnnotation revInfo pkgDir repoDir repo | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
895 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
896 |
"1 --- " |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
897 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
898 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
899 |
versionMethod notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
900 |
versionAnnotation := versionMethod annotationAt: #HGRevision:. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
901 |
versionAnnotation notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
902 |
^versionAnnotation revision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
903 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
904 |
] ifFalse:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
905 |
HGSourceCodeManager compileVersionMethod:HGSourceCodeManager nameOfVersionMethodInClasses of:self for:'$Changeset: <not expanded> $'. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
906 |
versionMethod := self class compiledMethodAt: HGSourceCodeManager nameOfVersionMethodInClasses. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
907 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
908 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
909 |
"2 --- " |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
910 |
self binaryRevisionString notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
911 |
revInfo := HGRevisionInfo readFrom: self binaryRevisionString onError:[nil]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
912 |
revInfo notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
913 |
^revInfo changesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
914 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
915 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
916 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
917 |
"3 --- " |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
918 |
pkgDir := Smalltalk getPackageDirectoryForPackage: self package. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
919 |
pkgDir notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
920 |
repoDir := HGRepository discover: pkgDir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
921 |
repoDir notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
922 |
| id | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
923 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
924 |
repo := HGRepository on: repoDir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
925 |
id := repo workingCopy changeset id. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
926 |
versionMethod annotateWith: (HGRevisionAnnotation revision: id). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
927 |
^id |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
928 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
929 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
930 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
931 |
"4 --- " |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
932 |
self breakPoint: #jv. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
933 |
^nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
934 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
935 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
936 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
937 |
stx_libbasic hgLogicalRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
938 |
stx_libsvn hgLogicalRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
939 |
stx_libscm_mercurial hgLogicalRevision |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
940 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
941 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
942 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
943 |
"Created: / 20-11-2012 / 23:54:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
944 |
"Modified: / 14-01-2013 / 13:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
945 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
946 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
947 |
!ProjectDefinition class methodsFor:'description - actions - hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
948 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
949 |
hgPostLoad |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
950 |
"possibly update an version_HG" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
951 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
952 |
<postLoad> |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
953 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
954 |
| dir repo versionMethod | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
955 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
956 |
HGRepository notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
957 |
self binaryRevisionString isNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
958 |
dir := Smalltalk getPackageDirectoryForPackage: self package. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
959 |
dir notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
960 |
dir := HGRepository discover: dir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
961 |
dir notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
962 |
repo := HGRepository on: dir. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
963 |
versionMethod := HGSourceCodeManager ensureVersionMethodInClass: self package: self package. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
964 |
versionMethod annotateWith: |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
965 |
(HGRevisionAnnotation revision: repo workingCopy changesetId) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
966 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
967 |
] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
968 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
969 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
970 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
971 |
"Created: / 26-11-2012 / 13:06:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
972 |
"Modified: / 07-02-2014 / 10:59:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
973 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
974 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
975 |
!ProjectDefinition class methodsFor:'accessing - hg - settings'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
976 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
977 |
hgRemoveContainesForDeletedClasses |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
978 |
"If true, then containers for removed classes are __AUTOMATICALLY__ removed from the |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
979 |
repositoru. If false, obsolete containes are kept. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
980 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
981 |
Default is true (remove obsolete containers) but if the repository is mirror of CVS and |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
982 |
you want to merge back to CVS at some point, you may want to return false to avoid deletions |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
983 |
of obsolete files. Usefull when branching off an old CVS repo with loads of mess." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
984 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
985 |
^true "default" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
986 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
987 |
"Created: / 21-05-2013 / 16:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
988 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
989 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
990 |
!String methodsFor:'converting'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
991 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
992 |
asHGChangesetId |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
993 |
^ HGChangesetId fromString:self. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
994 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
995 |
"Created: / 16-11-2012 / 21:24:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
996 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
997 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
998 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
999 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1000 |
commonMenuHGBrowseTemporaryWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1001 |
self selectedProjectsForHG value do:[:package| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1002 |
| pkg | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1003 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1004 |
pkg := HGPackageModel named: package. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1005 |
pkg notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1006 |
pkg temporaryWorkingCopy browse |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1007 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1008 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1009 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1010 |
"Created: / 11-01-2013 / 18:47:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1011 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1012 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1013 |
!Tools::NewSystemBrowser methodsFor:'menu actions-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1014 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1015 |
commonMenuHGBrowseWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1016 |
self selectedProjectsForHG value do:[:package| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1017 |
| pkg | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1018 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1019 |
pkg := HGPackageModel named: package. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1020 |
pkg notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1021 |
pkg repository workingCopy browse |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1022 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1023 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1024 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1025 |
"Modified: / 14-12-2012 / 17:51:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1026 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1027 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1028 |
!Tools::NewSystemBrowser methodsFor:'menus-dynamic-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1029 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1030 |
commonMenuHGPushSlice |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1031 |
| menu push submenu packages package remotes default | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1032 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1033 |
menu := Menu new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1034 |
push := MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1035 |
label: (resources string: 'Push...'); |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1036 |
yourself. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1037 |
menu addItem: push. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1038 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1039 |
packages := self selectedProjectsForHG value collect:[:id|HGPackageModel named:id string]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1040 |
((packages size ~~ 1) or:[packages anElement isNil]) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1041 |
push enabled: false. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1042 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1043 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1044 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1045 |
package := packages anElement. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1046 |
remotes := package repository remotes. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1047 |
remotes isEmpty ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1048 |
push enabled: false. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1049 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1050 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1051 |
"/ default := package repository remoteDefault. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1052 |
"/ default notNil ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1053 |
"/ menu addItem: (MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1054 |
"/ label:((resources string: 'Push to ') , 'default' asText allBold); |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1055 |
"/ value:[package repository push: default]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1056 |
"/ yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1057 |
"/ ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1058 |
(remotes size ~~ 1 or:[remotes anElement ~~ default]) ifTrue:[ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1059 |
submenu := Menu new. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1060 |
push submenu: submenu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1061 |
remotes do:[:remote| |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1062 |
submenu addItem: (MenuItem new |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1063 |
label: remote displayString; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1064 |
value:[package repository push: remote]; |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1065 |
yourself). |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1066 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1067 |
]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1068 |
^menu. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1069 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1070 |
"Created: / 10-12-2012 / 03:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1071 |
"Modified: / 11-04-2013 / 13:40:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1072 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1073 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1074 |
!Tools::NewSystemBrowser methodsFor:'aspects-navigation-hg'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1075 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1076 |
selectedProjectsForHG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1077 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1078 |
self selectedProjects value notNil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1079 |
ifTrue:[^self selectedProjects value]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1080 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1081 |
self selectedClasses value notNil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1082 |
ifTrue:[^(self selectedClasses value collect:[:cls|cls package]) asSet]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1083 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1084 |
^nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1085 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1086 |
"Created: / 10-12-2012 / 03:58:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1087 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1088 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1089 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-SCM-class'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1090 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1091 |
classMenuSCMExtra_HG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1092 |
"This resource specification was automatically generated |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1093 |
by the MenuEditor of ST/X." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1094 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1095 |
"Do not manually edit this!! If it is corrupted, |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1096 |
the MenuEditor may not be able to read the specification." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1097 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1098 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1099 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1100 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#classMenuSCMExtra_HG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1101 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser classMenuSCMExtra_HG)) startUp |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1102 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1103 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1104 |
<resource: #menu> |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1105 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1106 |
^ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1107 |
#(Menu |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1108 |
( |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1109 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1110 |
label: 'Push Slice' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1111 |
submenuChannel: commonMenuHGPushSlice |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1112 |
isMenuSlice: true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1113 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1114 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1115 |
label: 'Browse package working copy' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1116 |
itemValue: commonMenuHGBrowseWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1117 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1118 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1119 |
label: 'Browse temporary working copy (for commits & merges)' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1120 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1121 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1122 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1123 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1124 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1125 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1126 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1127 |
"Modified: / 14-12-2012 / 18:05:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1128 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1129 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1130 |
!Tools::NewSystemBrowser class methodsFor:'menu specs-SCM-project'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1131 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1132 |
projectMenuSCMExtra_HG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1133 |
"This resource specification was automatically generated |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1134 |
by the MenuEditor of ST/X." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1135 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1136 |
"Do not manually edit this!! If it is corrupted, |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1137 |
the MenuEditor may not be able to read the specification." |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1138 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1139 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1140 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1141 |
MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#projectMenuSCMExtra_HG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1142 |
(Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser projectMenuSCMExtra_HG)) startUp |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1143 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1144 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1145 |
<resource: #menu> |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1146 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1147 |
^ |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1148 |
#(Menu |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1149 |
( |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1150 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1151 |
label: 'Push Slice' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1152 |
submenuChannel: commonMenuHGPushSlice |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1153 |
isMenuSlice: true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1154 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1155 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1156 |
label: 'Browse package working copy' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1157 |
itemValue: commonMenuHGBrowseWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1158 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1159 |
(MenuItem |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1160 |
label: 'Browse temporary working copy (for commits & merges)' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1161 |
itemValue: commonMenuHGBrowseTemporaryWorkingCopy |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1162 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1163 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1164 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1165 |
nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1166 |
) |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1167 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1168 |
"Modified: / 14-12-2012 / 18:05:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1169 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1170 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1171 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1172 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1173 |
hgAutopush |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1174 |
"Return true, if changes should be automatically pushed |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1175 |
to an upstream repository (autopush), false otherwise" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1176 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1177 |
^self at: #hgAutopush ifAbsent:[ false "or true?" ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1178 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1179 |
"Created: / 10-12-2012 / 01:23:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1180 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1181 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1182 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1183 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1184 |
hgAutopush: aBoolean |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1185 |
"Set whether changes should be automatically pushed |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1186 |
to an upstream repository (autopush)" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1187 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1188 |
^self at: #hgAutopush put: aBoolean. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1189 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1190 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1191 |
UserPreferences current hgAutopush |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1192 |
UserPreferences current hgAutopush: true |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1193 |
UserPreferences current hgAutopush: false |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1194 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1195 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1196 |
"Created: / 10-12-2012 / 01:24:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1197 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1198 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1199 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1200 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1201 |
hgCommand |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1202 |
"Returns path svn executable" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1203 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1204 |
| cmd | |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1205 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1206 |
cmd := self at:#hgCommand ifAbsent:[ nil ]. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1207 |
^cmd isEmptyOrNil ifTrue:[ nil ] ifFalse:[ cmd ] |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1208 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1209 |
"Created: / 19-11-2012 / 21:39:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1210 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1211 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1212 |
!UserPreferences methodsFor:'accessing-scm-mercurial'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1213 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1214 |
hgCommand: aString |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1215 |
"Set the command to 'hg' executable" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1216 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1217 |
self at:#hgCommand put: aString. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1218 |
HGCommand hgCommand: aString. |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1219 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1220 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1221 |
UserPreferences current hgCommand |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1222 |
UserPreferences current hgCommand:'hg' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1223 |
UserPreferences current hgCommand:nil |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1224 |
" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1225 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1226 |
"Created: / 19-11-2012 / 21:39:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1227 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1228 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1229 |
!stx_libscm_mercurial class methodsFor:'documentation'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1230 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1231 |
extensionsVersion_HG |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1232 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1233 |
^ '$Changeset: <not expanded> $' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1234 |
! ! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1235 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1236 |
!stx_libscm_mercurial class methodsFor:'documentation'! |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1237 |
|
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1238 |
extensionsVersion_CVS |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1239 |
^ '$Header: /cvs/stx/stx/libscm/mercurial/extensions.st.orig,v 1.1 2015-01-16 14:42:08 vrany Exp $' |
61df05330245
Merged with mercurial revision ad2f5647305 (120 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff
changeset
|
1240 |
! ! |