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