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

Jacek Caban : winex11: Introduce x11drv_client_call.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 040d1f9bbd20c9d507279ea5585188db15ff3a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=040d1f9bbd20c9d507279ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 01:07:17 2022 +0200 winex11: Introduce x11drv_client_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/event.c | 15 +++++---------- dlls/winex11.drv/unixlib.h | 42 +++++++++++++++++++++++++++--------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 16 +++++++++++----- dlls/winex11.drv/x11drv_main.c | 15 +++++++++++++++ dlls/winex11.drv/xdnd.c | 41 ++++++++++++----------------------------- include/ntuser.h | 3 +++ 8 files changed, 110 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=040d1f9bbd20c9d50727…

1 0

Jacek Caban : winex11: Use unixlib interface for IME calls.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 6290d0599d1a9f28c99970127ffb233b5abd1bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6290d0599d1a9f28c9997012… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 23:10:15 2022 +0200 winex11: Use unixlib interface for IME calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 ++++++ dlls/winex11.drv/ime.c | 58 ++++++++++++++++++++++++++-------------------- dlls/winex11.drv/unixlib.h | 7 ++++++ dlls/winex11.drv/x11drv.h | 19 ++++++--------- dlls/winex11.drv/xim.c | 27 ++++++++++----------- 5 files changed, 66 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6290d0599d1a9f28c999…

1 0

Jacek Caban : winex11: Use unixlib interface for X11 calls from systray.c.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: e41630612ba2cb2f64ef3f3de7c712aafe7a2288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41630612ba2cb2f64ef3f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 23:39:17 2022 +0200 winex11: Use unixlib interface for X11 calls from systray.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 33 +++++++----------------------- dlls/winex11.drv/unixlib.h | 3 +++ dlls/winex11.drv/window.c | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 3 +++ 5 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 45ad0617246..bb2e5d563dd 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,10 +587,13 @@ static BOOL init_systray(void) { static BOOL init_done; WNDCLASSEXW class; - Display *display; - if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; + if (!X11DRV_CALL( systray_init, NULL )) + { + init_done = TRUE; + return FALSE; + } icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2 * ICON_BORDER; @@ -620,17 +623,6 @@ static BOOL init_systray(void) return FALSE; } - display = thread_init_display(); - if (DefaultScreen( display ) == 0) - systray_atom = x11drv_atom(_NET_SYSTEM_TRAY_S0); - else - { - char systray_buffer[29]; /* strlen(_NET_SYSTEM_TRAY_S4294967295)+1 */ - sprintf( systray_buffer, "_NET_SYSTEM_TRAY_S%u", DefaultScreen( display ) ); - systray_atom = XInternAtom( display, systray_buffer, False ); - } - XSelectInput( display, root_window, StructureNotifyMask ); - init_done = TRUE; return TRUE; } @@ -700,18 +692,11 @@ void change_systray_owner( Display *display, Window systray_window ) /* hide a tray icon */ static BOOL hide_icon( struct tray_icon *icon ) { - struct x11drv_win_data *data; - TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); if (!icon->window) return TRUE; /* already hidden */ - /* make sure we don't try to unmap it, it confuses some systray docks */ - if ((data = get_win_data( icon->window ))) - { - if (data->embedded) data->mapped = FALSE; - release_win_data( data ); - } + X11DRV_CALL( systray_hide, &icon->window ); DestroyWindow(icon->window); DestroyWindow(icon->tooltip); icon->window = 0; @@ -759,11 +744,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) { if (icon->display != -1) InvalidateRect( icon->window, NULL, TRUE ); else if (icon->layered) repaint_tray_icon( icon ); - else - { - Window win = X11DRV_get_whole_window( icon->window ); - if (win) XClearArea( gdi_display, win, 0, 0, 0, 0, True ); - } + else X11DRV_CALL( systray_clear, &icon->window ); } } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index fe3b430dc87..ce89f7d4d39 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -24,6 +24,9 @@ enum x11drv_funcs unix_clipboard_message, unix_create_desktop, unix_init, + unix_systray_clear, + unix_systray_hide, + unix_systray_init, unix_tablet_attach_queue, unix_tablet_get_packet, unix_tablet_info, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ccec4ee4ec..4ae1d3f11a3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2092,6 +2092,52 @@ HWND create_foreign_window( Display *display, Window xwin ) } +NTSTATUS x11drv_systray_init( void *arg ) +{ + Display *display; + + if (is_virtual_desktop()) return FALSE; + + display = thread_init_display(); + if (DefaultScreen( display ) == 0) + systray_atom = x11drv_atom(_NET_SYSTEM_TRAY_S0); + else + { + char systray_buffer[29]; /* strlen(_NET_SYSTEM_TRAY_S4294967295)+1 */ + sprintf( systray_buffer, "_NET_SYSTEM_TRAY_S%u", DefaultScreen( display ) ); + systray_atom = XInternAtom( display, systray_buffer, False ); + } + XSelectInput( display, root_window, StructureNotifyMask ); + + return TRUE; +} + + +NTSTATUS x11drv_systray_clear( void *arg ) +{ + HWND hwnd = *(HWND*)arg; + Window win = X11DRV_get_whole_window( hwnd ); + if (win) XClearArea( gdi_display, win, 0, 0, 0, 0, True ); + return 0; +} + + +NTSTATUS x11drv_systray_hide( void *arg ) +{ + HWND hwnd = *(HWND*)arg; + struct x11drv_win_data *data; + + /* make sure we don't try to unmap it, it confuses some systray docks */ + if ((data = get_win_data( hwnd ))) + { + if (data->embedded) data->mapped = FALSE; + release_win_data( data ); + } + + return 0; +} + + /*********************************************************************** * X11DRV_get_whole_window * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3986733782a..ec72d8a550e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,9 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_clear( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_hide( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_attach_queue( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_get_packet( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_load_info( void *arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 749fe2f761b..2d65f2a03d6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -977,6 +977,9 @@ const unixlib_entry_t __wine_unix_call_funcs[] = x11drv_clipboard_message, x11drv_create_desktop, x11drv_init, + x11drv_systray_clear, + x11drv_systray_hide, + x11drv_systray_init, x11drv_tablet_attach_queue, x11drv_tablet_get_packet, x11drv_tablet_info,

1 0

Jacek Caban : winex11: Use unixlib interface for systray docking.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 21d269f2fc9795188e08bae45adb6bd2a2ebb311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d269f2fc9795188e08bae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 00:10:36 2022 +0200 winex11: Use unixlib interface for systray docking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 1 + dlls/winex11.drv/event.c | 10 +++- dlls/winex11.drv/systray.c | 117 ++++++++--------------------------------- dlls/winex11.drv/unixlib.h | 16 ++++++ dlls/winex11.drv/window.c | 114 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 + 7 files changed, 165 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21d269f2fc9795188e08…

1 0

Francois Gouget : winetest/build-patterns: Use CSS to highlight the new failure modes.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 96a6a0db927096e2069998a0b752ead28978951d URL: https://source.winehq.org/git/tools.git/?a=commit;h=96a6a0db927096e2069998a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:21 2022 +0200 winetest/build-patterns: Use CSS to highlight the new failure modes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 20 ++++++++++++-------- winetest/report.css | 4 ++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index aa6a6e4..b6e5531 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -999,7 +999,7 @@ sub write_newmodes_line($$) foreach my $status (sort cmpstatus keys %{$test->{newmodes}}) { my ($symbol, $class, $title, $_link, $attrs) = get_status_html($status, $test->{colors}); - print $html " <span class='pat$class'$attrs title='$title'><b><i>$symbol</i></b></span>"; + print $html " <span class='pat$class newM'$attrs title='$title'>$symbol</span>"; } print $html "\n"; } @@ -1016,7 +1016,7 @@ sub write_pattern_line($$$) my ($range_start, $range_end, $range_title); foreach my $build (@sortedbuilds) { - my ($symbol, $class, $title); + my ($symbol, $class, $title, $is_new_mode); my ($tag, $attrs) = ("span", ""); my $status = $testreport->{status}->{$build->{name}}; @@ -1066,11 +1066,7 @@ sub write_pattern_line($$$) $attrs .= sprintf " href='%s/%s/%s.html#%s'", $build->{name}, $reportdir, $link, $dll; } - if ($test->{newmodes}->{$status}) - { - $symbol = "<b><i>$symbol</i></b>"; - $has_newmode = 1; - } + $is_new_mode = $test->{newmodes}->{$status}; } if ($range_symbol eq $symbol) @@ -1091,7 +1087,15 @@ sub write_pattern_line($$$) } # Start a new pattern range - $class = " class='pat$class'" if ($class); + if ($is_new_mode) + { + $class = $class ? " class='pat$class newM'" : " class='newM'"; + $has_newmode = 1; + } + elsif ($class) + { + $class = " class='pat$class'"; + } print $html "<$tag$class$attrs"; if ($tag eq "a") { diff --git a/winetest/report.css b/winetest/report.css index 25f156d..4b2d126 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -134,6 +134,10 @@ div.pattern :hover { color: black; text-decoration: underline; } .patV { /* test blocked by the anti-virus */ background-color: #99e6ff; } +.newM { /* new failure mode */ + font-style: italic; + font-weight: bold; +} .commitR { color: #cc0000;

1 0

Francois Gouget : winetest/build-patterns: Show failure counts <= 9 when over a pattern.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: b7387722ec5c12b237b7a597d105e92e0465de6a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7387722ec5c12b237b7a59… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:26 2022 +0200 winetest/build-patterns: Show failure counts <= 9 when over a pattern. The failure count can help distinguish the failure counts when there are many different values. But this makes the patterns more noisy so only show them when hovering over the pattern. Also each build result only gets one character so this is only possible if the failure count is 9 or less. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 ++++ winetest/patterns.js | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index b6e5531..7acb153 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -975,6 +975,10 @@ sub get_status_html($$) return @{$status2html{$status}} if ($status2html{$status}); + if ($status =~ /^[1-9]$/) + { + return ("F", "F", "$status failures", "t", " fcount='$status' style='background-color: $failcolors->{$status}'"); + } if ($status =~ /^[0-9]+$/) { return ("F", "F", "$status failures", "t", " style='background-color: $failcolors->{$status}'"); diff --git a/winetest/patterns.js b/winetest/patterns.js index 65e9cb8..4591903 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -170,6 +170,24 @@ function toggledReportCB(e) refreshPage(changes); } +function showRangeCounts(e) +{ + const domtest = e.target.closest("div.testfile"); + domtest.querySelectorAll(":scope [fcount]").forEach(frange => { + const fcount = frange.getAttribute("fcount"); + frange.innerHTML = fcount.repeat(frange.innerHTML.length); + }); +} + +function hideRangeCounts(e) +{ + const domtest = e.target.closest("div.testfile"); + domtest.querySelectorAll(":scope [fcount]").forEach(frange => { + const fcount = frange.getAttribute("fcount"); + frange.innerHTML = "F".repeat(frange.innerHTML.length); + }); +} + function init() { hide_reruns = false; /* reruns are shown by default */ @@ -225,6 +243,9 @@ function init() cb.patlines.push(patline); test.patlines.push(patline); if (cb.checked) test.linecount++; + const pattern = domline.querySelector("div.pattern"); + pattern.addEventListener('mouseenter', showRangeCounts); + pattern.addEventListener('mouseleave', hideRangeCounts); } }); if (test.linecount < test.patlines.length)

1 0

Francois Gouget : winetest/build-patterns: Include the trailing space in the pattern.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: c4e8a8b5f6f6ddc43d1da495b96898f2faf95989 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4e8a8b5f6f6ddc43d1da49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 5 16:57:29 2022 +0200 winetest/build-patterns: Include the trailing space in the pattern. Hovering over the trailing space will show the low failure counts without also popping up a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 7acb153..0bad351 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1122,7 +1122,7 @@ sub write_pattern_line($$$) $range_title, $range_symbol x $range_count; } my $newmode = $has_newmode ? " newmode" : ""; - print $html "</div> <span class='label$newmode'>$reportdir</span>\n</div>"; + print $html " </div><span class='label$newmode'>$reportdir</span>\n</div>"; } sub index2symbol($)

1 0

Jeremy White : Send a note when an MR is approved.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: cb5a963c89165cf3a262e84a4313229ba29549df URL: https://source.winehq.org/git/tools.git/?a=commit;h=cb5a963c89165cf3a262e84… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu May 5 09:21:59 2022 -0500 Send a note when an MR is approved. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 2b0b111..bd56033 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -365,9 +365,9 @@ def process_commented_on(event): return mail -def process_closed(event): +def process_status(event): if event['target_type'] != 'MergeRequest': - log(f"unknow target_type {event['target_type']}, skipping") + log(f"unknown target_type {event['target_type']}, skipping") return date = event['created_at'] @@ -401,14 +401,14 @@ def process_unknown(event): def process_ignore(event): - log(f"event {event['id']} ignored") + log(f"event {event['id']} {event['action_name']} ignored") EVENT_ACTION_TYPES = { "commented on": process_commented_on, "accepted": process_ignore, - "approved": process_ignore, - "closed": process_closed, + "approved": process_status, + "closed": process_status, "pushed to": process_ignore, "pushed new": process_ignore, "opened": process_ignore,

1 0

Jeremy White : Make event subjects match the MR cover letter.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 58a574fcad7161adf6213c0fed85fdabfda2134b URL: https://source.winehq.org/git/tools.git/?a=commit;h=58a574fcad7161adf6213c0… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 14:30:45 2022 -0500 Make event subjects match the MR cover letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 45f829f..6aa16be 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -349,9 +349,12 @@ def process_commented_on(event): log("comment was originally from the mailing list.") return + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"Re: {BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -377,9 +380,12 @@ def process_closed(event): action_name = event['action_name'] event_id = event['id'] + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"{BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title} - {action_name}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -518,6 +524,12 @@ def get_changes(iid, version, versionid, old_versionid, mr): return "\n" + version_string + changes +def cover_subject(mr_version, nr_patches, mr_iid, title): + vstring = "" + if mr_version > 1: + vstring = f" v{mr_version}" + return f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): author_name = f"{mr['author']['name']} (@{mr['author']['username']})" title = mr['title'] @@ -525,10 +537,8 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): mail = email.message.Message() mail['From'] = email.utils.formataddr((author_name, settings.BRIDGE_FROM_EMAIL)) - vstring = "" changes = "" if mr_version > 1: - vstring = f" v{mr_version}" if len(versions) > 1: # The versions array seems to be most recent first, while mr_version # is the positive version number. TODO: this assumes that the @@ -539,7 +549,7 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): if changes is None: return None - mail['Subject'] = f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + mail['Subject'] = cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname)

1 0

Jeremy White : Add the In-Reply-To id to References.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 754130bc4af8d8f99e4a3e9285042fb5a7b7f5ce URL: https://source.winehq.org/git/tools.git/?a=commit;h=754130bc4af8d8f99e4a3e9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:11:34 2022 -0500 Add the In-Reply-To id to References. It does no harm, and may help some utilities such as the winehq patch tracker to keep patches together. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 6aa16be..15fa5dd 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -357,7 +357,7 @@ def process_commented_on(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"{body}\n\n-- \n{mr_url}") @@ -388,7 +388,7 @@ def process_closed(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"\nThis merge request was {action_name} by {event['author']['name']}.\n-- \n{mr_url}") @@ -620,7 +620,7 @@ def process_mr(mr, update_db): fixup_date(mail, date) fixup_version(mail, version) create_headers_from_mr(mail, mr) - mail['References'] = create_reference(mr['id'], gitlab_hostname) + mail['References'] = create_reference(mr['id'], gitlab_hostname) + " " + mail['In-Reply-To'] log(f"MR{iid}v{version} - sent email") send_email(mail) if update_db:

1 0