Difference between revisions of "Mercurial history browsing"
Crulshorukh (talk | contribs) (→Project News) |
Crulshorukh (talk | contribs) m (→Project Leader(s)) |
||
(8 intermediate revisions by 2 users not shown) | |||
Line 17: | Line 17: | ||
== Project Leader(s) == | == Project Leader(s) == | ||
− | [[User:Crulshorukh| | + | [[User:Crulshorukh|Siddarth Kalra]] |
== Project Contributor(s) == | == Project Contributor(s) == | ||
− | * Tiago Moreira | + | * [[User:Tiago|Tiago Moreira]] |
* [http://armenzg.blogspot.com/ Armen Zambrano] | * [http://armenzg.blogspot.com/ Armen Zambrano] | ||
* [http://vocamus.net/dave/ David Humphrey] | * [http://vocamus.net/dave/ David Humphrey] | ||
Line 446: | Line 446: | ||
</td> | </td> | ||
<td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
− | <td rowspan="6" style="text-align: center;">Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=448707 the files touched bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=471321 the changesetUI bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=453162 the line breaks bug]<br/><br/>[View Detailed Info]</td> | + | <td rowspan="6" style="text-align: center;">Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=448707 the files touched bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=471321 the changesetUI bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=453162 the line breaks bug]<br/><br/>[http://blog.sidkalra.com/2009/04/v09-release-complete/ View Detailed Info]</td> |
</tr> | </tr> | ||
<tr> | <tr> | ||
Line 468: | Line 468: | ||
</ul> | </ul> | ||
</td> | </td> | ||
− | <td style="background-color: | + | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> |
+ | </tr> | ||
+ | </table> | ||
+ | |} | ||
+ | |||
+ | {|class="collapsible collapsed" style="border-style:solid;border-width:thin;border-color:black" | ||
+ | !align="left" style="background-color:Orange; font-weight:bold;border-style:solid;border-width:thin;padding: 2px 2px 2px 2px;"| '''v1.0 Release Details ([http://blog.sidkalra.com/2009/04/v10-release-goals/ Detailed Info])''' | ||
+ | |- | ||
+ | | | ||
+ | <table style="width: 100%;" class="standard-table" cellborder=1 border=1 cellpadding=3 cellspacing=0> | ||
+ | <th style="width: 40%;">Task</th> | ||
+ | <th style="width: 42%>Details</th> | ||
+ | <th style="width: 5%;">Status</th> | ||
+ | <th style="width: 25%;">Link(s) or Notes</th> | ||
+ | |||
+ | <tr> | ||
+ | <td>'''Add expand/collapse functionality for files touched'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Make sure that it doesn't interfere with the merge expand/collapse feature</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | <td rowspan="10" style="text-align: center;">Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=448707 the files touched bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=486939 the >5 merge changeset bug]<br/>Fixes for [https://bugzilla.mozilla.org/show_bug.cgi?id=459727 the on scroll bug]<br/><br/>[http://blog.sidkalra.com/2009/04/v10-release-complete/ View Detailed Info]</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Expand/Collapse only for merges that contain >5 pushes'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Use the ctx.parents()[0].rev() function to retrieve the push number</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Fixing OnScroll to work with the new version of hg_templates and using more jquery functionality'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Use jquery</li> | ||
+ | <li>Maintain functionality but reduce the lines of code</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Getting the Localize Dates Link Working with the New Entries Loaded On Scroll'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Create a new span with the class name 'Date'</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Further Improving Bug Functionality for the OnScroll Patch'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Get bugs that are 5 digits long to properly convert into bug links</li> | ||
+ | <li>Deal with bugs that will come in the future that will be more than 6 digits long</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Changing the Data Structure that Handles Merges for the OnScroll Patch'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Use a dictionary</li> | ||
+ | <li>Try to reduce the maze of nested blocks</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Move client-side code to an external JavaScript file for the OnScroll patch'''</td> | ||
+ | <td></td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Use a different code for the parity counter for the OnScroll patch'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Use counter % 2</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Change how max number of entries in the database is retrieved for the OnScroll patch'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>Use start = {max}</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
+ | </tr> | ||
+ | <tr> | ||
+ | <td>'''Pushlog should not load more entries on scroll if a query is being displayed (OnScroll patch)'''</td> | ||
+ | <td> | ||
+ | <ul> | ||
+ | <li>If a query has been executed then don't load more entries on scroll</li> | ||
+ | <li>If a query has not been executed then load more entries on scroll</li> | ||
+ | </ul> | ||
+ | </td> | ||
+ | <td style="background-color: Green; text-align: center; font-weight: bold; font-size: bigger">Done</td> | ||
</tr> | </tr> | ||
</table> | </table> | ||
Line 935: | Line 1,039: | ||
| | | | ||
|Made a [http://blog.sidkalra.com/2009/04/v09-release-complete/ blog post] about completing my v0.9 release | |Made a [http://blog.sidkalra.com/2009/04/v09-release-complete/ blog post] about completing my v0.9 release | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 18th, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-goals/ blog post] detailing the goals for my v1.0 release | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 20th, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-expandcollapse-for-the-files-touched-patch/ blog post] explaining my implementation for the expand/collapse feature in regards to the files touched patch | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 21st, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-expandcollapse-functionality-only-for-merges-with-5-pushes/ blog post] explaining my implementation to only add expand/collapse collapse functionality for merges that contain >5 pushes | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 22nd, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-fixing-the-onscroll-patch-to-work-with-the-new-version-of-hg_templates/ blog post] about getting my OnScroll patch to work with the new version of hg_templates and reducing lines of code by using taking advantage of jquery | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 22nd, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-getting-the-localize-dates-link-working-with-the-new-entries-loaded-on-scroll/ blog post] about getting the 'To Local' link to work with new entries loaded on scroll | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 23rd, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-further-improving-bug-functionality-for-the-onscroll-patch/ blog post] about improving the bug functionality for the OnScroll patch | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 23rd, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-changing-the-data-structure-that-handles-merges-for-the-onscroll-patch/ blog post] about changing the data structure that handles merges for the OnScroll patch | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 24th, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-various-changes-to-improve-the-onscroll-patch/ blog post] about making various changes (move js to an external file, fix the parity counter, use different way to retrieve max entries and deal with pushlog queries) for the OnScroll patch | ||
+ | |-valign="top" | ||
+ | |style="color:green;font-weight:bold" |April 24th, 2009 | ||
+ | | | ||
+ | |Made a [http://blog.sidkalra.com/2009/04/v10-release-complete/ blog post] about completing my v1.0 release | ||
|} | |} | ||
|} | |} | ||
Line 946: | Line 1,086: | ||
* [https://bugzilla.mozilla.org/show_bug.cgi?id=459823 bug 459823 - hg annotate output on hgweb is painfully slow] | * [https://bugzilla.mozilla.org/show_bug.cgi?id=459823 bug 459823 - hg annotate output on hgweb is painfully slow] | ||
* [https://bugzilla.mozilla.org/show_bug.cgi?id=471321 bug 471321 - Needs for an UI to run changeset queries ] | * [https://bugzilla.mozilla.org/show_bug.cgi?id=471321 bug 471321 - Needs for an UI to run changeset queries ] | ||
+ | * [https://bugzilla.mozilla.org/show_bug.cgi?id=453162 bug 453162 - pushlog turns line breaks in commit messages into spaces] | ||
+ | * [https://bugzilla.mozilla.org/show_bug.cgi?id=486939 bug 486939 - merge folding should only fold merges of >5 changesets] | ||
== External Links == | == External Links == |
Latest revision as of 13:21, 5 February 2013
Contents
Project Name
Adding Functionality to the Browser Based UI for Mercurial History Browsing, hgweb
Project Description
Mozilla is just starting to use an exciting new distributed version control tool: Mercurial.
One of the exciting things about Mercurial is that the history—the list of all the changes that have ever been checked in—is not linear. It frequently has branches and merges. This is actually a good, important feature, as you know if you've read a little about distributed version control. The downside is that the history becomes a maze of twisty little passages. Benjamin Smedberg's demo shows the history of a repository with lots of merges (each box is a check-in; you can click on the boxes to move around).
There have been a couple attempts at showing history in an intuitive, graphical way. Mercurial comes with a web UI for browsing the repository, including history (here's what it looks like). It also comes with an "hg glog" extension that draws history as ASCII art, and an "hg view" extension that does roughly the same thing with a little GUI. Sadly, none of these applications qualifies as awesome.
The project's goal is to rectify this sad situation by writing an awesome browser-based UI for navigating Mercurial repository history.
Resources: jorendorff, bsmedberg
Project Leader(s)
Project Contributor(s)
Project Mentors
- Jason Ordendorff (jorendorff)
- Dirkjan Ochtman (djc)
- Ted Mielczarek (ted)
- Benjamin Smedberg (bsmedberg)
Project Ideas
September 23rd, 2008
Hgweb ideas |
---|
|
January 15th, 2009
DPS911 - Project Description and Plan |
---|
I will be continuing my work on hgweb for this new course. I’ve had a talk with jorendorff and ted regarding the bugs I can try to fix. I have various options that I can take on. There are definitely things available that I can continue to work on throughout the semester. Ideas for Releases Ideas for Releases bug 459727 - pushloghtml should show more than 10 entries at a time History that is filtered by directory Filtering the pushlog according to the directories touched. According to jorendorff this is a large feature that will require work. I told him that we were required to put out releases every 2 weeks so he recommended that I choose one large feature to work on (this one). I can implement this feature and improve its functionality for at least a few releases. Hg Annotate is very slow This is a bug that people have been working on for a while. Files using Hg Annotate are taking forever to load in any browser in comparison to loading the same file in bonsai. This is a medium difficulty bug that I could fix in maybe 2 releases or so. Expand/Collapse functionality for files touched Last semester I fixed a bug that added files touched functionality to the pushlog. My bug passed the review but now I want to add expand/collapse functionality for the files touched. Goals My goals are to give priority to the bugs that users want done. I will probably start by working on the pushloghtml should show more than 10 entries at time bug and then see what I want to work on next. Ideally I would like to get all the four ideas I have listed above done but it is hard to say whether that will be possible. Inevitably there will be issues with my patches and I will have to probably dedicate some releases to bug fixing. Possible Problems Last semester’s experience with this stuff means that I won’t have a large learning curve. It should be smooth sailing but problems will definitely creep up. I will probably get stuck and will require help. In that scenario I will need to consult somebody with more knowledge than myself. Usually ted, jorendorff and djc are available but if they are not, then there might be issues. My project doesn’t involve waiting for anything or for anybody to do anything (except when I will be waiting for reviews) so in the end everything is on me to get things working. |
Project Details
v0.1 Release Details |
---|
|
v0.2 Release Details (More Information) (Final result) |
---|
|
v0.3 Release Details (View here) |
---|
|
v0.4 Release Details | |||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v0.5 Release Details | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v0.6 Release Details (View Detailed Info) | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v0.7 Release Details (Detailed Info) | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v0.8 Release Details (Detailed Info) | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v0.9 Release Details (Detailed Info) | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
v1.0 Release Details (Detailed Info) | |||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
Project News
DPS909 Timeline |
---|
September 18th, 2008
September 23rd, 2008
September 25th, 2008
September 26th, 2008
September 28th, 2008
September 29th, 2008
October 1st, 2008
October 2nd, 2008
October 3rd, 2008
October 5th, 2008
October 6th, 2008
October 7th, 2008
October 8th, 2008
October 9th, 2008
October 13th, 2008
October 14th, 2008
October 16th, 2008
October 17th, 2008
October 18th, 2008
October 19th, 2008
October 23rd, 2008
October 29th, 2008
November 3rd, 2008
November 4th, 2008
November 5th, 2008
November 6th, 2008
November 7th, 2008
November 8th, 2008
November 10th, 2008
November 11th, 2008
November 12th, 2008
November 13th, 2008
November 15th, 2008
November 16th, 2008
November 19th, 2008
November 24th, 2008
November 29th, 2008
December 1st, 2008
December 2nd, 2008
December 3rd, 2008
December 4th, 2008
December 5th, 2008
December 7th, 2008 |
January 2009 | |||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
February 2009 | ||||||||||||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
March 2009 | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
April 2009 | ||||||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
Project Bugs
- bug 459727 - pushloghtml should show more than 10 entries at a time
- bug 445560 - html pushlog should fold merge changesets into one line
- bug 448707 - display files in pushlog
- bug 468089 - pushlog should have a graph view
- bug 459823 - hg annotate output on hgweb is painfully slow
- bug 471321 - Needs for an UI to run changeset queries
- bug 453162 - pushlog turns line breaks in commit messages into spaces
- bug 486939 - merge folding should only fold merges of >5 changesets