aboutsummaryrefslogtreecommitdiff
path: root/paludis/fs_merger.hh
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-05-12 11:32:59 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-05-18 14:07:32 -0700
commit6bdc2e7523f8b2eebf78401356f568cace26f301 (patch)
treef625a1dcb31286850744387d4172a3c86cc82fff /paludis/fs_merger.hh
parent97d0f19557cbc209dab9fbfe8fcf74d9238d6161 (diff)
downloadpaludis-6bdc2e7523f8b2eebf78401356f568cace26f301.tar.gz
paludis-6bdc2e7523f8b2eebf78401356f568cace26f301.tar.xz
merger: refactor merge display
This moves the stringification of the classification, and the formatting of the merge display into FSMerger so that it may be shared across the VDB merger and the NDBAM merger. This will be used internally in FSMerger for selective parts. Signed-off-by: Saleem Abdulrasool <compnerd@compnerd.org>
Diffstat (limited to 'paludis/fs_merger.hh')
-rw-r--r--paludis/fs_merger.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh
index e9bde0f0c..e0f28487f 100644
--- a/paludis/fs_merger.hh
+++ b/paludis/fs_merger.hh
@@ -229,6 +229,9 @@ namespace paludis
///\}
virtual std::string make_arrows(const FSMergerStatusFlags & flags) const;
+ virtual void display_merge(const EntryType &, const FSPath &,
+ const FSMergerStatusFlags &,
+ const std::string & = "") const;
public:
///\name Basic operations