bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
1  | 
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
 | 
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
2  | 
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
 | 
| 
0.8.46
by Szilveszter Farkas (Phanatic)
 Modified OliveDialog class interface; huge cleanups.  | 
3  | 
#
 | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
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.
 | 
|
| 
0.8.46
by Szilveszter Farkas (Phanatic)
 Modified OliveDialog class interface; huge cleanups.  | 
8  | 
#
 | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
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.
 | 
|
| 
0.8.46
by Szilveszter Farkas (Phanatic)
 Modified OliveDialog class interface; huge cleanups.  | 
13  | 
#
 | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
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
 | 
|
| 
0.13.13
by Jelmer Vernooij
 Update TODO  | 
23  | 
|
| 
0.13.10
by Jelmer Vernooij
 Don't pass around gladefile all the time.  | 
24  | 
import gtk  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
25  | 
|
26  | 
from errors import show_bzr_error  | 
|
27  | 
||
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
28  | 
# FIXME: This needs to be public JRV 20070714
 | 
29  | 
from bzrlib.builtins import _create_prefix  | 
|
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
30  | 
from bzrlib.config import LocationConfig  | 
| 
0.11.1
by Jelmer Vernooij
 Eliminate olive.backend.errors.  | 
31  | 
import bzrlib.errors as errors  | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
32  | 
|
| 
153
by Jelmer Vernooij
 Fix references to dialog.  | 
33  | 
from dialog import error_dialog, info_dialog, question_dialog  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
34  | 
|
| 
154
by Jelmer Vernooij
 Add trivial generic class for storing URL history.  | 
35  | 
from history import UrlHistory  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
36  | 
|
37  | 
class PushDialog(gtk.Dialog):  | 
|
38  | 
""" New implementation of the Push dialog. """  | 
|
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
39  | 
def __init__(self, repository, revid, branch=None, parent=None):  | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
40  | 
""" Initialize the Push dialog. """  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
41  | 
gtk.Dialog.__init__(self, title="Push - Olive",  | 
42  | 
parent=parent,  | 
|
43  | 
flags=0,  | 
|
44  | 
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))  | 
|
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
45  | 
|
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
46  | 
        # Get arguments
 | 
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
47  | 
self.repository = repository  | 
48  | 
self.revid = revid  | 
|
| 
0.13.13
by Jelmer Vernooij
 Update TODO  | 
49  | 
self.branch = branch  | 
| 
0.8.19
by Szilveszter Farkas (Phanatic)
 2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>  | 
50  | 
|
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
51  | 
        # Create the widgets
 | 
52  | 
self._label_location = gtk.Label(_("Location:"))  | 
|
53  | 
self._combo = gtk.ComboBoxEntry()  | 
|
54  | 
self._button_push = gtk.Button(_("_Push"), use_underline=True)  | 
|
55  | 
self._hbox_location = gtk.HBox()  | 
|
56  | 
||
57  | 
        # Set callbacks
 | 
|
58  | 
self._button_push.connect('clicked', self._on_push_clicked)  | 
|
59  | 
||
60  | 
        # Set properties
 | 
|
61  | 
self._label_location.set_alignment(0, 0.5)  | 
|
62  | 
self._hbox_location.set_spacing(3)  | 
|
63  | 
self.vbox.set_spacing(3)  | 
|
64  | 
||
65  | 
        # Pack widgets
 | 
|
66  | 
self._hbox_location.pack_start(self._label_location, False, False)  | 
|
67  | 
self._hbox_location.pack_start(self._combo, True, True)  | 
|
68  | 
self.vbox.pack_start(self._hbox_location)  | 
|
69  | 
self.action_area.pack_end(self._button_push)  | 
|
70  | 
||
71  | 
        # Show the dialog
 | 
|
72  | 
self.vbox.show_all()  | 
|
73  | 
||
74  | 
        # Build location history
 | 
|
| 
154
by Jelmer Vernooij
 Add trivial generic class for storing URL history.  | 
75  | 
self._history = UrlHistory(self.branch.get_config(), 'push_history')  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
76  | 
self._build_history()  | 
77  | 
||
78  | 
def _build_history(self):  | 
|
79  | 
""" Build up the location history. """  | 
|
| 
154
by Jelmer Vernooij
 Add trivial generic class for storing URL history.  | 
80  | 
self._combo_model = gtk.ListStore(str)  | 
81  | 
for item in self._history.get_entries():  | 
|
82  | 
self._combo_model.append([ item ])  | 
|
83  | 
self._combo.set_model(self._combo_model)  | 
|
84  | 
self._combo.set_text_column(0)  | 
|
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
85  | 
|
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
86  | 
if self.branch is not None:  | 
87  | 
location = self.branch.get_push_location()  | 
|
88  | 
if location is not None:  | 
|
89  | 
self._combo.get_child().set_text(location)  | 
|
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
90  | 
|
91  | 
    @show_bzr_error
 | 
|
92  | 
def _on_push_clicked(self, widget):  | 
|
93  | 
""" Push button clicked handler. """  | 
|
94  | 
location = self._combo.get_child().get_text()  | 
|
95  | 
revs = 0  | 
|
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
96  | 
if self.branch is not None and self.branch.get_push_location() is None:  | 
97  | 
response = question_dialog(_('Set default push location'),  | 
|
98  | 
_('There is no default push location set.\nSet %r as default now?') % location)  | 
|
99  | 
if response == gtk.REPONSE_OK:  | 
|
100  | 
self.branch.set_push_location(location)  | 
|
101  | 
||
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
102  | 
try:  | 
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
103  | 
revs = do_push(self.branch, location=location, overwrite=False)  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
104  | 
except errors.DivergedBranches:  | 
105  | 
response = question_dialog(_('Branches have been diverged'),  | 
|
106  | 
_('You cannot push if branches have diverged.\nOverwrite?'))  | 
|
107  | 
if response == gtk.RESPONSE_OK:  | 
|
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
108  | 
revs = do_push(self.branch, location=location, overwrite=True)  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
109  | 
            return
 | 
110  | 
||
| 
154
by Jelmer Vernooij
 Add trivial generic class for storing URL history.  | 
111  | 
self._history.add_entry(location)  | 
| 
126.1.19
by Szilveszter Farkas (Phanatic)
 Refactored the Push dialog. Add 'gpush' command.  | 
112  | 
info_dialog(_('Push successful'),  | 
113  | 
_("%d revision(s) pushed.") % revs)  | 
|
114  | 
||
115  | 
self.response(gtk.RESPONSE_OK)  | 
|
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
116  | 
|
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
117  | 
def do_push(br_from, location, overwrite):  | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
118  | 
""" Update a mirror of a branch.  | 
119  | 
    
 | 
|
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
120  | 
    :param br_from: the source branch
 | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
121  | 
    
 | 
122  | 
    :param location: the location of the branch that you'd like to update
 | 
|
123  | 
    
 | 
|
124  | 
    :param overwrite: overwrite target location if it diverged
 | 
|
125  | 
    
 | 
|
126  | 
    :return: number of revisions pushed
 | 
|
127  | 
    """
 | 
|
| 
0.8.85
by Szilveszter Farkas (Phanatic)
 Fix Push functionality.  | 
128  | 
from bzrlib.bzrdir import BzrDir  | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
129  | 
from bzrlib.transport import get_transport  | 
130  | 
||
131  | 
transport = get_transport(location)  | 
|
132  | 
location_url = transport.base  | 
|
133  | 
||
134  | 
old_rh = []  | 
|
135  | 
||
136  | 
try:  | 
|
| 
0.8.85
by Szilveszter Farkas (Phanatic)
 Fix Push functionality.  | 
137  | 
dir_to = BzrDir.open(location_url)  | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
138  | 
br_to = dir_to.open_branch()  | 
| 
0.8.85
by Szilveszter Farkas (Phanatic)
 Fix Push functionality.  | 
139  | 
except errors.NotBranchError:  | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
140  | 
        # create a branch.
 | 
141  | 
transport = transport.clone('..')  | 
|
| 
228
by Jelmer Vernooij
 Remove unused code, prefer questions to check boxes.  | 
142  | 
try:  | 
143  | 
relurl = transport.relpath(location_url)  | 
|
144  | 
transport.mkdir(relurl)  | 
|
145  | 
except errors.NoSuchFile:  | 
|
146  | 
response = question_dialog(_('Non existing parent directory'),  | 
|
147  | 
_("The parent directory (%s)\ndoesn't exist. Create?") % location)  | 
|
148  | 
if response == gtk.RESPONSE_OK:  | 
|
149  | 
_create_prefix(transport)  | 
|
150  | 
else:  | 
|
| 
0.8.85
by Szilveszter Farkas (Phanatic)
 Fix Push functionality.  | 
151  | 
                return
 | 
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
152  | 
dir_to = br_from.bzrdir.clone(location_url,  | 
153  | 
revision_id=br_from.last_revision())  | 
|
154  | 
br_to = dir_to.open_branch()  | 
|
155  | 
count = len(br_to.revision_history())  | 
|
156  | 
else:  | 
|
157  | 
old_rh = br_to.revision_history()  | 
|
158  | 
try:  | 
|
| 
0.13.13
by Jelmer Vernooij
 Update TODO  | 
159  | 
tree_to = dir_to.open_workingtree()  | 
160  | 
except errors.NotLocalUrl:  | 
|
161  | 
            # FIXME - what to do here? how should we warn the user?
 | 
|
162  | 
count = br_to.pull(br_from, overwrite)  | 
|
163  | 
except errors.NoWorkingTree:  | 
|
164  | 
count = br_to.pull(br_from, overwrite)  | 
|
165  | 
else:  | 
|
166  | 
count = tree_to.pull(br_from, overwrite)  | 
|
167  | 
||
| 
0.11.9
by Jelmer Vernooij
 Remove last few bits from backend and integrate them where necessary.  | 
168  | 
return count  |