Differences between revisions 1 and 95 (spanning 94 versions)
Revision 1 as of 2010-07-31 20:28:01
Size: 1359
Editor: mpm
Comment:
Revision 95 as of 2010-10-13 16:27:53
Size: 6162
Editor: BrodieRao
Comment: Added nicknames to the attendees table
Deletions are marked like this. Additions are marked like this.
Line 3: Line 3:
This is going to be a long weekend of in-depth Mercurial discussion, design, and coding. It is open to all signficant Mercurial contributors. See [[javascript:void(0);/*1280607559259*/|1.5sprint]] for history. This was a long weekend of in-depth Mercurial discussion, design, and coding. The sprint took place October 8th-10th 2010 at Google Chicago.
Line 5: Line 5:
=== Costs ===
We will fund hotel for all attendees. Where possible, attendees should try to get their employers to cover travel. We refund personal travel costs based on available funds and contribution level.

=== Date and Time ===
We're currently aiming to hold the sprint in New York in early October, exact dates to be determined. This will allow us time to put some work started at the sprint into 1.7 before the code freeze on October 15th.

=== Travel ===
Make sure you have your passports and visas figured out in advance. Plan to arrive the day before the sprint begins to be ready for a full day of workshop.
Sprints are open to all significant Mercurial contributors. See [[1.5sprint]] for history.
Line 15: Line 8:
Add your name and other details here if you're interested in attending.
Line 17: Line 9:
||<tablestyle="width: 489px; height: 97px;">Name||<style="">Location||<style="">Travel Cost||Desired Assistance||Availability|| ||Name ||Location ||Chicago (assistance) ||Flights Booked ||
||[[mpm|Matt Mackall]] (mpm) ||Minneapolis ||$0 ($0) ||Yes: ?-? ||
||[[durin42|Augie Fackler]] (durin42) ||Chicago ||$0 ($0) ||Yes: ?-? ||
||[[danchr|Dan V. P. Christiansen]] (danchr) ||Århus, Denmark ||$900 (full) ||Yes: arrival 6th (15:25), departure 13th (21:50) ||
||[[NicolasDumazet|Nicolas Dumazet]] (nicdumz) ||Tokyo ||$900 (full) ||Yes: arrival 7th (23:00), departure 11th (7:00) ||
||[[tonfa|Benoit Boissinot]] (tonfa) ||Paris ||$650 (full) ||Yes: arrival 6th (12:40), departure 12th (14:00) ||
||[[pmezard|Patrick Mezard]] (pmezard) ||Paris ||$800 (full) ||Yes: arrival 7th (16:00), departure 12th (18:00) ||
||[[BrodieRao|Brodie Rao]] (brodie) ||Charlotte ||$0 ($0) ||Yes: arrival 7th (12:53), departure 10th (18:55) ||
||[[BenjaminPollack|Benjamin Pollack]] (bmp) ||New York ||$100 ($0) || Yes: arrival 7th (18:20), departure 10th (16:40) ||
||[[Steve Borho]] (muggs) ||St Louis ||$60 ($0) ||Yes: arrival 7th, leave anytime ||
||MartinGeisler (mg) ||Zurich, Switzerland ||$1000 ($0) ||Yes: arrival 6th (15:35), departure 12th (19:20) ||
||Mads Kiilerich (kiilerix) ||Copenhagen, Denmark ||$? ($0) ||Yes: arrival 7th (17:30), departure 12th (22:05) ||
||[[JesperNoehr|Jesper Noehr]] (jespern) ||Sydney, Australia ||$0 ($0) ||Yes, arrival 7th, departure 10th ||
|| Justen Stepka || San Francisco, CA || $0 ($0) || Yes ||
Line 19: Line 24:
||<tablestyle="width: 489px; height: 97px;">mpm||Minneapolis||$380||$380||Oct 1 -||
|| || || || || ||
=== What happened at the sprint? ===

Here's a mostly complete overview of features, discussions, bugs, patches, etc. that
came up (from a [[http://selenic.com/pipermail/mercurial-devel/2010-October/025192.html|posting]] to
mercurial-devel by Brodie):

==== Big new features ====

  * Online help in hg serve/hgweb (durin42)
  * [[ParentDeltaPlan|Parentdelta]] support (reduces repo size) (not yet enabled by default) (tonfa)

==== Unfinished business ====

  * Greatly improved changeset discovery (speeds up push/pull) (tonfa)
  * "Liquid HG" - a system for safely allowing mutable history (mpm)
  * "Dead heads" support for marking changesets as abandoned (via pushkey) (mg, [[http://markmail.org/message/vyyjfyshhnb5acpc|original email]], [[https://bitbucket.org/mg/dead-branches|patch queue]])
  * Better templater/templating language
  * Revset support everywhere -r/--rev is used (mpm)
  * "Black box" extension that records warnings, errors, etc. (nicdumz)
  * Improved extension error messages (nicdumz)
  * Test potential migration from [[http://roundup.sourceforge.net/|Roundup]] to [[Trac|http://trac.edgewall.org/]] for bug tracking (bmp, brodie)
  * No prompts from "hg merge" (use hg resolve to handle merges at your own pace instead) (muggs)
  * Automated [[http://pypi.python.org/pypi|PyPI]] upload through setup.py (tonfa, brodie)
  * hg config --edit (brodie, kiilerix, mg)
  * More consistent/reliable internal URL parsing (brodie, kiilerix)
  * Fine-grained `HGPLAIN` (e.g., make stuff plain except i18n) (brodie)

==== Discussions ====

  * Cleaning up and reorganizing the wiki
  * Scaling hgweb (smarter etags, better caching)
  * Improving [[SummerOfCode|Google Summer of Code]] (mpm, brodie, durin42, tonfa, nicdumz, mg)
  * Improving [[UsingExtensions|extension]] debugging (extensions could provide homepage URLs, their own version numbers, and specify what versions of Mercurial they support)
  * Better changeset signing support (support for more tools, [[CommitsigsExtension|commitsigs]] integration, pushkey-based changeset signing)
  * Moving [[ExtdiffExtension|extdiff]] into core and making it use [[MergeToolConfiguration|merge-tools settings]]
  * Moving other extensions into core ([[ProgressExtension|progress]], [[RecordExtension|record]], [[TransplantExtension|transplant]], [[GraphlogExtension|graphlog]])
  * Better auto-generated documentation (via [[http://sphinx.pocoo.org/|Sphinx]], [[http://danchr.bitbucket.org/mercurial-api/|epydoc]], etc.)
  * Adding more command examples in help
  * Better documenting how `--verbose`/`--quiet` affects different commands
  * Better documenting [[MergeProgram|internal:* merge settings]]
  * Specifying [[MergeToolConfiguration|merge tools]] on the command line
  * Improving the [[TimeBasedReleasePlan|release process]]
  * Improving [[Subrepositories|subrepo]] support (should we use it ourselves? [[http://bitbucket.org/izi/polib|polib]] is a candidate)

==== Patches for bugs ====

  * Bts:issue2364 - merge: handle no file parent in backwards merge (mpm)
  * Bts:issue2373 - ui.paths: expand paths directly in fixconfig (tonfa)
  * Bts:issue2427 - mq: handle deleting the same patch twice in one command (danchr)
  * Bts:issue2191 - progress: make sure stderr has isatty before calling (durin42)
  * Bts:issue2074 - windows: handle spaces in path to Python (bmp)
  * Bts:issue2417 - import: don't strip '#' lines from patch descriptions (kiilerix)
  * Bts:issue2376 - dispatch: properly handle relative path aliases used with -R (brodie)
  * Bts:issue2361 - revset: lower precedence of minus infix (mpm)
  * Bts:issue1564 - strip: add --keep flag to avoid modifying wc during strip (durin42)

==== Other interesting patches that made it in ====

  * setup/hg: always load Mercurial from where it was installed. (10da5a1f25dd) (danchr)
  * setup: user-friendly error message if Python headers are missing (6c0e1aee1b19) (nicdumz)
  * [[PagerExtension|pager]]: don't run pager if nothing is written to stdout/stderr (05077896ffe2) (brodie)
  * [[PagerExtension|pager]]: add global --pager=<auto/boolean> option (04f6de46bf3a) (brodie)
  * copies: don't detect copies as "divergent renames" (ada47c38f4e5) (danchr)

==== Miscellaneous ====

  * Made mercurial-consulting mailing list (mpm)
Line 23: Line 93:
== What we need ==
 * Hotel and travel funding
 * Meeting space and networking for 20+ people
 * Nearby hotel space
 * A finalized date
=== See also ===
 * http://blog.bitbucket.org/2010/10/09/mercurial-1-7-sprint-in-chicago-ongoing/

1.7 Developer Sprint

1. About

This was a long weekend of in-depth Mercurial discussion, design, and coding. The sprint took place October 8th-10th 2010 at Google Chicago.

Sprints are open to all significant Mercurial contributors. See 1.5sprint for history.

2. Attendees

Name

Location

Chicago (assistance)

Flights Booked

Matt Mackall (mpm)

Minneapolis

$0 ($0)

Yes: ?-?

Augie Fackler (durin42)

Chicago

$0 ($0)

Yes: ?-?

Dan V. P. Christiansen (danchr)

Århus, Denmark

$900 (full)

Yes: arrival 6th (15:25), departure 13th (21:50)

Nicolas Dumazet (nicdumz)

Tokyo

$900 (full)

Yes: arrival 7th (23:00), departure 11th (7:00)

Benoit Boissinot (tonfa)

Paris

$650 (full)

Yes: arrival 6th (12:40), departure 12th (14:00)

Patrick Mezard (pmezard)

Paris

$800 (full)

Yes: arrival 7th (16:00), departure 12th (18:00)

Brodie Rao (brodie)

Charlotte

$0 ($0)

Yes: arrival 7th (12:53), departure 10th (18:55)

Benjamin Pollack (bmp)

New York

$100 ($0)

Yes: arrival 7th (18:20), departure 10th (16:40)

Steve Borho (muggs)

St Louis

$60 ($0)

Yes: arrival 7th, leave anytime

MartinGeisler (mg)

Zurich, Switzerland

$1000 ($0)

Yes: arrival 6th (15:35), departure 12th (19:20)

Mads Kiilerich (kiilerix)

Copenhagen, Denmark

$? ($0)

Yes: arrival 7th (17:30), departure 12th (22:05)

Jesper Noehr (jespern)

Sydney, Australia

$0 ($0)

Yes, arrival 7th, departure 10th

Justen Stepka

San Francisco, CA

$0 ($0)

Yes

3. What happened at the sprint?

Here's a mostly complete overview of features, discussions, bugs, patches, etc. that came up (from a posting to mercurial-devel by Brodie):

3.1. Big new features

  • Online help in hg serve/hgweb (durin42)
  • Parentdelta support (reduces repo size) (not yet enabled by default) (tonfa)

3.2. Unfinished business

  • Greatly improved changeset discovery (speeds up push/pull) (tonfa)
  • "Liquid HG" - a system for safely allowing mutable history (mpm)
  • "Dead heads" support for marking changesets as abandoned (via pushkey) (mg, original email, patch queue)

  • Better templater/templating language
  • Revset support everywhere -r/--rev is used (mpm)
  • "Black box" extension that records warnings, errors, etc. (nicdumz)
  • Improved extension error messages (nicdumz)
  • Test potential migration from Roundup to http://trac.edgewall.org/ for bug tracking (bmp, brodie)

  • No prompts from "hg merge" (use hg resolve to handle merges at your own pace instead) (muggs)
  • Automated PyPI upload through setup.py (tonfa, brodie)

  • hg config --edit (brodie, kiilerix, mg)
  • More consistent/reliable internal URL parsing (brodie, kiilerix)
  • Fine-grained HGPLAIN (e.g., make stuff plain except i18n) (brodie)

3.3. Discussions

  • Cleaning up and reorganizing the wiki
  • Scaling hgweb (smarter etags, better caching)
  • Improving Google Summer of Code (mpm, brodie, durin42, tonfa, nicdumz, mg)

  • Improving extension debugging (extensions could provide homepage URLs, their own version numbers, and specify what versions of Mercurial they support)

  • Better changeset signing support (support for more tools, commitsigs integration, pushkey-based changeset signing)

  • Moving extdiff into core and making it use merge-tools settings

  • Moving other extensions into core (progress, record, transplant, graphlog)

  • Better auto-generated documentation (via Sphinx, epydoc, etc.)

  • Adding more command examples in help
  • Better documenting how --verbose/--quiet affects different commands

  • Better documenting internal:* merge settings

  • Specifying merge tools on the command line

  • Improving the release process

  • Improving subrepo support (should we use it ourselves? polib is a candidate)

3.4. Patches for bugs

  • issue2364 - merge: handle no file parent in backwards merge (mpm)

  • issue2373 - ui.paths: expand paths directly in fixconfig (tonfa)

  • issue2427 - mq: handle deleting the same patch twice in one command (danchr)

  • issue2191 - progress: make sure stderr has isatty before calling (durin42)

  • issue2074 - windows: handle spaces in path to Python (bmp)

  • issue2417 - import: don't strip '#' lines from patch descriptions (kiilerix)

  • issue2376 - dispatch: properly handle relative path aliases used with -R (brodie)

  • issue2361 - revset: lower precedence of minus infix (mpm)

  • issue1564 - strip: add --keep flag to avoid modifying wc during strip (durin42)

3.5. Other interesting patches that made it in

  • setup/hg: always load Mercurial from where it was installed. (10da5a1f25dd) (danchr)
  • setup: user-friendly error message if Python headers are missing (6c0e1aee1b19) (nicdumz)
  • pager: don't run pager if nothing is written to stdout/stderr (05077896ffe2) (brodie)

  • pager: add global --pager=<auto/boolean> option (04f6de46bf3a) (brodie)

  • copies: don't detect copies as "divergent renames" (ada47c38f4e5) (danchr)

3.6. Miscellaneous

  • Made mercurial-consulting mailing list (mpm)

4. See also

1.7sprint (last edited 2013-08-29 00:44:47 by AugieFackler)