/b-gtk/fix-viz : revision 793

21

from gi.repository import GObject

22

from gi.repository import Pango

23

24

try:

25

from bzrlib import bencode

26

except ImportError:

27

from bzrlib.util import bencode

28

29

24

from bzrlib import (

25

bencode,

30

26

errors,

27

osutils,

28

revision as _mod_revision,

31

29

trace,

30

tsort,

32

31

)

33

32

from bzrlib.plugins.gtk.dialog import question_dialog

33

from bzrlib.plugins.gtk.diff import DiffView

34

from bzrlib.plugins.gtk.errors import show_bzr_error

35

from bzrlib.plugins.gtk.i18n import _i18n

36

from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager

43

have_dbus = False

44

45

46

def _get_sorted_revisions(tip_revision, revision_ids, parent_map):

47

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

48

49

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

50

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

51

order.

52

53

:param revision_ids: A set of revision_ids

54

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

55

are considered ghosts should not be present in the map.

56

:return: iterator from MergeSorter.iter_topo_order()

57

"""

58

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

59

# of any references pointing outside of this graph.

60

parent_graph = {}

61

for revision_id in revision_ids:

62

if revision_id not in parent_map: # ghost

63

parent_graph[revision_id] = []

64

else:

65

# Only include parents which are in this sub-graph

66

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

67

if p in revision_ids]

68

sorter = tsort.MergeSorter(parent_graph, tip_revision)

69

return sorter.iter_topo_order()

70

71

46

72

def pending_revisions(wt):

47

73

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

48

74

53

79

"""

54

80

parents = wt.get_parent_ids()

55

81

if len(parents) < 2:

56

return None

82

return

57

83

58

84

# The basic pending merge algorithm uses the same algorithm as

59

85

# bzrlib.status.show_pending_merges

61

87

branch = wt.branch

62

88

last_revision = parents[0]

63

89

64

if last_revision is not None:

65

graph = branch.repository.get_graph()

66

ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])

67

else:

68

ignore = set([])

90

graph = branch.repository.get_graph()

91

other_revisions = [last_revision]

69

92

70

93

pm = []

71

94

for merge in pending:

72

ignore.add(merge)

73

try:

74

rev = branch.repository.get_revision(merge)

75

children = []

76

pm.append((rev, children))

77

78

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

79

inner_merges = branch.repository.get_ancestry(merge)

80

assert inner_merges[0] is None

81

inner_merges.pop(0)

82

for mmerge in reversed(inner_merges):

83

if mmerge in ignore:

84

continue

85

rev = branch.repository.get_revision(mmerge)

86

children.append(rev)

87

88

ignore.add(mmerge)

89

except errors.NoSuchRevision:

90

print "DEBUG: NoSuchRevision:", merge

91

92

return pm

95

try:

96

merge_rev = branch.repository.get_revision(merge)

97

except errors.NoSuchRevision:

98

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

99

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

100

other_revisions.append(merge)

101

continue

102

103

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

104

# last committed revision.

105

merge_extra = graph.find_unique_ancestors(merge, other_revisions)

106

other_revisions.append(merge)

107

merge_extra.discard(_mod_revision.NULL_REVISION)

108

109

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

110

try:

111

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

112

branch.repository.get_revisions(merge_extra))

113

except errors.NoSuchRevision:

114

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

115

revisions = {}

116

for revision_id in merge_extra:

117

try:

118

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

119

except errors.NoSuchRevision:

120

revisions[revision_id] = None

121

else:

122

revisions[revision_id] = rev

123

124

# Display the revisions brought in by this merge.

125

rev_id_iterator = _get_sorted_revisions(merge, merge_extra,

126

branch.repository.get_parent_map(merge_extra))

127

# Skip the first node

128

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

129

if first != merge:

130

raise AssertionError('Somehow we misunderstood how'

131

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

132

children = []

133

for num, sub_merge, depth, eom in rev_id_iterator:

134

rev = revisions[sub_merge]

135

if rev is None:

136

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

137

continue

138

children.append(rev)

139

yield (merge_rev, children)

93

140

94

141

95

142

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

96

143

def _sanitize_and_decode_message(utf8_message):

97

144

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

98

145

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

99

return fixed_newline.decode('utf-8')

146

return osutils.safe_unicode(fixed_newline)

100

147

101

148

102

149

class CommitDialog(Gtk.Dialog):

117

164

self._enable_per_file_commits = True

118

165

self._commit_all_changes = True

119

166

self.committed_revision_id = None # Nothing has been committed yet

167

self._last_selected_file = None

120

168

self._saved_commit_messages_manager = SavedCommitMessagesManager(

121

169

self._wt, self._wt.branch)

122

170

130

178

self._delta = None

131

179

self._wt.lock_read()

132

180

try:

133

self._pending = pending_revisions(self._wt)

181

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

134

182

finally:

135

183

self._wt.unlock()

136

184

190

238

191

239

all_enabled = (self._selected is None)

192

240

# The first entry is always the 'whole tree'

193

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

241

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

194

242

initial_cursor = store.get_path(all_iter)

195

243

# should we pass specific_files?

196

244

self._wt.lock_read()

241

289

self._check_local.hide()

242

290

return

243

291

if have_dbus:

244

bus = dbus.SystemBus()

292

try:

293

bus = dbus.SystemBus()

294

except dbus.DBusException:

295

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

296

self._check_local.show()

297

return

245

298

try:

246

299

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

247

300

'/org/freedesktop/NetworkManager')

249

302

trace.mutter("networkmanager not available.")

250

303

self._check_local.show()

251

304

return

252

305

253

306

dbus_iface = dbus.Interface(proxy_obj,

254

307

'org.freedesktop.NetworkManager')

255

308

try:

281

334

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

282

335

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

283

336

# sections.

284

self._hpane = Gtk.HPaned()

337

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

285

338

286

339

self._construct_left_pane()

287

340

self._construct_right_pane()

447

500

self._on_treeview_files_cursor_changed)

448

501

449

502

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

450

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

503

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

451

504

new_val = not model[path][2]

452

505

for node in model:

453

506

node[2] = new_val

507

560

Gtk.CellRendererText(), text=3))

508

561

509

562

def _construct_diff_view(self):

510

from bzrlib.plugins.gtk.diff import DiffView

511

512

563

# TODO: jam 2007-10-30 The diff label is currently disabled. If we

513

564

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

514

565

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

523

574

self._add_to_right_table(self._diff_view, 4, True)

524

575

self._diff_view.show()

525

576

577

@staticmethod

578

def get_line_height(widget):

579

pango_layout = widget.create_pango_layout("X");

580

ink_rectangle, logical_rectangle = pango_layout.get_pixel_extents()

581

return logical_rectangle.height

582

526

583

def _construct_file_message(self):

527

584

scroller = Gtk.ScrolledWindow()

528

585

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

535

592

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

536

593

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

537

594

self._file_message_text_view.set_accepts_tab(False)

595

line_height = self.get_line_height(self._file_message_text_view)

596

self._file_message_text_view.set_size_request(-1, line_height * 2)

538

597

self._file_message_text_view.show()

539

598

540

599

self._file_message_expander = Gtk.Expander(

570

629

571

630

def _on_treeview_files_cursor_changed(self, treeview):

572

631

treeselection = treeview.get_selection()

632

if treeselection is None:

633

# The treeview was probably destroyed as the dialog closes.

634

return

573

635

(model, selection) = treeselection.get_selected()

574

636

575

637

if selection is not None:

576

638

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

577

639

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

578

if path is None:

640

if path == "":

579

641

self._diff_view.show_diff(None)

580

642

else:

581

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

643

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

582

644

self._update_per_file_info(selection)

583

645

584

646

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

596

658

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

597

659

# commit message.

598

660

self._treeview_files.set_cursor(

599

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

661

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

600

662

self._global_message_text_view.grab_focus()

601

663

else:

602

664

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

621

683

self._save_current_file_message()

622

684

text_buffer = self._file_message_text_view.get_buffer()

623

685

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

624

if file_id is None: # Whole tree

686

if file_id == "": # Whole tree

625

687

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

626

688

self._file_message_expander.set_expanded(False)

627

689

self._file_message_expander.set_sensitive(False)

644

706

files = []

645

707

records = iter(self._files_store)

646

708

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

647

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

709

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

648

710

649

711

file_info = []

650

712

for record in records:

651

713

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

652

file_id = record[0] # [0] file_id

653

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

714

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

715

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

654

716

# [5] commit message

655

717

file_message = _sanitize_and_decode_message(record[5])

656

718

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