Note: There are a few cases of duplicates in user autocompletion which are being worked on.

html pushlog should fold merge changesets into one line

RESOLVED FIXED

Status

Developer Services
Mercurial: hg.mozilla.org
RESOLVED FIXED
9 years ago
3 years ago

People

(Reporter: ted, Assigned: Sid Kalra)

Tracking

Details

(URL)

Attachments

(4 attachments, 4 obsolete attachments)

(Reporter)

Description

9 years ago
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.
(Reporter)

Updated

9 years ago
Assignee: ted.mielczarek → nobody
Component: Release Engineering: Future → Hg: Customizations
QA Contact: release → hg.customizations
(Reporter)

Updated

9 years ago
Assignee: nobody → ted.mielczarek
(Reporter)

Comment 1

9 years ago
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.)
(Reporter)

Comment 2

9 years ago
Created attachment 343065 [details] [diff] [review]
WIP patch for pushlog
(Reporter)

Comment 3

9 years ago
Created attachment 343066 [details] [diff] [review]
WIP patch for templates
(Assignee)

Comment 4

9 years ago
Created attachment 348447 [details] [diff] [review]
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
Attachment #348447 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 5

9 years ago
Created attachment 348448 [details] [diff] [review]
 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
Attachment #348448 - Flags: review?(ted.mielczarek)
(Reporter)

Updated

9 years ago
Attachment #348447 - Flags: review?(ted.mielczarek) → review-
(Reporter)

Updated

9 years ago
Attachment #348448 - Flags: review?(ted.mielczarek) → review-
(Reporter)

Comment 6

9 years ago
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

9 years ago
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

9 years ago
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?
(Assignee)

Comment 9

9 years ago
Created attachment 349831 [details] [diff] [review]
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
Attachment #348447 - Attachment is obsolete: true
Attachment #349831 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 10

9 years ago
Created attachment 349832 [details] [diff] [review]
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
Attachment #348448 - Attachment is obsolete: true
Attachment #349832 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 11

9 years ago
Ignore comment #10. I meant to say:

Note: Requires ted's patch for hg_templates
(Reporter)

Comment 12

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

+                     "Id": id

Any reason this is capitalized?
Attachment #349831 - Flags: review?(ted.mielczarek) → review+
(Reporter)

Comment 13

9 years ago
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.
Attachment #349832 - Flags: review?(ted.mielczarek) → review+
Assignee: ted.mielczarek → sid
(Assignee)

Comment 14

9 years ago
Created attachment 363534 [details] [diff] [review]
Patch for hgpoller to fix expand/collapse functionality   

Changed variables name Id to id

Note: this patch requires WIP patch for hgpoller
Attachment #349831 - Attachment is obsolete: true
Attachment #363534 - Flags: review?(ted.mielczarek)
(Assignee)

Comment 15

9 years ago
Created attachment 363535 [details] [diff] [review]
Patch for hg_templates to fix expand/collapse functionality 

Changed the variable name id to pushid

Note: this patch requires WIP patch for templates
Attachment #349832 - Attachment is obsolete: true
Attachment #363535 - Flags: review?(ted.mielczarek)
(Reporter)

Updated

8 years ago
Attachment #363534 - Flags: review?(ted.mielczarek) → review+
(Reporter)

Updated

8 years ago
Attachment #363535 - Flags: review?(ted.mielczarek) → review+
(Reporter)

Comment 16

8 years ago
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.
(Reporter)

Comment 17

8 years ago
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
Status: NEW → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED

Comment 18

8 years ago
This is kind of frustrating, since merges happen all the time, not just in "merge" situations.
(Reporter)

Comment 19

8 years ago
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.
(Reporter)

Updated

8 years ago
Depends on: 486939

Updated

6 years ago
Depends on: 655463
Product: mozilla.org → Release Engineering
https://hg.mozilla.org/hgcustom/version-control-tools/rev/28ff4aabe5c7
https://hg.mozilla.org/hgcustom/version-control-tools/rev/2875f3473082
Product: Release Engineering → Developer Services
You need to log in before you can comment on or make changes to this bug.