comparison mercurial/commands.py @ 6405:b8346ae5d64b

commands: fix shadowed repo module

6401:635c57cf0de8

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from node import hex, nullid, nullrev, short
from repo import RepoError
from i18n import _
import os, re, sys, urllib
import hg, util, revlog, bundlerepo, extensions, copies
import difflib, patch, time, help, mdiff, tempfile
import version, socket

    other = hg.repository(ui, source)
    ui.status(_('pulling from %s\n') % util.hidepassword(source))
    if revs:
        try:
            revs = [other.lookup(rev) for rev in revs]
        except repo.NoCapability:
            error = _("Other repository doesn't support revision lookup, "
                      "so a rev cannot be specified.")
            raise util.Abort(error)

    modheads = repo.pull(other, heads=revs, force=opts['force'])

6405:b8346ae5d64b

#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from node import hex, nullid, nullrev, short
from repo import RepoError, NoCapability
from i18n import _
import os, re, sys, urllib
import hg, util, revlog, bundlerepo, extensions, copies
import difflib, patch, time, help, mdiff, tempfile
import version, socket

    other = hg.repository(ui, source)
    ui.status(_('pulling from %s\n') % util.hidepassword(source))
    if revs:
        try:
            revs = [other.lookup(rev) for rev in revs]
        except NoCapability:
            error = _("Other repository doesn't support revision lookup, "
                      "so a rev cannot be specified.")
            raise util.Abort(error)

    modheads = repo.pull(other, heads=revs, force=opts['force'])