# HG changeset patch # User Martin von Zweigbergk <martinvonz@google.com> # Date 1497634603 25200 # Fri Jun 16 10:36:43 2017 -0700 # Node ID f65786a02922bb670752f8bcafbb6f3ca8d9e216 # Parent 4c2a46f89f08724a5c5c74a90692c87593cb1156 bundle2: use "else" instead of checking condition again diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1200,7 +1200,7 @@ with repo.transaction('histedit.abort') as tr: if not isinstance(gen, bundle2.unbundle20): gen.apply(repo, 'histedit', 'bundle:' + backupfile) - if isinstance(gen, bundle2.unbundle20): + else: bundle2.applybundle(repo, gen, tr, source='histedit', url='bundle:' + backupfile) diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -130,7 +130,7 @@ gen.apply(self.repo, 'unshelve', 'bundle:' + self.vfs.join(self.fname), targetphase=phases.secret) - if isinstance(gen, bundle2.unbundle20): + else: bundle2.applybundle(self.repo, gen, self.repo.currenttransaction(), source='unshelve',