Patchwork convert: don't use multi argument set.update

login
register
mail settings
Submitter Mads Kiilerich
Date Aug. 31, 2014, 9:13 a.m.
Message ID <5c2331ef5d6641dd4b94.1409476394@localhost.localdomain>
Download mbox | patch
Permalink /patch/5654/
State Accepted
Headers show

Comments

Mads Kiilerich - Aug. 31, 2014, 9:13 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1409476302 -7200
#      Sun Aug 31 11:11:42 2014 +0200
# Node ID 5c2331ef5d6641dd4b947d89b06d2c9dfccf8941
# Parent  ca6d28307d6fd64a0ff9d9504b91f07b1601dc36
convert: don't use multi argument set.update

Mumble mumble 2.4 mumble.

Patch

diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -197,7 +197,8 @@  class mercurial_sink(converter_sink):
             p2 = parents.pop(0)
             fileset = set(files)
             if full:
-                fileset.update(self.repo[p1], self.repo[p2])
+                fileset.update(self.repo[p1])
+                fileset.update(self.repo[p2])
             ctx = context.memctx(self.repo, (p1, p2), text, fileset,
                                  getfilectx, commit.author, commit.date, extra)
             self.repo.commitctx(ctx)