Patchwork py3: byteify extension in test-relink.t

login
register
mail settings
Submitter Matt Harbison
Date Oct. 16, 2018, 2:21 a.m.
Message ID <bb67d54942a16a556cdf.1539656483@Envy>
Download mbox | patch
Permalink /patch/36023/
State Accepted
Headers show

Comments

Matt Harbison - Oct. 16, 2018, 2:21 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1539536753 14400
#      Sun Oct 14 13:05:53 2018 -0400
# Node ID bb67d54942a16a556cdf257d67ef8f98638728a7
# Parent  0947a5818862b8cbd0689d9bb943baa35361a436
py3: byteify extension in test-relink.t
Yuya Nishihara - Oct. 16, 2018, 7:17 a.m.
On Mon, 15 Oct 2018 22:21:23 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1539536753 14400
> #      Sun Oct 14 13:05:53 2018 -0400
> # Node ID bb67d54942a16a556cdf257d67ef8f98638728a7
> # Parent  0947a5818862b8cbd0689d9bb943baa35361a436
> py3: byteify extension in test-relink.t

Queued, thanks.

Patch

diff --git a/tests/test-relink.t b/tests/test-relink.t
--- a/tests/test-relink.t
+++ b/tests/test-relink.t
@@ -11,9 +11,12 @@ 
   > from __future__ import absolute_import, print_function
   > import os
   > import sys
-  > from mercurial import util
+  > from mercurial import (
+  >     pycompat,
+  >     util,
+  > )
   > path1, path2 = sys.argv[1:3]
-  > if util.samefile(path1, path2):
+  > if util.samefile(pycompat.fsencode(path1), pycompat.fsencode(path2)):
   >     print('%s == %s' % (path1, path2))
   > else:
   >     print('%s != %s' % (path1, path2))