Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 9b7d5ec6dbf0…

Parents 8d0a10cf17cb…

Parents 22804f32bb99…

by Sune Foldager

Changes to one file · Browse files at 9b7d5ec6dbf0 Showing diff from parent 8d0a10cf17cb 22804f32bb99 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
205
206
207
208
 
209
210
 
211
212
 
213
214
215
 
276
277
278
279
 
280
281
282
 
287
288
289
290
 
291
292
293
 
205
206
207
 
208
209
 
210
211
 
212
213
214
215
 
276
277
278
 
279
280
281
282
 
287
288
289
 
290
291
292
293
@@ -205,11 +205,11 @@
  # Disable 3-way merge if there is only one parent or no tool support   do3way = bool(mergeopts) and ctx1b is not None   if do3way: - args = ' '.join(mergeopts) + args = mergeopts   else: - args = ' '.join(diffopts) + args = diffopts   - def dodiff(tmproot, diffcmd, args): + def dodiff(tmproot):   fns_and_mtime = []     # Always make a copy of ctx1a (and ctx1b, if applicable) @@ -276,7 +276,7 @@
  plabel1=label1a, plabel2=label1b,   ancestor=dira, alabel=labela,   clabel=label2, child=dir2) - launchtool(diffcmd, diffopts, replace, True) + launchtool(diffcmd, args, replace, True)     # detect if changes were made to mirrored working files   for copy_fn, working_fn, mtime in fns_and_mtime: @@ -287,7 +287,7 @@
    def dodiffwrapper():   try: - dodiff(tmproot, diffcmd, args) + dodiff(tmproot)   finally:   ui.note(_('cleaning up temp directory\n'))   shutil.rmtree(tmproot)