# HG changeset patch
# User Patrick Mezard <patrick@mezard.eu>
# Date 1344077300 -7200
# Node ID a1fb18ad29a1096d780bfdf6a40caaad954d77e2
# Parent  22f348c25d251a7e8bae451267711f509fd24fa2
evolve: avoid duplication in graft wrapper

diff -r 22f348c25d25 -r a1fb18ad29a1 hgext/evolve.py
--- a/hgext/evolve.py	Sat Aug 04 12:28:21 2012 +0200
+++ b/hgext/evolve.py	Sat Aug 04 12:48:20 2012 +0200
@@ -634,16 +634,15 @@
         lock.release()
 
 def graftwrapper(orig, ui, repo, *revs, **kwargs):
+    obsoleted = kwargs.setdefault('obsolete', [])
     lock = repo.lock()
     try:
         if kwargs.get('old_obsolete'):
-            obsoleted = kwargs.setdefault('obsolete', [])
             if kwargs['continue']:
                 obsoleted.extend(repo.opener.read('graftstate').splitlines())
             else:
                 obsoleted.extend(revs)
         # convert obsolete target into revs to avoid alias joke
-        obsoleted = kwargs.setdefault('obsolete', [])
         obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)]
         if obsoleted and len(revs) > 1: