##// END OF EJS Templates
bundle2: use "else" instead of checking condition again
Martin von Zweigbergk -
r32881:f65786a0 default
parent child Browse files
Show More
@@ -1200,7 +1200,7 b' def _aborthistedit(ui, repo, state):'
1200 with repo.transaction('histedit.abort') as tr:
1200 with repo.transaction('histedit.abort') as tr:
1201 if not isinstance(gen, bundle2.unbundle20):
1201 if not isinstance(gen, bundle2.unbundle20):
1202 gen.apply(repo, 'histedit', 'bundle:' + backupfile)
1202 gen.apply(repo, 'histedit', 'bundle:' + backupfile)
1203 if isinstance(gen, bundle2.unbundle20):
1203 else:
1204 bundle2.applybundle(repo, gen, tr,
1204 bundle2.applybundle(repo, gen, tr,
1205 source='histedit',
1205 source='histedit',
1206 url='bundle:' + backupfile)
1206 url='bundle:' + backupfile)
@@ -130,7 +130,7 b' class shelvedfile(object):'
130 gen.apply(self.repo, 'unshelve',
130 gen.apply(self.repo, 'unshelve',
131 'bundle:' + self.vfs.join(self.fname),
131 'bundle:' + self.vfs.join(self.fname),
132 targetphase=phases.secret)
132 targetphase=phases.secret)
133 if isinstance(gen, bundle2.unbundle20):
133 else:
134 bundle2.applybundle(self.repo, gen,
134 bundle2.applybundle(self.repo, gen,
135 self.repo.currenttransaction(),
135 self.repo.currenttransaction(),
136 source='unshelve',
136 source='unshelve',
General Comments 0
You need to be logged in to leave comments. Login now