comparison mercurial/commands.py @ 4868:192cd95c2ba8

merge with crew-stable

4867:8be7ba425621

        if ui.verbose or not exact:
            ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
        targets[abstarget] = abssrc
        if abstarget != origsrc:
            if repo.dirstate.state(origsrc) == 'a':
                ui.warn(_("%s was marked for addition. "
                          "%s will not be committed as a copy.\n")
                        % (repo.pathto(origsrc, cwd), reltarget))
                if abstarget not in repo.dirstate and not opts.get('dry_run'):
                    repo.add([abstarget], wlock)
            elif not opts.get('dry_run'):
                repo.copy(origsrc, abstarget, wlock)
        copied.append((abssrc, relsrc, exact))

    optlist = ("name templates style address port ipv6"
               " accesslog errorlog webdir_conf certificate")
    for o in optlist.split():
        if opts[o]:
            parentui.setconfig("web", o, str(opts[o]))

    if repo is None and not ui.config("web", "webdir_conf"):
        raise hg.RepoError(_("There is no Mercurial repository here"
                             " (.hg not found)"))

4868:192cd95c2ba8

        if ui.verbose or not exact:
            ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
        targets[abstarget] = abssrc
        if abstarget != origsrc:
            if repo.dirstate.state(origsrc) == 'a':
                if not ui.quiet:
                    ui.warn(_("%s has not been committed yet, so no copy "
                              "data will be stored for %s.\n")
                            % (repo.pathto(origsrc, cwd), reltarget))
                if abstarget not in repo.dirstate and not opts.get('dry_run'):
                    repo.add([abstarget], wlock)
            elif not opts.get('dry_run'):
                repo.copy(origsrc, abstarget, wlock)
        copied.append((abssrc, relsrc, exact))

    optlist = ("name templates style address port ipv6"
               " accesslog errorlog webdir_conf certificate")
    for o in optlist.split():
        if opts[o]:
            parentui.setconfig("web", o, str(opts[o]))
            if repo.ui != parentui:
                repo.ui.setconfig("web", o, str(opts[o]))

    if repo is None and not ui.config("web", "webdir_conf"):
        raise hg.RepoError(_("There is no Mercurial repository here"
                             " (.hg not found)"))