445560 - html pushlog should fold merge changesets into one line

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[(not currently active) Ted Mielczarek]

The URL contains a mockup. After some discussion, I think the simplest approach here is "If any changeset in this push is a merge (has multiple parents), then fold the entire push into a single entry". Anything more complicated involves actually traversing the graph, which sort of sucks.

Comment 1

[(not currently active) Ted Mielczarek]

Jesse asked on IRC, so to clarify, my intent is actually only to do this folding if the changeset is a merge, and was pushed as a group of >5 changesets. (5 is just a convenient number so we don't fold small groups of changesets.)

Comment 2

[(not currently active) Ted Mielczarek]

Attachment: WIP patch for pushlog

Comment 3

[(not currently active) Ted Mielczarek]

Attachment: WIP patch for templates

Comment 4

[Sid Kalra]

Attachment: Patch that fixes certain functionality for the earlier patch submitted by ted

This patch first requires ted's patch for pushlog-feed.py (push-folding.patch). It makes it so that when a user clicks on a certain [Expand] link only the hidden rows for that link are shown

Comment 5

[Sid Kalra]

Attachment: Patch that fixes certain functionality for the earlier patch (hg_templates) submitted by ted

This patch first requires ted's patch for hg_templates (push-folding.patch). It makes it so that when a user clicks on a certain [Expand] link only the hidden rows for that link are shown

Comment 6

[(not currently active) Ted Mielczarek]

Comment on attachment 348448 [details] [diff] [review]
 Patch that fixes certain functionality for the earlier patch (hg_templates) submitted by ted

This is cool, and it's very close, I just have a few changes you'll need to make. First, you can't have multiple elements with the same id, it's not allowed. Nevermind the fact that it works. :) You can work around this by using a class instead. Second, I think instead of using the date, you should just use "id", which is a unique integer ID per push (group of changesets).

Comment 7

[Boris Zbarsky [:bzbarsky]]

Would it be possible to use one tbody per push, with the left-hand column (the one with the name/date) using a <td rowspan="0">?

Comment 8

[Boris Zbarsky [:bzbarsky]]

Also, would it be possible as a user to set this to either happen or not once and not have to unfold all the changesets manually if I always want them unfolded?

Comment 9

[Sid Kalra]

Attachment: Patch for hgpoller to fix expand/collapse functionality

Note: Requires ted's patch for hgpoller
- Now uses ids instead of dates as a unique identifier
- Now uses class to store the unique identifiers

Comment 10

[Sid Kalra]

Attachment: Patch for hg_templates to fix expand/collapse functionality

Note: Requires ted's patch for hgpoller
- Now uses ids instead of dates as a unique identifier
- Now uses class to store the unique identifiers

Comment 11

[Sid Kalra]

Ignore comment #10. I meant to say:

Note: Requires ted's patch for hg_templates

Comment 12

[(not currently active) Ted Mielczarek]

Comment on attachment 349831 [details] [diff] [review]
Patch for hgpoller to fix expand/collapse functionality

+                     "Id": id

Any reason this is capitalized?

Comment 13

[(not currently active) Ted Mielczarek]

Comment on attachment 349832 [details] [diff] [review]
Patch for hg_templates to fix expand/collapse functionality

+    var id = $(this).attr("class");

Could you rename this to 'pushid' or something clearer? Also, remove the XXX comment, since you fixed it.

r=me with those changes.

Comment 14

[Sid Kalra]

Attachment: Patch for hgpoller to fix expand/collapse functionality

Changed variables name Id to id

Note: this patch requires WIP patch for hgpoller

Comment 15

[Sid Kalra]

Attachment: Patch for hg_templates to fix expand/collapse functionality

Changed the variable name id to pushid

Note: this patch requires WIP patch for templates

Comment 16

[(not currently active) Ted Mielczarek]

Comment on attachment 363535 [details] [diff] [review]
Patch for hg_templates to fix expand/collapse functionality 

I tweaked this slightly to change "identifier" to "id", and I changed the call to "substring" to use a regex.

Comment 17

[(not currently active) Ted Mielczarek]

That is to say, I pushed both of these changes:
http://hg.mozilla.org/hg_templates/rev/0ecbdfad931d
http://hg.mozilla.org/users/bsmedberg_mozilla.com/hgpoller/rev/c88bf6c80d4e

Comment 18

[Robert Sayre]

This is kind of frustrating, since merges happen all the time, not just in "merge" situations.

Comment 19

[(not currently active) Ted Mielczarek]

Hm, apparently we didn't implement this as I said in comment 1. I wanted this to only fold merges of >5 changesets, so the simple "pushed one changeset but merged" case didn't get folded. I'll file a followup on that.

Comment 20

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/28ff4aabe5c7

Comment 21

[Gregory Szorc [:gps]]

https://hg.mozilla.org/hgcustom/version-control-tools/rev/2875f3473082