aboutsummaryrefslogtreecommitdiff
path: root/patch_reader.cc
diff options
context:
space:
mode:
authorSamuel Huang <huangs@chromium.org>2018-04-30 22:47:52 +0000
committerEdward Lesmes <ehmaldonado@google.com>2021-07-23 22:17:29 +0000
commit6951a286379338eaa10a712989541ca77c0c2a9c (patch)
tree2b4b9f8addfe9aa37804bb52929a235a10b23239 /patch_reader.cc
parent93ffc913ec7d369818a109b9ca6de7adb278e163 (diff)
downloadzucchini-6951a286379338eaa10a712989541ca77c0c2a9c.tar.gz
[Zucchini] Introduce Imposed Ensemble Matcher.
Previously Zucchini-gen uses built-in heuristics to perform element matching for ensemble patch generation. This CL adds an option (accessible via the -impose parameter) to specify elements in "old" and "new", and how they match. This allows the default heuristics to be overridden, and enables external applications (who perhaps have better ideas of element matching, e.g., have access to archiving programs) to better use Zucchini to patch archives. Zucchini-match is updated to prints the -impose command line to repeat its results. Also, ElementMatch::ToString() is added. Change-Id: I541b64722904c2fcd19ed75246d87e0268fbf86c Reviewed-on: https://chromium-review.googlesource.com/1027191 Reviewed-by: Samuel Huang <huangs@chromium.org> Reviewed-by: Greg Thompson <grt@chromium.org> Commit-Queue: Samuel Huang <huangs@chromium.org> Cr-Commit-Position: refs/heads/master@{#554909} NOKEYCHECK=True GitOrigin-RevId: 73a64ffde3f3b64df576aa1f2b5baebf7ec964ba
Diffstat (limited to 'patch_reader.cc')
-rw-r--r--patch_reader.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/patch_reader.cc b/patch_reader.cc
index 7e0b815..179f0fd 100644
--- a/patch_reader.cc
+++ b/patch_reader.cc
@@ -4,7 +4,6 @@
#include "components/zucchini/patch_reader.h"
-#include <algorithm>
#include <type_traits>
#include <utility>