> Is it used by "hg merge/rebase/etc"? Only if you pass --tool <something>?
No to the first, and I'm not sure if it'd work for the second. If so it'd be duplicating what simplemerge.py already does. In general -- no idea how this is being used. I suspect people might be using it to just to use hg's merge logic in arbitrary locations out of convenience. In the meanwhile on IRC, Jun voiced for its inclusion and Augie and I were able to workout an alternative design* to save it that might be acceptable to everyone. So we might not need to kill it after all. * The proposal is: - add `decodeddata()` to filectx which returns data after running repo filter hooks (see comment in D374 for why) - simplemege will call this function - contrib/simplemerge then passes a filectx-like object whose `decodeddata()` returns the data read off disk On Tue, Aug 15, 2017 at 2:56 PM, Martin von Zweigbergk via Mercurial-devel <mercurial-devel@mercurial-scm.org> wrote: > What is the script used for? Is it used by "hg merge/rebase/etc"? Only > if you pass --tool <something>? Not at all? > > On Tue, Aug 15, 2017 at 2:52 PM, Phillip Cohen <phil...@phillip.io> wrote: >> Hello, >> >> During some of the work to support in-memory merge, the >> `contrib/simplemerge` script (not to be confused with simplemerge.py >> in the mercurial package) has come up as a bit of a roadblock that >> makes existing code messier, and I was wondering if anyone would >> object if we removed it. >> >> This is a Python script that merges arbitrary files. It imports >> Mercurial code but doesn't have access to a repo object, or anything >> relying on one, which is where our troubles begin. To support >> in-memory merge we'd like to only support context objects so that >> making them backed by memory is trivial. But contrib/simplemerge can't >> create context objects. >> >> My existing stack (D377 - D383) refactors simplemerge.py to support >> both use cases, but reviewers have pointed out that this is unwieldy >> and asked if we can just nuke the contrib script instead. I'd happily >> support that if there are no complaints. >> >> timeless traced this script back to abd66eb0, an mpm commit from 2008 >> which moved the three-way merge script into core hg. It's likely the >> contrib script was kept around to support existing workflows at the >> time, 9 years ago. We haven't been able to find any uses of it in the >> codebase or anyone who uses it. >> >> Thanks! >> >> Phil >> _______________________________________________ >> Mercurial-devel mailing list >> Mercurial-devel@mercurial-scm.org >> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
