Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

status: exceptions must be converted to str before decoding to unicode

Changeset 5874d009504c…

Parent 1c5130171abd…

by Steve Borho

Changes to one file · Browse files at 5874d009504c Showing diff from parent 1c5130171abd Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
361
362
363
364
 
365
366
367
 
382
383
384
385
 
386
387
388
 
424
425
426
427
 
428
429
430
431
432
433
434
435
 
 
 
436
437
438
 
361
362
363
 
364
365
366
367
 
382
383
384
 
385
386
387
388
 
424
425
426
 
427
428
429
430
431
432
433
 
 
434
435
436
437
438
439
@@ -361,7 +361,7 @@
  for s, l in patch.difflabel(self.wctx.diff, match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e: - err = hglib.tounicode(e) + err = hglib.tounicode(str(e))   self.emit(SIGNAL('errorMessage'), QString(err))   return   o, e = hu.getdata() @@ -382,7 +382,7 @@
  match=m, git=True):   hu.write(s, label=l)   except (IOError, error.RepoError, error.LookupError, util.Abort), e: - err = hglib.tounicode(e) + err = hglib.tounicode(str(e))   self.emit(SIGNAL('errorMessage'), QString(err))   return   text += '</br><h3>' @@ -424,15 +424,16 @@
  wctx = self.repo[None]   wctx.status(**stopts)   except (OSError, IOError, util.Abort), e: - err = hglib.tounicode(e) + err = hglib.tounicode(str(e))   self.emit(SIGNAL('errorMessage'), QString(err))   try:   wctx.dirtySubrepos = []   for s in wctx.substate:   if wctx.sub(s).dirty():   wctx.dirtySubrepos.append(s) - except (OSError, IOError, util.Abort, error.ConfigError), e: - err = hglib.tounicode(e) + except (OSError, IOError, util.Abort, + error.RepoLookupError, error.ConfigError), e: + err = hglib.tounicode(str(e))   self.emit(SIGNAL('errorMessage'), QString(err))   self.emit(SIGNAL('finished'), wctx, patchecked)