Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.4, 2.0.5, and 2.1

stable visdiff: fix broken symlinks handling (mercurial issue 1909)

Corresponds to Mercurial extdiff changeset 3eb632d9cf42

Changeset e716c6fb68eb…

Parent 7fd66705239e…

by Steve Borho

Changes to one file · Browse files at e716c6fb68eb Showing diff from parent 7fd66705239e Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
113
114
115
116
 
 
117
118
119
 
334
335
336
337
 
338
339
340
 
113
114
115
 
116
117
118
119
120
 
335
336
337
 
338
339
340
341
@@ -113,7 +113,8 @@
  f.write(data)   f.close()   if ctx.rev() is None: - fns_and_mtime.append((dest, repo.wjoin(fn), os.path.getmtime(dest))) + fns_and_mtime.append((dest, repo.wjoin(fn), + os.lstat(dest).st_mtime))   else:   # Make file read/only, to indicate it's static (archival) nature   os.chmod(dest, stat.S_IREAD) @@ -334,7 +335,7 @@
  # detect if changes were made to mirrored working files   for copy_fn, working_fn, mtime in fns_and_mtime:   try: - if os.path.getmtime(copy_fn) != mtime: + if os.lstat(copy_fn).st_mtime != mtime:   ui.debug('file changed while diffing. '   'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn))   util.copyfile(copy_fn, working_fn)