January 2026 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] 3 commits: fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation
by brizental (＠brizental) 20 Jan '26

20 Jan '26

brizental pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c4d774af by Beatriz Rizental at 2026-01-20T09:58:59-03:00 fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation When building with tests enabled, the current patch was breaking the generated Makefile. This commit fixes it. - - - - - fb2c2a1d by Beatriz Rizental at 2026-01-20T09:59:06-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser We don't want to bootstrap OONX. It's a ML tool, not used. - - - - - 6055fdc6 by Beatriz Rizental at 2026-01-20T09:59:16-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser Use our MacOS SDK mirror when bootstrapping for Mac. - - - - - 3 changed files: - browser/Makefile.in - build/moz.configure/bootstrap.configure - toolkit/moz.configure Changes: ===================================== browser/Makefile.in ===================================== @@ -7,6 +7,7 @@ include $(topsrcdir)/config/rules.mk ifdef MAKENSISU ifdef ENABLE_TESTS +libs:: $(MAKE) -C installer/windows install_deps endif #ENABLE_TESTS ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -165,6 +165,7 @@ def bootstrap_path(path, **kwargs): when=when, ) @imports("os") + @imports("re") @imports("subprocess") @imports("sys") @imports("mozbuild.tbbutils") @@ -354,6 +355,23 @@ def bootstrap_path(path, **kwargs): + command["arguments"] + [path_parts[0]] ) + + # BIG HACK: Replace the Apple CDN link with our mirror, + # otherwise bootstrapping will fail whenever a new MacOS SDK + # is released, since Apple seems to retire the previous link everytime. + # Our mirror serves an _unmodified_ version of the file. + macosx_sdk_match = re.match(r"^MacOSX(.*)\.sdk$", path_parts[0]) + if macosx_sdk_match: + version = macosx_sdk_match.group(1) + command = [ + re.sub( + r"https://swcdn\.apple\.com/.*/CLTools_macOSNMOS_SDK\.pkg", + f"https://build-sources.tbb.torproject.org/CLTools_macOSNMOS_SDK-{version}.pkg", + c, + ) + for c in command + ] + # Clean up anything that was bootstrapped previously before going # forward. In other cases, that's taken care of by mach artifact toolchain. rmtree( ===================================== toolkit/moz.configure ===================================== @@ -4241,9 +4241,8 @@ with only_when(~artifact_builds): @depends("--with-onnx-runtime") def need_boostrap_onnxruntime(with_onnx_runtime): - return (with_onnx_runtime and len(with_onnx_runtime) == 0) or ( - with_onnx_runtime.origin == "default" - ) + # tor-browser#44412: Prevent ONNX from ever getting bootstrapped. + return False @depends( "--with-onnx-runtime", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/017f6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/017f6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] 3 commits: fixup! Mullvad Browser strings
by henry (＠henry) 20 Jan '26

20 Jan '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 1c53419e by Henry Wilkes at 2026-01-19T15:40:24+00:00 fixup! Mullvad Browser strings MB 489: Drop about:rights strings. - - - - - d4dac903 by Henry Wilkes at 2026-01-19T15:40:26+00:00 fixup! MB 63: Customize some about pages for Mullvad Browser MB 489: Drop about:rights for mullvad browser. - - - - - 29183696 by Henry Wilkes at 2026-01-19T15:40:29+00:00 BB 43901: Modify about:license. We also drop about:rights. - - - - - 7 changed files: - browser/base/moz.build - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - − toolkit/content/aboutRightsMullvad.xhtml - toolkit/content/jar.mn - toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/themes/shared/aboutLicense.css Changes: ===================================== browser/base/moz.build ===================================== @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"] DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"] DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR +# Do not include the Firefox app-license.html in about:license. +# tor-browser#43901. if CONFIG["BASE_BROWSER_UPDATE"]: DEFINES["BASE_BROWSER_UPDATE"] = True ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -97,9 +97,7 @@ static const RedirEntry kRedirMap[] = { {"profiling", "chrome://devtools/content/performance-new/aboutprofiling/index.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"rights", "chrome://global/content/aboutRights.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, +// Drop about:rights. tor-browser#43901. #ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | ===================================== browser/components/about/components.conf ===================================== @@ -23,7 +23,7 @@ pages = [ 'profiling', 'reader', 'restartrequired', - 'rights', + # Removed 'rights'. tor-browser#43901. # Removed 'robots'. tor-browser#42831. 'sessionrestore', 'settings', ===================================== toolkit/content/aboutRightsMullvad.xhtml deleted ===================================== @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html [ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -%htmlDTD; ]> - - - -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta - http-equiv="Content-Security-Policy" - content="default-src chrome:; object-src 'none'" - /> - <meta name="color-scheme" content="light dark" /> - <title data-l10n-id="rights-title"></title> - <link - rel="stylesheet" - href="chrome://global/skin/in-content/info-pages.css" - type="text/css" - /> - <link rel="localization" href="branding/brand.ftl" /> - <link rel="localization" href="toolkit/about/aboutRights.ftl" /> - <link rel="localization" href="toolkit/global/mullvad-browser.ftl" /> - </head> - - <body id="your-rights" class="aboutPageWideContainer"> - <div class="container"> - <h1 data-l10n-id="rights-title"></h1> - - <p data-l10n-id="rights-mullvad-intro"></p> - <p data-l10n-id="rights-mullvad-you-should-know"></p> - - <ul> - <li data-l10n-id="rights-intro-point-1"> - <a - href="http://www.mozilla.org/MPL/" - data-l10n-name="mozilla-public-license-link" - ></a> - </li> - <li data-l10n-id="rights-mullvad-trademarks"></li> - </ul> - </div> - </body> -</html> ===================================== toolkit/content/jar.mn ===================================== @@ -212,5 +212,3 @@ toolkit.jar: content/global/vendor/react-transition-group.js (vendor/react/react-transition-group.js) content/global/vendor/redux.js (vendor/react/redux.js) content/global/vendor/react-redux.js (vendor/react/react-redux.js) - - content/global/aboutRights.xhtml (aboutRightsMullvad.xhtml) ===================================== toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl ===================================== @@ -27,15 +27,6 @@ about-mullvad-browser-update-message = { -brand-short-name } has been updated t home-mode-choice-mullvad = .label = { -brand-product-name } Home -## about:rights page. - -rights-mullvad-intro = { -brand-short-name } is free and open source software. -rights-mullvad-you-should-know = There are a few things you should know: -rights-mullvad-trademarks = - You are not granted any trademark rights or licenses to the trademarks of - the { -brand-short-name } or any party, including without limitation the - { -brand-short-name } name or logo. - ## about:telemetry page. telemetry-title = Telemetry Information ===================================== toolkit/themes/shared/aboutLicense.css ===================================== @@ -5,13 +5,9 @@ /* License Illustration */ .license-header { - background-image: url("chrome://global/skin/illustrations/about-license.svg"); - background-repeat: no-repeat; - background-position: right center; - min-height: 300px; - display: flex; - align-items: center; - padding-inline-end: 320px; + /* Adjust the header to remove the background, which is out of place without + * the app-license.html content. */ + align-self: start; } td:nth-child(1), View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/c4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43525: Skip Remote Settings for search engine customization.
by Pier Angelo Vendrame (＠pierov) 20 Jan '26

20 Jan '26

Pier Angelo Vendrame pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 017f6c6a by Pier Angelo Vendrame at 2026-01-20T08:12:40+01:00 fixup! BB 43525: Skip Remote Settings for search engine customization. Linted. - - - - - 1 changed file: - toolkit/components/search/content/base-browser-search-engines.json Changes: ===================================== toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -63,11 +63,7 @@ "orders": [ { "environment": { "allRegionsAndLocales": true }, - "order": [ - "ddg", - "ddg-noai", - "startpage" - ] + "order": ["ddg", "ddg-noai", "startpage"] } ] } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/017f6c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/017f6c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] BB 43901: Modify about:license.
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 0f8c1a1a by henry at 2026-01-19T15:50:13+00:00 BB 43901: Modify about:license. We also drop about:rights. (cherry picked from commit d15d1ad113c2caba2815e46ab5d90e686ca494e5) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 4 changed files: - browser/base/moz.build - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - toolkit/themes/shared/aboutLicense.css Changes: ===================================== browser/base/moz.build ===================================== @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"] DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"] DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR +# Do not include the Firefox app-license.html in about:license. +# tor-browser#43901. if CONFIG["BASE_BROWSER_UPDATE"]: DEFINES["BASE_BROWSER_UPDATE"] = True ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -95,9 +95,7 @@ static const RedirEntry kRedirMap[] = { {"profiling", "chrome://devtools/content/performance-new/aboutprofiling/index.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"rights", "https://www.mozilla.org/about/legal/terms/firefox/", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, +// Drop about:rights. tor-browser#43901. #ifndef BASE_BROWSER_VERSION {"robots", "chrome://browser/content/aboutRobots.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | ===================================== browser/components/about/components.conf ===================================== @@ -24,7 +24,7 @@ pages = [ 'profiling', 'reader', 'restartrequired', - 'rights', + # Removed 'rights'. tor-browser#43901. # Removed 'robots'. tor-browser#42831. 'sessionrestore', 'settings', ===================================== toolkit/themes/shared/aboutLicense.css ===================================== @@ -5,13 +5,9 @@ /* License Illustration */ .license-header { - background-image: url("chrome://global/skin/illustrations/about-license.svg"); - background-repeat: no-repeat; - background-position: right center; - min-height: 300px; - display: flex; - align-items: center; - padding-inline-end: 320px; + /* Adjust the header to remove the background, which is out of place without + * the app-license.html content. */ + align-self: start; } td:nth-child(1), View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f8c1a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f8c1a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 2 commits: dropme! TB 43901: Modify about:license for Tor Browser.
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: baab94df by Henry Wilkes at 2026-01-19T15:37:22+00:00 dropme! TB 43901: Modify about:license for Tor Browser. MB 489: Revert the TB patch entirely by reverting f53f82ba5eaa6b4a5b011608e81c7b3887873c3b and 66d6a1e876bd80274edb7b0225dc81dfbb39bc30. - - - - - d15d1ad1 by Henry Wilkes at 2026-01-19T15:37:22+00:00 BB 43901: Modify about:license. We also drop about:rights. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b208f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b208f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 19 Jan '26

19 Jan '26

Pier Angelo Vendrame pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: c43f2216 by Pier Angelo Vendrame at 2026-01-19T16:14:40+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c43… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/c43… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 19 Jan '26

19 Jan '26

Pier Angelo Vendrame pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c2820657 by Pier Angelo Vendrame at 2026-01-19T16:13:59+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c282065… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c282065… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! BB 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 19 Jan '26

19 Jan '26

Pier Angelo Vendrame pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: b208f8bb by Pier Angelo Vendrame at 2026-01-19T11:31:32+01:00 fixup! BB 43140: Tighten up fonts on Linux. BB 44410: Use UI system font size. After tor-browser#44286, the browser UI font size is too small in some system. So, hardcode only a few properties, but still query the system for the font size. - - - - - 1 changed file: - widget/gtk/nsLookAndFeel.cpp Changes: ===================================== widget/gtk/nsLookAndFeel.cpp ===================================== @@ -1268,13 +1268,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, gfxFontStyle* aFontStyle) { aFontStyle->style = FontSlantStyle::NORMAL; -#ifdef BASE_BROWSER_VERSION - *aFontName = u"\"Arimo\""; - aFontStyle->systemFont = true; - aFontStyle->weight = FontWeight::NORMAL; - aFontStyle->stretch = FontStretch::NORMAL; - aFontStyle->size = 14; -#else // As in // https://git.gnome.org/browse/gtk+/tree/gtk/gtkwidget.c?h=3.22.19#n10333 PangoFontDescription* desc; @@ -1283,6 +1276,16 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->systemFont = true; +#ifdef BASE_BROWSER_VERSION + // tor-browser#44410: Set a few properties (especially the font name), but not + // the size, as strange scale methods might be in use in the system. + // We normalize the font size with RFP anyway, so this should not enable + // fingerprinting. + *aFontName = u"\"Arimo\""; + aFontStyle->systemFont = true; + aFontStyle->weight = FontWeight::NORMAL; + aFontStyle->stretch = FontStretch::NORMAL; +#else constexpr auto quote = u"\""_ns; NS_ConvertUTF8toUTF16 family(pango_font_description_get_family(desc)); *aFontName = quote + family + quote; @@ -1292,6 +1295,7 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, // FIXME: Set aFontStyle->stretch correctly! aFontStyle->stretch = FontStretch::NORMAL; +#endif float size = float(pango_font_description_get_size(desc)) / PANGO_SCALE; @@ -1309,7 +1313,6 @@ static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName, aFontStyle->size = size; pango_font_description_free(desc); -#endif } bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b208f8b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b208f8b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-147.0a1-16.0-2] fixup! BB 41803: Add some developer tools for working on tor-browser.
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 643f7c12 by henry at 2026-01-19T13:57:42+00:00 fixup! BB 41803: Add some developer tools for working on tor-browser. TB 44452: Improve the range-diff and diff-diff commands. (cherry picked from commit c344d0b6916e181d21523b5f308a9e825efd7d7c) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - tools/base_browser/tb-dev Changes: ===================================== tools/base_browser/tb-dev ===================================== @@ -1409,63 +1409,102 @@ def move_to_default(args: argparse.Namespace) -> None: git_run(["cherry-pick", f"{current_basis}..{old_branch_name}"], check=False) +def convert_ref_to_range(ref: str) -> str: + """ + Convert a reference given by the user into a reference range, defaulting to + the last firefox reference. + + :param ref: The reference to convert to a range, if it isn't one already. + :returns: The reference range. + """ + if ".." in ref: + return ref + firefox_commit = get_firefox_ref(ref).commit + return f"{firefox_commit}..{ref}" + + def show_range_diff(args: argparse.Namespace) -> None: """ - Show the range diff between two branches, from their firefox bases. + Show the range diff. If a single reference is given as one of the arguments, + its last "FIREFOX_" tag is used as the range start. """ - firefox_commit_1 = get_firefox_ref(args.branch1).commit - firefox_commit_2 = get_firefox_ref(args.branch2).commit + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) git_run( - [ - "range-diff", - f"{firefox_commit_1}..{args.branch1}", - f"{firefox_commit_2}..{args.branch2}", - ], - check=False, + ["range-diff", *args.gitargs, range1, range2, "--", *args.path], check=False ) def show_diff_diff(args: argparse.Namespace) -> None: """ - Show the diff between the diffs of two branches, relative to their firefox - bases. + Show the diff between the diffs of two ranges. If a single reference is + given as one of the arguments, its last "FIREFOX_" tag is used as the range + start. """ try: diff_tool = next(git_lines(["config", "--get", "diff.tool"])) except StopIteration: raise TbDevException("No diff.tool configured for git") + drop_context = not args.keep_context + # Filter out parts of the diff we expect to be different. index_regex = re.compile(r"index [0-9a-f]{12}\.\.[0-9a-f]{12}") - lines_regex = re.compile(r"@@ -[0-9]+,[0-9]+ \+[0-9]+,[0-9]+ @@(?P<rest>.*)") + context_regex = re.compile(r"@@ -[0-9]+(:?,[0-9]+)? \+[0-9]+(:?,[0-9]+)? @@") - def save_diff(branch: str) -> str: - firefox_commit = get_firefox_ref(branch).commit + # Limit a line length. E.g. "meld" has a line length limit. + LINE_LIMIT = 1024 + + def save_diff(ref_range: str) -> str: file_desc, file_name = tempfile.mkstemp( - text=True, prefix=f'{branch.split("/")[-1]}-' + text=True, prefix=f'{ref_range.replace("/", "_")}' ) # Register deleting the file at exit. atexit.register(os.remove, file_name) diff_process = subprocess.Popen( - [GIT_PATH, "diff", f"{firefox_commit}..{branch}"], + # --unified=1 will reduce the context to just directly neighbouring + # lines. + [ + GIT_PATH, + "diff", + "--binary", + "--unified=1", + *args.gitargs, + ref_range, + "--", + *args.path, + ], stdout=subprocess.PIPE, text=True, + encoding="utf-8", + errors="replace", ) with os.fdopen(file_desc, "w") as file: assert diff_process.stdout is not None for line in diff_process.stdout: - if index_regex.match(line): - # Fake data that will match. - file.write("index ????????????..????????????\n") - continue - lines_match = lines_regex.match(line) - if lines_match: - # Fake data that will match. - file.write("@@ ?,? ?,? @@" + lines_match.group("rest")) - continue - file.write(line) + if drop_context: + if index_regex.match(line): + # Fake data that will match. + file.write("index ????????????..????????????\n") + continue + if context_regex.match(line): + # Fake data that will match. + file.write("@@ ?,? ?,? @@\n") + continue + + remaining_line = line + while True: + if len(remaining_line) - 1 > LINE_LIMIT: + # NOTE: we use `len() - 1` to not count the trailing + # '\n', which we assume all lines in the diff have. + # Long line, split with a newline character. + file.write(remaining_line[:LINE_LIMIT] + "\n") + remaining_line = remaining_line[:LINE_LIMIT] + else: + file.write(remaining_line) + break status = diff_process.wait() if status != 0: @@ -1473,8 +1512,10 @@ def show_diff_diff(args: argparse.Namespace) -> None: return file_name - file_1 = save_diff(args.branch1) - file_2 = save_diff(args.branch2) + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) + file_1 = save_diff(range1) + file_2 = save_diff(range2) subprocess.run([diff_tool, file_1, file_2], check=False) @@ -1483,6 +1524,28 @@ def show_diff_diff(args: argparse.Namespace) -> None: # * -------------------- * +def ref_complete(prefix: str, **_kwargs: Any) -> list[str]: + """ + Complete the argument with a reference name. + """ + if not within_browser_root(): + return [] + try: + matching = [] + for symbolic_ref in ("HEAD",): + if symbolic_ref.startswith(prefix): + matching.append(symbolic_ref) + for ref_type in ("head", "remote", "tag"): + for ref in get_refs(ref_type, ""): + if ref.name.startswith(prefix): + matching.append(ref.name) + if ref.full_name.startswith(prefix): + matching.append(ref.full_name) + return matching + except Exception: + return [] + + def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: """ Complete the argument with a branch name. @@ -1490,12 +1553,9 @@ def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: if not within_browser_root(): return [] try: - branches = [ref.name for ref in get_refs("head", "")] - branches.extend(ref.name for ref in get_refs("remote", "")) - branches.append("HEAD") + return [ref.name for ref in get_refs("head", "") if ref.name.startswith(prefix)] except Exception: return [] - return [br for br in branches if br.startswith(prefix)] parser = argparse.ArgumentParser() @@ -1506,6 +1566,8 @@ class ArgConfig(TypedDict): help: str metavar: NotRequired[str] nargs: NotRequired[str] + action: NotRequired[str] + default: NotRequired[Any] completer: NotRequired[Callable[[str], list[str]]] @@ -1573,33 +1635,59 @@ all_commands: dict[str, CommandConfig] = { }, }, }, - "branch-range-diff": { + "range-diff": { "func": show_range_diff, "args": { - "branch1": { - "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "ref1": { + "help": "the first range to compare", + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { - "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "ref2": { + "help": "the second range to compare", + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git range-diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git range-diff", + "metavar": "-- git-range-diff-arg", + "nargs": "*", }, }, }, - "branch-diff-diff": { + "diff-diff": { "func": show_diff_diff, "args": { - "branch1": { + "--keep-context": { + "help": "keep the git context lines as they are, otherwise they are trivialised to reduce differences. You may want to use this if your diff tool, like meld, can filter out these lines from the diff without erasing them", + "action": "store_true", + }, + "ref1": { "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { + "ref2": { "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git diff", + "metavar": "-- git-diff-arg", + "nargs": "*", }, }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/643… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/643… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-147.0a1-16.0-2] fixup! BB 41803: Add some developer tools for working on tor-browser.
by henry (＠henry) 19 Jan '26

19 Jan '26

henry pushed to branch base-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 963cb849 by henry at 2026-01-19T13:55:09+00:00 fixup! BB 41803: Add some developer tools for working on tor-browser. TB 44452: Improve the range-diff and diff-diff commands. (cherry picked from commit c344d0b6916e181d21523b5f308a9e825efd7d7c) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - tools/base_browser/tb-dev Changes: ===================================== tools/base_browser/tb-dev ===================================== @@ -1409,63 +1409,102 @@ def move_to_default(args: argparse.Namespace) -> None: git_run(["cherry-pick", f"{current_basis}..{old_branch_name}"], check=False) +def convert_ref_to_range(ref: str) -> str: + """ + Convert a reference given by the user into a reference range, defaulting to + the last firefox reference. + + :param ref: The reference to convert to a range, if it isn't one already. + :returns: The reference range. + """ + if ".." in ref: + return ref + firefox_commit = get_firefox_ref(ref).commit + return f"{firefox_commit}..{ref}" + + def show_range_diff(args: argparse.Namespace) -> None: """ - Show the range diff between two branches, from their firefox bases. + Show the range diff. If a single reference is given as one of the arguments, + its last "FIREFOX_" tag is used as the range start. """ - firefox_commit_1 = get_firefox_ref(args.branch1).commit - firefox_commit_2 = get_firefox_ref(args.branch2).commit + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) git_run( - [ - "range-diff", - f"{firefox_commit_1}..{args.branch1}", - f"{firefox_commit_2}..{args.branch2}", - ], - check=False, + ["range-diff", *args.gitargs, range1, range2, "--", *args.path], check=False ) def show_diff_diff(args: argparse.Namespace) -> None: """ - Show the diff between the diffs of two branches, relative to their firefox - bases. + Show the diff between the diffs of two ranges. If a single reference is + given as one of the arguments, its last "FIREFOX_" tag is used as the range + start. """ try: diff_tool = next(git_lines(["config", "--get", "diff.tool"])) except StopIteration: raise TbDevException("No diff.tool configured for git") + drop_context = not args.keep_context + # Filter out parts of the diff we expect to be different. index_regex = re.compile(r"index [0-9a-f]{12}\.\.[0-9a-f]{12}") - lines_regex = re.compile(r"@@ -[0-9]+,[0-9]+ \+[0-9]+,[0-9]+ @@(?P<rest>.*)") + context_regex = re.compile(r"@@ -[0-9]+(:?,[0-9]+)? \+[0-9]+(:?,[0-9]+)? @@") - def save_diff(branch: str) -> str: - firefox_commit = get_firefox_ref(branch).commit + # Limit a line length. E.g. "meld" has a line length limit. + LINE_LIMIT = 1024 + + def save_diff(ref_range: str) -> str: file_desc, file_name = tempfile.mkstemp( - text=True, prefix=f'{branch.split("/")[-1]}-' + text=True, prefix=f'{ref_range.replace("/", "_")}' ) # Register deleting the file at exit. atexit.register(os.remove, file_name) diff_process = subprocess.Popen( - [GIT_PATH, "diff", f"{firefox_commit}..{branch}"], + # --unified=1 will reduce the context to just directly neighbouring + # lines. + [ + GIT_PATH, + "diff", + "--binary", + "--unified=1", + *args.gitargs, + ref_range, + "--", + *args.path, + ], stdout=subprocess.PIPE, text=True, + encoding="utf-8", + errors="replace", ) with os.fdopen(file_desc, "w") as file: assert diff_process.stdout is not None for line in diff_process.stdout: - if index_regex.match(line): - # Fake data that will match. - file.write("index ????????????..????????????\n") - continue - lines_match = lines_regex.match(line) - if lines_match: - # Fake data that will match. - file.write("@@ ?,? ?,? @@" + lines_match.group("rest")) - continue - file.write(line) + if drop_context: + if index_regex.match(line): + # Fake data that will match. + file.write("index ????????????..????????????\n") + continue + if context_regex.match(line): + # Fake data that will match. + file.write("@@ ?,? ?,? @@\n") + continue + + remaining_line = line + while True: + if len(remaining_line) - 1 > LINE_LIMIT: + # NOTE: we use `len() - 1` to not count the trailing + # '\n', which we assume all lines in the diff have. + # Long line, split with a newline character. + file.write(remaining_line[:LINE_LIMIT] + "\n") + remaining_line = remaining_line[:LINE_LIMIT] + else: + file.write(remaining_line) + break status = diff_process.wait() if status != 0: @@ -1473,8 +1512,10 @@ def show_diff_diff(args: argparse.Namespace) -> None: return file_name - file_1 = save_diff(args.branch1) - file_2 = save_diff(args.branch2) + range1 = convert_ref_to_range(args.ref1) + range2 = convert_ref_to_range(args.ref2) + file_1 = save_diff(range1) + file_2 = save_diff(range2) subprocess.run([diff_tool, file_1, file_2], check=False) @@ -1483,6 +1524,28 @@ def show_diff_diff(args: argparse.Namespace) -> None: # * -------------------- * +def ref_complete(prefix: str, **_kwargs: Any) -> list[str]: + """ + Complete the argument with a reference name. + """ + if not within_browser_root(): + return [] + try: + matching = [] + for symbolic_ref in ("HEAD",): + if symbolic_ref.startswith(prefix): + matching.append(symbolic_ref) + for ref_type in ("head", "remote", "tag"): + for ref in get_refs(ref_type, ""): + if ref.name.startswith(prefix): + matching.append(ref.name) + if ref.full_name.startswith(prefix): + matching.append(ref.full_name) + return matching + except Exception: + return [] + + def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: """ Complete the argument with a branch name. @@ -1490,12 +1553,9 @@ def branch_complete(prefix: str, **_kwargs: Any) -> list[str]: if not within_browser_root(): return [] try: - branches = [ref.name for ref in get_refs("head", "")] - branches.extend(ref.name for ref in get_refs("remote", "")) - branches.append("HEAD") + return [ref.name for ref in get_refs("head", "") if ref.name.startswith(prefix)] except Exception: return [] - return [br for br in branches if br.startswith(prefix)] parser = argparse.ArgumentParser() @@ -1506,6 +1566,8 @@ class ArgConfig(TypedDict): help: str metavar: NotRequired[str] nargs: NotRequired[str] + action: NotRequired[str] + default: NotRequired[Any] completer: NotRequired[Callable[[str], list[str]]] @@ -1573,33 +1635,59 @@ all_commands: dict[str, CommandConfig] = { }, }, }, - "branch-range-diff": { + "range-diff": { "func": show_range_diff, "args": { - "branch1": { - "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "ref1": { + "help": "the first range to compare", + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { - "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "ref2": { + "help": "the second range to compare", + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git range-diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git range-diff", + "metavar": "-- git-range-diff-arg", + "nargs": "*", }, }, }, - "branch-diff-diff": { + "diff-diff": { "func": show_diff_diff, "args": { - "branch1": { + "--keep-context": { + "help": "keep the git context lines as they are, otherwise they are trivialised to reduce differences. You may want to use this if your diff tool, like meld, can filter out these lines from the diff without erasing them", + "action": "store_true", + }, + "ref1": { "help": "the first branch to compare", - "metavar": "<branch-1>", - "completer": branch_complete, + "metavar": "<ref-1>", + "completer": ref_complete, }, - "branch2": { + "ref2": { "help": "the second branch to compare", - "metavar": "<branch-2>", - "completer": branch_complete, + "metavar": "<ref-2>", + "completer": ref_complete, + }, + "--path": { + "help": "path filter to pass to git diff. Can be given multiple times", + "metavar": "<path>", + "action": "append", + "default": [], + }, + "gitargs": { + "help": "additional argument to pass to git diff", + "metavar": "-- git-diff-arg", + "nargs": "*", }, }, }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/963cb84… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/963cb84… You're receiving this email because of your account on gitlab.torproject.org.

1 0