gnulib-tool.py: Fix extra arguments to function call.

gnulib-tool.py: Fix extra arguments to function call.

[Collin Funk]

[-- Attachment #1: Type: text/plain, Size: 916 bytes --]

I see a warning for this section of code because isfile() is called
with two arguments. It looks like the correct way to write this is to
joinpath() the two arguments, since that is what is done in
self.assistant.super_update() when not self.config['dryrun'].

diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index d44ceedcec..098bbc59ac 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1230,7 +1230,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
                     os.remove(tmpfile)
             else:  # if not self.config['dryrun']
                 backupname = '%s~' % basename
-                if isfile(destdir, basename):
+                if isfile(joinpath(destdir, basename)):
                     print('Update %s (backup in %s)' % (basename, backupname))
                 else:  # if not isfile(destdir, basename)
                     print('Create %s' % basename)

Collin

[-- Attachment #2: 0001-gnulib-tool.py-Fix-extra-arguments-to-function-call.patch --]
[-- Type: text/x-patch, Size: 1563 bytes --]

From f0990590b62f0a5e18970643ac31c967b4a5f19d Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 13 Apr 2024 10:09:17 -0700
Subject: [PATCH] gnulib-tool.py: Fix extra arguments to function call.

* pygnulib/GLImport.py (GLImport.execute): Add the missing joinpath call
on two file name components before calling isfile().
---
 ChangeLog            | 6 ++++++
 pygnulib/GLImport.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c72165e268..d65595122c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-13  Collin Funk  <collin.funk1@gmail.com>
+
+	gnulib-tool.py: Fix extra arguments to function call.
+	* pygnulib/GLImport.py (GLImport.execute): Add the missing joinpath call
+	on two file name components before calling isfile().
+
 2024-04-13  Bruno Haible  <bruno@clisp.org>
 
 	gnulib-tool.py: Code tweak.
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index d44ceedcec..098bbc59ac 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1230,7 +1230,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
                     os.remove(tmpfile)
             else:  # if not self.config['dryrun']
                 backupname = '%s~' % basename
-                if isfile(destdir, basename):
+                if isfile(joinpath(destdir, basename)):
                     print('Update %s (backup in %s)' % (basename, backupname))
                 else:  # if not isfile(destdir, basename)
                     print('Create %s' % basename)
-- 
2.44.0

Re: gnulib-tool.py: Fix extra arguments to function call.

[Collin Funk]

On 4/13/24 10:12 AM, Collin Funk wrote:
> diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
> index d44ceedcec..098bbc59ac 100644
> --- a/pygnulib/GLImport.py
> +++ b/pygnulib/GLImport.py
> @@ -1230,7 +1230,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix

Also, I found out that adding '*.py diff=python' to .gitattributes
will give a better diff hunk header [1]:

diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index d44ceedcec..098bbc59ac 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1230,7 +1230,7 @@ def execute(self, filetable: dict[str, list[str]], transformers: dict[str, str])

[1] https://github.com/git/git/blob/8f7582d995682f785e80e344197cc715e6bc7d8e/userdiff.c#L270

Collin

Re: gnulib-tool.py: Fix extra arguments to function call.

[Bruno Haible]

Collin Funk wrote:
> I see a warning for this section of code because isfile() is called
> with two arguments. It looks like the correct way to write this is to
> joinpath() the two arguments

Yes, I agree. Thanks! Applied.

Bruno

Re: .gitattributes

[Bruno Haible]

Collin Funk wrote:
> Also, I found out that adding '*.py diff=python' to .gitattributes
> will give a better diff hunk header [1]:
> 
> diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
> index d44ceedcec..098bbc59ac 100644
> --- a/pygnulib/GLImport.py
> +++ b/pygnulib/GLImport.py
> @@ -1230,7 +1230,7 @@ def execute(self, filetable: dict[str, list[str]], transformers: dict[str, str])

That will be nice, indeed. Please, can you provide a patch (with a ChangeLog
entry)?

Bruno

Improve 'git diff' of Python files.

[Collin Funk]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

Hi Bruno,

On 4/13/24 11:08 AM, Bruno Haible wrote:
> That will be nice, indeed. Please, can you provide a patch (with a ChangeLog
> entry)?

Sure, I attached a patch.

Collin

[-- Attachment #2: 0001-Improve-git-diff-of-Python-files.patch --]
[-- Type: text/x-patch, Size: 1106 bytes --]

From 9e2fcc6d5e8f30b402627cc73b7da1109c047249 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 13 Apr 2024 11:16:44 -0700
Subject: [PATCH] Improve 'git diff' of Python files.

* .gitattributes: Add a rule for *.py files.
---
 .gitattributes | 3 +++
 ChangeLog      | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index bad5997b57..c7fecf66a5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,6 @@ ChangeLog	merge=merge-changelog
 # Run this to make 'git diff' on .m4 files give nicer hunk context:
 #   git config diff.m4.xfuncname '^((AC_DEFUN|m4_define)[^,)]*)'
 *.m4	diff=m4
+
+# Improve diff hunk context on Python files.
+*.py	diff=python
diff --git a/ChangeLog b/ChangeLog
index 4a5594c5cd..c9349f22ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-04-13  Collin Funk  <collin.funk1@gmail.com>
+
+	Improve 'git diff' of Python files.
+	* .gitattributes: Add a rule for *.py files.
+
 2024-04-13  Collin Funk  <collin.funk1@gmail.com>
 
 	gnulib-tool.py: Fix extra arguments to function call.
-- 
2.44.0

Re: Improve 'git diff' of Python files.

[Bruno Haible]

Thanks, applied.