tor-browser

commit 3043aa65d91a2c287c44a748a5ba56c49af6abd7
parent f210e77414c4660dc444e9a579e368383866289f
Author: Steve Fink <sfink@mozilla.com>
Date:   Tue, 14 Oct 2025 17:11:47 +0000

Bug 1993225 - Revert hg diff_stream (default for clang-format) behavior change r=ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D268478

Diffstat:
M
python/mozversioncontrol/mozversioncontrol/repo/mercurial.py
 | 
2
++
M
python/mozversioncontrol/test/test_diff_stream.py
 | 
14
++++++++++----

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/python/mozversioncontrol/mozversioncontrol/repo/mercurial.py b/python/mozversioncontrol/mozversioncontrol/repo/mercurial.py
@@ -236,6 +236,8 @@ class HgRepository(Repository):
         args = ["diff", f"-U{context}"]
         if rev:
             args += ["-c", rev]
+        else:
+            args += ["-r", ".^"]
         for dot_extension in extensions:
             args += ["--include", f"glob:**{dot_extension}"]
         if exclude_file is not None:
diff --git a/python/mozversioncontrol/test/test_diff_stream.py b/python/mozversioncontrol/test/test_diff_stream.py
@@ -109,11 +109,17 @@ def test_diff_stream(repo):
                 files.add(m[1])
         return files
 
-    # Default: "uncommitted" changes (meaning @ in jj)
+    # Default: "uncommitted" changes (meaning @ in jj), except in hg
+    # (see bug 1993225)
     files = changed_files(vcs.diff_stream())
-    assert "file1.txt" in files
-    assert "anotherfile.txt" not in files
-    assert "constant.txt" not in files
+    if vcs.name != "hg":
+        assert "file1.txt" in files
+        assert "anotherfile.txt" not in files
+        assert "constant.txt" not in files
+    else:
+        assert "file1.txt" in files
+        assert "anotherfile.txt" in files
+        assert "constant.txt" not in files
 
     # Changes in selected revision ("BASE PATCH")
     files = changed_files(vcs.diff_stream(base_rev))