On Tue, Nov 16, 2010 at 9:03 AM, Steve Borho <[email protected]> wrote: > On Tue, Nov 16, 2010 at 6:31 AM, André Sintzoff > <[email protected]> wrote: >> 2010/11/16 John Sparrow <[email protected]>: >>> In 1.1.6 when looking in the log, clicking on a file in the left hand pane >>> does not correctly show the diff in the right hand pane! >> >> It seems that >> 9354 (8d8f200b5480) changeset: keep repo.status() output and provide >> to patch.diff() >> @@ -359,9 +361,10 @@ >> m = cmdutil.matchfiles(self.repo, [wfile]) >> opts = mdiff.diffopts(git=True, nodates=True) >> try: >> - for s in patch.diff(self.repo, n1, n2, match=m, opts=opts): >> + for s in patch.diff(self.repo, n1, n2, changes=self.changes, >> + match=m, opts=opts): >> >> causes the regression. >> Unfortunately, I don't understand the exact reason. > > Indeed, that is quite odd. I'll take a look at it this afternoon, and > probably release 1.1.6.1 this evening.
The problem was that the repo.status() call in patch.diff() was where the matcher filter was applied. By passing in the full repo.status() output, patch.diff() always returned diffs of all file affected by the changeset - and our output parser was not intelligent enough to even put dividers between the various file outputs. I have a fix and am building new installers. -- Steve Borho ------------------------------------------------------------------------------ Beautiful is writing same markup. Internet Explorer 9 supports standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today http://p.sf.net/sfu/msIE9-sfdev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
