hgext/extdiff.py

30677:c80c16a8a0b0

from __future__ import absolute_import

import os
import re
import shlex
import shutil
import tempfile
from mercurial.i18n import _
from mercurial.node import (
    nullid,

    archival,
    cmdutil,
    commands,
    error,
    filemerge,
    scmutil,
    util,
)

cmdtable = {}

            continue
        else:
            if path:
                # case "cmd = path opts"
                cmdline = path
                diffopts = len(shlex.split(cmdline)) > 1
            else:
                # case "cmd ="
                path = util.findexe(cmd)
                if path is None:
                    path = filemerge.findexternaltool(ui, cmd) or cmd

30678:caf7e1c5efe4

from __future__ import absolute_import

import os
import re
import shutil
import tempfile
from mercurial.i18n import _
from mercurial.node import (
    nullid,

    archival,
    cmdutil,
    commands,
    error,
    filemerge,
    pycompat,
    scmutil,
    util,
)

cmdtable = {}

            continue
        else:
            if path:
                # case "cmd = path opts"
                cmdline = path
                diffopts = len(pycompat.shlexsplit(cmdline)) > 1
            else:
                # case "cmd ="
                path = util.findexe(cmd)
                if path is None:
                    path = filemerge.findexternaltool(ui, cmd) or cmd