comparison mercurial/commands.py @ 46907:ffd3e823a7e5

urlutil: extract `url` related code from `util` into the new module

The new module is well fitting for this new code. And this will be useful to
make the gathered code collaborate more later.

Differential Revision: https://phab.mercurial-scm.org/D10374

46906:33524c46a092

    wireprotoserver,
)
from .utils import (
    dateutil,
    stringutil,
)

if pycompat.TYPE_CHECKING:
    from typing import (
        List,

        try:
            if b'bookmarks' not in other.listkeys(b'namespaces'):
                ui.warn(_(b"remote doesn't support bookmarks\n"))
                return 0
            ui.pager(b'incoming')
            ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
            return bookmarks.incoming(ui, repo, other)
        finally:
            other.close()

    repo._subtoppath = ui.expandpath(source)

        other = hg.peer(repo, opts, dest)
        try:
            if b'bookmarks' not in other.listkeys(b'namespaces'):
                ui.warn(_(b"remote doesn't support bookmarks\n"))
                return 0
            ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
            ui.pager(b'outgoing')
            return bookmarks.outgoing(ui, repo, other)
        finally:
            other.close()

    else:
        pathitems = sorted(pycompat.iteritems(ui.paths))

    fm = ui.formatter(b'paths', opts)
    if fm.isplain():
        hidepassword = util.hidepassword
    else:
        hidepassword = bytes
    if ui.quiet:
        namefmt = b'%s\n'
    else:

        sources = [b'default']
    for source in sources:
        source, branches = hg.parseurl(
            ui.expandpath(source), opts.get(b'branch')
        )
        ui.status(_(b'pulling from %s\n') % util.hidepassword(source))
        ui.flush()
        other = hg.peer(repo, opts, source)
        update_conflict = None
        try:
            revs, checkout = hg.addbranchrevs(

                _(b'default repository not configured!'),
                hint=_(b"see 'hg help config.paths'"),
            )
        dest = path.pushloc or path.loc
        branches = (path.branch, opts.get(b'branch') or [])
        ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
        revs, checkout = hg.addbranchrevs(
            repo, repo, branches, opts.get(b'rev')
        )
        other = hg.peer(repo, opts, dest)

                raise
            return source, sbranch, None, None, None
        revs, checkout = hg.addbranchrevs(repo, other, branches, None)
        if revs:
            revs = [other.lookup(rev) for rev in revs]
        ui.debug(b'comparing with %s\n' % util.hidepassword(source))
        repo.ui.pushbuffer()
        commoninc = discovery.findcommonincoming(repo, other, heads=revs)
        repo.ui.popbuffer()
        return source, sbranch, other, commoninc, commoninc[1]

                dother = hg.peer(repo, {}, dest)
            except error.RepoError:
                if opts.get(b'remote'):
                    raise
                return dest, dbranch, None, None
            ui.debug(b'comparing with %s\n' % util.hidepassword(dest))
        elif sother is None:
            # there is no explicit destination peer, but source one is invalid
            return dest, dbranch, None, None
        else:
            dother = sother

                )
            url = b'bundle:' + fname
            try:
                txnname = b'unbundle'
                if not isinstance(gen, bundle2.unbundle20):
                    txnname = b'unbundle\n%s' % util.hidepassword(url)
                with repo.transaction(txnname) as tr:
                    op = bundle2.applybundle(
                        repo, gen, tr, source=b'unbundle', url=url
                    )
            except error.BundleUnknownFeatureError as exc:

46907:ffd3e823a7e5

    wireprotoserver,
)
from .utils import (
    dateutil,
    stringutil,
    urlutil,
)

if pycompat.TYPE_CHECKING:
    from typing import (
        List,

        try:
            if b'bookmarks' not in other.listkeys(b'namespaces'):
                ui.warn(_(b"remote doesn't support bookmarks\n"))
                return 0
            ui.pager(b'incoming')
            ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(source))
            return bookmarks.incoming(ui, repo, other)
        finally:
            other.close()

    repo._subtoppath = ui.expandpath(source)

        other = hg.peer(repo, opts, dest)
        try:
            if b'bookmarks' not in other.listkeys(b'namespaces'):
                ui.warn(_(b"remote doesn't support bookmarks\n"))
                return 0
            ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(dest))
            ui.pager(b'outgoing')
            return bookmarks.outgoing(ui, repo, other)
        finally:
            other.close()

    else:
        pathitems = sorted(pycompat.iteritems(ui.paths))

    fm = ui.formatter(b'paths', opts)
    if fm.isplain():
        hidepassword = urlutil.hidepassword
    else:
        hidepassword = bytes
    if ui.quiet:
        namefmt = b'%s\n'
    else:

        sources = [b'default']
    for source in sources:
        source, branches = hg.parseurl(
            ui.expandpath(source), opts.get(b'branch')
        )
        ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
        ui.flush()
        other = hg.peer(repo, opts, source)
        update_conflict = None
        try:
            revs, checkout = hg.addbranchrevs(

                _(b'default repository not configured!'),
                hint=_(b"see 'hg help config.paths'"),
            )
        dest = path.pushloc or path.loc
        branches = (path.branch, opts.get(b'branch') or [])
        ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
        revs, checkout = hg.addbranchrevs(
            repo, repo, branches, opts.get(b'rev')
        )
        other = hg.peer(repo, opts, dest)

                raise
            return source, sbranch, None, None, None
        revs, checkout = hg.addbranchrevs(repo, other, branches, None)
        if revs:
            revs = [other.lookup(rev) for rev in revs]
        ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
        repo.ui.pushbuffer()
        commoninc = discovery.findcommonincoming(repo, other, heads=revs)
        repo.ui.popbuffer()
        return source, sbranch, other, commoninc, commoninc[1]

                dother = hg.peer(repo, {}, dest)
            except error.RepoError:
                if opts.get(b'remote'):
                    raise
                return dest, dbranch, None, None
            ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
        elif sother is None:
            # there is no explicit destination peer, but source one is invalid
            return dest, dbranch, None, None
        else:
            dother = sother

                )
            url = b'bundle:' + fname
            try:
                txnname = b'unbundle'
                if not isinstance(gen, bundle2.unbundle20):
                    txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
                with repo.transaction(txnname) as tr:
                    op = bundle2.applybundle(
                        repo, gen, tr, source=b'unbundle', url=url
                    )
            except error.BundleUnknownFeatureError as exc: