/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

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
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
try:
 
19
    import pygtk
 
20
    pygtk.require("2.0")
 
21
except:
 
22
    pass
 
23
    
 
24
import gtk
 
25
 
 
26
from errors import show_bzr_error
 
27
 
 
28
# FIXME: This needs to be public JRV 20070714
 
29
from bzrlib.builtins import _create_prefix
 
30
from bzrlib.config import LocationConfig
 
31
import bzrlib.errors as errors
 
32
 
 
33
from bzrlib.plugins.gtk import _i18n
 
34
from dialog import error_dialog, info_dialog, question_dialog
 
35
 
 
36
from history import UrlHistory
 
37
 
 
38
class PushDialog(gtk.Dialog):
 
39
    """ New implementation of the Push dialog. """
 
40
    def __init__(self, repository, revid, branch=None, parent=None):
 
41
        """ Initialize the Push dialog. """
 
42
        gtk.Dialog.__init__(self, title="Push - Olive",
 
43
                                  parent=parent,
 
44
                                  flags=0,
 
45
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
46
        
 
47
        # Get arguments
 
48
        self.repository = repository
 
49
        self.revid = revid
 
50
        self.branch = branch
 
51
        
 
52
        # Create the widgets
 
53
        self._label_location = gtk.Label(_i18n("Location:"))
 
54
        self._combo = gtk.ComboBoxEntry()
 
55
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
 
56
        self._hbox_location = gtk.HBox()
 
57
        
 
58
        # Set callbacks
 
59
        self._button_push.connect('clicked', self._on_push_clicked)
 
60
        
 
61
        # Set properties
 
62
        self._label_location.set_alignment(0, 0.5)
 
63
        self._hbox_location.set_spacing(3)
 
64
        self.vbox.set_spacing(3)
 
65
        
 
66
        # Pack widgets
 
67
        self._hbox_location.pack_start(self._label_location, False, False)
 
68
        self._hbox_location.pack_start(self._combo, True, True)
 
69
        self.vbox.pack_start(self._hbox_location)
 
70
        self.action_area.pack_end(self._button_push)
 
71
        
 
72
        # Show the dialog
 
73
        self.vbox.show_all()
 
74
        
 
75
        # Build location history
 
76
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
77
        self._build_history()
 
78
        
 
79
    def _build_history(self):
 
80
        """ Build up the location history. """
 
81
        self._combo_model = gtk.ListStore(str)
 
82
        for item in self._history.get_entries():
 
83
            self._combo_model.append([ item ])
 
84
        self._combo.set_model(self._combo_model)
 
85
        self._combo.set_text_column(0)
 
86
        
 
87
        if self.branch is not None:
 
88
            location = self.branch.get_push_location()
 
89
            if location is not None:
 
90
                self._combo.get_child().set_text(location)
 
91
    
 
92
    @show_bzr_error
 
93
    def _on_push_clicked(self, widget):
 
94
        """ Push button clicked handler. """
 
95
        location = self._combo.get_child().get_text()
 
96
        revs = 0
 
97
        
 
98
        try:
 
99
            revs = do_push(self.branch, location=location, overwrite=False)
 
100
        except errors.DivergedBranches:
 
101
            response = question_dialog(_i18n('Branches have been diverged'),
 
102
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
 
103
            if response == gtk.RESPONSE_YES:
 
104
                revs = do_push(self.branch, location=location, overwrite=True)
 
105
        
 
106
        if self.branch is not None and self.branch.get_push_location() is None:
 
107
            self.branch.set_push_location(location)
 
108
        
 
109
        self._history.add_entry(location)
 
110
        info_dialog(_i18n('Push successful'),
 
111
                    _i18n("%d revision(s) pushed.") % revs)
 
112
        
 
113
        self.response(gtk.RESPONSE_OK)
 
114
 
 
115
def do_push(br_from, location, overwrite):
 
116
    """ Update a mirror of a branch.
 
117
    
 
118
    :param br_from: the source branch
 
119
    
 
120
    :param location: the location of the branch that you'd like to update
 
121
    
 
122
    :param overwrite: overwrite target location if it diverged
 
123
    
 
124
    :return: number of revisions pushed
 
125
    """
 
126
    from bzrlib.bzrdir import BzrDir
 
127
    from bzrlib.transport import get_transport
 
128
        
 
129
    transport = get_transport(location)
 
130
    location_url = transport.base
 
131
 
 
132
    old_rh = []
 
133
 
 
134
    try:
 
135
        dir_to = BzrDir.open(location_url)
 
136
        br_to = dir_to.open_branch()
 
137
    except errors.NotBranchError:
 
138
        # create a branch.
 
139
        transport = transport.clone('..')
 
140
        try:
 
141
            relurl = transport.relpath(location_url)
 
142
            transport.mkdir(relurl)
 
143
        except errors.NoSuchFile:
 
144
            response = question_dialog(_i18n('Non existing parent directory'),
 
145
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
 
146
            if response == gtk.RESPONSE_OK:
 
147
                _create_prefix(transport)
 
148
            else:
 
149
                return
 
150
        dir_to = br_from.bzrdir.clone(location_url,
 
151
            revision_id=br_from.last_revision())
 
152
        br_to = dir_to.open_branch()
 
153
        count = len(br_to.revision_history())
 
154
    else:
 
155
        old_rh = br_to.revision_history()
 
156
        try:
 
157
            tree_to = dir_to.open_workingtree()
 
158
        except errors.NotLocalUrl:
 
159
            # FIXME - what to do here? how should we warn the user?
 
160
            count = br_to.pull(br_from, overwrite)
 
161
        except errors.NoWorkingTree:
 
162
            count = br_to.pull(br_from, overwrite)
 
163
        else:
 
164
            count = tree_to.pull(br_from, overwrite)
 
165
 
 
166
    return count