# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1307794645 -7200
# Node ID aaafe06aaa5f3d1fe75746c8813853d1a3ed0f34
# Parent  b5a4f9f5ec495d037aa0127c98bff5546d5d1145
patch: generalize the use of patchmeta in applydiff()

- Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta
  instances in applydiff() makes things simpler.
- Rename selectfile() into makepatchmeta(). It is responsible for creating
  patchmeta for regular patches.
- Pass patchmeta objects to patchfile() directly

patchmeta instances were associated with git patches, for regular patches we
had to pass additional variables to tell the patch intent to patchfile().
Instead, we generate patchmeta for regular patches and pass them. This will
also help with patch filtering by matcher objects.

[ original upstream message ]

diff -r b5a4f9f5ec49 -r aaafe06aaa5f hgkw/keyword.py
--- a/hgkw/keyword.py	Tue May 31 20:39:04 2011 -0500
+++ b/hgkw/keyword.py	Sat Jun 11 14:17:25 2011 +0200
@@ -595,12 +595,10 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, backend, store, mode, create,
-                         remove, eolmode=None, copysource=None):
+    def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, backend, store, mode, create, remove,
-             eolmode, copysource)
+        orig(self, ui, gp, backend, store, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)