Patchwork [4,of,7] py3: handle opts correctly for unbundle

login
register
mail settings
Submitter Pulkit Goyal
Date May 4, 2017, 3:16 a.m.
Message ID <3acb9078079918d8de45.1493867806@pulkit-goyal>
Download mbox | patch
Permalink /patch/20417/
State Accepted
Headers show

Comments

Pulkit Goyal - May 4, 2017, 3:16 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1492767272 -19800
#      Fri Apr 21 15:04:32 2017 +0530
# Node ID 3acb9078079918d8de45d96619f8c12871828fa3
# Parent  c8d28b86f3ccb0c06bac98ede55d7296e205e687
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.

Patch

diff -r c8d28b86f3cc -r 3acb90780799 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
@@ -5346,7 +5346,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)')),