hgext/narrow/narrowwirepeer.py
changeset 45682 d2e1dcd4490d
parent 43506 9f70512ae2cf
child 45942 89a2afe31e82
equal deleted inserted replaced
45681:a736ab681b78 45682:d2e1dcd4490d
    11     bundle2,
    11     bundle2,
    12     error,
    12     error,
    13     extensions,
    13     extensions,
    14     hg,
    14     hg,
    15     narrowspec,
    15     narrowspec,
    16     pycompat,
       
    17     wireprototypes,
    16     wireprototypes,
    18     wireprotov1peer,
    17     wireprotov1peer,
    19     wireprotov1server,
    18     wireprotov1server,
    20 )
    19 )
    21 
    20 
   123             narrowbundle2.generate_ellipses_bundle2_for_widening(
   122             narrowbundle2.generate_ellipses_bundle2_for_widening(
   124                 bundler, repo, oldmatch, newmatch, cgversion, common, known,
   123                 bundler, repo, oldmatch, newmatch, cgversion, common, known,
   125             )
   124             )
   126     except error.Abort as exc:
   125     except error.Abort as exc:
   127         bundler = bundle2.bundle20(repo.ui)
   126         bundler = bundle2.bundle20(repo.ui)
   128         manargs = [(b'message', pycompat.bytestr(exc))]
   127         manargs = [(b'message', exc.message)]
   129         advargs = []
   128         advargs = []
   130         if exc.hint is not None:
   129         if exc.hint is not None:
   131             advargs.append((b'hint', exc.hint))
   130             advargs.append((b'hint', exc.hint))
   132         bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))
   131         bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))
   133         preferuncompressed = True
   132         preferuncompressed = True