py3: handle opts correctly for unbundle
authorPulkit Goyal <7895pulkit@gmail.com>
Fri, 21 Apr 2017 15:04:32 +0530
changeset 32145 f1aaa100f2a5
parent 32144 93155367a2a6
child 32146 e807c373846a
py3: handle opts correctly for unbundle There is just a check whether the value is None or not. So even having optupdate as unicodes won't harm us.
mercurial/commands.py
--- a/mercurial/commands.py	Fri Apr 21 02:20:46 2017 +0530
+++ b/mercurial/commands.py	Fri Apr 21 15:04:32 2017 +0530
@@ -5340,7 +5340,7 @@
             else:
                 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
 
-    return postincoming(ui, repo, modheads, opts.get('update'), None, None)
+    return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
 
 @command('^update|up|checkout|co',
     [('C', 'clean', None, _('discard uncommitted changes (no backup)')),