/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 push.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-11 23:00:17 UTC
  • mfrom: (719.1.3 bzr-gtk)
  • Revision ID: jelmer@canonical.com-20110311230017-yexxy58qe5f8fegx
Merge translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
20
20
    pygtk.require("2.0")
21
21
except:
22
22
    pass
23
 
 
 
23
    
24
24
import gtk
25
25
 
26
26
from errors import show_bzr_error
27
27
 
 
28
from bzrlib.config import LocationConfig
28
29
import bzrlib.errors as errors
29
30
 
30
 
from bzrlib.plugins.gtk.dialog import (
31
 
    info_dialog,
32
 
    question_dialog,
33
 
    )
34
 
 
35
 
from bzrlib.plugins.gtk.history import UrlHistory
36
 
from bzrlib.plugins.gtk.i18n import _i18n
37
 
 
 
31
from bzrlib.plugins.gtk import _i18n
 
32
from dialog import error_dialog, info_dialog, question_dialog
 
33
 
 
34
from history import UrlHistory
38
35
 
39
36
class PushDialog(gtk.Dialog):
40
 
    """New implementation of the Push dialog."""
41
 
 
 
37
    """ New implementation of the Push dialog. """
42
38
    def __init__(self, repository, revid, branch=None, parent=None):
43
 
        """Initialize the Push dialog. """
44
 
        gtk.Dialog.__init__(self, title="Push",
 
39
        """ Initialize the Push dialog. """
 
40
        gtk.Dialog.__init__(self, title="Push - Olive",
45
41
                                  parent=parent,
46
42
                                  flags=0,
47
43
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
48
 
 
 
44
        
49
45
        # Get arguments
50
46
        self.repository = repository
51
47
        self.revid = revid
52
48
        self.branch = branch
53
 
 
 
49
        
54
50
        # Create the widgets
55
51
        self._label_location = gtk.Label(_i18n("Location:"))
56
52
        self._combo = gtk.ComboBoxEntry()
57
53
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
58
54
        self._hbox_location = gtk.HBox()
59
 
 
 
55
        
60
56
        # Set callbacks
61
57
        self._button_push.connect('clicked', self._on_push_clicked)
62
 
 
 
58
        
63
59
        # Set properties
64
60
        self._label_location.set_alignment(0, 0.5)
65
61
        self._hbox_location.set_spacing(3)
66
62
        self.vbox.set_spacing(3)
67
 
 
 
63
        
68
64
        # Pack widgets
69
65
        self._hbox_location.pack_start(self._label_location, False, False)
70
66
        self._hbox_location.pack_start(self._combo, True, True)
71
67
        self.vbox.pack_start(self._hbox_location)
72
68
        self.action_area.pack_end(self._button_push)
73
 
 
 
69
        
74
70
        # Show the dialog
75
71
        self.vbox.show_all()
76
 
 
 
72
        
77
73
        # Build location history
78
74
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
79
75
        self._build_history()
80
 
 
 
76
        
81
77
    def _build_history(self):
82
 
        """Build up the location history. """
 
78
        """ Build up the location history. """
83
79
        self._combo_model = gtk.ListStore(str)
84
80
        for item in self._history.get_entries():
85
81
            self._combo_model.append([ item ])
86
82
        self._combo.set_model(self._combo_model)
87
83
        self._combo.set_text_column(0)
88
 
 
 
84
        
89
85
        if self.branch is not None:
90
86
            location = self.branch.get_push_location()
91
87
            if location is not None:
92
88
                self._combo.get_child().set_text(location)
93
 
 
 
89
    
94
90
    @show_bzr_error
95
91
    def _on_push_clicked(self, widget):
96
 
        """Push button clicked handler. """
 
92
        """ Push button clicked handler. """
97
93
        location = self._combo.get_child().get_text()
98
94
        revs = 0
99
 
 
 
95
        
100
96
        try:
101
97
            revs = do_push(self.branch, location=location, overwrite=False)
102
98
        except errors.DivergedBranches:
104
100
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
105
101
            if response == gtk.RESPONSE_YES:
106
102
                revs = do_push(self.branch, location=location, overwrite=True)
107
 
 
 
103
        
108
104
        if self.branch is not None and self.branch.get_push_location() is None:
109
105
            self.branch.set_push_location(location)
110
 
 
 
106
        
111
107
        self._history.add_entry(location)
112
108
        info_dialog(_i18n('Push successful'),
113
109
                    _i18n("%d revision(s) pushed.") % revs)
114
 
 
 
110
        
115
111
        self.response(gtk.RESPONSE_OK)
116
112
 
117
 
 
118
113
def do_push(br_from, location, overwrite):
119
 
    """Update a mirror of a branch.
120
 
 
 
114
    """ Update a mirror of a branch.
 
115
    
121
116
    :param br_from: the source branch
 
117
    
122
118
    :param location: the location of the branch that you'd like to update
 
119
    
123
120
    :param overwrite: overwrite target location if it diverged
 
121
    
124
122
    :return: number of revisions pushed
125
123
    """
126
124
    from bzrlib.bzrdir import BzrDir
127
125
    from bzrlib.transport import get_transport
128
 
 
 
126
        
129
127
    transport = get_transport(location)
130
128
    location_url = transport.base
131
129