Mercurial > evolve

changeset 140:462d52ae7fb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add user to the list of option prevent the "no change found" message to show up
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 29 Feb 2012 14:42:30 +0100
parents 9b9500175ae5
children 8dbae2bd4d06
files hgext/evolve.py
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri Feb 17 19:54:42 2012 +0100
+++ b/hgext/evolve.py	Wed Feb 29 14:42:30 2012 +0100
@@ -374,8 +374,13 @@
             updatenodes = set(cl.nodesbetween(roots=[old.node()],
                                               heads=[head.node()])[0])
             updatenodes.remove(old.node())
-            if not updatenodes and not (opts.get('message') or opts.get('logfile') or opts.get('edit')):
-                raise error.Abort(_('no updates found'))
+            okoptions = ['message', 'logfile', 'edit', 'user', 'branch']
+            if not updatenodes:
+                for o in okoptions:
+                    if opts.get(o):
+                        break
+                else:
+                    raise error.Abort(_('no updates found'))
             updates = [repo[n] for n in updatenodes]
 
             # perform amend