/b-gtk/fix-viz : revision 739.1.1

16

17

import re

18

19

from gi.repository import Gdk

20

from gi.repository import Gtk

21

from gi.repository import GObject

22

from gi.repository import Pango

19

try:

20

import pygtk

21

pygtk.require("2.0")

22

except:

23

pass

24

25

import gtk

26

import gobject

27

import pango

23

28

24

29

from bzrlib import (

25

bencode,

26

30

errors,

27

31

osutils,

28

revision as _mod_revision,

29

32

trace,

30

tsort,

31

33

)

34

try:

35

from bzrlib import bencode

36

except ImportError:

37

from bzrlib.util import bencode

38

32

39

from bzrlib.plugins.gtk.dialog import question_dialog

33

40

from bzrlib.plugins.gtk.errors import show_bzr_error

34

41

from bzrlib.plugins.gtk.i18n import _i18n

35

from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager

36

42

37

43

try:

38

44

import dbus

42

48

have_dbus = False

43

49

44

50

45

def _get_sorted_revisions(tip_revision, revision_ids, parent_map):

46

"""Get an iterator which will return the revisions in merge sorted order.

47

48

This will build up a list of all nodes, such that only nodes in the list

49

are referenced. It then uses MergeSorter to return them in 'merge-sorted'

50

order.

51

52

:param revision_ids: A set of revision_ids

53

:param parent_map: The parent information for each node. Revisions which

54

are considered ghosts should not be present in the map.

55

:return: iterator from MergeSorter.iter_topo_order()

56

"""

57

# MergeSorter requires that all nodes be present in the graph, so get rid

58

# of any references pointing outside of this graph.

59

parent_graph = {}

60

for revision_id in revision_ids:

61

if revision_id not in parent_map: # ghost

62

parent_graph[revision_id] = []

63

else:

64

# Only include parents which are in this sub-graph

65

parent_graph[revision_id] = [p for p in parent_map[revision_id]

66

if p in revision_ids]

67

sorter = tsort.MergeSorter(parent_graph, tip_revision)

68

return sorter.iter_topo_order()

69

70

71

51

def pending_revisions(wt):

72

52

"""Return a list of pending merges or None if there are none of them.

73

53

78

58

"""

79

59

parents = wt.get_parent_ids()

80

60

if len(parents) < 2:

81

return

61

return None

82

62

83

63

# The basic pending merge algorithm uses the same algorithm as

84

64

# bzrlib.status.show_pending_merges

86

66

branch = wt.branch

87

67

last_revision = parents[0]

88

68

89

graph = branch.repository.get_graph()

90

other_revisions = [last_revision]

69

if last_revision is not None:

70

try:

71

ignore = set(branch.repository.get_ancestry(last_revision,

72

topo_sorted=False))

73

except errors.NoSuchRevision:

74

# the last revision is a ghost : assume everything is new

75

# except for it

76

ignore = set([None, last_revision])

77

else:

78

ignore = set([None])

91

79

92

80

pm = []

93

81

for merge in pending:

94

try:

95

merge_rev = branch.repository.get_revision(merge)

96

except errors.NoSuchRevision:

97

# If we are missing a revision, just print out the revision id

98

trace.mutter("ghost: %r", merge)

99

other_revisions.append(merge)

100

continue

101

102

# Find all of the revisions in the merge source, which are not in the

103

# last committed revision.

104

merge_extra = graph.find_unique_ancestors(merge, other_revisions)

105

other_revisions.append(merge)

106

merge_extra.discard(_mod_revision.NULL_REVISION)

107

108

# Get a handle to all of the revisions we will need

109

try:

110

revisions = dict((rev.revision_id, rev) for rev in

111

branch.repository.get_revisions(merge_extra))

112

except errors.NoSuchRevision:

113

# One of the sub nodes is a ghost, check each one

114

revisions = {}

115

for revision_id in merge_extra:

116

try:

117

rev = branch.repository.get_revisions([revision_id])[0]

118

except errors.NoSuchRevision:

119

revisions[revision_id] = None

120

else:

121

revisions[revision_id] = rev

122

123

# Display the revisions brought in by this merge.

124

rev_id_iterator = _get_sorted_revisions(merge, merge_extra,

125

branch.repository.get_parent_map(merge_extra))

126

# Skip the first node

127

num, first, depth, eom = rev_id_iterator.next()

128

if first != merge:

129

raise AssertionError('Somehow we misunderstood how'

130

' iter_topo_order works %s != %s' % (first, merge))

131

children = []

132

for num, sub_merge, depth, eom in rev_id_iterator:

133

rev = revisions[sub_merge]

134

if rev is None:

135

trace.warning("ghost: %r", sub_merge)

136

continue

137

children.append(rev)

138

yield (merge_rev, children)

82

ignore.add(merge)

83

try:

84

rev = branch.repository.get_revision(merge)

85

children = []

86

pm.append((rev, children))

87

88

# This does need to be topo sorted, so we search backwards

89

inner_merges = branch.repository.get_ancestry(merge)

90

assert inner_merges[0] is None

91

inner_merges.pop(0)

92

for mmerge in reversed(inner_merges):

93

if mmerge in ignore:

94

continue

95

rev = branch.repository.get_revision(mmerge)

96

children.append(rev)

97

98

ignore.add(mmerge)

99

except errors.NoSuchRevision:

100

print "DEBUG: NoSuchRevision:", merge

101

102

return pm

139

103

140

104

141

105

_newline_variants_re = re.compile(r'\r\n?')

142

106

def _sanitize_and_decode_message(utf8_message):

143

107

"""Turn a utf-8 message into a sanitized Unicode message."""

144

108

fixed_newline = _newline_variants_re.sub('\n', utf8_message)

145

return osutils.safe_unicode(fixed_newline)

146

147

148

class CommitDialog(Gtk.Dialog):

109

return fixed_newline.decode('utf-8')

110

111

112

class CommitDialog(gtk.Dialog):

149

113

"""Implementation of Commit."""

150

114

151

115

def __init__(self, wt, selected=None, parent=None):

152

super(CommitDialog, self).__init__(

153

title="Commit to %s" % wt.basedir, parent=parent, flags=0)

116

gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,

117

parent=parent, flags=0,)

154

118

self.connect('delete-event', self._on_delete_window)

155

119

self._question_dialog = question_dialog

156

120

157

self.set_type_hint(Gdk.WindowTypeHint.NORMAL)

121

self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)

158

122

159

123

self._wt = wt

160

124

# TODO: Do something with this value, it is used by Olive

163

127

self._enable_per_file_commits = True

164

128

self._commit_all_changes = True

165

129

self.committed_revision_id = None # Nothing has been committed yet

166

self._last_selected_file = None

167

self._saved_commit_messages_manager = SavedCommitMessagesManager(

168

self._wt, self._wt.branch)

130

self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)

169

131

170

132

self.setup_params()

171

133

self.construct()

175

137

"""Setup the member variables for state."""

176

138

self._basis_tree = self._wt.basis_tree()

177

139

self._delta = None

178

self._wt.lock_read()

179

try:

180

self._pending = list(pending_revisions(self._wt))

181

finally:

182

self._wt.unlock()

140

self._pending = pending_revisions(self._wt)

183

141

184

142

self._is_checkout = (self._wt.branch.get_bound_location() is not None)

185

143

237

195

238

196

all_enabled = (self._selected is None)

239

197

# The first entry is always the 'whole tree'

240

all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])

198

all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])

241

199

initial_cursor = store.get_path(all_iter)

242

200

# should we pass specific_files?

243

201

self._wt.lock_read()

274

232

# This sets the cursor, which causes the expander to close, which

275

233

# causes the _file_message_text_view to never get realized. So we have

276

234

# to give it a little kick, or it warns when we try to grab the focus

277

self._treeview_files.set_cursor(initial_cursor, None, False)

235

self._treeview_files.set_cursor(initial_cursor)

278

236

279

237

def _realize_file_message_tree_view(*args):

280

238

self._file_message_text_view.realize()

288

246

self._check_local.hide()

289

247

return

290

248

if have_dbus:

291

try:

292

bus = dbus.SystemBus()

293

except dbus.DBusException:

294

trace.mutter("DBus system bus not available")

295

self._check_local.show()

296

return

249

bus = dbus.SystemBus()

297

250

try:

298

251

proxy_obj = bus.get_object('org.freedesktop.NetworkManager',

299

252

'/org/freedesktop/NetworkManager')

301

254

trace.mutter("networkmanager not available.")

302

255

self._check_local.show()

303

256

return

304

257

305

258

dbus_iface = dbus.Interface(proxy_obj,

306

259

'org.freedesktop.NetworkManager')

307

260

try:

333

286

"""Build up the dialog widgets."""

334

287

# The primary pane which splits it into left and right (adjustable)

335

288

# sections.

336

self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)

289

self._hpane = gtk.HPaned()

337

290

338

291

self._construct_left_pane()

339

292

self._construct_right_pane()

340

293

self._construct_action_pane()

341

294

342

self.get_content_area().pack_start(self._hpane, True, True, 0)

295

self.vbox.pack_start(self._hpane)

343

296

self._hpane.show()

344

297

self.set_focus(self._global_message_text_view)

345

298

364

317

self._hpane.set_position(300)

365

318

366

319

def _construct_accelerators(self):

367

group = Gtk.AccelGroup()

368

group.connect(Gdk.keyval_from_name('N'),

369

Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)

320

group = gtk.AccelGroup()

321

group.connect_group(gtk.gdk.keyval_from_name('N'),

322

gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)

370

323

self.add_accel_group(group)

371

324

372

325

# ignore the escape key (avoid closing the window)

373

326

self.connect_object('close', self.emit_stop_by_name, 'close')

374

327

375

328

def _construct_left_pane(self):

376

self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)

329

self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)

377

330

self._construct_file_list()

378

331

self._construct_pending_list()

379

332

380

self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),

333

self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),

381

334

use_underline=True)

382

self._left_pane_box.pack_end(self._check_local, False, False, 0)

335

self._left_pane_box.pack_end(self._check_local, False, False)

383

336

self._check_local.set_active(False)

384

337

385

338

self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)

392

345

# commit, and 1 for file commit, and it looked good. But I don't seem

393

346

# to have a way to do that with the gtk boxes... :( (Which is extra

394

347

# weird since wx uses gtk on Linux...)

395

self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)

348

self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)

396

349

self._right_pane_table.set_row_spacings(5)

397

350

self._right_pane_table.set_col_spacings(5)

398

351

self._right_pane_table_row = 0

404

357

self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)

405

358

406

359

def _construct_action_pane(self):

407

self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)

360

self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)

408

361

self._button_cancel.connect('clicked', self._on_cancel_clicked)

409

362

self._button_cancel.show()

410

self.get_action_area().pack_end(

411

self._button_cancel, True, True, 0)

412

self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)

363

self.action_area.pack_end(self._button_cancel)

364

self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)

413

365

self._button_commit.connect('clicked', self._on_commit_clicked)

414

self._button_commit.set_can_default(True)

366

self._button_commit.set_flags(gtk.CAN_DEFAULT)

415

367

self._button_commit.show()

416

self.get_action_area().pack_end(

417

self._button_commit, True, True, 0)

368

self.action_area.pack_end(self._button_commit)

418

369

self._button_commit.grab_default()

419

370

420

371

def _add_to_right_table(self, widget, weight, expanding=False):

426

377

"""

427

378

end_row = self._right_pane_table_row + weight

428

379

options = 0

429

expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK

380

expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK

430

381

if expanding:

431

382

options = expand_opts

432

383

self._right_pane_table.attach(widget, 0, 1,

435

386

self._right_pane_table_row = end_row

436

387

437

388

def _construct_file_list(self):

438

self._files_box = Gtk.VBox(homogeneous=False, spacing=0)

439

file_label = Gtk.Label(label=_i18n('Files'))

389

self._files_box = gtk.VBox(homogeneous=False, spacing=0)

390

file_label = gtk.Label(_i18n('Files'))

440

391

# file_label.show()

441

self._files_box.pack_start(file_label, False, True, 0)

392

self._files_box.pack_start(file_label, expand=False)

442

393

443

self._commit_all_files_radio = Gtk.RadioButton.new_with_label(

394

self._commit_all_files_radio = gtk.RadioButton(

444

395

None, _i18n("Commit all changes"))

445

self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)

396

self._files_box.pack_start(self._commit_all_files_radio, expand=False)

446

397

self._commit_all_files_radio.show()

447

398

self._commit_all_files_radio.connect('toggled',

448

399

self._toggle_commit_selection)

449

self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(

400

self._commit_selected_radio = gtk.RadioButton(

450

401

self._commit_all_files_radio, _i18n("Only commit selected changes"))

451

self._files_box.pack_start(self._commit_selected_radio, False, True, 0)

402

self._files_box.pack_start(self._commit_selected_radio, expand=False)

452

403

self._commit_selected_radio.show()

453

404

self._commit_selected_radio.connect('toggled',

454

405

self._toggle_commit_selection)

457

408

self._commit_all_files_radio.set_sensitive(False)

458

409

self._commit_selected_radio.set_sensitive(False)

459

410

460

scroller = Gtk.ScrolledWindow()

461

scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)

462

self._treeview_files = Gtk.TreeView()

411

scroller = gtk.ScrolledWindow()

412

scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

413

self._treeview_files = gtk.TreeView()

463

414

self._treeview_files.show()

464

415

scroller.add(self._treeview_files)

465

scroller.set_shadow_type(Gtk.ShadowType.IN)

416

scroller.set_shadow_type(gtk.SHADOW_IN)

466

417

scroller.show()

467

self._files_box.pack_start(scroller, True, True, 0)

418

self._files_box.pack_start(scroller,

419

expand=True, fill=True)

468

420

self._files_box.show()

469

self._left_pane_box.pack_start(self._files_box, True, True, 0)

421

self._left_pane_box.pack_start(self._files_box)

470

422

471

423

# Keep note that all strings stored in a ListStore must be UTF-8

472

424

# strings. GTK does not support directly setting and restoring Unicode

473

425

# objects.

474

liststore = Gtk.ListStore(

475

GObject.TYPE_STRING, # [0] file_id

476

GObject.TYPE_STRING, # [1] real path

477

GObject.TYPE_BOOLEAN, # [2] checkbox

478

GObject.TYPE_STRING, # [3] display path

479

GObject.TYPE_STRING, # [4] changes type

480

GObject.TYPE_STRING, # [5] commit message

426

liststore = gtk.ListStore(

427

gobject.TYPE_STRING, # [0] file_id

428

gobject.TYPE_STRING, # [1] real path

429

gobject.TYPE_BOOLEAN, # [2] checkbox

430

gobject.TYPE_STRING, # [3] display path

431

gobject.TYPE_STRING, # [4] changes type

432

gobject.TYPE_STRING, # [5] commit message

481

433

)

482

434

self._files_store = liststore

483

435

self._treeview_files.set_model(liststore)

484

crt = Gtk.CellRendererToggle()

436

crt = gtk.CellRendererToggle()

485

437

crt.set_property('activatable', not bool(self._pending))

486

438

crt.connect("toggled", self._toggle_commit, self._files_store)

487

439

if self._pending:

488

440

name = _i18n('Commit*')

489

441

else:

490

442

name = _i18n('Commit')

491

commit_col = Gtk.TreeViewColumn(name, crt, active=2)

443

commit_col = gtk.TreeViewColumn(name, crt, active=2)

492

444

commit_col.set_visible(False)

493

445

self._treeview_files.append_column(commit_col)

494

self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),

495

Gtk.CellRendererText(), text=3))

496

self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),

497

Gtk.CellRendererText(), text=4))

446

self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),

447

gtk.CellRendererText(), text=3))

448

self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),

449

gtk.CellRendererText(), text=4))

498

450

self._treeview_files.connect('cursor-changed',

499

451

self._on_treeview_files_cursor_changed)

500

452

501

453

def _toggle_commit(self, cell, path, model):

502

if model[path][0] == "": # No file_id means 'All Files'

454

if model[path][0] is None: # No file_id means 'All Files'

503

455

new_val = not model[path][2]

504

456

for node in model:

505

457

node[2] = new_val

515

467

checked_col.set_visible(False)

516

468

else:

517

469

checked_col.set_visible(True)

518

renderer = checked_col.get_cells()[0]

470

renderer = checked_col.get_cell_renderers()[0]

519

471

renderer.set_property('activatable', not all_files)

520

472

521

473

def _construct_pending_list(self):

522

474

# Pending information defaults to hidden, we put it all in 1 box, so

523

475

# that we can show/hide all of them at once

524

self._pending_box = Gtk.VBox()

476

self._pending_box = gtk.VBox()

525

477

self._pending_box.hide()

526

478

527

pending_message = Gtk.Label()

479

pending_message = gtk.Label()

528

480

pending_message.set_markup(

529

481

_i18n('<i>* Cannot select specific files when merging</i>'))

530

self._pending_box.pack_start(pending_message, False, True, 5)

482

self._pending_box.pack_start(pending_message, expand=False, padding=5)

531

483

pending_message.show()

532

484

533

pending_label = Gtk.Label(label=_i18n('Pending Revisions'))

534

self._pending_box.pack_start(pending_label, False, True, 0)

485

pending_label = gtk.Label(_i18n('Pending Revisions'))

486

self._pending_box.pack_start(pending_label, expand=False, padding=0)

535

487

pending_label.show()

536

488

537

scroller = Gtk.ScrolledWindow()

538

scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)

539

self._treeview_pending = Gtk.TreeView()

489

scroller = gtk.ScrolledWindow()

490

scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

491

self._treeview_pending = gtk.TreeView()

540

492

scroller.add(self._treeview_pending)

541

scroller.set_shadow_type(Gtk.ShadowType.IN)

493

scroller.set_shadow_type(gtk.SHADOW_IN)

542

494

scroller.show()

543

self._pending_box.pack_start(scroller, True, True, 5)

495

self._pending_box.pack_start(scroller,

496

expand=True, fill=True, padding=5)

544

497

self._treeview_pending.show()

545

self._left_pane_box.pack_start(self._pending_box, True, True, 0)

498

self._left_pane_box.pack_start(self._pending_box)

546

499

547

liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id

548

GObject.TYPE_STRING, # date

549

GObject.TYPE_STRING, # committer

550

GObject.TYPE_STRING, # summary

500

liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id

501

gobject.TYPE_STRING, # date

502

gobject.TYPE_STRING, # committer

503

gobject.TYPE_STRING, # summary

551

504

)

552

505

self._pending_store = liststore

553

506

self._treeview_pending.set_model(liststore)

554

self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),

555

Gtk.CellRendererText(), text=1))

556

self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),

557

Gtk.CellRendererText(), text=2))

558

self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),

559

Gtk.CellRendererText(), text=3))

507

self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),

508

gtk.CellRendererText(), text=1))

509

self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),

510

gtk.CellRendererText(), text=2))

511

self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),

512

gtk.CellRendererText(), text=3))

560

513

561

514

def _construct_diff_view(self):

562

515

from bzrlib.plugins.gtk.diff import DiffView

565

518

# decide that we really don't ever want to display it, we should

566

519

# actually remove it, and other references to it, along with the

567

520

# tests that it is set properly.

568

self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))

521

self._diff_label = gtk.Label(_i18n('Diff for whole tree'))

569

522

self._diff_label.set_alignment(0, 0)

570

523

self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)

571

524

self._add_to_right_table(self._diff_label, 1, False)

576

529

self._diff_view.show()

577

530

578

531

def _construct_file_message(self):

579

scroller = Gtk.ScrolledWindow()

580

scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)

532

scroller = gtk.ScrolledWindow()

533

scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

581

534

582

self._file_message_text_view = Gtk.TextView()

535

self._file_message_text_view = gtk.TextView()

583

536

scroller.add(self._file_message_text_view)

584

scroller.set_shadow_type(Gtk.ShadowType.IN)

537

scroller.set_shadow_type(gtk.SHADOW_IN)

585

538

scroller.show()

586

539

587

self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))

588

self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)

540

self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))

541

self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)

589

542

self._file_message_text_view.set_accepts_tab(False)

590

543

self._file_message_text_view.show()

591

544

592

self._file_message_expander = Gtk.Expander(

593

label=_i18n('File commit message'))

545

self._file_message_expander = gtk.Expander(_i18n('File commit message'))

594

546

self._file_message_expander.set_expanded(True)

595

547

self._file_message_expander.add(scroller)

596

548

self._add_to_right_table(self._file_message_expander, 1, False)

597

549

self._file_message_expander.show()

598

550

599

551

def _construct_global_message(self):

600

self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))

552

self._global_message_label = gtk.Label(_i18n('Global Commit Message'))

601

553

self._global_message_label.set_markup(

602

554

_i18n('<b>Global Commit Message</b>'))

603

555

self._global_message_label.set_alignment(0, 0)

606

558

# Can we remove the spacing between the label and the box?

607

559

self._global_message_label.show()

608

560

609

scroller = Gtk.ScrolledWindow()

610

scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)

561

scroller = gtk.ScrolledWindow()

562

scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

611

563

612

self._global_message_text_view = Gtk.TextView()

564

self._global_message_text_view = gtk.TextView()

613

565

self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])

614

self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))

566

self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))

615

567

scroller.add(self._global_message_text_view)

616

scroller.set_shadow_type(Gtk.ShadowType.IN)

568

scroller.set_shadow_type(gtk.SHADOW_IN)

617

569

scroller.show()

618

570

self._add_to_right_table(scroller, 2, True)

619

self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)

571

self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)

620

572

self._file_message_text_view.set_accepts_tab(False)

621

573

self._global_message_text_view.show()

622

574

623

575

def _on_treeview_files_cursor_changed(self, treeview):

624

576

treeselection = treeview.get_selection()

625

if treeselection is None:

626

# The treeview was probably destroyed as the dialog closes.

627

return

628

577

(model, selection) = treeselection.get_selected()

629

578

630

579

if selection is not None:

631

580

path, display_path = model.get(selection, 1, 3)

632

581

self._diff_label.set_text(_i18n('Diff for ') + display_path)

633

if path == "":

582

if path is None:

634

583

self._diff_view.show_diff(None)

635

584

else:

636

self._diff_view.show_diff([osutils.safe_unicode(path)])

585

self._diff_view.show_diff([path.decode('UTF-8')])

637

586

self._update_per_file_info(selection)

638

587

639

588

def _on_accel_next(self, accel_group, window, keyval, modifier):

650

599

# We have either made it to the end of the list, or nothing was

651

600

# selected. Either way, select All Files, and jump to the global

652

601

# commit message.

653

self._treeview_files.set_cursor(

654

Gtk.TreePath(path=0), "", False)

602

self._treeview_files.set_cursor((0,))

655

603

self._global_message_text_view.grab_focus()

656

604

else:

657

605

# Set the cursor to this entry, and jump to the per-file commit

658

606

# message

659

self._treeview_files.set_cursor(model.get_path(next), None, False)

607

self._treeview_files.set_cursor(model.get_path(next))

660

608

self._file_message_text_view.grab_focus()

661

609

662

610

def _save_current_file_message(self):

664

612

return # Nothing to save

665

613

text_buffer = self._file_message_text_view.get_buffer()

666

614

cur_text = text_buffer.get_text(text_buffer.get_start_iter(),

667

text_buffer.get_end_iter(), True)

615

text_buffer.get_end_iter())

668

616

last_selected = self._files_store.get_iter(self._last_selected_file)

669

617

self._files_store.set_value(last_selected, 5, cur_text)

670

618

676

624

self._save_current_file_message()

677

625

text_buffer = self._file_message_text_view.get_buffer()

678

626

file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)

679

if file_id == "": # Whole tree

627

if file_id is None: # Whole tree

680

628

self._file_message_expander.set_label(_i18n('File commit message'))

681

629

self._file_message_expander.set_expanded(False)

682

630

self._file_message_expander.set_sensitive(False)

699

647

files = []

700

648

records = iter(self._files_store)

701

649

rec = records.next() # Skip the All Files record

702

assert rec[0] == "", "Are we skipping the wrong record?"

650

assert rec[0] is None, "Are we skipping the wrong record?"

703

651

704

652

file_info = []

705

653

for record in records:

706

654

if self._commit_all_changes or record[2]:# [2] checkbox

707

file_id = osutils.safe_utf8(record[0]) # [0] file_id

708

path = osutils.safe_utf8(record[1]) # [1] real path

655

file_id = record[0] # [0] file_id

656

path = record[1] # [1] real path

709

657

# [5] commit message

710

658

file_message = _sanitize_and_decode_message(record[5])

711

659

files.append(path.decode('UTF-8'))

741

689

_i18n('Commit cancelled'),

742

690

_i18n('Do you want to save your commit messages ?'),

743

691

parent=self)

744

if response == Gtk.ResponseType.NO:

692

if response == gtk.RESPONSE_NO:

745

693

# save nothing and destroy old comments if any

746

694

mgr = SavedCommitMessagesManager()

747

695

mgr.save(self._wt, self._wt.branch)

748

self.response(Gtk.ResponseType.CANCEL) # close window

696

self.response(gtk.RESPONSE_CANCEL) # close window

749

697

750

698

@show_bzr_error

751

699

def _on_commit_clicked(self, button):

760

708

_i18n('Commit with an empty message?'),

761

709

_i18n('You can describe your commit intent in the message.'),

762

710

parent=self)

763

if response == Gtk.ResponseType.NO:

711

if response == gtk.RESPONSE_NO:

764

712

# Kindly give focus to message area

765

713

self._global_message_text_view.grab_focus()

766

714

return

782

730

_i18n("Unknown files exist in the working tree. Commit anyway?"),

783

731

parent=self)

784

732

# Doesn't set a parent for the dialog..

785

if response == Gtk.ResponseType.NO:

733

if response == gtk.RESPONSE_NO:

786

734

return

787

735

break

788

736

803

751

_i18n('There are no changes in the working tree.'

804

752

' Do you want to commit anyway?'),

805

753

parent=self)

806

if response == Gtk.ResponseType.YES:

754

if response == gtk.RESPONSE_YES:

807

755

rev_id = self._wt.commit(message,

808

756

allow_pointless=True,

809

757

strict=False,

813

761

self.committed_revision_id = rev_id

814

762

# destroy old comments if any

815

763

SavedCommitMessagesManager().save(self._wt, self._wt.branch)

816

self.response(Gtk.ResponseType.OK)

764

self.response(gtk.RESPONSE_OK)

817

765

818

766

def _get_global_commit_message(self):

819

767

buf = self._global_message_text_view.get_buffer()

820

768

start, end = buf.get_bounds()

821

text = buf.get_text(start, end, True)

769

text = buf.get_text(start, end)

822

770

return _sanitize_and_decode_message(text)

823

771

824

772

def _set_global_commit_message(self, message):

847

795

rev_dict['revision_id'] = rev.revision_id

848

796

return rev_dict

849

797

798

799

class SavedCommitMessagesManager:

800

"""Save glogal and per-file commit messages.

801

802

Saves global commit message and utf-8 file_id->message dictionary

803

of per-file commit messages on disk. Re-reads them later for re-using.

804

"""

805

806

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

807

"""If branch is None, builds empty messages, otherwise reads them

808

from branch's disk storage. 'tree' argument is for the future."""

809

if branch is None:

810

self.global_message = u''

811

self.file_messages = {}

812

else:

813

config = branch.get_config()

814

self.global_message = config.get_user_option(

815

'gtk_global_commit_message')

816

if self.global_message is None:

817

self.global_message = u''

818

file_messages = config.get_user_option('gtk_file_commit_messages')

819

if file_messages: # unicode and B-encoded:

820

self.file_messages = bencode.bdecode(

821

file_messages.encode('UTF-8'))

822

else:

823

self.file_messages = {}

824

825

def get(self):

826

return self.global_message, self.file_messages

827

828

def is_not_empty(self):

829

return bool(self.global_message or self.file_messages)

830

831

def insert(self, global_message, file_info):

832

"""Formats per-file commit messages (list of dictionaries, one per file)

833

into one utf-8 file_id->message dictionary and merges this with

834

previously existing dictionary. Merges global commit message too."""

835

file_messages = {}

836

for fi in file_info:

837

file_message = fi['message']

838

if file_message:

839

file_messages[fi['file_id']] = file_message # utf-8 strings

840

for k,v in file_messages.iteritems():

841

try:

842

self.file_messages[k] = v + '\n******\n' + self.file_messages[k]

843

except KeyError:

844

self.file_messages[k] = v

845

if self.global_message:

846

self.global_message = global_message + '\n******\n' \

847

+ self.global_message

848

else:

849

self.global_message = global_message

850

851

def save(self, tree, branch):

852

# We store in branch's config, which can be a problem if two gcommit

853

# are done in two checkouts of one single branch (comments overwrite

854

# each other). Ideally should be in working tree. But uncommit does

855

# not always have a working tree, though it always has a branch.

856

# 'tree' argument is for the future

857

config = branch.get_config()

858

# should it be named "gtk_" or some more neutral name ("gui_" ?) to

859

# be compatible with qbzr in the future?

860

config.set_user_option('gtk_global_commit_message', self.global_message)

861

# bencode() does not know unicode objects but set_user_option()

862

# requires one:

863

config.set_user_option(

864

'gtk_file_commit_messages',

865

bencode.bencode(self.file_messages).decode('UTF-8'))

866

867

868

def save_commit_messages(local, master, old_revno, old_revid,

869

new_revno, new_revid):

870

b = local

871

if b is None:

872

b = master

873

mgr = SavedCommitMessagesManager(None, b)

874

revid_iterator = b.repository.iter_reverse_revision_history(old_revid)

875

cur_revno = old_revno

876

new_revision_id = old_revid

877

graph = b.repository.get_graph()

878

for rev_id in revid_iterator:

879

if cur_revno == new_revno:

880

break

881

cur_revno -= 1

882

rev = b.repository.get_revision(rev_id)

883

file_info = rev.properties.get('file-info', None)

884

if file_info is None:

885

file_info = {}

886

else:

887

file_info = bencode.bdecode(file_info.encode('UTF-8'))

888

global_message = osutils.safe_unicode(rev.message)

889

# Concatenate comment of the uncommitted revision

890

mgr.insert(global_message, file_info)

891

892

parents = graph.get_parent_map([rev_id]).get(rev_id, None)

893

if not parents:

894

continue

895

mgr.save(None, b)