/b-gtk/fix-viz : revision 763

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

24

29

from bzrlib import (

25

bencode,

26

30

errors,

27

osutils,

28

revision as _mod_revision,

29

31

trace,

30

tsort,

31

32

)

32

33

from bzrlib.plugins.gtk.dialog import question_dialog

33

34

from bzrlib.plugins.gtk.errors import show_bzr_error

42

43

have_dbus = False

43

44

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

46

def pending_revisions(wt):

72

47

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

73

48

78

53

"""

79

54

parents = wt.get_parent_ids()

80

55

if len(parents) < 2:

81

return

56

return None

82

57

83

58

# The basic pending merge algorithm uses the same algorithm as

84

59

# bzrlib.status.show_pending_merges

86

61

branch = wt.branch

87

62

last_revision = parents[0]

88

63

89

graph = branch.repository.get_graph()

90

other_revisions = [last_revision]

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([])

91

69

92

70

pm = []

93

71

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)

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

139

93

140

94

141

95

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

142

96

def _sanitize_and_decode_message(utf8_message):

143

97

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

144

98

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

145

return osutils.safe_unicode(fixed_newline)

99

return fixed_newline.decode('utf-8')

146

100

147

101

148

102

class CommitDialog(Gtk.Dialog):

163

117

self._enable_per_file_commits = True

164

118

self._commit_all_changes = True

165

119

self.committed_revision_id = None # Nothing has been committed yet

166

self._last_selected_file = None

167

120

self._saved_commit_messages_manager = SavedCommitMessagesManager(

168

121

self._wt, self._wt.branch)

169

122

177

130

self._delta = None

178

131

self._wt.lock_read()

179

132

try:

180

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

133

self._pending = pending_revisions(self._wt)

181

134

finally:

182

135

self._wt.unlock()

183

136

237

190

238

191

all_enabled = (self._selected is None)

239

192

# The first entry is always the 'whole tree'

240

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

193

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

241

194

initial_cursor = store.get_path(all_iter)

242

195

# should we pass specific_files?

243

196

self._wt.lock_read()

288

241

self._check_local.hide()

289

242

return

290

243

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

244

bus = dbus.SystemBus()

297

245

try:

298

246

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

299

247

'/org/freedesktop/NetworkManager')

301

249

trace.mutter("networkmanager not available.")

302

250

self._check_local.show()

303

251

return

304

252

305

253

dbus_iface = dbus.Interface(proxy_obj,

306

254

'org.freedesktop.NetworkManager')

307

255

try:

333

281

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

334

282

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

335

283

# sections.

336

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

284

self._hpane = Gtk.HPaned()

337

285

338

286

self._construct_left_pane()

339

287

self._construct_right_pane()

499

447

self._on_treeview_files_cursor_changed)

500

448

501

449

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

502

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

450

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

503

451

new_val = not model[path][2]

504

452

for node in model:

505

453

node[2] = new_val

622

570

623

571

def _on_treeview_files_cursor_changed(self, treeview):

624

572

treeselection = treeview.get_selection()

625

if treeselection is None:

626

# The treeview was probably destroyed as the dialog closes.

627

return

628

573

(model, selection) = treeselection.get_selected()

629

574

630

575

if selection is not None:

631

576

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

632

577

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

633

if path == "":

578

if path is None:

634

579

self._diff_view.show_diff(None)

635

580

else:

636

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

581

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

637

582

self._update_per_file_info(selection)

638

583

639

584

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

651

596

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

652

597

# commit message.

653

598

self._treeview_files.set_cursor(

654

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

599

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

655

600

self._global_message_text_view.grab_focus()

656

601

else:

657

602

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

676

621

self._save_current_file_message()

677

622

text_buffer = self._file_message_text_view.get_buffer()

678

623

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

679

if file_id == "": # Whole tree

624

if file_id is None: # Whole tree

680

625

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

681

626

self._file_message_expander.set_expanded(False)

682

627

self._file_message_expander.set_sensitive(False)

699

644

files = []

700

645

records = iter(self._files_store)

701

646

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

702

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

647

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

703

648

704

649

file_info = []

705

650

for record in records:

706

651

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

652

file_id = record[0] # [0] file_id

653

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

709

654

# [5] commit message

710

655

file_message = _sanitize_and_decode_message(record[5])

711

656

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