[tor-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile and desktop patches

[Tor Bug Tracker & Wiki]

#31918: Rebase and squash mobile and desktop patches
-------------------------------------------------+-------------------------
 Reporter:  sysrqb                               |          Owner:  acat
     Type:  task                                 |         Status:
                                                 |  needs_revision
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-9.5, ReleaseTrainMigration,      |  Actual Points:
  TorBrowserTeam202004                           |
Parent ID:  #33656                               |         Points:  1
 Reviewer:  sysrqb, gk                           |        Sponsor:
                                                 |  Sponsor58-must
-------------------------------------------------+-------------------------
Changes (by gk):

 * keywords:  tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004R =>
     tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004
 * status:  needs_review => needs_revision


Comment:

 Replying to [comment:19 acat]:
 > I'm using this one to also squash some of the desktop patches, not only
 mobile -> desktop. I used the 33533+4 branch, and the resulting rebased
 patches are in ​https://github.com/acatarineu/tor-browser/commits/31918.
 >
 > I squashed some commits with the mozconfigs one which are not strictly
 mozconfigs, but I think they could all belong to the same category,
 something like "build-time options that we set or unset". And if we do
 #23656 then all the changes in this patch would be effective for tor-
 browser-builds.

 Sounds good to me.

 > Here is the list of changes from 33533+4 to 31918:

 I think everything looks good just...

 [snip]

 > Bug 25741 - TBA: Add an AppConstant for TOR_BROWSER_VERSION
 >   fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

 is a thing we should not do, I think. The mobile part does not really
 belong the desktop updater patch. What about breaking the
 `TOR_BROWSER_VERSION` part of that patch out putting it into the "build-
 time options that we set or unset" one and merging the patch into that
 one?

 [snip]

 Additionally:

 1) There are parts in `a71ce964674ec47aed50cd322d40fdd7f6ec9c4a` that can
 get squashed into TB3: Tor Browser's official .mozconfigs.
 2) Can we squash `bd5a3a8f8fa37fa3e877c4b6ca66c5a25b7cd3cc` into 4234?
 3) Can we squash `66197cbb3e3f6b72124a30ffc0e2a82819a52e9d` into 4234?
 4) Merge both Bug 19121 commits?
 5) Squash the `old.configure` changes into TB3: Tor Browser's official
 .mozconfigs and just start using `--enable-tor-browser-data-outside-app-
 dir` in from that commit on? (Essentially similar to my
 `TOR_BROWSER_VERSION` idea from above)
 6) Squash a0a69636e3074efcbf7c1fc80e07d77bd94a81ab into TB4 commit?

 There might even be more :)

 >
 > Some notes/questions:
 >
 > I did not  touch the onboarding patches, as I'm not sure what we are
 going to do with #31660. If we keep the current onboarding, I think it
 might be worth to squash them. I was thinking to keep two patches:
 >
 > - "Resurrect Firefox old onboarding"
 >   - Revert "Bug 1462415 - Delete onboarding system add-on
 r=Standard8,k88hudson
 >   - squash! Revert "Bug 1498378 - Actually remove the old onboarding
 add-on's prefs r=Gijs
 >   - squash! Bug 28822: Convert onboarding to webextension
 >   - squash! Partially revert 1564367 (controlCenter in UITour.jsm)
 >
 > - "Actual onboarding implementation"
 >   - Bug 26961: New user onboarding.
 >   - squash! Bug 27082: enable a limited UITour
 >   - squash! Bug 26962 - implement new features onboarding (part 1).
 >   - squash! Bug 27486 Avoid about:blank tabs when opening onboarding
 pages.
 >   - squash! Bug 31768: Introduce toolbar and network settings changes in
 onboarding

 Bug 29768: Introduce new features to users needs to be somewhere in this
 picture as well.

 > Given that now some "actual onboarding" patches go after "Bug 28822:
 Convert onboarding to webextension", to do this reordering + squashing we
 would have to fix some conflicts, but it should not be a big deal. The
 only thing is that "actual onboarding" patch should go after the most
 recent patch from all features, which I assume would be "Bug 27511: Add
 new identity button to toolbar".

 Sounds good. I think proceeding with that plan is a good idea. I would not
 bet us on getting a proper onboarding going. So, let's go for now with the
 squashing idea.

 > If we agree with the mozconf squashes I suggested, would the patch "Bug
 21849: Don't allow SSL key logging" fit in that too? (build-time configs
 that we set/change)

 Works for me.

 > Is it fine to leave tests separated from patches, or do you think we
 could also squash those too?

 I think if we have tests belonging to particular code fixes in our patch
 set then the tests should get merged into those commits. All the other
 tests can get into one "test" commit.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/31918#comment:23>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online