Mercurial > hg

changeset 3018:db3f42261452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix errors reported by pychecker mercurial/merge.py:174: No global (mode) found mercurial/merge.py:253: No global (errno) found
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 26 Aug 2006 11:19:00 +0200
parents 47aad3489da8
children aebc3f64b20f
files mercurial/merge.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Aug 24 15:19:56 2006 -0700
+++ b/mercurial/merge.py	Sat Aug 26 11:19:00 2006 +0200
@@ -8,7 +8,7 @@
 from node import *
 from i18n import gettext as _
 from demandload import *
-demandload(globals(), "util os tempfile")
+demandload(globals(), "errno util os tempfile")
 
 def fmerge(f, local, other, ancestor):
     """merge executable flags"""
@@ -168,7 +168,8 @@
                     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):
+                    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)