Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[thistleknot]

I setup this crazy project inspired by McTeelox's desire to track bugfixes for Masterwork in github.

I used github and version tracking/branching concept to track changes between mods and hopefully derive base patches to apply specific changes to other mods.

https://github.com/thistleknot/BasedOnVanillaRaws/branches

So far, this concept works with mods that don't rewrite an entire raw file where contextual diff changes can't be used.

Update

Spoiler: I have this idea (click to show/hide)

 to use sed and regexp to sort token's by their token-id.  Doing so will destroy [top level] comments (comments above the token-id) without some sort of fancy comment parsing method (which IMO is a little much for a batch script), so I suggest final raw input for diff comparison will be stripped of all comments except for file_name?  What's scary about this is if using these patches to be based on contextual matches... the fact that things are alphabetized... idk if that would lead to matches for the wrong object... I don't think so due to the way we are deriving patches off a source branch, but any FOLLOWUP patches that are applied in a sequential order could potentially break it.

Regexp could match the [object:id]

and store it in a var.

Then when it finds [id:specificObject]'s
It will select all from that var [id:specificObject] to the next instance of another var (or EOF).

and reorder based on the [idspecificObject]'s alphabetically.

This will allow mods that reorder their reactions to better line up with each other prior to patch file creation.

I would like to post what I've come up with so far so other people can start adding to or basing their work on accordingly.

Btw, thanks goes to the original content creators who I try to give credit to if not in name, at least by title of mod.

So far I've added in

• Accelerated Mod
• Modest Mod options
• Billy Jack's leather changes (  Using just 1 type of leather)
• Tiered Leather
• Some masterwork shop's & reactions
• phoebus changes from 34.11
• 34_11 to 40_06 changes

I'd like to add more mods, and if people start forking, maybe we can track other mod changes so people can piecemeal their own patch files from the work.

The mod I'm working with is based on Phoebus, but due to the way I applied phoebus to the "tree?", the phoebus changes are more down line towards vanilla, so when looking at say Accelerated mod, the patches highlight the changes that accelerated specifically brings to the raws and doesn't muddy it up with say Phoebus changes at the same time.

Spoiler (click to show/hide)

I'm hoping to derive a diff application that can be used to help make modding a little bit easier.

[thistleknot]

I derived a way to apply patches to mods in a much more efficient manner than previously.

http://www.reddit.com/r/dwarffortress/comments/2d7jxg/tortoisegitmerge_a_great_tool_for_merging_raws/

Basically, I use git to derive a patch from a commit (skipping binaries), then I have a specific mod patch that I can apply to whatever mod I want.  I only have to look for sometimes deleted sections and/or red spots.  But everything else generally auto-merges quite well.  I merged a mod in about 20 minutes.

[thistleknot]

I made a major breakthrough/discovery today.

N way merges

I was able to merge 3 mods with little to no fuss
http://www.bay12forums.com/smf/index.php?topic=142295.msg5589237#msg5589237

direforge
advanced civilizations
and
plantfixes

answered from this stackoverflow post
http://stackoverflow.com/questions/25388806/github-3-way-merge-patch
 
I think I can start taking some mod merges requests.

So, please spam this thread with as many mods as you'd like to see as an option to merge, and I'll make a poll

[expwnent]

Yes, git is awesome! I was wondering why more people haven't used it for things like this. A lot of DF players are somewhat familiar with programming so you'd think there'd be more people who know git.

[thistleknot]

I just did a 4 way merge of:

accelerated modest mod, civilization forge, fortress defense, and finally a layer of 40_09 on top.

So far the errors I got were due to new files having deprecated object calls (like personality facets and tree colors).

[thistleknot]

So using github.  I can derive a patch between two versions of the game with a command like:

git diff versiona versionb > patch.patch

That means, if I apply a patch in reverse to versionb, then I get versionA

basically subtracting the changes.

I was thinking.  If patches are derived as differences between two versions, subtractive methods can be used to find common ancestor's...  therefore allowing a way to derive a base common ancestor from any version basically (baring re-ordering of object:id's, but kdiff3 does allow for manual re-alignment...don't know if it would work with alphabetized raws)

[Shadowclaimer]

Thank you for handling my mod in this =) freaking awesome.