|
Size: 9618
Comment: summary by brodie
|
Size: 6060
Comment: Cleanup and wikification
|
| 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 significant Mercurial contributors. See [[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: |
| === Possible Agenda === * Lightweight copies, parent deltas, shallow clones * Wire protocol improvements * Performance improvements * Usability * Stable inotify, passing some kind of python run-tests.py --inotify * * Web UI improvements/overhaul * Safe, easy to use history editing/changeset staging system * Improving bookmarks integration * Subrepositories * What is the roadmap for subrepos? * Should we use subrepos ourselves? The [[http://bitbucket.org/izi/polib|polib]] library is a candidate since we already include a snapshot of it. * Dead heads: a way mark heads that should not be pushed or pulled: [[http://markmail.org/message/vyyjfyshhnb5acpc|original email]], [[https://bitbucket.org/mg/dead-branches|patch queue]] * Move extensions to core: progress (should be enabled by default), record (for `hg commit -i`), transplant * Eradicate test failures in our continuous integration server -- spurious failures makes the apycot build server less than ideal today * Extract and publish API documentation from docstrings with Sphinx or [[http://danchr.bitbucket.org/mercurial-api/|epydoc]] * Packaging woes === 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 === The sprint will be in Chicago on October 8th-10th 2010. This will allow us time to put some work started at the sprint into 1.7 before the code freeze on October 15th. Augie will be at Google Chicago starting around 8:30 on Friday, so feel free to start arriving anytime after that. Please try to arrive at least by 9:15 so we can get started promptly. The [[http://www.fairfieldsuiteschicago.com/|Fairfield Inn]] hotel has been booked for three nights from October 7th to 10th -- checkin is Thursday, checkout is Sunday. You need to make other reservations if you arrive earlier or leave later. Check-in on Thursday is at 3pm. The rooms are theoretically booked in your names, but if for some reason they can't find you, the reservation number is 15443446301. === 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. ==== Getting to the Hotel from an Airport ==== From Midway: Take the Orange Line to Roosevelt. Transfer to the Red Line headed towards Howard. Get off the Red at Grand, walk two blocks North then turn right. You'll see the hotel on the left side of the street. From O'Hare: Take the Blue Line to Monroe. Transfer to the Red Line headed towards Howard. Get off the Red at Grand, walk two blocks North then turn right. You'll see the hotel on the left side of the street. This is the Blue Line terminal in O'Hare: [[attachment:Farecard-Ohare.jpg]]. This [[attachment:Hotel.jpg]] is what the hotel looks like from across the street. For either public transit option from the airports, you'll need a farecard for the train. It's US$2.25 for either trip and transfers are free. The farecard machines in the airports do take cards as well as cash. Unless you plan to take the CTA for sightseeing while in town, there's no point in getting a 3-day pass, as you'll only need $4.50 of fares and the 3-day pass is $14. If you plan to take a taxi, be aware that not all taxis accept credit cards. Many take only cash. ==== Getting to Google from the Hotel ==== Walk West on Ontario to State, turn left on State and go to Kinzie. Turn right on Kinzie. Google is in that block on the right, our entrance is just after the entrance to the Amalfi hotel. The entrance isn't marked as Google, but if you get to Dearborn Street or see Keifer's Steakhouse you're too far. There are two revolving doors, and a security guard. On Friday, there should be someone at a table (or something along those lines) to greet you just inside the door. [[attachment:Google.jpg]] is what Google looks like from across the street. |
Sprints are open to all significant Mercurial contributors. See [[1.5sprint]] for history. |
| Line 52: | Line 8: |
| Add your name and other details here if you're interested in attending. | |
| Line 66: | Line 22: |
| || Justen Stepka || San Francisco, CA || $0 ($0) || || === Hotel Arrangements === Figure out who you're splitting a room with: || Room 1408 || mpm || || || Room 307 || jesper || brodie || || Room 406 || danchr || tonfa || || Room 407 || mg || kiilerich || || Room 508 || pmezard || nicdumz || || Room 809 || sborho || bmp || |
|| Justen Stepka || San Francisco, CA || $0 ($0) || Yes || |
| Line 81: | Line 26: |
| Here's an overview of features, discussions, bugs, patches, etc. that | Here's a mostly complete overview of features, discussions, bugs, patches, etc. that |
| Line 85: | Line 30: |
| Big new features: | ==== Big new features ==== |
| Line 88: | Line 33: |
| * Parentdelta support (reduces repo size) (not yet enabled by default) (tonfa) | * [[ParentDeltaPlan|Parentdelta]] support (reduces repo size) (not yet enabled by default) (tonfa) ==== Unfinished business ==== |
| Line 90: | Line 38: |
Unfinished business: |
|
| Line 94: | Line 39: |
| * "Dead heads" support for marking changesets as abandoned (via pushkey) (mg) | * "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]]) |
| Line 99: | Line 44: |
| * Test potential migration from Roundup to Trac for bug tracking (bmp, brodie) | * Test potential migration from [[http://roundup.sourceforge.net/|Roundup]] to [[Trac|http://trac.edgewall.org/]] for bug tracking (bmp, brodie) |
| Line 101: | Line 46: |
| * Automated PyPI upload through setup.py (tonfa, brodie) | * Automated [[http://pypi.python.org/pypi|PyPI]] upload through setup.py (tonfa, brodie) |
| Line 104: | Line 49: |
| * Fine-grained HGPLAIN (e.g., make stuff plain except i18n) (brodie) | * Fine-grained `HGPLAIN` (e.g., make stuff plain except i18n) (brodie) |
| Line 106: | Line 51: |
| Discussions: | ==== Discussions ==== |
| Line 110: | Line 55: |
| * Improving GSoC (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, etc.) |
* 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.) |
| Line 117: | Line 62: |
| * Better documenting how --verbose/--quiet affects different commands * Better documenting internal:* merge settings * Specifying merge tools on the command line * Improving the release process |
* 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) |
| Line 122: | Line 68: |
| Patches for bugs: | ==== Patches for bugs ==== |
| Line 124: | Line 70: |
| * merge: handle no file parent in backwards merge (issue2364) (mpm) * ui.paths: expand paths directly in fixconfig (issue2373) (tonfa) * mq: handle deleting the same patch twice in one command (issue2427) (danchr) * progress: make sure stderr has isatty before calling (issue2191) (durin42) * windows: handle spaces in path to Python (issue2074) (bmp) * import: don't strip '#' lines from patch descriptions (issue2417) (kiilerix) * dispatch: properly handle relative path aliases used with -R (issue2376) (brodie) * revset: lower precedence of minus infix (issue2361) (mpm) * strip: add --keep flag to avoid modifying wc during strip (issue1564) (durin42) |
* 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) |
| Line 134: | Line 80: |
| Other interesting patches that made it in: | ==== Other interesting patches that made it in ==== |
| Line 138: | Line 84: |
| * pager: don't run pager if nothing is written to stdout/stderr (05077896ffe2) (brodie) * pager: add global --pager=<auto/boolean> option (04f6de46bf3a) (brodie) |
* [[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) |
| Line 142: | Line 88: |
| Miscellaneous: | ==== Miscellaneous ==== |
| Line 145: | Line 91: |
I (brodie) might be missing some things, but I think that covers a lot of what we did at the sprint. |
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 |
Minneapolis |
$0 ($0) |
Yes: ?-? |
|
Chicago |
$0 ($0) |
Yes: ?-? |
|
Århus, Denmark |
$900 (full) |
Yes: arrival 6th (15:25), departure 13th (21:50) |
|
Tokyo |
$900 (full) |
Yes: arrival 7th (23:00), departure 11th (7:00) |
|
Paris |
$650 (full) |
Yes: arrival 6th (12:40), departure 12th (14:00) |
|
Paris |
$800 (full) |
Yes: arrival 7th (16:00), departure 12th (18:00) |
|
Charlotte |
$0 ($0) |
Yes: arrival 7th (12:53), departure 10th (18:55) |
|
New York |
$100 ($0) |
Yes: arrival 7th (18:20), departure 10th (16:40) |
|
St Louis |
$60 ($0) |
Yes: arrival 7th, leave anytime |
|
Zurich, Switzerland |
$1000 ($0) |
Yes: arrival 6th (15:35), departure 12th (19:20) |
|
Mads Kiilerich |
Copenhagen, Denmark |
$? ($0) |
Yes: arrival 7th (17:30), departure 12th (22:05) |
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)