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