May 2022 - Wine-commits - list.winehq.org

Francois Gouget : testbot/SetWinLocale: Copy the locales again after a revert.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: 0c6de95d716da310ffceea197a8fbda78e2eeace URL: https://source.winehq.org/git/tools.git/?a=commit;h=0c6de95d716da310ffceea1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 2 19:22:42 2022 +0200 testbot/SetWinLocale: Copy the locales again after a revert. Most of the time the system and default user account locales are not impacted when the current account's --locale and --country locales are reverted after a reboot. But for some locales they are reverted too so that SetWinLocale needs to set them again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e41af20..0752df5 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -946,7 +946,7 @@ if ($OptReboot) if ($Reverted) { Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); - SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, undef, undef, undef, undef); last; } sleep(2);

1 0

Francois Gouget : testbot/web: Standardise escaping of the job details page URLs.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: a035f917da8e21ecd29d97ef554fe69d49857c19 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a035f917da8e21ecd29d97e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 2 19:23:05 2022 +0200 testbot/web: Standardise escaping of the job details page URLs. There is no need to call uri_escape() on integers. Also don't call escapeHTML() on simple URLs that contain no ampersand. But do call it any time they may contain one such as the return value of GetMoreInfoLink(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c042663..748153f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,7 +91,7 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { - print "<a href='#k", $self->escapeHTML($Row->{Item}->GetKey()), "'>"; + print "<a href='#k", $StepTask->GetKey(), "'>"; print $self->escapeHTML($StepTask->VM->Name); print "</a>"; } @@ -101,11 +101,9 @@ sub GenerateDataView($$$) if ($FileName and -r $FileName) { my $JobId = $self->{EnclosingPage}->GetJob()->Id; - my $URI = "/GetFile.pl?JobKey=" . uri_escape($JobId) . - "&StepKey=" . uri_escape($StepTask->StepNo); - print "<a href='" . $self->escapeHTML($URI) . "'>"; - print $self->escapeHTML($StepTask->FileName); - print "</a>"; + my $URI = "/GetFile.pl?JobKey=$JobId&StepKey=". $StepTask->StepNo; + print "<a href='", $self->escapeHTML($URI), "'>", + $self->escapeHTML($StepTask->FileName), "</a>"; } else { @@ -371,7 +369,7 @@ sub GetMoreInfoLink($$$$;$) { my ($self, $LinkKey, $Label, $Set, $Value) = @_; - my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); + my $Url = $ENV{"SCRIPT_NAME"} ."?Key=$self->{JobId}"; my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) @@ -423,11 +421,11 @@ sub GenerateMoreInfoLink($$$$;$$) my $Html = "<a href='". $self->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if (defined $Value) { - $Url = "/GetTaskFile.pl?Job=". uri_escape($self->{JobId}) - ."&Step=". uri_escape($StepTask->StepNo) - ."&Task=". uri_escape($StepTask->TaskNo) + $Url = "/GetTaskFile.pl?Job=$self->{JobId}" + ."&Step=". $StepTask->StepNo + ."&Task=". $StepTask->TaskNo ."&File=". uri_escape($Value); - $Html = "<a href='$Url'>↓</a> $Html"; + $Html = "<a href='". $self->escapeHTML($Url) ."'>↓</a> $Html"; } if ($Action eq "Hide") { @@ -585,11 +583,11 @@ EOF { if ($MoreInfo->{Screenshot}) { - my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . - "&StepKey=" . uri_escape($StepTask->StepNo) . - "&TaskKey=" . uri_escape($StepTask->TaskNo); - print "<div class='Screenshot'><img src='" . - $self->escapeHTML($URI) . "' alt='Screenshot' /></div>\n"; + my $URI = "/Screenshot.pl?JobKey=$self->{JobId}" + ."&StepKey=". $StepTask->StepNo + ."&TaskKey=". $StepTask->TaskNo; + print "<div class='Screenshot'><img src='", $self->escapeHTML($URI), + "' alt='Screenshot'/></div>\n"; } $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } @@ -665,7 +663,7 @@ EOF if (defined $LogInfo->{BadLog}) { my ($_Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); - print "<pre class='log-note'>The error summary is not available (<a href='$Url'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; + print "<pre class='log-note'>The error summary is not available (<a href='", $self->escapeHTML($Url), "'>see full log instead</a>): $LogInfo->{BadLog}</pre>\n"; } elsif ($LogInfo->{NoRef} and !defined $LogInfo->{BadRef}) {

1 0

Francois Gouget : testbot/cgi: Add an HasRW property to form pages.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: 2499b01e16a85d381d34fae761e876286c60ada0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2499b01e16a85d381d34fae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 2 19:23:21 2022 +0200 testbot/cgi: Add an HasRW property to form pages. Derived pages can use it to determine whether the form has any editable field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index e286880..224bf36 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -90,6 +90,7 @@ sub _initialize($$$$) $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; $self->{Method} = "post"; + $self->{HasRW} = !1; } =pod @@ -437,6 +438,7 @@ sub GenerateField($$$$) my $Value = $self->GetFormValue($PropertyDescriptor); if ($Display eq "rw") { + $self->{HasRW} = 1; print "<div class='ItemValue'>"; $self->GenerateValueInput($PropertyDescriptor, $Value, $Format); print "</div>";

1 0

Francois Gouget : testbot/cgi: Don't offer to save the item if no field is editable.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: 5783c4f88d469db676316523578c4f7f50734dd8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5783c4f88d469db67631652… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 2 19:23:33 2022 +0200 testbot/cgi: Don't offer to save the item if no field is editable. This allows derived pages to offer a read-only view of the item details just by overriding DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 1b77eea..8bea816 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -132,10 +132,7 @@ sub GetActions($) { my ($self) = @_; - my @Actions = @{$self->SUPER::GetActions()}; - push @Actions, "Save", "Cancel"; - - return \@Actions; + return $self->{HasRW} ? ["Save", "Cancel"] : []; } sub RedirectToList($)

1 0

Jeremy White : Use position to try to match DiffNotes.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: bbe90c2b8f64e3851db37b472986ad5fd4f90085 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bbe90c2b8f64e3851db37b4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 19:18:52 2022 -0500 Use position to try to match DiffNotes. This seems to produce a better result. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index a2f7079..6beedf3 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -152,33 +152,26 @@ def quote_original_comment(note): return prefix + '> ' + '> '.join(ret) -def find_line_code_in_notes(notes, line_code): - for note in notes: - if 'diff_file' in note and 'truncated_diff_lines' in note: - for diff in note['truncated_diff_lines']: - if diff['line_code'] == line_code: - return "{}@{}/{}\n".format(note['diff_file']['new_path'], diff['new_line'], - str(diff['old_line']) + "> " + diff['text'] + "\n") - return None - - -def fetch_diffnotes(mr_iid, author, line_codes): +def fetch_diffnotes(mr_iid, author, note_id, position): # This is a KLUDGE. The discussions.json entry point is not documented. # It provides back an array of all discussions on a given Merge request. - # We can use it to pick out a particular DiffNote, using the ending line_code. + # We can use it to pick out a particular DiffNote, using the position. # Human readable text seems to come up in 'truncated_diff_lines'. # I've made an ask for a better way to do this, but it seems to work for now. url = urljoin(settings.GITLAB_URL, f"/{settings.GITLAB_PROJECT_NAME}/-/merge_requests/{mr_iid}/discussions.json") r = requests.get(url, headers={"PRIVATE-TOKEN": settings.GITLAB_TOKEN}) r.raise_for_status() - notes = r.json() + discussions = r.json() diffnotes = "" - for note in notes: - if 'line_code' in note and note['line_code'] in line_codes: - diffnotes += "{} commented about {}:\n".format(author, note['diff_file']['new_path']) - if 'truncated_diff_lines' in note: - for diff in note['truncated_diff_lines']: - diffnotes += "> " + diff['text'] + "\n" + for d in discussions: + if d['notes'][0]['id'] == str(note_id): + if 'truncated_diff_lines' in d and 'position' in d: + if d['position'] == position: + diffnotes += "{} commented about {}:\n".format(author, d['diff_file']['new_path']) + if 'truncated_diff_lines' in d: + for diff in d['truncated_diff_lines']: + diffnotes += "> " + diff['text'] + "\n" + break return diffnotes @@ -340,13 +333,7 @@ def process_commented_on(event): # TODO - this is fairly fragile. hoping to get guidance here: # https://forum.gitlab.com/t/end-point-to-retrieve-a-diffnote/66926 if event['note']['type'] == 'DiffNote': - line_codes = [] - if 'position' in event['note'] and 'line_range' in event['note']['position']: - if 'start' in event['note']['position']['line_range']: - line_codes.append(event['note']['position']['line_range']['start']['line_code']) - if 'end' in event['note']['position']['line_range']: - line_codes.append(event['note']['position']['line_range']['end']['line_code']) - diffnote = fetch_diffnotes(event['note']['noteable_iid'], author, line_codes) + diffnote = fetch_diffnotes(event['note']['noteable_iid'], author, event['note']['id'], event['note']['position']) body += diffnote if event['note']['type'] == 'DiscussionNote':

1 0

Jeremy White : Add context for threads of any kind.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: 8feb70cfc29b465c9644174b0c77cc0ed49951dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=8feb70cfc29b465c9644174… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Apr 28 19:27:34 2022 -0500 Add context for threads of any kind. Seems to give better context for discussions with diffnotes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 6beedf3..747ac66 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -336,10 +336,11 @@ def process_commented_on(event): diffnote = fetch_diffnotes(event['note']['noteable_iid'], author, event['note']['id'], event['note']['position']) body += diffnote - if event['note']['type'] == 'DiscussionNote': - original = find_original_comment(event['note']['noteable_iid'], event['note']['id']) - if original: - body += quote_original_comment(original) + # If we are part of a thread, naively quote the last comment + # this seems slightly improve reported context. + original = find_original_comment(event['note']['noteable_iid'], event['note']['id']) + if original: + body += quote_original_comment(original) body += event['note']['body']

1 0

Jeremy White : Make maintainer author comparison case insensitive.
by Alexandre Julliard 02 May '22

02 May '22

Module: tools Branch: master Commit: e43ef2c6a47bd0d17ed61828d1ccefbf71819126 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e43ef2c6a47bd0d17ed6182… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Apr 30 08:36:32 2022 -0500 Make maintainer author comparison case insensitive. Found by https://gitlab.winehq.org/wine/wine/-/merge_requests/14. Eric Pouech == eric pouech Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 747ac66..45f829f 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -457,7 +457,7 @@ def fixup_version(mail, version): def done_by_maintainer(author, commits): for commit in commits: - if commit['committer_name'] != author: + if commit['committer_name'].casefold() != author.casefold(): return True return False

1 0