Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

overlay: don't send SHCNE_ASSOCCHANGED unless a thgstatus file was modified

Changeset 570ddfc1cb23…

Parent 3d7d0a3b4816…

by David Golub

Changes to 2 files · Browse files at 570ddfc1cb23 Showing diff from parent 3d7d0a3b4816 Diff from another changeset...

Change 1 of 2 Show Entire File TortoiseHgOverlayServer.py Stacked
 
262
263
264
 
265
266
267
 
 
268
269
270
 
278
279
280
281
 
282
283
284
 
262
263
264
265
266
267
 
268
269
270
271
272
 
280
281
282
 
283
284
285
286
@@ -262,9 +262,11 @@
  _stderr = sys.stderr   sys.stderr = errorstream   try: + updated_any = False   for r in sorted(roots):   try: - shlib.update_thgstatus(_ui, r, wait=False) + if shlib.update_thgstatus(_ui, r, wait=False): + updated_any = True   shlib.shell_notify([r], noassoc=True)   logger.msg('Updated ' + r)   except (IOError, OSError): @@ -278,7 +280,7 @@
  notifypaths -= failedroots   if notifypaths:   time.sleep(2) - shlib.shell_notify(list(notifypaths)) + shlib.shell_notify(list(notifypaths), noassoc=not updated_any)   logger.msg('Shell notified')   errmsg = errorstream.getvalue()   if errmsg:
Change 1 of 1 Show Entire File tortoisehg/​util/​shlib.py Stacked
 
140
141
142
 
143
144
145
 
140
141
142
143
144
145
146
@@ -140,6 +140,7 @@
  f.write(s + dn + '\n')   ui.note("%s %s\n" % (s, dn))   f.rename() + return update    else:   def shell_notify(paths, noassoc=False):