Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable visdiff: verify selected file(s) are in copy to or from list

Closes #1091

Changeset 8d4561bb691c…

Parent 1e3224ae8a15…

by Steve Borho

Changes to one file · Browse files at 8d4561bb691c Showing diff from parent 1e3224ae8a15 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
172
173
174
175
 
 
 
 
 
 
 
 
 
176
177
178
 
172
173
174
 
175
176
177
178
179
180
181
182
183
184
185
186
@@ -172,7 +172,15 @@
  else:   toollist.add(preferred)   - if len(toollist) > 1 or cpy: + cto = cpy.keys() + cfrom = cpy.values() + for path in MAR: + if path in cto or path in cfrom: + hascopies = True + break + else: + hascopies = False + if len(toollist) > 1 or hascopies:   usewin = True   else:   preferred = toollist.pop()