comparison mercurial/commands.py @ 625:978011cf5279

Cleanups for repo.pull

Use repo.pull in pull and clone commands
Teach clone about ssh:// (temporarily)
Fix up shutil issue on failed pull

624:876333a295ff

        ui.warn("abort: destination '%s' already exists\n" % dest)
        return 1

    class dircleanup:
        def __init__(self, dir):
            self.dir = dir
            os.mkdir(dir)
        def close(self):
            self.dir = None
        def __del__(self):
            if self.dir:
                import shutil
                shutil.rmtree(self.dir, True)

    d = dircleanup(dest)

    link = 0
    abspath = source
    if not (source.startswith("http://") or
            source.startswith("hg://") or
            source.startswith("old-http://")):
        abspath = os.path.abspath(source)
        d1 = os.stat(dest).st_dev
        d2 = os.stat(source).st_dev
        if d1 == d2: link = 1

        repo = hg.repository(ui, dest)

    else:
        repo = hg.repository(ui, dest, create=1)
        other = hg.repository(ui, source)
        fetch = repo.findincoming(other)
        if fetch:
            cg = other.changegroup(fetch)
            repo.addchangegroup(cg)

    f = repo.opener("hgrc", "w")
    f.write("[paths]\n")
    f.write("default = %s\n" % abspath)

            show_changeset(ui, repo, changenode=n)

def pull(ui, repo, source="default", **opts):
    """pull changes from the specified source"""
    source = ui.expandpath(source)

    ui.status('pulling from %s\n' % (source))

    other = hg.repository(ui, source)
    fetch = repo.findincoming(other)
    if not fetch:
        ui.status("no changes found\n")
        return

    cg = other.changegroup(fetch)
    r = repo.addchangegroup(cg)
    if cg and not r:
        if opts['update']:
            return update(ui, repo)
        else:
            ui.status("(run 'hg update' to get a working copy)\n")

625:978011cf5279

        ui.warn("abort: destination '%s' already exists\n" % dest)
        return 1

    class dircleanup:
        def __init__(self, dir):
            import shutil
            self.rmtree = shutil.rmtree
            self.dir = dir
            os.mkdir(dir)
        def close(self):
            self.dir = None
        def __del__(self):
            if self.dir:
                self.rmtree(self.dir, True)

    d = dircleanup(dest)

    link = 0
    abspath = source
    if not (source.startswith("http://") or
            source.startswith("hg://") or
            source.startswith("ssh://") or
            source.startswith("old-http://")):
        abspath = os.path.abspath(source)
        d1 = os.stat(dest).st_dev
        d2 = os.stat(source).st_dev
        if d1 == d2: link = 1

        repo = hg.repository(ui, dest)

    else:
        repo = hg.repository(ui, dest, create=1)
        other = hg.repository(ui, source)
        repo.pull(other)

    f = repo.opener("hgrc", "w")
    f.write("[paths]\n")
    f.write("default = %s\n" % abspath)

            show_changeset(ui, repo, changenode=n)

def pull(ui, repo, source="default", **opts):
    """pull changes from the specified source"""
    source = ui.expandpath(source)
    ui.status('pulling from %s\n' % (source))

    other = hg.repository(ui, source)
    r = repo.pull(other)
    if not r:
        if opts['update']:
            return update(ui, repo)
        else:
            ui.status("(run 'hg update' to get a working copy)\n")