Commits

Augie Fackler committed f44f84c Merge

Merge whitespace diffopt fix.

Comments (0)

Files changed (1)

     fp = os.fdopen(fd, 'w')
     diffopts = patch.diffopts(ui, opts)
     diffopts.git = True
+    diffopts.ignorews = False
+    diffopts.ignorewsamount = False
+    diffopts.ignoreblanklines = False
     gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
     for chunk in gen:
         fp.write(chunk)
     fp = os.fdopen(fd, 'w')
     diffopts = patch.diffopts(ui, opts)
     diffopts.git = True
+    diffopts.ignorews = False
+    diffopts.ignorewsamount = False
+    diffopts.ignoreblanklines = False
     gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
     for chunk in gen:
         fp.write(chunk)
     fp = os.fdopen(fd, 'w')
     diffopts = patch.diffopts(ui, opts)
     diffopts.git = True
+    diffopts.ignorews = False
+    diffopts.ignorewsamount = False
+    diffopts.ignoreblanklines = False
     gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
     for chunk in gen:
         fp.write(chunk)
     fp = os.fdopen(fd, 'w')
     diffopts = patch.diffopts(ui, opts)
     diffopts.git = True
+    diffopts.ignorews = False
+    diffopts.ignorewsamount = False
+    diffopts.ignoreblanklines = False
     gen = patch.diff(repo, parent, newnode, opts=diffopts)
     for chunk in gen:
         fp.write(chunk)