Yuya Nishihara avatar Yuya Nishihara committed 9750c59

copypatch: support internal lossless export/import via clipboard (fixes #841)

Because the patch content is not always unicode-safe, we'd better avoid
encoding conversion.

Comments (0)

Files changed (2)

tortoisehg/hgqt/repowidget.py

         if returnval:
             return output
         else:
-            QApplication.clipboard().setText(hglib.tounicode(output))
+            mdata = QMimeData()
+            mdata.setData('text/x-diff', output)  # for lossless import
+            mdata.setText(hglib.tounicode(output))
+            QApplication.clipboard().setMimeData(mdata)
 
     def copyHash(self):
         clip = QApplication.clipboard()

tortoisehg/hgqt/thgimport.py

             self.src_combo.setFocus()
 
     def getcliptext(self):
-        text = hglib.fromunicode(QApplication.clipboard().text())
-        if not text:
+        mdata = QApplication.clipboard().mimeData()
+        if mdata.hasFormat('text/x-diff'):  # lossless
+            text = str(mdata.data('text/x-diff'))
+        elif mdata.hasText():  # could be encoding damaged
+            text = hglib.fromunicode(mdata.text(), errors='ignore')
+        else:
             return
         filename = self.writetempfile(text)
         curtext = self.src_combo.currentText()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.