Mercurial > evolve
comparison hgext/evolve.py @ 1785:f22120b12715
merge with stable
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 25 Jan 2017 16:50:19 +0100 |
| parents | a046e78c3290 c3741a5adbb0 |
| children | e553fc96447d |
comparison
equal
deleted
inserted
replaced
| 1783:9480e13ee59a | 1785:f22120b12715 |
|---|---|
| 3131 # Nothing to do; "revs" is already set correctly | 3131 # Nothing to do; "revs" is already set correctly |
| 3132 pass | 3132 pass |
| 3133 else: | 3133 else: |
| 3134 raise error.Abort(_('must specify either --from or --exact')) | 3134 raise error.Abort(_('must specify either --from or --exact')) |
| 3135 | 3135 |
| 3136 if len(revs) == 1: | 3136 if not revs: |
| 3137 raise error.Abort(_('specified revisions evaluate to an empty set'), | |
| 3138 hint=_('use different revision arguments')) | |
| 3139 elif len(revs) == 1: | |
| 3137 ui.write_err(_('single revision specified, nothing to fold\n')) | 3140 ui.write_err(_('single revision specified, nothing to fold\n')) |
| 3138 return 1 | 3141 return 1 |
| 3139 | 3142 |
| 3140 wlock = lock = None | 3143 wlock = lock = None |
| 3141 try: | 3144 try: |