hgext/fix.py
branchstable
changeset 43380 579672b347d2
parent 43227 f02d3c0eed18
child 43501 b2f95f9d3588
child 44048 61881b170140
equal deleted inserted replaced
43379:bb509f39d387 43380:579672b347d2
   124 
   124 
   125 from __future__ import absolute_import
   125 from __future__ import absolute_import
   126 
   126 
   127 import collections
   127 import collections
   128 import itertools
   128 import itertools
   129 import json
       
   130 import os
   129 import os
   131 import re
   130 import re
   132 import subprocess
   131 import subprocess
   133 
   132 
   134 from mercurial.i18n import _
   133 from mercurial.i18n import _
   640                 showstderr(ui, fixctx.rev(), fixername, stderr)
   639                 showstderr(ui, fixctx.rev(), fixername, stderr)
   641             newerdata = stdout
   640             newerdata = stdout
   642             if fixer.shouldoutputmetadata():
   641             if fixer.shouldoutputmetadata():
   643                 try:
   642                 try:
   644                     metadatajson, newerdata = stdout.split(b'\0', 1)
   643                     metadatajson, newerdata = stdout.split(b'\0', 1)
   645                     metadata[fixername] = json.loads(metadatajson)
   644                     metadata[fixername] = pycompat.json_loads(metadatajson)
   646                 except ValueError:
   645                 except ValueError:
   647                     ui.warn(
   646                     ui.warn(
   648                         _(b'ignored invalid output from fixer tool: %s\n')
   647                         _(b'ignored invalid output from fixer tool: %s\n')
   649                         % (fixername,)
   648                         % (fixername,)
   650                     )
   649                     )