equal
deleted
inserted
replaced
423 except error.ParseError as inst: |
423 except error.ParseError as inst: |
424 dispatch._formatparse(self.ui.warn, inst) |
424 dispatch._formatparse(self.ui.warn, inst) |
425 self.ui.flush() |
425 self.ui.flush() |
426 self.cresult.write('exit 255') |
426 self.cresult.write('exit 255') |
427 return |
427 return |
|
428 except error.Abort as inst: |
|
429 self.ui.error(_("abort: %s\n") % inst) |
|
430 if inst.hint: |
|
431 self.ui.error(_("(%s)\n") % inst.hint) |
|
432 self.ui.flush() |
|
433 self.cresult.write('exit 255') |
|
434 return |
428 newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) |
435 newhash = hashstate.fromui(lui, self.hashstate.mtimepaths) |
429 insts = [] |
436 insts = [] |
430 if newhash.mtimehash != self.hashstate.mtimehash: |
437 if newhash.mtimehash != self.hashstate.mtimehash: |
431 addr = _hashaddress(self.baseaddress, self.hashstate.confighash) |
438 addr = _hashaddress(self.baseaddress, self.hashstate.confighash) |
432 insts.append('unlink %s' % addr) |
439 insts.append('unlink %s' % addr) |