[PATCH] py3: fix bytes/str issue when finding matching revisions

10 views
Skip to first unread message

Aay Jay Chan

unread,
Feb 23, 2024, 5:40:18 PMFeb 23
to thg...@googlegroups.com
# HG changeset patch
# User Aay Jay Chan <aayja...@gmail.com>
# Date 1708727934 0
# Fri Feb 23 22:38:54 2024 +0000
# Branch stable
# Node ID 1fabcaa0804d3c09ce394ed75e2bdfb489871442
# Parent 6364e3b9c0dfa953844c2fc0edf36c42bec6e751
py3: fix bytes/str issue when finding matching revisions

diff --git a/tortoisehg/hgqt/matching.py b/tortoisehg/hgqt/matching.py
--- a/tortoisehg/hgqt/matching.py
+++ b/tortoisehg/hgqt/matching.py
@@ -274,7 +274,7 @@
if chk.isChecked():
fields.append(field)

- rev = hglib.fromunicode(self.rev_combo.currentText())
+ rev = self.rev_combo.currentText()
if fields:
self.revsetexpression = ("matching(%s, '%s')"
% (rev, ' '.join(fields)))

Yuya Nishihara

unread,
Feb 23, 2024, 10:03:15 PMFeb 23
to Aay Jay Chan, thg...@googlegroups.com
On Fri, 23 Feb 2024 22:40:14 +0000, Aay Jay Chan wrote:
> # HG changeset patch
> # User Aay Jay Chan <aayja...@gmail.com>
> # Date 1708727934 0
> # Fri Feb 23 22:38:54 2024 +0000
> # Branch stable
> # Node ID 1fabcaa0804d3c09ce394ed75e2bdfb489871442
> # Parent 6364e3b9c0dfa953844c2fc0edf36c42bec6e751
> py3: fix bytes/str issue when finding matching revisions

Queued for stable, thanks.
Reply all
Reply to author
Forward
0 new messages