mercurial/commands.py

7873:4a4c7f6a5912

    # templates
    ui.status(_("Checking templates...\n"))
    try:
        import templater
        t = templater.templater(templater.templatepath("map-cmdline.default"))
    except Exception, inst:
        ui.write(" %s\n" % inst)
        ui.write(_(" (templates seem to have been installed incorrectly)\n"))
        problems += 1

                if opts.get('exact') or opts.get('import_branch'):
                    repo.dirstate.setbranch(branch or 'default')

                files = {}
                try:
                    fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
                                       files=files)
                finally:
                    files = patch.updatedir(ui, repo, files, similarity=sim/100.)
                if not opts.get('no_commit'):
                    n = repo.commit(files, message, opts.get('user') or user,
                                    opts.get('date') or date)

7874:d812029cda85

    # templates
    ui.status(_("Checking templates...\n"))
    try:
        import templater
        templater.templater(templater.templatepath("map-cmdline.default"))
    except Exception, inst:
        ui.write(" %s\n" % inst)
        ui.write(_(" (templates seem to have been installed incorrectly)\n"))
        problems += 1

                if opts.get('exact') or opts.get('import_branch'):
                    repo.dirstate.setbranch(branch or 'default')

                files = {}
                try:
                    patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
                                files=files)
                finally:
                    files = patch.updatedir(ui, repo, files, similarity=sim/100.)
                if not opts.get('no_commit'):
                    n = repo.commit(files, message, opts.get('user') or user,
                                    opts.get('date') or date)