/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-14 20:12:19 UTC
  • Revision ID: jelmer@samba.org-20110314201219-wo692nzwywu6mevh
Fix formatting, imports.

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