threads / discuss / 2890

Random notes about qgit

Subject: Random notes about qgit

## tl;dr

3 messages between Dec 21, 2005 and Dec 21, 2005.

replies: 2people: 1as markdown or json

Pavel Roskin· Dec 21, 2005, 02:48 UTC · lore

Hello, Marco!

Here's some assorted notes about current qgit.

Thanks for making the range dialog optional, but now I don't see any way to see the local changes unless I re-enable the dialog. I think it should be an action activated from the menu - "diff local files to this revision". Or maybe the "local" radio button in the diff pane.

Current qgit seems to have another crash, also annotation related. Run qgit on its own repository. Select "Add range select dialog options", then double click on src/commitimpl.cpp in the file list. Sometimes it works, sometimes it crashes like this:

ASSERT getFileAnnotation: no revision 9771bea705024b3d0a59e1b9144adf5d77ca82d1

Sometimes you need to select other revisions and double click on other files. Another assert I got was:

ASSERT getFileAnnotation: no revision bbf2abcbcafc2e458343034c8f249ac4956ec4fb

"git-cat-file commit" works fine on both revisions. Just in case, I'm seeing this on x86_64.

"View->Revision Diff" and "View->Archive Tree" work differently. The former doesn't allow to turn the pane off. I'd like it to work like "View->Archive Tree". Neither can "Revision Diff" be closed from the popup menu.

-- 
Regards,
Pavel Roskin

Pavel Roskin· Dec 21, 2005, 16:22 UTC · lore

Re: Random notes about qgit

On Wed, 2005-12-21 at 13:17 +0100, Marco Costalba wrote:

Show 10 quoted lines

> On 12/21/05, Pavel Roskin <proski@gnu.org> wrote:
> 
> > Thanks for making the range dialog optional, but now I don't see any way
> > to see the local changes unless I re-enable the dialog.  I think it
> > should be an action activated from the menu - "diff local files to this
> > revision".  Or maybe the "local" radio button in the diff pane.
> >
> 
> Actually you could re-enable working dir diffs from
> menu->edit->settings->'git index'

Indeed.  Thank you!

> Do you think is too hidden?

It shouldn't be an option. It should be an action, available on demand, regardless of options. In the majority of cases, only diff to the head revision is needed, but some users may want to see diff against other revisions, e.g. when verifying manual merge.

Maybe there should be an option to check the local diff on startup and indicate it somehow (not necessarily in the revision list) if it's not empty.

But I'm not a GUI expert and I don't know how to make it easy to discover without being constantly in the way.

Show 10 quoted lines

> > Current qgit seems to have another crash, also annotation related.  Run
> > qgit on its own repository.  Select "Add range select dialog options",
> > then double click on src/commitimpl.cpp in the file list.  Sometimes it
> > works, sometimes it crashes like this:
> >
> > ASSERT getFileAnnotation: no revision
> > 9771bea705024b3d0a59e1b9144adf5d77ca82d1
> 
> I cannot reproduce the bug but please Pavel, add qDebug() lines
> in git.cpp as following:

OK, this will be a in separate thread.

Show 7 quoted lines

> > "View->Revision Diff" and "View->Archive Tree" work differently.  The
> > former doesn't allow to turn the pane off.  I'd like it to work like
> > "View->Archive Tree".  Neither can "Revision Diff" be closed from the
> > popup menu.
> >
> 
> Yes, "View->Revision Diff" should be a toggle action.  ;-)

OK

-- 
Regards,
Pavel Roskin

Pavel Roskin· Dec 21, 2005, 16:56 UTC · lore

getFileAnnotation: no revision

On Wed, 2005-12-21 at 13:17 +0100, Marco Costalba wrote:

> I cannot reproduce the bug but please Pavel, add qDebug() lines
> in git.cpp as following:

Please use a mail client that doesn't damage inline attachments, or use attachments. The diff was wrapped before it was base64 encoded. I had to unwrap it manually. Although, I guess you don't have much choice with Google.

I had to replace %i with %li and (int) with (long) to make the compiler happy. It's a 64-bit platform.

> Then, please, try to reproduce the crash and send me the output.

$ bin/qgit Git::cancelAnnotate 0 Git::getFileHistory src/commitimpl.cpp Git::startAnnotate 7943344 Git::runAnnotate 7943344 ASSERT getFileAnnotation: no revision bbf2abcbcafc2e458343034c8f249ac4956ec4fb cancelingAnnotate 0 Segmentation fault

-- 
Regards,
Pavel Roskin