From patchwork Fri Mar 13 16:14:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1,of,2,evolve] drophack: fix to match upstream repair.strip From: Durham Goode X-Patchwork-Id: 8057 Message-Id: <31f4a25075b234ca280b.1426263271@dev2000.prn2.facebook.com> To: Cc: pierre-yves.david@ens-lyon.org Date: Fri, 13 Mar 2015 09:14:31 -0700 # HG changeset patch # User Durham Goode # Date 1426262652 25200 # Fri Mar 13 09:04:12 2015 -0700 # Branch stable # Node ID 31f4a25075b234ca280b93702998ac49f55ccad1 # Parent 1e7c8046a9f461bda3c8f6003dae65e235af8bb6 drophack: fix to match upstream repair.strip repair.strip upstream now assumes the input nodelist is a list, so update to match it. The upstream change only affects the name of the backup bundle, so this shouldn't affect any other functionality. diff --git a/hgext/drophack.py b/hgext/drophack.py --- a/hgext/drophack.py +++ b/hgext/drophack.py @@ -150,7 +150,7 @@ def cmddrop(ui, repo, *revs, **opts): stripmarker(ui, repo, markers) # strip the changeset with timed(ui, 'strip nodes'): - repair.strip(ui, repo, allnodes, backup="all", topic='drophack') + repair.strip(ui, repo, list(allnodes), backup="all", topic='drophack') finally: lockmod.release(lock, wlock)