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 3a0438fa4710…

Parents bcd9246d3995…

Parents f71be5565076…

by Steve Borho

Changes to one file · Browse files at 3a0438fa4710 Showing diff from parent bcd9246d3995 f71be5565076 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
760
761
762
763
 
764
765
766
 
768
769
770
771
 
772
773
774
 
760
761
762
 
763
764
765
766
 
768
769
770
 
771
772
773
774
@@ -760,7 +760,7 @@
  clean=clean,   unknown=unknown)   self.status = status - except (IOError, util.Abort), e: + except (OSError, IOError, util.Abort), e:   self.status_error = str(e)   self.subrepos = []   wctx = repo[None] @@ -768,7 +768,7 @@
  for s in wctx.substate:   if matcher(s) and wctx.sub(s).dirty():   self.subrepos.append(s) - except (IOError, error.ConfigError), e: + except (OSError, IOError, error.ConfigError), e:   self.status_error = str(e)     def status_wait(thread):