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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.