Commits

Yuya Nishihara  committed eaa0dec Merge

Merge with stable

  • Participants
  • Parent commits 1818b7a, 4f3c632

Comments (0)

Files changed (2)

File doc/source/workbench.txt

 		Allows to manage tags to the selected revision.
 	:guilabel:`Bookmark...`
 		Allows to manage bookmarks for the selected revision.
-		*This option requires the boomarks extension to be enabled.*
 	:guilabel:`Backout...`
 		Create a backout changeset for selected revision.
 	:guilabel:`Export`

File tortoisehg/hgqt/manifestmodel.py

         def preparefiles():
             files = [self.filePath(i) for i in indexes if i.isValid()]
             if self._rev is not None:
-                base, _fns = visdiff.snapshot(self._repo, files,
+                lfiles = map(hglib.fromunicode, files)
+                base, _fns = visdiff.snapshot(self._repo, lfiles,
                                               self._repo[self._rev])
             else:  # working copy
                 base = self._repo.root
-            return iter(os.path.join(base, e) for e in files)
+            return iter(os.path.join(hglib.tounicode(base), e) for e in files)
 
         m = QMimeData()
         m.setUrls([QUrl.fromLocalFile(e) for e in preparefiles()])