comparison mercurial/merge.py @ 3018:db3f42261452

fix errors reported by pychecker

mercurial/merge.py:174: No global (mode) found
mercurial/merge.py:253: No global (errno) found

3017:47aad3489da8

# of the GNU General Public License, incorporated herein by reference.

from node import *
from i18n import gettext as _
from demandload import *
demandload(globals(), "util os tempfile")

def fmerge(f, local, other, ancestor):
    """merge executable flags"""
    a, b, c = ancestor.execf(f), local.execf(f), other.execf(f)
    return ((a^b) | (a^c)) ^ a

            if not queued and m1.execf(f) != m2.execf(f):
                if overwrite:
                    repo.ui.debug(_(" updating permissions for %s\n") % f)
                    util.set_exec(repo.wjoin(f), m2.execf(f))
                else:
                    if fmerge(f, m1, m2, ma) != m1.execf(f):
                        repo.ui.debug(_(" updating permissions for %s\n")
                                      % f)
                        util.set_exec(repo.wjoin(f), mode)
            del m2[f]
        elif f in ma:

3018:db3f42261452

# of the GNU General Public License, incorporated herein by reference.

from node import *
from i18n import gettext as _
from demandload import *
demandload(globals(), "errno util os tempfile")

def fmerge(f, local, other, ancestor):
    """merge executable flags"""
    a, b, c = ancestor.execf(f), local.execf(f), other.execf(f)
    return ((a^b) | (a^c)) ^ a

            if not queued and m1.execf(f) != m2.execf(f):
                if overwrite:
                    repo.ui.debug(_(" updating permissions for %s\n") % f)
                    util.set_exec(repo.wjoin(f), m2.execf(f))
                else:
                    mode = fmerge(f, m1, m2, ma)
                    if mode != m1.execf(f):
                        repo.ui.debug(_(" updating permissions for %s\n")
                                      % f)
                        util.set_exec(repo.wjoin(f), mode)
            del m2[f]
        elif f in ma: