# HG changeset patch # User Augie Fackler # Date 1565341794 14400 # Node ID 50c2c3eae64e881a7fc43bbb0a12bc12f4e3cd6b # Parent cdf0e9523de12a98b9395192b7a25108a7d0b36d# Parent 978c9a0c5974a6049c639b4b2c712978af034455 merge with stable diff -r cdf0e9523de1 -r 50c2c3eae64e hgdemandimport/tracing.py --- a/hgdemandimport/tracing.py Mon Aug 05 13:31:12 2019 -0700 +++ b/hgdemandimport/tracing.py Fri Aug 09 05:09:54 2019 -0400 @@ -12,6 +12,7 @@ _pipe = None _checked = False +_session = 'none' def _isactive(): global _pipe, _session, _checked diff -r cdf0e9523de1 -r 50c2c3eae64e relnotes/5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/relnotes/5.1 Fri Aug 09 05:09:54 2019 -0400 @@ -0,0 +1,90 @@ +== New Features == + + * New config `commands.commit.post-status` shows status after successful + commit. + + * `hg root` now has templating support, including support for showing + where a repo share's source is. See `hg help -v root` for details. + + * New `--force-close-branch` flag for `hg commit` to forcibly close + branch from a non-head changeset. + + * The curses-based interface for commands like `hg commit -i` now supports + a range-select mechanism. Select the first line using space like before, + navigate to the last line, and press X (capital x) to set all items in + the range at once. Lowercase x has been added as a synonym for space to + help reinforce the mechanism, and pressing enter/return continues to be a + synonym for "toggle the current line and move down to the next item in + this section." + +== New Experimental Features == + + * New config `experimental.log.topo` makes `hg log -G` use + topological sorting. This is especially useful for aliases since it + lets the alias accept an `-r` option while still using topological + sorting with or without the `-r` (unlike if you use the `sort(..., + topo)` revset). + + +== Bug Fixes == + + * issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels} + in template show wrong files on merged revision". See details in + "Backwards Compatibility Changes". + + +== Backwards Compatibility Changes == + + * Removed (experimental) support for log graph lines mixing + parent/grandparent styles. Setting + e.g. `experimental.graphstyle.parent = !` and + `experimental.graphstyle.grandparent = 3.` would use `!` for the + first three lines of the graph and then `.`. This is no longer + supported. + + * If `ui.origbackuppath` had been (incorrectly) configured to point + to a file, we will now replace that file by a directory and put + backups in that directory. This is similar to how we would + previously replace files *in* the configured directory by + subdirectories. + +* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}` + have changed behavior on merge commits. They used to be relative to + the first parent, but they now consider both parents. `{file_adds}` + shows files that exists in the commit but did not exist in either + parent. `{file_dels}` shows files that do not exist in the commit + but existed in either parent. `{file_mods}` show the remaining + files from `{files}` that were not in the other two + sets. + + +== Internal API Changes == + + * Matchers are no longer iterable. Use `match.files()` instead. + + * `match.visitdir()` and `match.visitchildrenset()` now expect the + empty string instead of '.' to indicate the root directory. + + * `util.dirs()` and `util.finddirs()` now include an entry for the + root directory (empty string). + + * shelve is no longer an extension now. it will be turned on by default. + + * New API to manage unfinished operations: Earlier there were distinct APIs + which dealt with unfinished states and separate lists maintaining them + that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and + `cmdutil.STATES`. Now these have been unified to a single + API which handles the various states and their utilities. This API + has been added to `state.py`. Now instead of adding to these 3 lists + independently a state for a new operation can be registered using + `addunfinished()` in `state` module. + + * `cmdutil.checkunfinished()` now includes detection for merge too. + + * merge abort has been disallowed in case an operation of higher + precedence is in progress to avoid cases of partial abort of + operations. + + * We used to automatically attempt to make extensions compatible with + Python 3 (by translating their source code while loading it). We no + longer do that. diff -r cdf0e9523de1 -r 50c2c3eae64e relnotes/next --- a/relnotes/next Mon Aug 05 13:31:12 2019 -0700 +++ b/relnotes/next Fri Aug 09 05:09:54 2019 -0400 @@ -1,90 +1,14 @@ == New Features == - * New config `commands.commit.post-status` shows status after successful - commit. - - * `hg root` now has templating support, including support for showing - where a repo share's source is. See `hg help -v root` for details. - - * New `--force-close-branch` flag for `hg commit` to forcibly close - branch from a non-head changeset. - - * The curses-based interface for commands like `hg commit -i` now supports - a range-select mechanism. Select the first line using space like before, - navigate to the last line, and press X (capital x) to set all items in - the range at once. Lowercase x has been added as a synonym for space to - help reinforce the mechanism, and pressing enter/return continues to be a - synonym for "toggle the current line and move down to the next item in - this section." == New Experimental Features == - * New config `experimental.log.topo` makes `hg log -G` use - topological sorting. This is especially useful for aliases since it - lets the alias accept an `-r` option while still using topological - sorting with or without the `-r` (unlike if you use the `sort(..., - topo)` revset). - == Bug Fixes == - * issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels} - in template show wrong files on merged revision". See details in - "Backwards Compatibility Changes". - == Backwards Compatibility Changes == - * Removed (experimental) support for log graph lines mixing - parent/grandparent styles. Setting - e.g. `experimental.graphstyle.parent = !` and - `experimental.graphstyle.grandparent = 3.` would use `!` for the - first three lines of the graph and then `.`. This is no longer - supported. - - * If `ui.origbackuppath` had been (incorrectly) configured to point - to a file, we will now replace that file by a directory and put - backups in that directory. This is similar to how we would - previously replace files *in* the configured directory by - subdirectories. - -* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}` - have changed behavior on merge commits. They used to be relative to - the first parent, but they now consider both parents. `{file_adds}` - shows files that exists in the commit but did not exist in either - parent. `{file_dels}` shows files that do not exist in the commit - but existed in either parent. `{file_mods}` show the remaining - files from `{files}` that were not in the other two - sets. - == Internal API Changes == - * Matchers are no longer iterable. Use `match.files()` instead. - - * `match.visitdir()` and `match.visitchildrenset()` now expect the - empty string instead of '.' to indicate the root directory. - - * `util.dirs()` and `util.finddirs()` now include an entry for the - root directory (empty string). - - * shelve is no longer an extension now. it will be turned on by default. - - * New API to manage unfinished operations: Earlier there were distinct APIs - which dealt with unfinished states and separate lists maintaining them - that are `cmdutil.afterresolvestates`, `cmdutil.unfinishedstates` and - `cmdutil.STATES`. Now these have been unified to a single - API which handles the various states and their utilities. This API - has been added to `state.py`. Now instead of adding to these 3 lists - independently a state for a new operation can be registered using - `addunfinished()` in `state` module. - - * `cmdutil.checkunfinished()` now includes detection for merge too. - - * merge abort has been disallowed in case an operation of higher - precedence is in progress to avoid cases of partial abort of - operations. - - * We used to automatically attempt to make extensions compatible with - Python 3 (by translating their source code while loading it). We no - longer do that. diff -r cdf0e9523de1 -r 50c2c3eae64e tests/test-run-tests.t --- a/tests/test-run-tests.t Mon Aug 05 13:31:12 2019 -0700 +++ b/tests/test-run-tests.t Fri Aug 09 05:09:54 2019 -0400 @@ -1030,7 +1030,7 @@ # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test - \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} test-success.t (re) + \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} test-success.t (re) test for --time with --job enabled ==================================== @@ -1041,7 +1041,7 @@ # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test - \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} \s*[\d\.]{5} test-success.t (re) + \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} \s*[\d\.]{5,8} test-success.t (re) Skips ================