/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/frontend/gtk/commit.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-07-21 18:18:20 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060721181820-450b5e29bb2614d9
2006-07-21  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/olive.glade: some UI refreshment (push, remove and commit dialog)
    * olive/frontend/gtk/push.py: implemented 'push' functionality
    * olive/frontend/gtk/commit.py: implemented 'commit' functionality
    * olive/frontend/gtk/remove.py: implemented 'remove' functionality
    * olive/frontend/gtk/add.py: implemented 'add' functionality
    * olive/frontend/gtk/handler.py: implemented 'init' functionality
    * olive/backend/fileops.py: added recursive mode to add(), added
      NotBranchError exception to add() and remove()

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
 
2
 
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
 
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
 
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import sys
 
18
 
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
except:
 
28
    sys.exit(1)
 
29
 
 
30
import olive.backend.commit as commit
 
31
import olive.backend.errors as errors
 
32
 
 
33
class OliveCommit:
 
34
    """ Display Commit dialog and perform the needed actions. """
 
35
    def __init__(self, gladefile, comm):
 
36
        """ Initialize the Commit dialog. """
 
37
        self.gladefile = gladefile
 
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_commit')
 
39
        
 
40
        self.comm = comm
 
41
        
 
42
        self.window = self.glade.get_widget('window_commit')
 
43
        
 
44
        # Dictionary for signal_autoconnect
 
45
        dic = { "on_button_commit_commit_clicked": self.commit,
 
46
                "on_button_commit_cancel_clicked": self.close }
 
47
        
 
48
        # Connect the signals to the handlers
 
49
        self.glade.signal_autoconnect(dic)
 
50
    
 
51
    def display(self):
 
52
        """ Display the Push dialog. """
 
53
        self.window.show_all()
 
54
    
 
55
    def commit(self, widget):
 
56
        from dialog import OliveDialog
 
57
        dialog = OliveDialog(self.gladefile)
 
58
        
 
59
        textview = self.glade.get_widget('textview_commit')
 
60
        textbuffer = textview.get_buffer()
 
61
        start, end = textbuffer.get_bounds()
 
62
        message = textbuffer.get_text(start, end)
 
63
        
 
64
        checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
 
65
        checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
 
66
        checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
 
67
        
 
68
        try:
 
69
            commit.commit([self.comm.get_path()], message, None,
 
70
                          checkbutton_force.get_active(),
 
71
                          checkbutton_strict.get_active(),
 
72
                          checkbutton_local.get_active())
 
73
        except errors.NotBranchError:
 
74
            dialog.error_dialog('Directory is not a branch.')
 
75
            return
 
76
        except errors.LocalRequiresBoundBranch:
 
77
            dialog.error_dialog('Local commit requires a bound branch.')
 
78
            return
 
79
        except errors.EmptyMessageError:
 
80
            dialog.error_dialog('Commit message is empty.')
 
81
            return
 
82
        except errors.NoChangesToCommitError:
 
83
            dialog.error_dialog('No changes to commit. Try force commit.')
 
84
            return
 
85
        except errors.ConflictsInTreeError:
 
86
            dialog.error_dialog('Conflicts in tree. Please resolve them first.')
 
87
            return
 
88
        except errors.StrictCommitError:
 
89
            dialog.error_dialog('Strict commit failed. There are unknown files.')
 
90
            return
 
91
        except errors.BoundBranchOutOfDate, errmsg:
 
92
            dialog.error_dialog('Bound branch is out of date: %s' % errmsg)
 
93
            return
 
94
        except:
 
95
            raise
 
96
        
 
97
        self.close()
 
98
        self.comm.refresh_right()
 
99
        
 
100
    def close(self, widget=None):
 
101
        self.window.destroy()