From c92948e8b9dbd11c0ccd7489cb1b3a148043d9c9 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 29 Jan 2024 00:39:07 +0300
Subject: [PATCH] Improve error message.

---
 td/telegram/files/FileManager.cpp | 17 +++++++++++++++--
 td/telegram/files/FileManager.h   |  2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index f4633744d..719d1254c 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -72,6 +72,18 @@ StringBuilder &operator<<(StringBuilder &string_builder, FileLocationSource sour
   }
 }
 
+StringBuilder &operator<<(StringBuilder &string_builder, const NewRemoteFileLocation &location) {
+  if (location.is_full_alive) {
+    string_builder << "alive ";
+  }
+  if (location.full) {
+    string_builder << location.full.value();
+  } else {
+    string_builder << "[no location]";
+  }
+  return string_builder << " from " << location.full_source;
+}
+
 StringBuilder &operator<<(StringBuilder &string_builder, FileManager::Query::Type type) {
   switch (type) {
     case FileManager::Query::Type::UploadByHash:
@@ -1692,8 +1704,9 @@ Status FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sync) {
   if (size_i == -1) {
     try_flush_node_info(x_node, "merge 2");
     try_flush_node_info(y_node, "merge 3");
-    return Status::Error(
-        400, PSLICE() << "Can't merge files. Different size: " << x_node->size_ << " and " << y_node->size_);
+    return Status::Error(400, PSLICE() << "Can't merge files " << x_node->local_ << '/' << x_node->remote_ << " and "
+                                       << y_node->local_ << '/' << y_node->remote_
+                                       << ". Different size: " << x_node->size_ << " and " << y_node->size_);
   }
   if (encryption_key_i == -1) {
     if (nodes[remote_i]->remote_.full && nodes[local_i]->local_.type() != LocalFileLocation::Type::Partial) {
diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h
index a8321b2e4..2d9744c25 100644
--- a/td/telegram/files/FileManager.h
+++ b/td/telegram/files/FileManager.h
@@ -66,6 +66,8 @@ struct NewRemoteFileLocation {
   int64 ready_size = 0;
 };
 
+StringBuilder &operator<<(StringBuilder &string_builder, const NewRemoteFileLocation &location);
+
 class FileNode {
  public:
   FileNode(LocalFileLocation local, NewRemoteFileLocation remote, unique_ptr<FullGenerateFileLocation> generate,