/b-gtk/fix-viz : revision 782.1.1

24

from bzrlib import (

25

bencode,

26

errors,

27

osutils,

28

revision as _mod_revision,

27

29

trace,

30

tsort,

28

31

)

29

32

from bzrlib.plugins.gtk.dialog import question_dialog

30

33

from bzrlib.plugins.gtk.errors import show_bzr_error

39

42

have_dbus = False

40

43

41

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

42

71

def pending_revisions(wt):

43

72

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

44

73

49

78

"""

50

79

parents = wt.get_parent_ids()

51

80

if len(parents) < 2:

52

return None

81

return

53

82

54

83

# The basic pending merge algorithm uses the same algorithm as

55

84

# bzrlib.status.show_pending_merges

57

86

branch = wt.branch

58

87

last_revision = parents[0]

59

88

60

if last_revision is not None:

61

graph = branch.repository.get_graph()

62

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

63

else:

64

ignore = set([])

89

graph = branch.repository.get_graph()

90

other_revisions = [last_revision]

65

91

66

92

pm = []

67

93

for merge in pending:

68

ignore.add(merge)

69

try:

70

rev = branch.repository.get_revision(merge)

71

children = []

72

pm.append((rev, children))

73

74

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

75

inner_merges = branch.repository.get_ancestry(merge)

76

assert inner_merges[0] is None

77

inner_merges.pop(0)

78

for mmerge in reversed(inner_merges):

79

if mmerge in ignore:

80

continue

81

rev = branch.repository.get_revision(mmerge)

82

children.append(rev)

83

84

ignore.add(mmerge)

85

except errors.NoSuchRevision:

86

print "DEBUG: NoSuchRevision:", merge

87

88

return pm

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)

89

139

90

140

91

141

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

92

142

def _sanitize_and_decode_message(utf8_message):

93

143

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

94

144

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

95

return fixed_newline.decode('utf-8')

145

return osutils.safe_unicode(fixed_newline)

96

146

97

147

98

148

class CommitDialog(Gtk.Dialog):

113

163

self._enable_per_file_commits = True

114

164

self._commit_all_changes = True

115

165

self.committed_revision_id = None # Nothing has been committed yet

166

self._last_selected_file = None

116

167

self._saved_commit_messages_manager = SavedCommitMessagesManager(

117

168

self._wt, self._wt.branch)

118

169

126

177

self._delta = None

127

178

self._wt.lock_read()

128

179

try:

129

self._pending = pending_revisions(self._wt)

180

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

130

181

finally:

131

182

self._wt.unlock()

132

183

186

237

187

238

all_enabled = (self._selected is None)

188

239

# The first entry is always the 'whole tree'

189

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

240

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

190

241

initial_cursor = store.get_path(all_iter)

191

242

# should we pass specific_files?

192

243

self._wt.lock_read()

237

288

self._check_local.hide()

238

289

return

239

290

if have_dbus:

240

bus = dbus.SystemBus()

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

241

297

try:

242

298

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

243

299

'/org/freedesktop/NetworkManager')

245

301

trace.mutter("networkmanager not available.")

246

302

self._check_local.show()

247

303

return

248

304

249

305

dbus_iface = dbus.Interface(proxy_obj,

250

306

'org.freedesktop.NetworkManager')

251

307

try:

277

333

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

278

334

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

279

335

# sections.

280

self._hpane = Gtk.HPaned()

336

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

281

337

282

338

self._construct_left_pane()

283

339

self._construct_right_pane()

443

499

self._on_treeview_files_cursor_changed)

444

500

445

501

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

446

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

502

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

447

503

new_val = not model[path][2]

448

504

for node in model:

449

505

node[2] = new_val

566

622

567

623

def _on_treeview_files_cursor_changed(self, treeview):

568

624

treeselection = treeview.get_selection()

625

if treeselection is None:

626

# The treeview was probably destroyed as the dialog closes.

627

return

569

628

(model, selection) = treeselection.get_selected()

570

629

571

630

if selection is not None:

572

631

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

573

632

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

574

if path is None:

633

if path == "":

575

634

self._diff_view.show_diff(None)

576

635

else:

577

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

636

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

578

637

self._update_per_file_info(selection)

579

638

580

639

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

592

651

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

593

652

# commit message.

594

653

self._treeview_files.set_cursor(

595

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

654

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

596

655

self._global_message_text_view.grab_focus()

597

656

else:

598

657

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

617

676

self._save_current_file_message()

618

677

text_buffer = self._file_message_text_view.get_buffer()

619

678

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

620

if file_id is None: # Whole tree

679

if file_id == "": # Whole tree

621

680

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

622

681

self._file_message_expander.set_expanded(False)

623

682

self._file_message_expander.set_sensitive(False)

640

699

files = []

641

700

records = iter(self._files_store)

642

701

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

643

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

702

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

644

703

645

704

file_info = []

646

705

for record in records:

647

706

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

648

file_id = record[0] # [0] file_id

649

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

707

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

708

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

650

709

# [5] commit message

651

710

file_message = _sanitize_and_decode_message(record[5])

652

711

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