Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 27344:43c00ca887d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: have merge.update use a matcher instead of partial fn This is relatively rarely used functionality, but migrating this to a matcher will make future work on narrow clones more feasible.
author Augie Fackler <augie@google.com>
date Mon, 14 Dec 2015 18:54:03 -0500
parents 8117e2cd959e
children 4eeef1b2d689
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sat Dec 12 09:57:05 2015 -0800
+++ b/mercurial/cmdutil.py	Mon Dec 14 18:54:03 2015 -0500
@@ -183,9 +183,9 @@
             # 3a. apply filtered patch to clean repo  (clean)
             if backups:
                 # Equivalent to hg.revert
-                choices = lambda key: key in backups
+                m = scmutil.matchfiles(repo, backups.keys())
                 mergemod.update(repo, repo.dirstate.p1(),
-                        False, True, choices)
+                        False, True, matcher=m)
 
             # 3b. (apply)
             if dopatch: