Mercurial > evolve
changeset 2815:e453fc535094
branching: merge back with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 16:35:40 +0200 |
| parents | 0fd701dbfcc6 (current diff) 768e2629cb48 (diff) |
| children | ec2beb920341 |
| files | |
| diffstat | 6 files changed, 49 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jul 25 05:51:44 2017 +0200 +++ b/.hgtags Tue Jul 25 16:35:40 2017 +0200 @@ -55,3 +55,4 @@ e358c0263e4629746a7c925429c951f67d4b02b1 6.3.1 e60248f26f923f4460682252f7863ff86f7b86b0 6.4.0 734c0bc066cdc0121a20a9cb44c8cc30c653be94 6.5.0 +cc3e09e033a3c632c9ac35badbf8b5d53f584049 6.6.0
--- a/README Tue Jul 25 05:51:44 2017 +0200 +++ b/README Tue Jul 25 16:35:40 2017 +0200 @@ -121,23 +121,29 @@ Changelog ========= -6.6.0 - in progress +6.6.0 -- 2017-07-25 ------------------- - - amend: add a --extract flag to move change back to the working copy + - amend: add a --extract flag to move change back to the working copy, (same as uncommit, but accessible through the amend commit) - - split: now properly refuse to split public changeset - - commands: unify and improve the pre-rewrite validation and error message - - uncommit: add support for --current-date and --current-user option - - fold: add support for --current-date and --current-user option - - metaedit: add support for --current-date and --current-user option - - split add support for --current-date and --current-user option + - split: now properly refuse to split public changeset, + - commands: unify and improve the pre-rewrite validation and error message, + - uncommit: add support for --current-date and --current-user option, + - fold: add support for --current-date and --current-user option, + - metaedit: add support for --current-date and --current-user option, + - split: add support for --current-date and --current-user option, + - compat: use various new API instead of the one deprecated in 4.3, + (when available) + - documentation: various minor documentation update. + +topic (0.2.0): - topic: add --age option to sort topic by the most recently touched, - topic: add a 't0' to access the root of a topic while keeping it active, - topic: allow 'hg prev' to me move to 't0', - - topic: add a config option to enforce topic on new commit + - topic: add a config option to enforce topic on new commit, (experimental.enforce-topic) + - topic: make command names valid as expected, even if ui.strict=true. 6.5.0 -- 2017-07-02 -------------------
--- a/hgext3rd/evolve/__init__.py Tue Jul 25 05:51:44 2017 +0200 +++ b/hgext3rd/evolve/__init__.py Tue Jul 25 16:35:40 2017 +0200 @@ -2066,7 +2066,7 @@ raise children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()] - topic = getattr(repo, 'currenttopic', '') + topic = _getcurrenttopic(repo) filtered = [] if topic and not opts.get("no_topic", False): filtered = [ctx for ctx in children if ctx.topic() != topic]
--- a/hgext3rd/evolve/metadata.py Tue Jul 25 05:51:44 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Tue Jul 25 16:35:40 2017 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '6.6.0.dev' -testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.1' +__version__ = '6.6.1.dev' +testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.2' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Tue Jul 25 05:51:44 2017 +0200 +++ b/hgext3rd/topic/__init__.py Tue Jul 25 16:35:40 2017 +0200 @@ -118,7 +118,7 @@ 'topic.active': 'green', } -version = '0.2.0.dev' +version = '0.2.1.dev' testedwith = '4.0.2 4.1.3 4.2.1' minimumhgversion = '4.0' buglink = 'https://bz.mercurial-scm.org/' @@ -307,12 +307,13 @@ 'topics', 'topic', namemap=_namemap, nodemap=_nodemap, listnames=lambda repo: repo.topics)) -@command('topics [TOPIC]', [ +@command('topics', [ ('', 'clear', False, 'clear active topic if any'), ('r', 'rev', '', 'revset of existing revisions', _('REV')), ('l', 'list', False, 'show the stack of changeset in the topic'), ('', 'age', False, 'show when you last touched the topics') - ] + commands.formatteropts) + ] + commands.formatteropts, + _('hg topics [TOPIC]')) def topics(ui, repo, topic='', clear=False, rev=None, list=False, **opts): """View current topic, set current topic, change topic for a set of revisions, or see all topics. @@ -365,7 +366,9 @@ _listtopics(ui, repo, opts) -@command('stack [TOPIC]', [] + commands.formatteropts) +@command('stack', [ + ] + commands.formatteropts, + _('hg stack [TOPIC]')) def cmdstack(ui, repo, topic='', **opts): """list all changesets in a topic and other information
--- a/tests/test-topic-stack.t Tue Jul 25 05:51:44 2017 +0200 +++ b/tests/test-topic-stack.t Tue Jul 25 16:35:40 2017 +0200 @@ -187,6 +187,29 @@ } ] +check that topics and stack are available even if ui.strict=true + + $ hg topics + * foo + $ hg stack + ### topic: foo + ### branch: default + t4@ c_f (current) + t3: c_e + t2: c_d + t1: c_c + t0^ c_b (base) + $ hg topics --config ui.strict=true + * foo + $ hg stack --config ui.strict=true + ### topic: foo + ### branch: default + t4@ c_f (current) + t3: c_e + t2: c_d + t1: c_c + t0^ c_b (base) + error case, nothing to list $ hg topic --clear