Code Differences between Phabricator and Phorge
This page can help to sum up the differences between Phabricator and Phorge to prevent conflicts or duplicate work.
Normal users probably are not interested in this page. This page is internally useful since Phorge often introduces changes not developed by Phabricator. But, sometime Phabricator also introduces unique changes, that could be pulled in Phorge. Some times, we do the same thing but with different approaches.
In short
Phorge has many more bug fixes and features than Phabricator 😎
This page just shows:
- commits that are only present in Phabricator (very few)
- commits that are somehow present in both
So that we can eventually import them in Phorge if we like that (example: T15094).
Differences from upstream Phabricator
https://secure.phabricator.com/source/phabricator/history/master/
List of recent changes in Phabricator-only (most recent up):
| Phab Topic | in Phabricator | in Phorge | Notes |
|---|---|---|---|
| PHP8 | 40b272fa51ea | mixed | |
| PHP8 Conduit | dd94e2efcfb7 | mixed | |
| PHP8 Dashboard | 60158470d04a | mixed | |
| PHP8 | cf400694c717 | mixed | |
| Fix HTTP Mercurial | 0b6e758978a9 | D25471 | |
| PHP8 Remarkup | ec9ebe532e52 | mixed | |
| PHP8 Diffusion & Differential | ce3d484b0ec7 | mixed | |
| PHP8 refactor ProfileMenu | 58995268dd97 | mixed | |
| PHP8 fixes | f6214f060e78 | mixed | Basically in Phab they reinvented the wheel after 3 months of day-by-day fixes in Phorge. They are probably missing things we already fixed and vice-versa. |
| Fix Figlet regression | bc6f4786a2e3 | rP71e4eee275f5 | Phab has just a fix for this ↓. Phorge does not need this. |
| Update Figlet in PHP8 | d5c63c86e7e4 | rP71e4eee275f5 | Phab introduced a regression in line 150. Phorge does not need that fix. |
| Fix Pholio | a83cb99e856a | rPa8a38835e15e | Phorge can take inspiration. |
| (no older differences) | (no older differences) | ||
As you can see, since ~2022, Phacility introduced ~12 commits while Phorge introduced 300+ commits so we indeed strongly suggest to propose patches in Phorge directly.
Differences from upstream Arcanist
https://secure.phabricator.com/diffusion/ARC/history/master/
List of recent changes in Arcanist-only (most recent up):
| Phab Topic | in Phabricator | in Phorge | Notes |
|---|---|---|---|
| PHP8 | e50d1bc4eaba | mixed | |
| PHP8 | 34b20ec7d88d | mixed | |
| Fix for Mercurial 6.4 | 0fc22183e796 | rARC5cdafa4002d8 | C. Speck betrayed Phorge 🤨 than turned back ✨ |
| Fix utf8_decode() | d87d5f0e02e2 | rARC08dfffd5caf7 | The approach in Phorge is more efficient. |
| Fix Diff PHP8.1 | c39ab20eb371 | rARC0e32dbc1ac8f | |
| (no older differences) | (no older differences) | ||
Unique features of Phorge
Apart from the lines in common mentioned above,
To discover how many bug fixes and features are Phorge-only, explore the Phorge's Change Log.
- Last Author
- valerio.bozzolan
- Last Edited
- Nov 20 2023, 10:10
Event Timeline
what's the point of this page? it's very easy to get a detailed difference between the code bases using git; Why create a manually-maintained list as well?
@avivey The problem is, I cannot annotate my git with comments and share them to folks in Wikimedia Foundation. Also, it's not simple to have a 1:1 match between our commits and theirs in secure.
Probably a way to automate that, is to add an additional fields in Diffusion commits like "upstream commit hash". But at the moment a manual wiki page solves some problems