git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Random notes about qgit
@ 2005-12-21  2:48 Pavel Roskin
       [not found] ` <e5bfff550512210417p1d363017p9d08e3c55fc841d5@mail.gmail.com>
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Roskin @ 2005-12-21  2:48 UTC (permalink / raw)
  To: Marco Costalba; +Cc: git

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Random notes about qgit
       [not found] ` <e5bfff550512210417p1d363017p9d08e3c55fc841d5@mail.gmail.com>
@ 2005-12-21 16:22   ` Pavel Roskin
  2005-12-21 16:56   ` getFileAnnotation: no revision Pavel Roskin
  1 sibling, 0 replies; 3+ messages in thread
From: Pavel Roskin @ 2005-12-21 16:22 UTC (permalink / raw)
  To: Marco Costalba; +Cc: git

On Wed, 2005-12-21 at 13:17 +0100, Marco Costalba wrote:
> 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.

> > 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.

> > "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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* getFileAnnotation: no revision
       [not found] ` <e5bfff550512210417p1d363017p9d08e3c55fc841d5@mail.gmail.com>
  2005-12-21 16:22   ` Pavel Roskin
@ 2005-12-21 16:56   ` Pavel Roskin
  1 sibling, 0 replies; 3+ messages in thread
From: Pavel Roskin @ 2005-12-21 16:56 UTC (permalink / raw)
  To: Marco Costalba; +Cc: git

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2005-12-21 16:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-12-21  2:48 Random notes about qgit Pavel Roskin
     [not found] ` <e5bfff550512210417p1d363017p9d08e3c55fc841d5@mail.gmail.com>
2005-12-21 16:22   ` Pavel Roskin
2005-12-21 16:56   ` getFileAnnotation: no revision Pavel Roskin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).