/b-gtk/fix-viz : revision 231

1

2

3

#

3

4

# This program is free software; you can redistribute it and/or modify

4

5

# it under the terms of the GNU General Public License as published by

24

25

26

from errors import show_bzr_error

26

27

28

# FIXME: This needs to be public JRV 20070714

29

from bzrlib.builtins import _create_prefix

27

30

from bzrlib.config import LocationConfig

28

31

import bzrlib.errors as errors

29

32

33

36

34

37

class PushDialog(gtk.Dialog):

35

38

""" New implementation of the Push dialog. """

36

def __init__(self, branch, parent=None):

39

def __init__(self, repository, revid, branch=None, parent=None):

37

40

""" Initialize the Push dialog. """

38

41

gtk.Dialog.__init__(self, title="Push - Olive",

39

42

parent=parent,

41

44

buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))

42

45

43

46

# Get arguments

47

self.repository = repository

48

self.revid = revid

44

49

self.branch = branch

45

50

46

51

# Create the widgets

47

52

self._label_location = gtk.Label(_("Location:"))

48

53

self._label_test = gtk.Label(_("(click the Test button to check write access)"))

49

self._check_remember = gtk.CheckButton(_("_Remember as default location"),

50

use_underline=True)

51

self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),

52

use_underline=True)

53

self._check_overwrite = gtk.CheckButton(_("_Overwrite target if diverged"),

54

use_underline=True)

55

54

self._combo = gtk.ComboBoxEntry()

56

55

self._button_test = gtk.Button(_("_Test"), use_underline=True)

57

56

self._button_push = gtk.Button(_("_Push"), use_underline=True)

77

76

self._hbox_test.pack_start(self._image_test, False, False)

78

77

self._hbox_test.pack_start(self._label_test, True, True)

79

78

self.vbox.pack_start(self._hbox_location)

80

self.vbox.pack_start(self._check_remember)

81

self.vbox.pack_start(self._check_prefix)

82

self.vbox.pack_start(self._check_overwrite)

83

79

self.vbox.pack_start(self._hbox_test)

84

80

self.action_area.pack_start(self._button_test)

85

81

self.action_area.pack_end(self._button_push)

99

95

self._combo.set_model(self._combo_model)

100

96

self._combo.set_text_column(0)

101

97

102

location = self.branch.get_push_location()

103

if location:

104

self._combo.get_child().set_text(location)

98

if self.branch is not None:

99

location = self.branch.get_push_location()

100

if location is not None:

101

self._combo.get_child().set_text(location)

105

102

106

103

def _on_test_clicked(self, widget):

107

104

""" Test button clicked handler. """

113

110

m = _urlRE.match(url)

114

111

if m:

115

112

proto = m.groupdict()['proto']

116

if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):

117

# have write acces (most probably)

113

# FIXME: This should ask the transport or branch rather than

114

# guessing using regular expressions. JRV 20070714

115

if proto in ('sftp', 'file', 'ftp'):

116

# have write access (most probably)

118

117

self._image_test.set_from_stock(gtk.STOCK_YES, 4)

119

118

self._label_test.set_markup(_('<b>Write access is probably available</b>'))

120

119

else:

131

130

""" Push button clicked handler. """

132

131

location = self._combo.get_child().get_text()

133

132

revs = 0

133

if self.branch is not None and self.branch.get_push_location() is None:

134

response = question_dialog(_('Set default push location'),

135

_('There is no default push location set.\nSet %r as default now?') % location)

136

if response == gtk.REPONSE_OK:

137

self.branch.set_push_location(location)

138

134

139

try:

135

revs = do_push(self.branch,

136

location=location,

137

overwrite=self._check_overwrite.get_active(),

138

remember=self._check_remember.get_active(),

139

create_prefix=self._check_prefix.get_active())

140

revs = do_push(self.branch, location=location, overwrite=False)

140

141

except errors.DivergedBranches:

141

142

response = question_dialog(_('Branches have been diverged'),

142

143

_('You cannot push if branches have diverged.\nOverwrite?'))

143

144

if response == gtk.RESPONSE_OK:

144

revs = do_push(self.branch, overwrite=True)

145

revs = do_push(self.branch, location=location, overwrite=True)

145

146

return

146

147

148

self._history.add_entry(location)

150

151

152

self.response(gtk.RESPONSE_OK)

152

153

def do_push(branch, location=None, remember=False, overwrite=False,

154

create_prefix=False):

154

def do_push(br_from, location, overwrite):

155

""" Update a mirror of a branch.

156

157

:param branch: the source branch

157

:param br_from: the source branch

158

159

:param location: the location of the branch that you'd like to update

160

161

:param remember: if set, the location will be stored

162

163

161

:param overwrite: overwrite target location if it diverged

164

162

165

:param create_prefix: create the path leading up to the branch if it doesn't exist

166

167

163

:return: number of revisions pushed

168

164

"""

169

165

from bzrlib.bzrdir import BzrDir

170

166

from bzrlib.transport import get_transport

171

167

172

br_from = branch

173

174

stored_loc = br_from.get_push_location()

175

if location is None:

176

if stored_loc is None:

177

error_dialog(_('Push location is unknown'),

178

_('Please specify a location manually.'))

179

return

180

else:

181

location = stored_loc

182

183

168

transport = get_transport(location)

184

169

location_url = transport.base

185

170

186

if br_from.get_push_location() is None or remember:

187

br_from.set_push_location(location_url)

188

189

171

old_rh = []

190

172

191

173

try:

194

176

except errors.NotBranchError:

195

177

# create a branch.

196

178

transport = transport.clone('..')

197

if not create_prefix:

198

try:

199

relurl = transport.relpath(location_url)

200

transport.mkdir(relurl)

201

except errors.NoSuchFile:

202

error_dialog(_('Non existing parent directory'),

203

_("The parent directory (%s)\ndoesn't exist.") % location)

179

try:

180

relurl = transport.relpath(location_url)

181

transport.mkdir(relurl)

182

except errors.NoSuchFile:

183

response = question_dialog(_('Non existing parent directory'),

184

_("The parent directory (%s)\ndoesn't exist. Create?") % location)

185

if response == gtk.RESPONSE_OK:

186

_create_prefix(transport)

187

else:

204

188

return

205

else:

206

current = transport.base

207

needed = [(transport, transport.relpath(location_url))]

208

while needed:

209

try:

210

transport, relpath = needed[-1]

211

transport.mkdir(relpath)

212

needed.pop()

213

except errors.NoSuchFile:

214

new_transport = transport.clone('..')

215

needed.append((new_transport,

216

new_transport.relpath(transport.base)))

217

if new_transport.base == transport.base:

218

error_dialog(_('Path prefix not created'),

219

_("The path leading up to the specified location couldn't\nbe created."))

220

return

221

189

dir_to = br_from.bzrdir.clone(location_url,

222

190

revision_id=br_from.last_revision())

223

191

br_to = dir_to.open_branch()

228

196

tree_to = dir_to.open_workingtree()

229

197

except errors.NotLocalUrl:

230

198

# FIXME - what to do here? how should we warn the user?

231

#warning('This transport does not update the working '

232

# 'tree of: %s' % (br_to.base,))

233

199

count = br_to.pull(br_from, overwrite)

234

200

except errors.NoWorkingTree:

235

201

count = br_to.pull(br_from, overwrite)