mercurial-devel | Pipeline #16929 has failed for branch/default | 49352c0a
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/default ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default ) Commit: 49352c0a ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/49352c0af716430238d8a5aba44ab3041e2c6337 ) Commit Message: cext: add Python 3.10 support * Replace "Py_TY... Commit Author: Victor Stinner ( https://foss.heptapod.net/vstinner ) Pipeline #16929 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/16929 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 1 failed build. Job #155860 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/155860/raw ) Stage: tests Name: test-py3-chg -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial-devel | Pipeline #16921 has failed for branch/stable | 346feed6
Your pipeline has failed. Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel ) Branch: branch/stable ( https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/stable ) Commit: 346feed6 ( https://foss.heptapod.net/octobus/mercurial-devel/-/commit/346feed6708610de0af985dd44dae6fb4fb2e686 ) Commit Message: contrib: stop building rust for every job This... Commit Author: Raphaël Gomès Pipeline #16921 ( https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/16921 ) triggered by Administrator ( https://foss.heptapod.net/root ) had 1 failed build. Job #155809 ( https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/155809/raw ) Stage: tests Name: test-py3-chg -- You're receiving this email because of your account on foss.heptapod.net. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9855: histedit: rip out mysterious catch-all ignore curses.error handler
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I have no idea why this was here, and ripping it out doesn't obviously break anything for me (tests all pass, I can poke around chistedit UI a bit without issue), so I'm thinking we should rip it out and see if we get bug reports. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9855 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1623,63 +1623,60 @@ stdscr.clear() stdscr.refresh() while True: -try: -oldmode, unused = state[b'mode'] -if oldmode == MODE_INIT: -changemode(state, MODE_RULES) -e = event(state, ch) - -if e == E_QUIT: -return False -if e == E_HISTEDIT: -return state[b'rules'] +oldmode, unused = state[b'mode'] +if oldmode == MODE_INIT: +changemode(state, MODE_RULES) +e = event(state, ch) + +if e == E_QUIT: +return False +if e == E_HISTEDIT: +return state[b'rules'] +else: +if e == E_RESIZE: +size = screen_size() +if size != stdscr.getmaxyx(): +curses.resizeterm(*size) + +curmode, unused = state[b'mode'] +sizes = layout(curmode) +if curmode != oldmode: +state[b'page_height'] = sizes[b'main'][0] +# Adjust the view to fit the current screen size. +movecursor(state, state[b'pos'], state[b'pos']) + +# Pack the windows against the top, each pane spread across the +# full width of the screen. +y, x = (0, 0) +helpwin, y, x = drawvertwin(sizes[b'help'], y, x) +mainwin, y, x = drawvertwin(sizes[b'main'], y, x) +commitwin, y, x = drawvertwin(sizes[b'commit'], y, x) + +if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP): +if e == E_PAGEDOWN: +changeview(state, +1, b'page') +elif e == E_PAGEUP: +changeview(state, -1, b'page') +elif e == E_LINEDOWN: +changeview(state, +1, b'line') +elif e == E_LINEUP: +changeview(state, -1, b'line') + +# start rendering +commitwin.erase() +helpwin.erase() +mainwin.erase() +if curmode == MODE_PATCH: +renderpatch(mainwin, state) +elif curmode == MODE_HELP: +renderstring(mainwin, state, __doc__.strip().splitlines()) else: -if e == E_RESIZE: -size = screen_size() -if size != stdscr.getmaxyx(): -curses.resizeterm(*size) - -curmode, unused = state[b'mode'] -sizes = layout(curmode) -if curmode != oldmode: -state[b'page_height'] = sizes[b'main'][0] -# Adjust the view to fit the current screen size. -movecursor(state, state[b'pos'], state[b'pos']) - -# Pack the windows against the top, each pane spread across the -# full width of the screen. -y, x = (0, 0) -helpwin, y, x = drawvertwin(sizes[b'help'], y, x) -mainwin, y, x = drawvertwin(sizes[b'main'], y, x) -commitwin, y, x = drawvertwin(sizes[b'commit'], y, x) - -if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP): -if e == E_PAGEDOWN: -changeview(state, +1, b'page') -elif e == E_PAGEUP: -changeview(state, -1, b'page') -elif e == E_LINEDOWN: -changeview(state, +1, b'line') -elif e == E_LINEUP: -changeview(state, -1, b'line') - -# start rendering -commitwin.erase() -helpwin.erase() -mainwin.erase() -if curmode == MODE_PATCH: -renderpatch(mainwin, state) -elif curmode == MODE_HELP: -renderstring(mainwin, state, __doc__.strip().splitlines()) -else: -renderrules(mainwin, state) -rendercommit(commitwin, state) -renderhelp(helpwin, state) -curses.doupdate() -# done rendering -ch = encoding.strtolocal(stdscr.getkey()) -except curses.error: -pass +renderrules(mainwin, state) +rendercommi
D9854: histedit: notice when the main window underflows height and abort
durin42 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
If you try to have a 13-line-tall terminal and use curses histedit, it
fails by spinning in an infinite loop due to the catch-all ignore of
curses errors on line 1682 of histedit.py. We should also fix that
catch-all ignore of curses errors (what other demons lurk here, I
wonder?) but we can trivially catch this case and guide the user to a
happy path. We've seen this mostly in IDE users that have a tendency
to have really tiny embedded terminal windows.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9854
AFFECTED FILES
hgext/histedit.py
CHANGE DETAILS
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1581,10 +1581,19 @@
def layout(mode):
maxy, maxx = stdscr.getmaxyx()
helplen = len(helplines(mode))
+mainlen = maxy - helplen - 12
+if mainlen < 1:
+raise error.Abort(
+_(b"terminal dimensions %d by %d too small for curses
histedit")
+% (maxy, maxx),
+hint=_(
+b"enlarge your terminal or use --config ui.interface=text"
+),
+)
return {
b'commit': (12, maxx),
b'help': (helplen, maxx),
-b'main': (maxy - helplen - 12, maxx),
+b'main': (mainlen, maxx),
}
def drawvertwin(size, y, x):
To: durin42, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9853: histedit: don't assign to _ for unused values
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY I don't know what this ignored value is, but we need to not clobber the _() function from gettext, or we get mysterious crashes instead of internationalizing some strings in my upcoming patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9853 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1615,7 +1615,7 @@ stdscr.refresh() while True: try: -oldmode, _ = state[b'mode'] +oldmode, unused = state[b'mode'] if oldmode == MODE_INIT: changemode(state, MODE_RULES) e = event(state, ch) @@ -1630,7 +1630,7 @@ if size != stdscr.getmaxyx(): curses.resizeterm(*size) -curmode, _ = state[b'mode'] +curmode, unused = state[b'mode'] sizes = layout(curmode) if curmode != oldmode: state[b'page_height'] = sizes[b'main'][0] To: durin42, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6471] New: After strip moved to core: AttributeError: module 'hgext.strip' has no attribute 'cmdtable'
https://bz.mercurial-scm.org/show_bug.cgi?id=6471 Bug ID: 6471 Summary: After strip moved to core: AttributeError: module 'hgext.strip' has no attribute 'cmdtable' Product: Mercurial Version: 5.7rc0 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: normal Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: z...@zash.se CC: mercurial-devel@mercurial-scm.org Python Version: 3.7 # Command hg$ make local hg$ ./hg version # Error Traceback (most recent call last): File "/home/zash/src/hg/mercurial/extensions.py", line 264, in _runextsetup extsetup(ui) File "/usr/lib/python3/dist-packages/hgext3rd/evolve/exthelper.py", line 182, in finalextsetup knownexts[ext] = e.cmdtable AttributeError: module 'hgext.strip' has no attribute 'cmdtable' *** failed to set up extension evolve: module 'hgext.strip' has no attribute 'cmdtable' *** failed to set up extension evolve: module 'hgext.strip' has no attribute 'cmdtable' Mercurial Distributed SCM (version 5.6+98-d7a508a75d72) (see https://mercurial-scm.org for more information) Copyright (C) 2005-2020 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # Bisect The first bad revision is: changeset: 46029:d7a508a75d72 user:Valentin Gatien-Baron date:Sun Nov 08 16:23:35 2020 -0500 summary: strip: move into core -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D9852: rust: lower compile error on non-linux platforms to a warning
danchr created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D9852
AFFECTED FILES
rust/hg-core/src/lib.rs
setup.py
CHANGE DETAILS
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -609,6 +609,12 @@
# and its build is not explictely disabled (for external build
# as Linux distributions would do)
if self.distribution.rust and self.rust:
+if not sys.platform.startswith('linux'):
+self.warn(
+"rust extensions have only been tested on Linux "
+"and may not behave correctly on other platforms; "
+)
+
for rustext in ruststandalones:
rustext.build('' if self.inplace else self.build_lib)
diff --git a/rust/hg-core/src/lib.rs b/rust/hg-core/src/lib.rs
--- a/rust/hg-core/src/lib.rs
+++ b/rust/hg-core/src/lib.rs
@@ -30,14 +30,6 @@
pub mod operations;
pub mod utils;
-// Remove this to see (potential) non-artificial compile failures. MacOS
-// *should* compile, but fail to compile tests for example as of 2020-03-06
-#[cfg(not(target_os = "linux"))]
-compile_error!(
-"`hg-core` has only been tested on Linux and will most \
- likely not behave correctly on other platforms."
-);
-
use crate::utils::hg_path::{HgPathBuf, HgPathError};
pub use filepatterns::{
parse_pattern_syntax, read_pattern_file, IgnorePattern,
To: danchr, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
