[PATCH 2 of 2 evolve-ext] evolve: make split respect rev args passed without --rev or -r
Kostia Balytskyi
ikostia at fb.com
Fri Jan 29 17:05:12 UTC 2016
# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1454081827 28800
# Fri Jan 29 07:37:07 2016 -0800
# Node ID 0699e3d3ea1e7acd6254fd196ba771ecc8c98f0c
# Parent 817cf1e8333856dd21b2886a61acef90e2151a7b
evolve: make split respect rev args passed without --rev or -r
Currently, if one runs `hg split .` or `hg split`, it will fail
with an exception. This happens becuase we only expect revision
args to be passed as --rev/-r ones and don't treat unnamed args
properly or add default values if no args are provided.
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2729,15 +2729,12 @@
tr = wlock = lock = None
newcommits = []
- revopt = opts.get('rev')
- if revopt:
- revs = scmutil.revrange(repo, revopt)
- if len(revs) != 1:
- raise error.Abort(_("you can only specify one revision to split"))
- else:
- rev = list(revs)[0]
+ revarg = revs or opts.get('rev') or '.'
+ revs = scmutil.revrange(repo, revarg)
+ if len(revs) != 1:
+ raise error.Abort(_("you can only specify one revision to split"))
else:
- rev = '.'
+ rev = list(revs)[0]
try:
wlock = repo.wlock()
More information about the Mercurial-devel
mailing list