On 21.09.2009 20:51, Steve Borho wrote: > On Mon, Sep 21, 2009 at 11:58 AM, Adrian Buehlmann <adr...@cadifra.com> wrote: >> On 21.09.2009 14:52, Adrian Buehlmann wrote: >>> On 21.09.2009 08:57, Peer Sommerlund wrote: >>>> Hi list >>>> >>>> I have recieved the following exception upon merging using "hgtk ci" >>>> with a file that should be resolved. The bug report dialog shows up >>>> after I closed the main dialog, but I suspect it happened after commit >>>> followed by refresh. >>>> >>>> Traceback (most recent call last): >>>> File "E:\src\mercurial\thg\branch-view\tortoisehg\hgtk\status.py", >>>> line 932, in tree_sel_changed >>>> buf = self.generate_text_diffs(row) >>>> File "E:\src\mercurial\thg\branch-view\tortoisehg\hgtk\status.py", >>>> line 1000, in generate_text_diffs >>>> for s in patch.diff(self.repo, pctxs[1].node(), None, >>>> IndexError: list index out of range >>>> >>>> A peek at the code in status.py made me suspect line 206 in get_body(self) >>>> self.merging = (self.count_revs() < 2 >>>> and len(self.repo.parents()) == 2) >>>> >>>> As far as I could tell get_body is called only once during construction, >>>> so when the merge has been committed, the flag self.merging is not >>>> updated to False. >>>> >>> I think I managed to make the status dialog survive repo merge / non-merge >>> state changes. It should pick up the new state on refresh. >>> >>> Please pull >>> http://bitbucket.org/abuehl/thg-abuehl/changeset/b9fbfaca467d/ >>> >>> I haven't looked at the commit dialog yet. >>> >> Commit dialog should be fine with >> http://bitbucket.org/abuehl/thg-abuehl/changeset/00999fa85730 > > Can I close issue #276? It looks like you've tackled the issues head > on. Based on my tests it looks like the issues are resolved. Did I > miss anything?
I've closed it. There might still be minor glitches on merge state changes, but they should be easy to fix now. ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
