Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

rename: most of user interface fleshed out

Changeset d7b97c23ef99…

Parent 950d0989a22a…

by Steve Borho

Changes to one file · Browse files at d7b97c23ef99 Showing diff from parent 950d0989a22a Diff from another changeset...

Change 1 of 7 Show Entire File hggtk/​rename.py Stacked
 
25
26
27
28
29
30
 
 
31
32
 
33
34
35
36
 
 
37
38
39
 
52
53
54
55
56
57
58
59
60
 
63
64
65
66
67
 
 
68
69
 
 
 
 
 
 
 
 
70
71
72
 
 
73
74
75
 
 
76
77
78
 
79
80
81
 
83
84
85
86
 
 
 
87
88
89
 
91
92
93
94
95
96
 
 
 
97
98
99
 
100
101
 
102
103
104
 
112
113
114
115
116
117
 
 
 
118
119
120
 
121
122
123
 
 
 
 
124
125
 
 
 
 
126
127
128
 
130
131
132
133
 
134
 
 
 
 
135
136
137
138
139
 
 
 
 
 
 
140
141
142
 
143
144
 
 
 
 
 
 
 
 
145
146
 
147
148
149
150
 
151
152
 
 
 
 
 
 
 
 
 
 
 
 
153
154
 
155
156
 
157
158
159
 
 
 
 
 
 
 
 
 
 
 
160
161
162
 
25
26
27
 
28
 
29
30
31
 
32
33
 
 
 
34
35
36
37
38
 
51
52
53
 
54
 
55
56
57
 
60
61
62
 
 
63
64
65
 
66
67
68
69
70
71
72
73
74
75
 
76
77
78
79
 
80
81
82
83
 
84
85
86
87
 
89
90
91
 
92
93
94
95
96
97
 
99
100
101
 
 
 
102
103
104
105
 
 
106
107
 
108
109
110
111
 
119
120
121
 
 
 
122
123
124
125
 
 
126
127
 
 
128
129
130
131
132
 
133
134
135
136
137
138
139
 
141
142
143
 
144
145
146
147
148
149
150
 
 
 
 
151
152
153
154
155
156
157
158
 
159
160
 
161
162
163
164
165
166
167
168
169
 
170
171
172
173
 
174
175
 
176
177
178
179
180
181
182
183
184
185
186
187
188
 
189
190
 
191
192
 
 
193
194
195
196
197
198
199
200
201
202
203
204
205
206
@@ -25,15 +25,14 @@
    self.root = root   self.set_title('Detect Copies/Renames in %s' % os.path.basename(root)) - self.set_default_size(610, 400)   self.settings = shlib.Settings('rename') - self.connect('delete-event', self.save_settings) + dims = self.settings.get_value('dims', (800, 600)) + self.set_default_size(dims[0], dims[1])   - self.adjustment = gtk.Adjustment(50, 0, 100, 1) + adjustment = gtk.Adjustment(50, 0, 100, 1)   value = self.settings.get_value('percent', None) - if value: - self.adjustment.set_value(value) - hscale = gtk.HScale(self.adjustment) + if value: adjustment.set_value(value) + hscale = gtk.HScale(adjustment)   frame = gtk.Frame('Minimum Simularity Percentage')   frame.add(hscale)   topvbox = gtk.VBox() @@ -52,9 +51,7 @@
  vbox = gtk.VBox()   vbox.pack_start(scroller, True, True, 2)   fr = gtk.Button('Find Renames') - fr.connect('pressed', self.find_renames, unknowntree)   fc = gtk.Button('Find Copies') - fc.connect('pressed', self.find_copies, unknowntree)   hbox = gtk.HBox()   hbox.pack_start(fr, True, True, 2)   hbox.pack_start(fc, True, True, 2) @@ -63,19 +60,28 @@
  unknownframe = gtk.Frame('Unrevisioned Files')   unknownframe.add(vbox)   - # source, dest, percent match - cmodel = gtk.ListStore(str, str, str) + # source, dest, percent match, sensitive + cmodel = gtk.ListStore(str, str, str, bool)   ctree = gtk.TreeView(cmodel) - col = gtk.TreeViewColumn('Source', gtk.CellRendererText(), text=0) + ctree.set_rules_hint(True) + ctree.set_reorderable(False) + ctree.set_enable_search(True) + ctree.connect('cursor-changed', self.show_diff) + sel = ctree.get_selection() + sel.set_mode(gtk.SELECTION_SINGLE) + col = gtk.TreeViewColumn('Source', gtk.CellRendererText(), + text=0, sensitive=3)   col.set_resizable(True)   ctree.append_column(col) - col = gtk.TreeViewColumn('Dest', gtk.CellRendererText(), text=1) + col = gtk.TreeViewColumn('Dest', gtk.CellRendererText(), + text=1, sensitive=3)   col.set_resizable(True)   ctree.append_column(col) - col = gtk.TreeViewColumn('%', gtk.CellRendererText(), text=2) + col = gtk.TreeViewColumn('%', gtk.CellRendererText(), + text=2, sensitive=3)   col.set_resizable(True)   ctree.append_column(col) - ctree.connect('row-activated', self.candidate_row_act) + ctree.connect('row-activated', self.candidate_row_act, unknowntree)   scroller = gtk.ScrolledWindow()   scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scroller.add(ctree) @@ -83,7 +89,9 @@
  vbox = gtk.VBox()   vbox.pack_start(scroller, True, True, 2)   ac = gtk.Button('Accept Match') - fr.connect('pressed', self.accept_match, ctree) + fc.connect('pressed', self.find_copies, unknowntree, ctree) + fr.connect('pressed', self.find_renames, unknowntree, ctree) + ac.connect('pressed', self.accept_match, unknowntree, ctree)   hbox = gtk.HBox()   hbox.pack_start(ac, False, False, 2)   vbox.pack_start(hbox, False, False, 2) @@ -91,14 +99,13 @@
  candidateframe = gtk.Frame('Candidate Matches')   candidateframe.add(vbox)   - self.hpaned = gtk.HPaned() - self.hpaned.pack1(unknownframe, True, True) - self.hpaned.pack2(candidateframe, True, True) + hpaned = gtk.HPaned() + hpaned.pack1(unknownframe, True, True) + hpaned.pack2(candidateframe, True, True)   pos = self.settings.get_value('hpaned', None) - if pos: - self.hpaned.set_position(pos) + if pos: hpaned.set_position(pos)   - topvbox.pack_start(self.hpaned, True, True, 2) + topvbox.pack_start(hpaned, True, True, 2)     diffframe = gtk.Frame('Differences from Source to Dest')   diffframe.set_shadow_type(gtk.SHADOW_ETCHED_IN) @@ -112,17 +119,21 @@
  diffview.set_editable(False)   scroller.add(diffview)   - self.vpaned = gtk.VPaned() - self.vpaned.pack1(topvbox, True, False) - self.vpaned.pack2(diffframe) + vpaned = gtk.VPaned() + vpaned.pack1(topvbox, True, False) + vpaned.pack2(diffframe)   pos = self.settings.get_value('vpaned', None) - if pos: - self.vpaned.set_position(pos) + if pos: vpaned.set_position(pos)   - self.add(self.vpaned) - self.connect('map_event', self.on_window_map_event) + self.add(vpaned) + self.connect('map_event', self.on_window_map_event, unkmodel, cmodel) + self.connect('delete-event', self.save_settings, + hpaned, vpaned, adjustment)   - def on_window_map_event(self, event, param): + def on_window_map_event(self, event, param, unkmodel, cmodel): + self.refresh(unkmodel, cmodel) + + def refresh(self, unkmodel, cmodel):   try:   repo = hg.repository(ui.ui(), self.root)   except RepoError: @@ -130,33 +141,66 @@
    matcher = match.always(repo.root, repo.root)   self.status = repo.status(node1=repo.dirstate.parents()[0], node2=None, - match=matcher, ignored=False, clean=True, unknown=True) + match=matcher, ignored=False, clean=False, unknown=True)   #(modified, added, removed, deleted, unknown, ignored, clean) = status + unkmodel.clear() + for u in self.status[4]: + unkmodel.append( [u] ) + cmodel.clear()   - def save_settings(self, widget, event): - self.settings.set_value('vpaned', self.vpaned.get_position()) - self.settings.set_value('hpaned', self.hpaned.get_position()) - self.settings.set_value('percent', self.adjustment.get_value()) + def save_settings(self, widget, event, hpaned, vpaned, adjustment): + self.settings.set_value('vpaned', vpaned.get_position()) + self.settings.set_value('hpaned', hpaned.get_position()) + self.settings.set_value('percent', adjustment.get_value()) + rect = self.get_allocation() + self.settings.set_value('dims', (rect.width, rect.height))   self.settings.write()   - def find_renames(self, widget, unktree): + def find_renames(self, widget, unktree, ctree):   'User pressed "find renames" button' - pass + # Fake a rename find operation + cmodel = ctree.get_model() + cmodel.clear() + umodel, paths = unktree.get_selection().get_selected_rows() + if not paths: return + u = umodel[paths[0]][0] + for d in self.status[3]: + cmodel.append( [d, u, '10', True] )   - def find_copies(self, widget, unktree): + def find_copies(self, widget, unktree, ctree):   'User pressed "find copies" button'   pass   - def accept_match(self, widget, ctree): + def accept_match(self, widget, unktree, ctree):   'User pressed "accept match" button' - pass + cmodel, paths = ctree.get_selection().get_selected_rows() + for path in paths: + row = cmodel[path] + src, dest, percent, sensitive = row + if not sensitive: continue + print 'hg copy --after', src, dest + if src in self.status[3]: + print 'hg rm', src + # Mark all rows with this target file as non-sensitive + for row in cmodel: + if row[1] == dest: + row[3] = False   - def candidate_row_act(self, tree, path, column): + def candidate_row_act(self, ctree, path, column, unktree):   'User activated row of candidate list' - pass # accept copy or rename + self.accept_match(ctree, unktree, ctree)   - def adj_changed(self, adj): - newvalue = adj.get_value() + def show_diff(self, tree): + 'User selected a row in the candidate tree' + model, paths = tree.get_selection().get_selected_rows() + for path in paths: + row = model[path] + src, dest, percent, sensitive = row + if sensitive: + print 'show diffs from', src, 'to', dest + if src in self.status[3]: + print src, 'must be resurrected' +    def run(fname='', target='', detect=True, root='', **opts):   if detect: