[tbb-bugs] #29104 [Applications/Tor Browser]: Rebase Tor Browser patches against 60.5.0esr

[Tor Bug Tracker & Wiki]

#29104: Rebase Tor Browser patches against 60.5.0esr
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  task                                 |         Status:
                                                 |  needs_review
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  TorBrowserTeam201901R,               |  Actual Points:
  GeorgKoppen201901                              |
Parent ID:                                       |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by gk):

 * keywords:  TorBrowserTeam201901, GeorgKoppen201901 =>
     TorBrowserTeam201901R, GeorgKoppen201901
 * status:  new => needs_review


Comment:

 Replying to [comment:1 mcs]:
 > I did not realize that the reformatting was applied to the ESR code, but
 it make sense from Mozilla's perspective to do so. What is the status of
 automated tools to help with the rebase (after the reformatting)? I know
 Mozilla created some tools for hg and git, but I did not follow the
 conversation closely on their dev-platform list.

 That's been a good point which I had forgotten about.

 https://groups.google.com/forum/#!topic/mozilla.dev.platform/kQ0q29dlmJQ

 is relevant here and contains two tools for Git. I used
 https://github.com/emilio/clang-format-merge which I had to patch: `./mach
 clang-format` did not work for me (not sure if that's expected for esr60),
 instead I made sure that the wrapper hit `cat "$1" | clang-format
 "-assume-filename=$REPO_PATH" > "$1.tmp"` (needs to have `clang-format`
 installed).

 After that the rewriting mostly worked. There are five patches (IIRC)
 which I needed to adapt manually. `bug_29104_rebase_6050esr_v2`
 (https://gitweb.torproject.org/user/gk/tor-
 browser.git/log/?h=bug_29104_rebase_6050esr_v2) in my `tor-browser` repo
 is the result. Let me know if that makes sense (it's not the final rebase
 for the release but I plan to use it for comparison to make sure the final
 rebase is correct, both for the alpha and the stable branch).

 I additionally filed #29141 to track a clean-up of our search engine list
 patch.

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