Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose PutHumptyTogetherAgain method in LfMergeBridge #398

Merged
merged 2 commits into from
Apr 26, 2024

Conversation

rmunn
Copy link
Contributor

@rmunn rmunn commented Apr 18, 2024

The LexBox project wants to be able to generate .fwdata files on the fly, which will enable various features such as being able to view recent changes to a project in a nicer form than Mercurial diffs. In order to make this work, we need to expose the PutHumptyTogetherAgain method as a public method.

This PR seems the simplest way to do it, enabling access to that API from LfMergeBridge without changing the access granted to any other projects. That way we minimize the risk to FLEx and WeSay, as the code they use is not touched at all.


This change is Reviewable

Will be used for LexBox to be able to generate .fwdata files as needed
Copy link
Contributor

@jasonleenaylor jasonleenaylor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 files reviewed, all discussions resolved


src/LfMergeBridge/LfMergeBridge.cs line 75 at r1 (raw file):

		}

		public static void PutHumptyTogetherAgain(IProgress progress, bool writeVerbose, string mainFilePathname)

This is an opportunity, should you want one, to adjust the name.

Code quote:

PutHumptyTogetherAgain

The Humpty name is fun and cleverly silly, but when we expose it to
outside code in LfMerge, it might be nicer to have a name that
communicates its purpose a little more clearly.
Copy link
Contributor Author

@rmunn rmunn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 1 files reviewed, all discussions resolved (waiting on @jasonleenaylor)


src/LfMergeBridge/LfMergeBridge.cs line 75 at r1 (raw file):

Previously, jasonleenaylor (Jason Naylor) wrote…

This is an opportunity, should you want one, to adjust the name.

Good point. I've pushed a new commit to use more boring, but easier to understand, names. And while I'm at it, I've decided to expose the reverse operation too; I have no need for it yet in the code I'm about to write in LexBox, but could definitely see a need for this in future features.

@rmunn
Copy link
Contributor Author

rmunn commented Apr 26, 2024

I'm assuming Jason would have mentioned any objections if he had them; since this affects nothing except the code that interfaces with LfMerge, I'm going to go ahead and merge it now.

@rmunn rmunn merged commit 74e5e01 into develop Apr 26, 2024
2 of 3 checks passed
@rmunn rmunn deleted the feature/lfmergebridge-create-fwdata branch April 26, 2024 03:32
@rmunn rmunn self-assigned this May 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expose .fwdata file splitting/reassembling APIs in LfMergeBridge
2 participants