[tor-bugs] #10362 [Pluggable transport]: Deploy FTE as a pluggable transport in PTTBBs

[Tor Bug Tracker & Wiki]

#10362: Deploy FTE as a pluggable transport in PTTBBs
-------------------------------------+----------------------
     Reporter:  asn                  |      Owner:  kpdyer
         Type:  task                 |     Status:  reopened
     Priority:  normal               |  Milestone:
    Component:  Pluggable transport  |    Version:
   Resolution:                       |   Keywords:
Actual Points:                       |  Parent ID:
       Points:                       |
-------------------------------------+----------------------
Changes (by dcf):

 * status:  closed => reopened
 * resolution:  implemented =>


Comment:

 Replying to [comment:11 kpdyer]:
 > I have integrated and tested fteproxy as part of the TBB.
 >
 > My repository is at [1], and is a branch of dcf's 3.6-beta branch of
 [2].
 >
 > [1] https://github.com/kpdyer/tor-browser-bundle
 > [2] https://gitweb.torproject.org/user/dcf/tor-browser-bundle.git

 Could you rebase your branch on top of, say,
 [https://gitweb.torproject.org/builders/tor-browser-
 bundle.git/tag/refs/tags/tbb-3.5.2-build5 tag tbb-3.5.2-build5]? At the
 moment your branch's history is totally disjoint from both the 3.6-beta
 branch and the main tor-browser-bundle branch. [https://github.com/kpdyer
 /tor-browser-bundle/commit/b0571a5f4ee6c0d200ecfd068acef28701e11f89
 b0571a5f] looks like you made an unversioned copy of the 3.6-beta branch
 and added all the files, which loses all the common history.

 What you should do instead, is check out a copy of the mainline tor-
 browser-bundle,
 {{{
 git clone -b tbb-3.5.2-build5 https://git.torproject.org/builders/tor-
 browser-bundle.git
 }}}
 and then make a branch within that repository,
 {{{
 git checkout -b fte
 }}}
 Make your changes in the fte branch, and make that the branch that you
 push to github. If things work out right, `git log | tail` in your branch
 should go all the way back to the `from __aliens__ import Bitcoin`
 [https://gitweb.torproject.org/builders/tor-browser-
 bundle.git/commit/f2de3e8df7878280dd1e9022aaade18fd845ac2a commit]. `gitk
 fte master` should show the fte branch splitting off the master branch.

 [https://github.com/kpdyer/tor-browser-
 bundle/commit/bd78934549867c3bc037d0b4501084f29e826b61 bd789345] looks
 like a mistaken merge with fteproxy. Even though you later undid the
 merge, it will be *a lot* easier to review the branch if it doesn't have
 all the fteproxy commits in it.

 Repairing the history might be a bit tricky. Since there are only about a
 dozen commits that aren't due to the fteproxy merge, I think I'd handle it
 with a `git format-patch` on each of the changes in the old repository,
 then `git am` in a new repository. To be specific:
 {{{
 mv tor-browser-bundle tor-browser-bundle-old
 git clone -b tbb-3.5.2-build5 https://git.torproject.org/builders/tor-
 browser-bundle.git
 cd tor-browser-bundle
 git checkout -b fte
 cd ../tor-browser-bundle-old
 git format-patch ec01e4d85a0b75dd3abbf38bf5ad79ba59479b72^!
 cd ../tor-browser-bundle
 git am ../tor-browser-bundle-old/0001-Iniital-update.patch
 }}}
 Repeat `format-patch` and `am` for all the commits you want to keep. It
 looks like this command in tor-browser-bundle-old will give you just the
 non-fteproxy commits you want (e.g.,
 ec01e4d85a0b75dd3abbf38bf5ad79ba59479b72 is in there):
 {{{
 git log --first-parent --reverse
 }}}

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