From Monday 21th to may 25th, around 12 people gathered in the Logilab office to discuss version control and hack on Mercurial. A big thanks to Logilab for hosting us. We covered multiple topics:

Mercurial 4.6

Fixing Mercurial 4.6 compatibility for the following extensions: hgsubversion, hg-git (and preparation of the associated release), confman, preparing a Windows installer for tortoise-hg 4.6



hgweb

First version of a Readme extension that displays the lasted content of a project README on hgweb landing page,

Various usability improvements for hg serve (automatic browser opening, printing URL, etc),

(automatic browser opening, printing URL, etc), Displaying obsolescence log information in hgweb,

Ability to view and exchange hidden changeset through hgweb,

Discussion how to facilitate theme development and maintenance.

Performance tracking

Upstreaming of some of our work on ASV,

Work on benchmarking clone and stream clone time,

Discussion with a Git core developer about similar efforts in the git community.

Evolution and feature branches

New flag for obslog to filter out changesets that are unknown locally,

Improvement of core ability to do in memory merge and in memory diffing,

New message about local phase movement on pull,

Improvement of message around empty topics,

Implementation of an "internal phase" for changesets that are a byproduct of Mercurial command (eg: evolve, shelve).

Discussion about feature branch and workflow.

Mercurial hosting

Installation of an experimental heptapod instance (gitlab + Mercurial) for further testing,

Mercurial compatibility for the Gitlab CI runners.

Other

Experiment with tortoise-hg styling to get a mode closer to what hgview does,

Implementing strip-less shelve using the new internal phase,

Demo of an experimental test orchestrator atop the Mercurial test runner,

Refactoring of context.py to better facilitate in-memory merges.

Thanks to Anton Shestakov, Arthur Lutz, Aurelien Campeas, Boris Feld, Christian Couder, David Douard, Denis Laxalde, Nicolas Spanti, Paul Morelle, Phillipe Pépiot, Pierre-Yves David and Sean Farley for being part of this event. Extra thanks go to Pulkit Goyal for remotely helping with the shelve code.