[PATCH 2 of 2 RFC] applyupdates: audit path on flag changes

Adrian Buehlmann adrian at cadifra.com
Sat May 21 17:32:11 CDT 2011

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1306012872 -7200
# Node ID f2295a829f4751c34e6336334a4087c9aefa7590
# Parent  69b60edfd76c9dc173730627d4d962006f6b4bb1
applyupdates: audit path on flag changes

we're using the auditor of the repo wopener, since this is a path that belongs
to the tree we're updating to

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -373,6 +373,7 @@
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
+            repo.wopener.audit(f)
             util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
     u.progress(_('updating'), None, total=numupdates, unit=_('files'))

More information about the Mercurial-devel mailing list