# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1432747417 25200
# Node ID 69e5de3e6129185469c2cbf98383ac6d58260d0c
# Parent  d46a967f257e146ff63e4c333bda8df6869a73a6
evolve: small refactoring of the uncommit function

We introduce a new variable to simplify the implementation of hg uncommit
--interactive.

diff -r d46a967f257e -r 69e5de3e6129 hgext/evolve.py
--- a/hgext/evolve.py	Wed May 13 09:46:34 2015 -0700
+++ b/hgext/evolve.py	Wed May 27 10:23:37 2015 -0700
@@ -2131,8 +2131,8 @@
         # Recommit the filtered changeset
         tr = repo.transaction('uncommit')
         newid = None
-        if (pats or opts.get('include') or opts.get('exclude')
-            or opts.get('all')):
+        includeorexclude = opts.get('include') or opts.get('exclude')
+        if (pats or includeorexclude or opts.get('all')):
             match = scmutil.match(old, pats, opts)
             newid = _commitfiltered(repo, old, match, target=rev)
         if newid is None: