comparison mercurial/exchange.py @ 37084:f0b6fbea00cf

stringutil: bulk-replace call sites to point to new module

This might conflict with other patches floating around, sorry.

37083:f99d64e8a4e4

    scmutil,
    sslutil,
    streamclone,
    url as urlmod,
    util,
)

urlerr = util.urlerr
urlreq = util.urlreq

                repo.ui.debug(str(e) + '\n')
                continue
            except error.UnsupportedBundleSpecification as e:
                repo.ui.debug('filtering %s because unsupported bundle '
                              'spec: %s\n' % (
                                  entry['URL'], util.forcebytestr(e)))
                continue
        # If we don't have a spec and requested a stream clone, we don't know
        # what the entry is so don't attempt to apply it.
        elif streamclonerequested:
            repo.ui.debug('filtering %s because cannot determine if a stream '

            else:
                bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
            return True
        except urlerr.httperror as e:
            ui.warn(_('HTTP error fetching bundle: %s\n') %
                    util.forcebytestr(e))
        except urlerr.urlerror as e:
            ui.warn(_('error fetching bundle: %s\n') %
                    util.forcebytestr(e.reason))

        return False

37084:f0b6fbea00cf

    scmutil,
    sslutil,
    streamclone,
    url as urlmod,
    util,
)
from .utils import (
    stringutil,
)

urlerr = util.urlerr
urlreq = util.urlreq

                repo.ui.debug(str(e) + '\n')
                continue
            except error.UnsupportedBundleSpecification as e:
                repo.ui.debug('filtering %s because unsupported bundle '
                              'spec: %s\n' % (
                                  entry['URL'], stringutil.forcebytestr(e)))
                continue
        # If we don't have a spec and requested a stream clone, we don't know
        # what the entry is so don't attempt to apply it.
        elif streamclonerequested:
            repo.ui.debug('filtering %s because cannot determine if a stream '

            else:
                bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
            return True
        except urlerr.httperror as e:
            ui.warn(_('HTTP error fetching bundle: %s\n') %
                    stringutil.forcebytestr(e))
        except urlerr.urlerror as e:
            ui.warn(_('error fetching bundle: %s\n') %
                    stringutil.forcebytestr(e.reason))

        return False