From 8de7f8f8467db68fb9e01c8fb5d711114803d715 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 6 Oct 2024 17:27:23 +0200 Subject: [PATCH] Some more tooling updates & Update to v1.11.79 --- README.md | 32 ------------ element-desktop | 2 +- element-web | 2 +- generate_patches.sh | 3 ++ matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- ...ildi-fetch-package.ts-modifications.patch} | 4 +- ...Add-fields-for-media-caption-support.patch | 4 +- .../0001-Disable-sticky-rooms.patch | 8 +-- .../0002-Bring-back-unified-room-list.patch | 50 +++++++++---------- ...-rooms-to-bottom-I-still-want-to-see.patch | 8 +-- ...rendering-captions-in-media-messages.patch | 24 ++++----- .../0005-Don-t-preview-reactions.patch | 8 +-- ...tification-state-the-same-way-as-the.patch | 8 +-- ...llow-muted-rooms-to-render-as-unread.patch | 8 +-- .../0008-Increase-default-visible-tiles.patch | 8 +-- ...paceDMBadges-setting-force-enabled-f.patch | 18 +++---- ...m-reactions-from-tadzik-freeform-rea.patch | 18 +++---- ...1-Allow-reactions-to-take-more-space.patch | 10 ++-- ...don-t-automatically-show-last-opened.patch | 18 +++---- ...0013-Exclude-spaces-from-breadcrumbs.patch | 8 +-- .../0014-Stop-the-search-bar-wobble.patch | 8 +-- push_current_sc_branches.sh | 40 +++++++++++++++ 23 files changed, 152 insertions(+), 141 deletions(-) rename patches/element-desktop/{0001-Add-back-schildi-fetch-package.ts-modifications.patch => 0002-Add-back-schildi-fetch-package.ts-modifications.patch} (96%) create mode 100755 push_current_sc_branches.sh diff --git a/README.md b/README.md index 78b0399..1b5738a 100644 --- a/README.md +++ b/README.md @@ -5,38 +5,6 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/ This branch builds the "lite" variant, which rebases a reduced feature set of the original fork on top of the latest Element, in order to keep maintenance effort more manageable while staying up-to-date. -For bringup I'm currently trying out a new approach which relies less on merges but rather on cherry-picking our changes back. -So while the old build instructions mostly still apply, you need to do some new steps: - -After cloning, add usptream remotes: - -``` -source merge_helpers.sh -forall_repos add_upstream -``` - -Then, to checkout the latest upstream release and pick our changes on top of it (I know the script name isn't accurate right now) - -``` -./merge_upstream.sh -``` - -Note that `./merge_upstream.sh` may pick up a wrong tag right now, e.g. a release candidate instead of the latest build, which may cause problems if you plan to develop on top of it. -If you want to build against a specific Element version rather than the latest (e.g. v1.11.66): - -``` -./merge_upstream.sh v1.11.66 -``` - -If there are conflicts picking some changes running this script, solve them manually. -If you want to persist a new set of patches in `schildichat-desktop`, run - -``` -./generate_patches.sh -``` - -Note this script may be broken right now when not run against actual element releases (it was causing issues for a release candidate for sure). - ## Old build instructions, to be revised in the future diff --git a/element-desktop b/element-desktop index 093d2e2..5782a86 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 093d2e28d82e693b8f7575b1b16206723b9269e5 +Subproject commit 5782a86e0113784cd97d3cd34472ddc5696d4b9b diff --git a/element-web b/element-web index 9fa6db0..6ff1f21 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9fa6db056ac4cd2240a9b676cf305a1ca73bc15c +Subproject commit 6ff1f21927883ac3302430c9406ffb5f5ace6c65 diff --git a/generate_patches.sh b/generate_patches.sh index b456c34..4a2771d 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -28,6 +28,9 @@ persist_patches() { git format-patch -k upstream/master.. -o "$patch_dir" echo "Clearing automated commits from patches" find "$patch_dir" -name "*-Automatic-package.json-adjustment.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-icon-update.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-theme-update.patch" -exec rm {} \; + find "$patch_dir" -name "*-Automatic-setup-commit.patch" -exec rm {} \; find "$patch_dir" -name "*-Update-version-to-*.patch" -exec rm {} \; popd } diff --git a/matrix-js-sdk b/matrix-js-sdk index b6a86ca..646153b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit b6a86ca2e65407999a71d92cbbfec7a856d7a586 +Subproject commit 646153b51b6de55c74beb5666875d283df04cba1 diff --git a/matrix-react-sdk b/matrix-react-sdk index abfce03..048ba0d 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit abfce03f8cd209ce9289cdcd6a0f4c91e0da6072 +Subproject commit 048ba0db6e21468d484303fafed3c3703cba1b89 diff --git a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch similarity index 96% rename from patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch rename to patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch index 2ceda12..30145b0 100644 --- a/patches/element-desktop/0001-Add-back-schildi-fetch-package.ts-modifications.patch +++ b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch @@ -1,4 +1,4 @@ -From 00009e6d27ccc63b0e1e32888a79a3dda12537db Mon Sep 17 00:00:00 2001 +From 68654457f34f0821d52d61453a7c3de40bd9a473 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 2 Dec 2023 12:57:26 +0100 Subject: Add back schildi fetch-package.ts modifications @@ -58,5 +58,5 @@ index 54da3f3..354f039 100644 if (!haveDeploy) { const outPath = path.join(pkgDir, filename); -- -2.46.0 +2.46.2 diff --git a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch index 8ec1e73..00e3f90 100644 --- a/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch +++ b/patches/matrix-js-sdk/0001-Add-fields-for-media-caption-support.patch @@ -1,4 +1,4 @@ -From 3e11b1c51c4b0f0e673c4b22864f97be7098b888 Mon Sep 17 00:00:00 2001 +From 646153b51b6de55c74beb5666875d283df04cba1 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 9 May 2024 09:21:21 +0200 Subject: Add fields for media caption support @@ -52,5 +52,5 @@ index ef23668b0..9b4ff3b97 100644 /** -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch index bf35661..eb55bde 100644 --- a/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch +++ b/patches/matrix-react-sdk/0001-Disable-sticky-rooms.patch @@ -1,4 +1,4 @@ -From 6e30626e23f9bd3eed4bb62ce91d86678b6e2023 Mon Sep 17 00:00:00 2001 +From 88a9117efb7131a593c2cb012d831bebcdd5878d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 18 Jan 2022 13:28:22 +0100 Subject: Disable sticky rooms @@ -8,10 +8,10 @@ Subject: Disable sticky rooms 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 6e28eb1a4e..775b68e7d9 100644 +index c3450d70cf..e296676149 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts -@@ -167,8 +167,10 @@ export class Algorithm extends EventEmitter { +@@ -159,8 +159,10 @@ export class Algorithm extends EventEmitter { this.recalculateActiveCallRooms(tagId); } @@ -25,5 +25,5 @@ index 6e28eb1a4e..775b68e7d9 100644 } -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch index 2642465..901193c 100644 --- a/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch +++ b/patches/matrix-react-sdk/0002-Bring-back-unified-room-list.patch @@ -1,4 +1,4 @@ -From 60b5acaf9615e189667a594bb1477ea6c0feb457 Mon Sep 17 00:00:00 2001 +From 108b8d05d2f0c701e75a327094610bf672dcbf75 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 5 May 2024 10:12:17 +0200 Subject: Bring back unified room list @@ -16,10 +16,10 @@ Co-authored-by: su-ex 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx -index 7d47748de8..cec95bcf6d 100644 +index e27b2ca03f..311a54d9d8 100644 --- a/src/components/views/rooms/RoomList.tsx +++ b/src/components/views/rooms/RoomList.tsx -@@ -80,11 +80,13 @@ interface IState { +@@ -72,11 +72,13 @@ interface IState { sublists: ITagMap; currentRoomId?: string; suggestedRooms: ISuggestedRoom[]; @@ -33,7 +33,7 @@ index 7d47748de8..cec95bcf6d 100644 DefaultTagID.DM, DefaultTagID.Untagged, DefaultTagID.Conference, -@@ -97,6 +99,7 @@ export const TAG_ORDER: TagID[] = [ +@@ -89,6 +91,7 @@ export const TAG_ORDER: TagID[] = [ // but we'd have to make sure that rooms you weren't in were hidden. ]; const ALWAYS_VISIBLE_TAGS: TagID[] = [DefaultTagID.DM, DefaultTagID.Untagged]; @@ -41,7 +41,7 @@ index 7d47748de8..cec95bcf6d 100644 interface ITagAesthetics { sectionLabel: TranslationKey; -@@ -374,6 +377,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { +@@ -366,6 +369,17 @@ const UntaggedAuxButton: React.FC = ({ tabIndex }) => { return null; }; @@ -59,7 +59,7 @@ index 7d47748de8..cec95bcf6d 100644 const TAG_AESTHETICS: TagAestheticsMap = { [DefaultTagID.Invite]: { sectionLabel: _td("action|invites_list"), -@@ -391,6 +405,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -383,6 +397,12 @@ const TAG_AESTHETICS: TagAestheticsMap = { defaultHidden: false, AuxButtonComponent: DmAuxButton, }, @@ -72,7 +72,7 @@ index 7d47748de8..cec95bcf6d 100644 [DefaultTagID.Conference]: { sectionLabel: _td("voip|metaspace_video_rooms|conference_room_section"), isInvite: false, -@@ -429,6 +449,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { +@@ -421,6 +441,7 @@ const TAG_AESTHETICS: TagAestheticsMap = { export default class RoomList extends React.PureComponent { private dispatcherRef?: string; @@ -80,7 +80,7 @@ index 7d47748de8..cec95bcf6d 100644 private treeRef = createRef(); public static contextType = MatrixClientContext; -@@ -440,7 +461,14 @@ export default class RoomList extends React.PureComponent { +@@ -432,7 +453,14 @@ export default class RoomList extends React.PureComponent { this.state = { sublists: {}, suggestedRooms: SpaceStore.instance.suggestedRooms, @@ -95,7 +95,7 @@ index 7d47748de8..cec95bcf6d 100644 } public componentDidMount(): void { -@@ -455,9 +483,16 @@ export default class RoomList extends React.PureComponent { +@@ -447,9 +475,16 @@ export default class RoomList extends React.PureComponent { SpaceStore.instance.off(UPDATE_SUGGESTED_ROOMS, this.updateSuggestedRooms); RoomListStore.instance.off(LISTS_UPDATE_EVENT, this.updateLists); if (this.dispatcherRef) defaultDispatcher.unregister(this.dispatcherRef); @@ -112,7 +112,7 @@ index 7d47748de8..cec95bcf6d 100644 private onRoomViewStoreUpdate = (): void => { this.setState({ currentRoomId: SdkContextClass.instance.roomViewStore.getRoomId() ?? undefined, -@@ -598,7 +633,9 @@ export default class RoomList extends React.PureComponent { +@@ -590,7 +625,9 @@ export default class RoomList extends React.PureComponent { const aesthetics = TAG_AESTHETICS[orderedTagId]; if (!aesthetics) throw new Error(`Tag ${orderedTagId} does not have aesthetics`); @@ -124,10 +124,10 @@ index 7d47748de8..cec95bcf6d 100644 (this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) || (this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) || diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 7cd58c9355..9709fcd83b 100644 +index 2fadb53dde..47eb9b284e 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -197,6 +197,14 @@ export interface IFeature extends Omit, "isFeature"> { +@@ -190,6 +190,14 @@ export interface IFeature extends Omit, "isFeature"> { export type ISetting = IBaseSetting | IFeature; export const SETTINGS: { [setting: string]: ISetting } = { @@ -143,10 +143,10 @@ index 7cd58c9355..9709fcd83b 100644 isFeature: true, labsGroup: LabGroup.VoiceAndVideo, diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts -index 7dcb28c325..63f43118fa 100644 +index 53377e0a01..381187b85c 100644 --- a/src/stores/room-list/RoomListStore.ts +++ b/src/stores/room-list/RoomListStore.ts -@@ -508,6 +508,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -500,6 +500,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements this.setAndPersistListOrder(tag, listOrder); } } @@ -156,7 +156,7 @@ index 7dcb28c325..63f43118fa 100644 } private onAlgorithmListUpdated = (forceUpdate: boolean): void => { -@@ -621,7 +624,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements +@@ -613,7 +616,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient implements */ public getTagsForRoom(room: Room): TagID[] { const algorithmTags = this.algorithm.getTagsForRoom(room); @@ -180,10 +180,10 @@ index 7dcb28c325..63f43118fa 100644 } diff --git a/src/stores/room-list/algorithms/Algorithm.ts b/src/stores/room-list/algorithms/Algorithm.ts -index 775b68e7d9..39add54d89 100644 +index e296676149..06147137b3 100644 --- a/src/stores/room-list/algorithms/Algorithm.ts +++ b/src/stores/room-list/algorithms/Algorithm.ts -@@ -83,6 +83,7 @@ export class Algorithm extends EventEmitter { +@@ -75,6 +75,7 @@ export class Algorithm extends EventEmitter { * Set to true to suspend emissions of algorithm updates. */ public updatesInhibited = false; @@ -191,7 +191,7 @@ index 775b68e7d9..39add54d89 100644 public start(): void { CallStore.instance.on(CallStoreEvent.ConnectedCalls, this.onConnectedCalls); -@@ -114,6 +115,10 @@ export class Algorithm extends EventEmitter { +@@ -106,6 +107,10 @@ export class Algorithm extends EventEmitter { return this._cachedRooms; } @@ -202,7 +202,7 @@ index 775b68e7d9..39add54d89 100644 /** * Awaitable version of the sticky room setter. * @param val The new room to sticky. -@@ -521,7 +526,10 @@ export class Algorithm extends EventEmitter { +@@ -513,7 +518,10 @@ export class Algorithm extends EventEmitter { } if (!inTag) { @@ -214,7 +214,7 @@ index 775b68e7d9..39add54d89 100644 newTags[DefaultTagID.DM].push(room); } else { newTags[DefaultTagID.Untagged].push(room); -@@ -565,7 +573,13 @@ export class Algorithm extends EventEmitter { +@@ -557,7 +565,13 @@ export class Algorithm extends EventEmitter { tags.push(...this.getTagsOfJoinedRoom(room)); } @@ -229,7 +229,7 @@ index 775b68e7d9..39add54d89 100644 return tags; } -@@ -575,7 +589,7 @@ export class Algorithm extends EventEmitter { +@@ -567,7 +581,7 @@ export class Algorithm extends EventEmitter { if (tags.length === 0) { // Check to see if it's a DM if it isn't anything else @@ -239,10 +239,10 @@ index 775b68e7d9..39add54d89 100644 } } diff --git a/src/stores/room-list/models.ts b/src/stores/room-list/models.ts -index d8b0488842..335097ccdb 100644 +index 50cecda665..8efc2d040d 100644 --- a/src/stores/room-list/models.ts +++ b/src/stores/room-list/models.ts -@@ -21,6 +21,7 @@ export enum DefaultTagID { +@@ -13,6 +13,7 @@ export enum DefaultTagID { LowPriority = "m.lowpriority", Favourite = "m.favourite", DM = "im.vector.fake.direct", @@ -250,7 +250,7 @@ index d8b0488842..335097ccdb 100644 Conference = "im.vector.fake.conferences", ServerNotice = "m.server_notice", Suggested = "im.vector.fake.suggested", -@@ -29,6 +30,7 @@ export enum DefaultTagID { +@@ -21,6 +22,7 @@ export enum DefaultTagID { export const OrderedDefaultTagIDs = [ DefaultTagID.Invite, DefaultTagID.Favourite, @@ -259,5 +259,5 @@ index d8b0488842..335097ccdb 100644 DefaultTagID.Conference, DefaultTagID.Untagged, -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch index dc063fc..d51648a 100644 --- a/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch +++ b/patches/matrix-react-sdk/0003-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch @@ -1,4 +1,4 @@ -From b0c7839b0ea5d707120df607eeba7c535b16da3a Mon Sep 17 00:00:00 2001 +From 7c7a368ac7a3e9ae4c096b70994476832fec812c Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 17 Dec 2023 11:11:58 +0100 Subject: Don't sort muted rooms to bottom, I still want to see them. @@ -8,10 +8,10 @@ Subject: Don't sort muted rooms to bottom, I still want to see them. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -index 1b6472a018..8eae273a06 100644 +index 67ee1ca084..67dcaa3855 100644 --- a/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts +++ b/src/stores/room-list/algorithms/list-ordering/OrderingAlgorithm.ts -@@ -46,7 +46,7 @@ export abstract class OrderingAlgorithm { +@@ -38,7 +38,7 @@ export abstract class OrderingAlgorithm { } public get isMutedToBottom(): boolean { @@ -21,5 +21,5 @@ index 1b6472a018..8eae273a06 100644 /** -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch index 89973e9..aaa686f 100644 --- a/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch +++ b/patches/matrix-react-sdk/0004-Add-support-for-rendering-captions-in-media-messages.patch @@ -1,4 +1,4 @@ -From bc56cc58fbb23b3e19740e202fe2231240fbc0c9 Mon Sep 17 00:00:00 2001 +From eba8b0f5bacb6762146eda9075e4f4e3e8e54e81 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 12 Jul 2022 15:34:57 +0300 Subject: Add support for rendering captions in media messages @@ -11,10 +11,10 @@ Subject: Add support for rendering captions in media messages 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts -index fcc204dae3..95cb2eb37d 100644 +index e48ba96b56..3caeff225c 100644 --- a/src/components/views/messages/IBodyProps.ts +++ b/src/components/views/messages/IBodyProps.ts -@@ -59,4 +59,6 @@ export interface IBodyProps { +@@ -51,4 +51,6 @@ export interface IBodyProps { // Set to `true` to disable interactions (e.g. video controls) and to remove controls from the tab order. // This may be useful when displaying a preview of the event. inhibitInteraction?: boolean; @@ -22,10 +22,10 @@ index fcc204dae3..95cb2eb37d 100644 + OrigBodyType?: React.ComponentType>; } diff --git a/src/components/views/messages/MessageEvent.tsx b/src/components/views/messages/MessageEvent.tsx -index fb700579be..76f60bad76 100644 +index 1a5d09e415..bfe908aacc 100644 --- a/src/components/views/messages/MessageEvent.tsx +++ b/src/components/views/messages/MessageEvent.tsx -@@ -183,6 +183,15 @@ export default class MessageEvent extends React.Component implements IMe +@@ -175,6 +175,15 @@ export default class MessageEvent extends React.Component implements IMe } } @@ -41,7 +41,7 @@ index fb700579be..76f60bad76 100644 if (SettingsStore.getValue("feature_mjolnir")) { const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`; const allowRender = localStorage.getItem(key) === "true"; -@@ -216,7 +225,13 @@ export default class MessageEvent extends React.Component implements IMe +@@ -208,7 +217,13 @@ export default class MessageEvent extends React.Component implements IMe getRelationsForEvent={this.props.getRelationsForEvent} isSeeingThroughMessageHiddenForModeration={this.props.isSeeingThroughMessageHiddenForModeration} inhibitInteraction={this.props.inhibitInteraction} @@ -56,10 +56,10 @@ index fb700579be..76f60bad76 100644 + +) diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx -index 5dba3e42b7..f665e6dc67 100644 +index 8b7bfb9a5a..a8890303f8 100644 --- a/src/components/views/messages/TextualBody.tsx +++ b/src/components/views/messages/TextualBody.tsx -@@ -565,6 +565,9 @@ export default class TextualBody extends React.Component { +@@ -557,6 +557,9 @@ export default class TextualBody extends React.Component { const isNotice = content.msgtype === MsgType.Notice; const isEmote = content.msgtype === MsgType.Emote; @@ -69,7 +69,7 @@ index 5dba3e42b7..f665e6dc67 100644 const willHaveWrapper = this.props.replacingEventId || this.props.isSeeingThroughMessageHiddenForModeration || isEmote; -@@ -643,6 +646,14 @@ export default class TextualBody extends React.Component { +@@ -635,6 +638,14 @@ export default class TextualBody extends React.Component { ); } @@ -85,10 +85,10 @@ index 5dba3e42b7..f665e6dc67 100644
{body} diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts -index 75511756f5..a8e3b9cceb 100644 +index 194cb31d20..0c0aec2138 100644 --- a/src/utils/FileUtils.ts +++ b/src/utils/FileUtils.ts -@@ -46,7 +46,9 @@ export function presentableTextForFile( +@@ -38,7 +38,9 @@ export function presentableTextForFile( shortened = false, ): string { let text = fallbackText; @@ -100,5 +100,5 @@ index 75511756f5..a8e3b9cceb 100644 // file extension. text = content.body; -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch index 2e7366c..462bf09 100644 --- a/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch +++ b/patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch @@ -1,4 +1,4 @@ -From 9a88dd5e3f1a03a4eecfe11515a502ef89d7d6b3 Mon Sep 17 00:00:00 2001 +From e5e461d0bf3dfb693dc63075b653a2c01df9c6f4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 14 Dec 2023 10:32:10 +0100 Subject: Don't preview reactions @@ -8,10 +8,10 @@ Subject: Don't preview reactions 1 file changed, 2 insertions(+) diff --git a/src/stores/room-list/MessagePreviewStore.ts b/src/stores/room-list/MessagePreviewStore.ts -index a3c44084d5..f412cf3b89 100644 +index e0e06ec980..7ee27f8402 100644 --- a/src/stores/room-list/MessagePreviewStore.ts +++ b/src/stores/room-list/MessagePreviewStore.ts -@@ -65,10 +65,12 @@ const PREVIEWS: Record< +@@ -57,10 +57,12 @@ const PREVIEWS: Record< isState: false, previewer: new StickerEventPreview(), }, @@ -25,5 +25,5 @@ index a3c44084d5..f412cf3b89 100644 isState: false, previewer: new PollStartEventPreview(), -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch index 7e99a27..3ab319d 100644 --- a/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch +++ b/patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch @@ -1,4 +1,4 @@ -From b8da294b5d544da9760299037dd2830989298510 Mon Sep 17 00:00:00 2001 +From e099a50b6339607e7238567829bbaa245d0b1a2a Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 17 Nov 2021 12:50:25 +0100 Subject: Hide the "mute" notification state the same way as the other states @@ -11,10 +11,10 @@ way. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx -index 71ff1ef296..4ab94e7278 100644 +index 93fb42f447..09df8eaac9 100644 --- a/src/components/views/rooms/RoomTile.tsx +++ b/src/components/views/rooms/RoomTile.tsx -@@ -312,7 +312,9 @@ export class RoomTile extends React.PureComponent { +@@ -304,7 +304,9 @@ export class RoomTile extends React.PureComponent { // Only show the icon by default if the room is overridden to muted. // TODO: [FTUE Notifications] Probably need to detect global mute state @@ -26,5 +26,5 @@ index 71ff1ef296..4ab94e7278 100644 return ( -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch index 10bee6c..a6e121d 100644 --- a/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch +++ b/patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch @@ -1,4 +1,4 @@ -From e8d9cca6e0838659a02373bf922f5aceb16ee015 Mon Sep 17 00:00:00 2001 +From 61945db01ec4c64a7c89a31a09ba3f7d0fd5da9f Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 10 May 2024 18:58:32 +0200 Subject: Allow muted rooms to render as unread @@ -8,10 +8,10 @@ Subject: Allow muted rooms to render as unread 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts -index 1fb5e5ba4d..f9cb6ed026 100644 +index cc027c9682..c4c31a51cb 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts -@@ -263,7 +263,7 @@ export function determineUnreadState( +@@ -255,7 +255,7 @@ export function determineUnreadState( return { symbol: "!", count: 1, level: NotificationLevel.Highlight }; } @@ -21,5 +21,5 @@ index 1fb5e5ba4d..f9cb6ed026 100644 } -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch index f1fdb94..5e005e9 100644 --- a/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch +++ b/patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch @@ -1,4 +1,4 @@ -From de95a495964ac0b8a91c3a30268fa362e3cc5373 Mon Sep 17 00:00:00 2001 +From ad8b2ad718275363b9aba3a40792b761e3532be8 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 30 Aug 2020 15:33:01 +0200 Subject: Increase default visible tiles @@ -8,10 +8,10 @@ Subject: Increase default visible tiles 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts -index afc93f3b01..6020b2148d 100644 +index ff60309e08..275b6d330b 100644 --- a/src/stores/room-list/ListLayout.ts +++ b/src/stores/room-list/ListLayout.ts -@@ -82,7 +82,7 @@ export class ListLayout { +@@ -74,7 +74,7 @@ export class ListLayout { public get defaultVisibleTiles(): number { // This number is what "feels right", and mostly subject to design's opinion. @@ -21,5 +21,5 @@ index afc93f3b01..6020b2148d 100644 public tilesWithPadding(n: number, paddingPx: number): number { -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch index b0902f2..b291c04 100644 --- a/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch +++ b/patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch @@ -1,4 +1,4 @@ -From 54ff718e21a20c653721ffd6ec30c6d91cb67900 Mon Sep 17 00:00:00 2001 +From 4ec13ff8a65486fac9a905b79b26530d2257d318 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 26 May 2024 10:43:36 +0200 Subject: Bring back showSpaceDMBadges setting, force-enabled for now @@ -12,10 +12,10 @@ Co-authored-by: SpiritCroc 2 files changed, 30 insertions(+) diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 9709fcd83b..7b402ef8cf 100644 +index 47eb9b284e..9d43f8e1e0 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -204,6 +204,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -197,6 +197,11 @@ export const SETTINGS: { [setting: string]: ISetting } = { default: true, controller: new ReloadOnChangeController(), }, @@ -28,10 +28,10 @@ index 9709fcd83b..7b402ef8cf 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index 966b564d68..bda81e9d5f 100644 +index 90358f3310..60df05478a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -162,9 +162,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient { /** Whether the feature flag is set for MSC3946 */ private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors"); @@ -49,7 +49,7 @@ index 966b564d68..bda81e9d5f 100644 SettingsStore.monitorSetting("Spaces.allRoomsInHome", null); SettingsStore.monitorSetting("Spaces.enabledMetaSpaces", null); SettingsStore.monitorSetting("Spaces.showPeopleInSpace", null); -@@ -200,6 +208,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -192,6 +200,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { return this._allRoomsInHome; } @@ -60,7 +60,7 @@ index 966b564d68..bda81e9d5f 100644 public setActiveRoomInSpace(space: SpaceKey): void { if (!isMetaSpace(space) && !this.matrixClient?.getRoom(space)?.isSpaceRoom()) return; if (space !== this.activeSpace) this.setActiveSpace(space, false); -@@ -709,6 +721,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -701,6 +713,10 @@ export class SpaceStoreClass extends AsyncStoreWithClient { if (room.isSpaceRoom() || !flattenedRoomsForSpace.has(room.roomId)) return false; @@ -71,7 +71,7 @@ index 966b564d68..bda81e9d5f 100644 if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) { return s === dmBadgeSpace; } -@@ -1285,6 +1301,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -1277,6 +1293,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient { break; } @@ -88,5 +88,5 @@ index 966b564d68..bda81e9d5f 100644 const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces"); const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]); -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch index 9430d17..f5c0059 100644 --- a/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch +++ b/patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch @@ -1,4 +1,4 @@ -From bbc655c919fe9283a38e6e3c86bedb8c348776a7 Mon Sep 17 00:00:00 2001 +From 9e0626583e090e72a9b14908cf9781aa0766779b Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 29 May 2024 19:32:42 +0200 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream @@ -71,10 +71,10 @@ Date: Tue Aug 17 11:29:22 2021 +0200 2 files changed, 16 insertions(+) diff --git a/src/components/views/emojipicker/EmojiPicker.tsx b/src/components/views/emojipicker/EmojiPicker.tsx -index 16258bb3d7..847170dc92 100644 +index 4806ad4216..7d4a4353e2 100644 --- a/src/components/views/emojipicker/EmojiPicker.tsx +++ b/src/components/views/emojipicker/EmojiPicker.tsx -@@ -25,6 +25,7 @@ import Header from "./Header"; +@@ -17,6 +17,7 @@ import Header from "./Header"; import Search from "./Search"; import Preview from "./Preview"; import QuickReactions from "./QuickReactions"; @@ -82,7 +82,7 @@ index 16258bb3d7..847170dc92 100644 import Category, { CategoryKey, ICategory } from "./Category"; import { filterBoolean } from "../../../utils/arrays"; import { -@@ -45,6 +46,7 @@ export const EMOJIS_PER_ROW = 8; +@@ -37,6 +38,7 @@ export const EMOJIS_PER_ROW = 8; const ZERO_WIDTH_JOINER = "\u200D"; interface IProps { @@ -90,7 +90,7 @@ index 16258bb3d7..847170dc92 100644 selectedEmojis?: Set; onChoose(unicode: string): boolean; onFinished(): void; -@@ -349,6 +351,10 @@ class EmojiPicker extends React.Component { +@@ -341,6 +343,10 @@ class EmojiPicker extends React.Component { } }; @@ -101,7 +101,7 @@ index 16258bb3d7..847170dc92 100644 private static categoryHeightForEmojiCount(count: number): number { if (count === 0) { return 0; -@@ -404,6 +410,15 @@ class EmojiPicker extends React.Component { +@@ -396,6 +402,15 @@ class EmojiPicker extends React.Component { return categoryElement; })} @@ -118,10 +118,10 @@ index 16258bb3d7..847170dc92 100644 ) : ( diff --git a/src/components/views/emojipicker/ReactionPicker.tsx b/src/components/views/emojipicker/ReactionPicker.tsx -index 8265331a3c..c29fc698aa 100644 +index 2c2eb442a0..62bfd2ea0f 100644 --- a/src/components/views/emojipicker/ReactionPicker.tsx +++ b/src/components/views/emojipicker/ReactionPicker.tsx -@@ -131,6 +131,7 @@ class ReactionPicker extends React.Component { +@@ -123,6 +123,7 @@ class ReactionPicker extends React.Component { public render(): React.ReactNode { return ( Date: Sat, 22 Apr 2023 12:15:18 +0200 Subject: Allow reactions to take more space @@ -8,10 +8,10 @@ Subject: Allow reactions to take more space 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/messages/_ReactionsRowButton.pcss b/res/css/views/messages/_ReactionsRowButton.pcss -index 26d2d25fae..9920c6c20d 100644 +index f2e3885de4..2a8bb9224e 100644 --- a/res/css/views/messages/_ReactionsRowButton.pcss +++ b/res/css/views/messages/_ReactionsRowButton.pcss -@@ -23,6 +23,7 @@ limitations under the License. +@@ -14,6 +14,7 @@ Please see LICENSE files in the repository root for full details. background-color: $secondary-hairline-color; user-select: none; align-items: center; @@ -19,7 +19,7 @@ index 26d2d25fae..9920c6c20d 100644 &:hover { border-color: $quinary-content; -@@ -38,7 +39,6 @@ limitations under the License. +@@ -29,7 +30,6 @@ Please see LICENSE files in the repository root for full details. } .mx_ReactionsRowButton_content { @@ -28,5 +28,5 @@ index 26d2d25fae..9920c6c20d 100644 white-space: nowrap; text-overflow: ellipsis; -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch index 8ac51e2..0ded0b7 100644 --- a/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch +++ b/patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch @@ -1,4 +1,4 @@ -From c9fd9e3448066ede633e8e2d388c9e6a040f3956 Mon Sep 17 00:00:00 2001 +From efb1f2b9ca610e6282583d8585317803389a87e2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 May 2024 14:35:16 +0200 Subject: On space switch don't automatically show last opened room @@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx -index 53514ab817..73068d3090 100644 +index 8e0eaabe4f..ed9f1f30c1 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx -@@ -1438,7 +1438,15 @@ export default class MatrixChat extends React.PureComponent { +@@ -1446,7 +1446,15 @@ export default class MatrixChat extends React.PureComponent { if (this.screenAfterLogin && this.screenAfterLogin.screen) { this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params); this.screenAfterLogin = undefined; @@ -30,7 +30,7 @@ index 53514ab817..73068d3090 100644 // Before defaulting to directory, show the last viewed room this.viewLastRoom(); } else { -@@ -1450,6 +1458,14 @@ export default class MatrixChat extends React.PureComponent { +@@ -1458,6 +1466,14 @@ export default class MatrixChat extends React.PureComponent { } } @@ -46,10 +46,10 @@ index 53514ab817..73068d3090 100644 dis.dispatch({ action: Action.ViewRoom, diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx -index 7b402ef8cf..cfaeb9ac29 100644 +index 9d43f8e1e0..eede03b5b7 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx -@@ -209,6 +209,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { +@@ -202,6 +202,12 @@ export const SETTINGS: { [setting: string]: ISetting } = { supportedLevels: LEVELS_ACCOUNT_SETTINGS, default: true, }, @@ -63,10 +63,10 @@ index 7b402ef8cf..cfaeb9ac29 100644 "feature_video_rooms": { isFeature: true, diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts -index bda81e9d5f..6f16e7261f 100644 +index 60df05478a..0be7ba190a 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts -@@ -273,6 +273,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { +@@ -265,6 +265,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient { // else if the last viewed room in this space is joined then view that // else view space home or home depending on what is being clicked on if ( @@ -75,5 +75,5 @@ index bda81e9d5f..6f16e7261f 100644 cliSpace?.getMyMembership() !== KnownMembership.Invite && this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join && -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch index fa1fbc2..95f28b5 100644 --- a/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch +++ b/patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch @@ -1,4 +1,4 @@ -From 5e5285a00c60802d7ef74fe6881601a3c4f20746 Mon Sep 17 00:00:00 2001 +From 19cacbc689d2cd27f400033c7c73dbe5fe9acf8d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 9 Aug 2022 09:32:19 +0200 Subject: Exclude spaces from breadcrumbs @@ -8,10 +8,10 @@ Subject: Exclude spaces from breadcrumbs 1 file changed, 1 insertion(+) diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts -index 36bb0a78b6..c1edee140f 100644 +index 9859f24015..957b54286c 100644 --- a/src/stores/BreadcrumbsStore.ts +++ b/src/stores/BreadcrumbsStore.ts -@@ -145,6 +145,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { +@@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient { } private async appendRoom(room: Room): Promise { @@ -20,5 +20,5 @@ index 36bb0a78b6..c1edee140f 100644 const rooms = (this.state.rooms || []).slice(); // cheap clone const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors"); -- -2.46.0 +2.46.2 diff --git a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch index f62a0d7..3910330 100644 --- a/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch +++ b/patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch @@ -1,4 +1,4 @@ -From c6a550e2c3f9020730c8bd603514e9ce7cf69064 Mon Sep 17 00:00:00 2001 +From 086f83a33c6c3c41cce9fb985d2be4ec4e5dafc4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Mon, 19 Aug 2024 20:27:33 +0200 Subject: Stop the search bar wobble @@ -8,10 +8,10 @@ Subject: Stop the search bar wobble 1 file changed, 1 insertion(+) diff --git a/res/css/_common.pcss b/res/css/_common.pcss -index 605ad41b81..d1f55282f6 100644 +index 05a3dac067..7861af6381 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss -@@ -189,6 +189,7 @@ input[type="search"].mx_textinput_icon { +@@ -181,6 +181,7 @@ input[type="search"].mx_textinput_icon { padding-left: 36px; background-repeat: no-repeat; background-position: 10px center; @@ -20,5 +20,5 @@ index 605ad41b81..d1f55282f6 100644 /* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */ -- -2.46.0 +2.46.2 diff --git a/push_current_sc_branches.sh b/push_current_sc_branches.sh new file mode 100755 index 0000000..51cab81 --- /dev/null +++ b/push_current_sc_branches.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +get_branch_of() { + local repo="$1" + pushd "$repo" > /dev/null + local b=`git branch --show-current` + if [[ "$b" = sc_v* ]]; then + echo "$b" + else + >&2 echo "Unexpected branch name for $repo: $b" + exit 1 + fi + popd > /dev/null +} + +b_js=`get_branch_of matrix-js-sdk` +b_react=`get_branch_of matrix-react-sdk` +b_web=`get_branch_of element-web` +b_desktop=`get_branch_of element-desktop` + +if [ "$b_js" != "$b_react" ] || [ "$b_react" != "$b_web" ] || [ "$b_web" != "$b_desktop" ]; then + echo "Detected branch name mismatch!" + echo "js-sdk: $b_js" + echo "react-sdk: $b_react" + echo "element-web: $b_web" + echo "element-desktop: $b_desktop" + exit 1 +fi + +branch="$b_js" + +echo "Pushing to all repos: $branch" +forall_repos git push --set-upstream origin "$branch"