Patchwork obsstore: fix defaultformat option passing

login
register
mail settings
Submitter Durham Goode
Date Oct. 15, 2014, 7:55 p.m.
Message ID <d627d886a7d658956312.1413402949@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/6280/
State Accepted
Headers show

Comments

Durham Goode - Oct. 15, 2014, 7:55 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1413402730 25200
#      Wed Oct 15 12:52:10 2014 -0700
# Node ID d627d886a7d6589563123407a7100e281fbb7b6e
# Parent  75d0edb68b417964110e3fcd69187c867f31a119
obsstore: fix defaultformat option passing

The obsstore format passing was not actually being passed to the obsstore. This
fixes it.
Pierre-Yves David - Oct. 15, 2014, 9:35 p.m.
On 10/15/2014 12:55 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1413402730 25200
> #      Wed Oct 15 12:52:10 2014 -0700
> # Node ID d627d886a7d6589563123407a7100e281fbb7b6e
> # Parent  75d0edb68b417964110e3fcd69187c867f31a119
> obsstore: fix defaultformat option passing

Pushed to the clowncopter after adding a test. Thanks!

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -405,7 +405,7 @@  class localrepository(object):
         # rely on obsstore class default when possible.
         kwargs = {}
         if defaultformat is not None:
-            defaultformat['defaultformat'] = defaultformat
+            kwargs['defaultformat'] = defaultformat
         store = obsolete.obsstore(self.sopener, **kwargs)
         if store and not obsolete._enabled:
             # message is rare enough to not be translated