Mercurial > evolve
changeset 4693:6f6fec14e607
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
This patch backout 3027005c42c3 as it was accepted by mistake
while it was being "in-discussion" state.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 15 Jun 2019 17:17:19 +0530 |
| parents | 8195452be71d |
| children | b6a7d2594ff3 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-topic.t tests/test-evolve.t tests/test-tutorial.t |
| diffstat | 4 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Sat Jun 08 16:03:05 2019 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Sat Jun 15 17:17:19 2019 +0530 @@ -1612,6 +1612,8 @@ contopt = opts['continue'] anyopt = opts['any'] allopt = opts['all'] + if allopt is None: + allopt = True startnode = repo['.'].node() dryrunopt = opts['dry_run'] confirmopt = opts['confirm'] @@ -1631,8 +1633,6 @@ targetcat = 'orphan' has_some_opts = bool(revopt or anyopt or allopt or contopt or stopopt or abortopt) - if allopt is None: - allopt = True if 1 < len(specifiedcategories): msg = _('cannot specify more than one trouble category to solve (yet)') raise error.Abort(msg)
--- a/tests/test-evolve-topic.t Sat Jun 08 16:03:05 2019 +0530 +++ b/tests/test-evolve-topic.t Sat Jun 15 17:17:19 2019 +0530 @@ -458,3 +458,5 @@ switching to topic bar 3 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at 2c295936ac04 + abort: filtered revision '3'! + [255]
--- a/tests/test-evolve.t Sat Jun 08 16:03:05 2019 +0530 +++ b/tests/test-evolve.t Sat Jun 15 17:17:19 2019 +0530 @@ -1442,6 +1442,7 @@ update:[1] added a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at ab832e43dd5a + no troubled changesets $ hg log -GT "{rev}:{node|short} {desc} ({bookmarks})\n" --hidden @ 1:ab832e43dd5a added a (book)
--- a/tests/test-tutorial.t Sat Jun 08 16:03:05 2019 +0530 +++ b/tests/test-tutorial.t Sat Jun 15 17:17:19 2019 +0530 @@ -1528,6 +1528,7 @@ update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory is now at 2a2b36e14660 + no troubled changesets Relocating unstable change after prune ----------------------------------------------