--- a/hgext3rd/evolve/evolvecmd.py Sun Jun 09 12:07:08 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py Sun Jun 16 23:39:55 2019 +0530
@@ -1678,20 +1678,20 @@
else:
cmdutil.bailifchanged(repo)
+ obswdir = repo['.'].obsolete()
revs = _selectrevs(repo, allopt, revopt, anyopt, targetcat)
- hadobswdp = False
- if repo['.'].obsolete():
- hadobswdp = True
+ if not (revs or obswdir):
+ return _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat)
+ obswdironly = not revs and obswdir
+
+ if obswdir:
result = solveobswdp(ui, repo, opts)
if result != 0 or result is True:
# return as solving obswdp wasn't successful
return result
-
- if not revs:
- if hadobswdp:
- return 0
- return _handlenotrouble(ui, repo, allopt, revopt, anyopt, targetcat)
+ if obswdironly:
+ return 0
# Progress handling
seen = 1