Merge branch 'master' into cli/branch-management

dulwich/porcelain.py

@@ -768,9 +768,10 @@ def print_commit(commit, decode, outstream=sys.stdout) -> None:
     time_str = time.strftime("%a %b %d %Y %H:%M:%S", time_tuple)
     timezone_str = format_timezone(commit.author_timezone).decode("ascii")
     outstream.write("Date:   " + time_str + " " + timezone_str + "\n")
-    outstream.write("\n")
-    outstream.write(decode(commit.message) + "\n")
-    outstream.write("\n")
+    if commit.message:
+        outstream.write("\n")
+        outstream.write(decode(commit.message) + "\n")
+        outstream.write("\n")
 
 
 def print_tag(tag, decode, outstream=sys.stdout) -> None:
@@ -907,7 +908,13 @@ def log(
       max_entries: Optional maximum number of entries to display
     """
     with open_repo_closing(repo) as r:
-        walker = r.get_walker(max_entries=max_entries, paths=paths, reverse=reverse)
+        try:
+            include = [r.head()]
+        except KeyError:
+            include = []
+        walker = r.get_walker(
+            include=include, max_entries=max_entries, paths=paths, reverse=reverse
+        )
         for entry in walker:
 
             def decode(x):

pyproject.toml

@@ -41,7 +41,7 @@ https = ["urllib3>=1.24.1"]
 pgp = ["gpg"]
 paramiko = ["paramiko"]
 dev = [
-    "ruff==0.9.9",
+    "ruff==0.11.0",
     "mypy==1.15.0"
 ]
 

tests/test_objects.py

@@ -1376,17 +1376,17 @@ class TimezoneTests(TestCase):
         self.assertEqual((-4 * 60 * 60, False), parse_timezone(b"-0400"))
 
     def test_format_timezone_pdt_half(self) -> None:
-        self.assertEqual(b"-0440", format_timezone(int(((-4 * 60) - 40) * 60)))
+        self.assertEqual(b"-0440", format_timezone(((-4 * 60) - 40) * 60))
 
     def test_format_timezone_double_negative(self) -> None:
-        self.assertEqual(b"--700", format_timezone(int((7 * 60) * 60), True))
+        self.assertEqual(b"--700", format_timezone(((7 * 60) * 60), True))
 
     def test_parse_timezone_pdt_half(self) -> None:
         self.assertEqual((((-4 * 60) - 40) * 60, False), parse_timezone(b"-0440"))
 
     def test_parse_timezone_double_negative(self) -> None:
-        self.assertEqual((int((7 * 60) * 60), False), parse_timezone(b"+700"))
-        self.assertEqual((int((7 * 60) * 60), True), parse_timezone(b"--700"))
+        self.assertEqual((((7 * 60) * 60), False), parse_timezone(b"+700"))
+        self.assertEqual((((7 * 60) * 60), True), parse_timezone(b"--700"))
 
 
 class ShaFileCopyTests(TestCase):

tests/test_porcelain.py

@@ -1082,9 +1082,39 @@ class LogTests(PorcelainTestCase):
             self.repo.object_store, [[1], [2, 1], [3, 1, 2]]
         )
         self.repo.refs[b"HEAD"] = c3.id
+        self.maxDiff = None
         outstream = StringIO()
         porcelain.log(self.repo.path, outstream=outstream)
-        self.assertEqual(3, outstream.getvalue().count("-" * 50))
+        self.assertEqual(
+            outstream.getvalue(),
+            """\
+--------------------------------------------------
+commit: 4a3b887baa9ecb2d054d2469b628aef84e2d74f0
+merge: 7508036b1cfec5aa9cef0d5a7f04abcecfe09112
+Author: Test Author <test@nodomain.com>
+Committer: Test Committer <test@nodomain.com>
+Date:   Fri Jan 01 2010 00:00:00 +0000
+
+Commit 3
+
+--------------------------------------------------
+commit: 7508036b1cfec5aa9cef0d5a7f04abcecfe09112
+Author: Test Author <test@nodomain.com>
+Committer: Test Committer <test@nodomain.com>
+Date:   Fri Jan 01 2010 00:00:00 +0000
+
+Commit 2
+
+--------------------------------------------------
+commit: 11d3cf672a19366435c1983c7340b008ec6b8bf3
+Author: Test Author <test@nodomain.com>
+Committer: Test Committer <test@nodomain.com>
+Date:   Fri Jan 01 2010 00:00:00 +0000
+
+Commit 1
+
+""",
+        )
 
     def test_max_entries(self) -> None:
         c1, c2, c3 = build_commit_graph(
@@ -1095,6 +1125,28 @@ class LogTests(PorcelainTestCase):
         porcelain.log(self.repo.path, outstream=outstream, max_entries=1)
         self.assertEqual(1, outstream.getvalue().count("-" * 50))
 
+    def test_no_revisions(self) -> None:
+        outstream = StringIO()
+        porcelain.log(self.repo.path, outstream=outstream)
+        self.assertEqual("", outstream.getvalue())
+
+    def test_empty_message(self) -> None:
+        c1 = make_commit(message="")
+        self.repo.object_store.add_object(c1)
+        self.repo.refs[b"HEAD"] = c1.id
+        outstream = StringIO()
+        porcelain.log(self.repo.path, outstream=outstream)
+        self.assertEqual(
+            outstream.getvalue(),
+            """\
+--------------------------------------------------
+commit: 4a7ad5552fad70647a81fb9a4a923ccefcca4b76
+Author: Test Author <test@nodomain.com>
+Committer: Test Committer <test@nodomain.com>
+Date:   Fri Jan 01 2010 00:00:00 +0000
+""",
+        )
+
 
 class ShowTests(PorcelainTestCase):
     def test_nolist(self) -> None: