{"thread":{"id":"9378","subject":"git-gui console app ?","startedAt":"2007-08-04T10:10:58Z","lastAt":"2007-08-11T10:22:29Z","messageCount":14,"participants":["Erik Colson","Johannes Schindelin","Jeff King","Junio C Hamano","David Kågedal","Jonas Fonseca"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"49690","messageId":"20070804101058.GA520@Mac2.local","threadId":"9378","inReplyTo":null,"subject":"git-gui console app ?","fromName":"Erik Colson","fromEmail":"eco@ecocode.net","sentAt":"2007-08-04T10:10:58Z","receivedAt":"2007-08-04T10:10:58Z","isPatch":false,"sender":{"key":"eco@ecocode.net","avatar":"https://gravatar.com/avatar/49c3fa7fa68eb4dc97ad0bcf6ca1bafb4bba97d03d9553830b5cf27adcf43539?d=mp&s=160"},"body":"Hello !\n\ngit-gui is a nice application and I like to use it while developping.\nHowever as probably a lot of developpers do, I regularly code in Emacs\nfrom a distant ssh client.\nTherefor I'd want to find some app like git-gui running in console...\nDoes this exist or is there a project in development ?\n\nThanks for info\n\n-- \nErik\n"},{"id":"49695","messageId":"Pine.LNX.4.64.0708041225520.14781@racer.site","threadId":"9378","inReplyTo":"20070804101058.GA520@Mac2.local","subject":"Re: git-gui console app ?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-08-04T11:29:03Z","receivedAt":"2007-08-04T11:29:03Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 4 Aug 2007, Erik Colson wrote:\n\n> git-gui is a nice application and I like to use it while developping.\n> However as probably a lot of developpers do, I regularly code in Emacs\n> from a distant ssh client.\n> Therefor I'd want to find some app like git-gui running in console...\n> Does this exist or is there a project in development ?\n\nThere is tig.  http://repo.or.cz/w/tig.git\n\nIt is something similar to gitk but based on curses, so it is a viewer for \nnow.  But I do not see any fundamental reason why it should not be \npossible to teach it many of the tricks git-gui does.\n\nJust fork it (you can even do that on repo.or.cz; tig.git is mirrored \nthere), and give it a go!\n\nCiao,\nDscho\n"},{"id":"49702","messageId":"20070804115331.GA2962@Mac2.local","threadId":"9378","inReplyTo":"Pine.LNX.4.64.0708041225520.14781@racer.site","subject":"Re: git-gui console app ?","fromName":"Erik Colson","fromEmail":"eco@ecocode.net","sentAt":"2007-08-04T11:53:31Z","receivedAt":"2007-08-04T11:53:31Z","isPatch":false,"sender":{"key":"eco@ecocode.net","avatar":"https://gravatar.com/avatar/49c3fa7fa68eb4dc97ad0bcf6ca1bafb4bba97d03d9553830b5cf27adcf43539?d=mp&s=160"},"body":"On Sat, Aug 04, 2007 at 12:29:03PM +0100, Johannes Schindelin wrote:\n> Hi,\n> \n> On Sat, 4 Aug 2007, Erik Colson wrote:\n> \n> > git-gui is a nice application and I like to use it while developping.\n> > However as probably a lot of developpers do, I regularly code in Emacs\n> > from a distant ssh client.\n> > Therefor I'd want to find some app like git-gui running in console...\n> > Does this exist or is there a project in development ?\n> \n> There is tig.  http://repo.or.cz/w/tig.git\n> \n> It is something similar to gitk but based on curses, so it is a viewer for \n> now.  But I do not see any fundamental reason why it should not be \n> possible to teach it many of the tricks git-gui does.\n> \n> Just fork it (you can even do that on repo.or.cz; tig.git is mirrored \n> there), and give it a go!\n\nThanks for the very fast answer. I'm currently trying it out. However\nI can't figure out how to view the 'changed but not updated' in diff\nformat...\nAny clue what I'm missing ?\n\n-- \nErik\n"},{"id":"49704","messageId":"20070804120342.GC9716@coredump.intra.peff.net","threadId":"9378","inReplyTo":"20070804115331.GA2962@Mac2.local","subject":"Re: git-gui console app ?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-08-04T12:03:42Z","receivedAt":"2007-08-04T12:03:42Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Aug 04, 2007 at 01:53:31PM +0200, Erik Colson wrote:\n\n> Thanks for the very fast answer. I'm currently trying it out. However\n> I can't figure out how to view the 'changed but not updated' in diff\n> format...\n\ngit-diff ?\n\nBy default, it will show the changes between your working tree and the\nindex (i.e., changed but not updated). You can show the diff of \"updated\nbut not commited\" with \"git-diff --cached\".\n\n-Peff\n"},{"id":"49711","messageId":"20070804123834.GA3036@Mac2.local","threadId":"9378","inReplyTo":"20070804120342.GC9716@coredump.intra.peff.net","subject":"Re: git-gui console app ?","fromName":"Erik Colson","fromEmail":"eco@ecocode.net","sentAt":"2007-08-04T12:38:34Z","receivedAt":"2007-08-04T12:38:34Z","isPatch":false,"sender":{"key":"eco@ecocode.net","avatar":"https://gravatar.com/avatar/49c3fa7fa68eb4dc97ad0bcf6ca1bafb4bba97d03d9553830b5cf27adcf43539?d=mp&s=160"},"body":"On Sat, Aug 04, 2007 at 08:03:42AM -0400, Jeff King wrote:\n> On Sat, Aug 04, 2007 at 01:53:31PM +0200, Erik Colson wrote:\n> \n> > Thanks for the very fast answer. I'm currently trying it out. However\n> > I can't figure out how to view the 'changed but not updated' in diff\n> > format...\n> \n> git-diff ?\n> \n> By default, it will show the changes between your working tree and the\n> index (i.e., changed but not updated). You can show the diff of \"updated\n> but not commited\" with \"git-diff --cached\".\n\nPeff,\n\nyep that is the info I would like to browse in a way git-gui does it...\nshowing a list of the files in the diff, and letting the user select a\nfile to show the part of the diff for that file.\n\n-- \nErik\n"},{"id":"49768","messageId":"7vhcnfgn6s.fsf@assigned-by-dhcp.cox.net","threadId":"9378","inReplyTo":"20070804123834.GA3036@Mac2.local","subject":"Re: git-gui console app ?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-04T18:38:19Z","receivedAt":"2007-08-04T18:38:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Erik Colson <eco@ecocode.net> writes:\n\n> On Sat, Aug 04, 2007 at 08:03:42AM -0400, Jeff King wrote:\n>> On Sat, Aug 04, 2007 at 01:53:31PM +0200, Erik Colson wrote:\n>> \n>> > Thanks for the very fast answer. I'm currently trying it out. However\n>> > I can't figure out how to view the 'changed but not updated' in diff\n>> > format...\n>> \n>> git-diff ?\n>> \n>> By default, it will show the changes between your working tree and the\n>> index (i.e., changed but not updated). You can show the diff of \"updated\n>> but not commited\" with \"git-diff --cached\".\n>\n> Peff,\n>\n> yep that is the info I would like to browse in a way git-gui does it...\n> showing a list of the files in the diff, and letting the user select a\n> file to show the part of the diff for that file.\n\nSince you are an Emacs user, perhaps contrib/emacs/* would be\nmore to your taste?\n \n"},{"id":"49857","messageId":"20070805101953.GI12507@coredump.intra.peff.net","threadId":"9378","inReplyTo":"20070804123834.GA3036@Mac2.local","subject":"Re: git-gui console app ?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-08-05T10:19:53Z","receivedAt":"2007-08-05T10:19:53Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Aug 04, 2007 at 02:38:34PM +0200, Erik Colson wrote:\n\n> > By default, it will show the changes between your working tree and the\n> > index (i.e., changed but not updated). You can show the diff of \"updated\n> > but not commited\" with \"git-diff --cached\".\n> \n> yep that is the info I would like to browse in a way git-gui does it...\n> showing a list of the files in the diff, and letting the user select a\n> file to show the part of the diff for that file.\n\nAh, I see. There is a status mode for tig (tig -S), but you can't jump\nto the diff of a particular file. It shouldn't be that difficult to add\nfor somebody familiar with the tig codebase, but I am not such a\nsomebody.\n\nJonas, am I right that this should be a one-liner? If you can point me\nin the right direction, I can try to take a closer look, but I'm having\ntrouble following the code.\n\n-Peff\n"},{"id":"50131","messageId":"87k5s7e88d.fsf@morpheus.local","threadId":"9378","inReplyTo":"20070804101058.GA520@Mac2.local","subject":"Re: git-gui console app ?","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2007-08-07T14:21:06Z","receivedAt":"2007-08-07T14:21:06Z","isPatch":false,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"Erik Colson <eco@ecocode.net> writes:\n\n> Hello !\n>\n> git-gui is a nice application and I like to use it while developping.\n> However as probably a lot of developpers do, I regularly code in Emacs\n> from a distant ssh client.\n> Therefor I'd want to find some app like git-gui running in console...\n> Does this exist or is there a project in development ?\n\nIf you are already using emacs, why not use the emacs frontend?  It\nisn't as featureful as git gui right now, but it integrates better\nwith your emacs.\n\n-- \nDavid Kågedal\n"},{"id":"50134","messageId":"20070807151831.GB6717@Mac2.local","threadId":"9378","inReplyTo":"87k5s7e88d.fsf@morpheus.local","subject":"Re: git-gui console app ?","fromName":"Erik Colson","fromEmail":"eco@ecocode.net","sentAt":"2007-08-07T15:18:31Z","receivedAt":"2007-08-07T15:18:31Z","isPatch":false,"sender":{"key":"eco@ecocode.net","avatar":"https://gravatar.com/avatar/49c3fa7fa68eb4dc97ad0bcf6ca1bafb4bba97d03d9553830b5cf27adcf43539?d=mp&s=160"},"body":"On Tue, Aug 07, 2007 at 04:21:06PM +0200, David Kågedal wrote:\n> If you are already using emacs, why not use the emacs frontend?  It\n> isn't as featureful as git gui right now, but it integrates better\n> with your emacs.\n\nI'm actually using git-status in Emacs. But I'd like to access repo\ndiffs in a gui like tig. It's quite nice excepted that I can't figure\nout how to show the result of git-diff --cached\n\n-- \nErik\n"},{"id":"50407","messageId":"20070810133132.GA3770@diku.dk","threadId":"9378","inReplyTo":"20070805101953.GI12507@coredump.intra.peff.net","subject":"Re: git-gui console app ?","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2007-08-10T13:31:32Z","receivedAt":"2007-08-10T13:31:32Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Jeff King <peff@peff.net> wrote Sun, Aug 05, 2007:\n> On Sat, Aug 04, 2007 at 02:38:34PM +0200, Erik Colson wrote:\n> \n> > > By default, it will show the changes between your working tree and the\n> > > index (i.e., changed but not updated). You can show the diff of \"updated\n> > > but not commited\" with \"git-diff --cached\".\n> > \n> > yep that is the info I would like to browse in a way git-gui does it...\n> > showing a list of the files in the diff, and letting the user select a\n> > file to show the part of the diff for that file.\n> \n> Ah, I see. There is a status mode for tig (tig -S), but you can't jump\n> to the diff of a particular file. It shouldn't be that difficult to add\n> for somebody familiar with the tig codebase, but I am not such a\n> somebody.\n> \n> Jonas, am I right that this should be a one-liner? If you can point me\n> in the right direction, I can try to take a closer look, but I'm having\n> trouble following the code.\n\nNot quite a one-liner, but I've implemented something that will show\ndiffs of staged/unstaged changes as well as the content of untracked\nfiles when pressing Enter on a file in the status view. To update the\nstatus of a file (unstaged->staged, untracked->staged, etc) you now\nhave to press 'u'.\n\nHope this helps.\n\n-- \nJonas Fonseca\n"},{"id":"50413","messageId":"20070810142104.GA10997@sigill.intra.peff.net","threadId":"9378","inReplyTo":"20070810133132.GA3770@diku.dk","subject":"Re: git-gui console app ?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-08-10T14:21:04Z","receivedAt":"2007-08-10T14:21:04Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Aug 10, 2007 at 03:31:32PM +0200, Jonas Fonseca wrote:\n\n> Not quite a one-liner, but I've implemented something that will show\n> diffs of staged/unstaged changes as well as the content of untracked\n> files when pressing Enter on a file in the status view. To update the\n> status of a file (unstaged->staged, untracked->staged, etc) you now\n> have to press 'u'.\n\nNice. This was exactly what I had envisioned. Minor help text fixup is\nbelow.\n\n-Peff\n\n-- >8 --\nstatus window: mention 'u' instead of Enter\n\nCommits ca1d71ea and 89d917a bound the Enter functionality\nto 'u' (and Enter now shows the diff).\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\n tig.c |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/tig.c b/tig.c\nindex d9c9df8..40670e2 100644\n--- a/tig.c\n+++ b/tig.c\n@@ -3156,15 +3156,15 @@ status_select(struct view *view, struct line *line)\n \n \tswitch (line->type) {\n \tcase LINE_STAT_STAGED:\n-\t\ttext = \"Press Enter to unstage file for commit\";\n+\t\ttext = \"Press 'u' to unstage file for commit\";\n \t\tbreak;\n \n \tcase LINE_STAT_UNSTAGED:\n-\t\ttext = \"Press Enter to stage file for commit  \";\n+\t\ttext = \"Press 'u' to stage file for commit  \";\n \t\tbreak;\n \n \tcase LINE_STAT_UNTRACKED:\n-\t\ttext = \"Press Enter to stage file for addition\";\n+\t\ttext = \"Press 'u' to stage file for addition\";\n \t\tbreak;\n \n \tcase LINE_STAT_NONE:\n-- \n1.5.2.4\n"},{"id":"50414","messageId":"20070810142540.GE363@Mac2.local","threadId":"9378","inReplyTo":"20070810133132.GA3770@diku.dk","subject":"Re: git-gui console app ?","fromName":"Erik Colson","fromEmail":"eco@ecocode.net","sentAt":"2007-08-10T14:25:40Z","receivedAt":"2007-08-10T14:25:40Z","isPatch":false,"sender":{"key":"eco@ecocode.net","avatar":"https://gravatar.com/avatar/49c3fa7fa68eb4dc97ad0bcf6ca1bafb4bba97d03d9553830b5cf27adcf43539?d=mp&s=160"},"body":"On Fri, Aug 10, 2007 at 03:31:32PM +0200, Jonas Fonseca wrote:\n> Not quite a one-liner, but I've implemented something that will show\n> diffs of staged/unstaged changes as well as the content of untracked\n> files when pressing Enter on a file in the status view. To update the\n> status of a file (unstaged->staged, untracked->staged, etc) you now\n> have to press 'u'.\n> \n> Hope this helps.\n\nWorks like a charm ! Thanks for the implementation.  Btw, I'm using\ngit (and tig) on MacosX and got it compiled by using the same remarks\nyou mention for FreeBSD, so may be you could add this to the INSTALL\ndocument...\n\n-- \nErik\n"},{"id":"50471","messageId":"20070811101122.GB25053@diku.dk","threadId":"9378","inReplyTo":"20070810142104.GA10997@sigill.intra.peff.net","subject":"Re: git-gui console app ?","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2007-08-11T10:11:22Z","receivedAt":"2007-08-11T10:11:22Z","isPatch":false,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Jeff King <peff@peff.net> wrote Fri, Aug 10, 2007:\n> On Fri, Aug 10, 2007 at 03:31:32PM +0200, Jonas Fonseca wrote:\n> \n> > Not quite a one-liner, but I've implemented something that will show\n> > diffs of staged/unstaged changes as well as the content of untracked\n> > files when pressing Enter on a file in the status view. To update the\n> > status of a file (unstaged->staged, untracked->staged, etc) you now\n> > have to press 'u'.\n> \n> Nice. This was exactly what I had envisioned. Minor help text fixup is\n> below.\n\nThanks! I forgot to mention that I applied something like what you\nsent yesterday.\n\n-- \nJonas Fonseca\n"},{"id":"50472","messageId":"2c6b72b30708110322i53bb713fka6fe259b43a95b45@mail.gmail.com","threadId":"9378","inReplyTo":"20070810142540.GE363@Mac2.local","subject":"Re: git-gui console app ?","fromName":"Jonas Fonseca","fromEmail":"jonas.fonseca@gmail.com","sentAt":"2007-08-11T10:22:29Z","receivedAt":"2007-08-11T10:22:29Z","isPatch":false,"sender":{"key":"jonas.fonseca@gmail.com","avatar":"https://gravatar.com/avatar/9b7fa23cce50269e5d164312b6ac5ae818a180f837b38f28f3bdf689dd7f96cd?d=mp&s=160"},"body":"On 8/10/07, Erik Colson <eco@ecocode.net> wrote:\n> On Fri, Aug 10, 2007 at 03:31:32PM +0200, Jonas Fonseca wrote:\n> > Not quite a one-liner, but I've implemented something that will show\n> > diffs of staged/unstaged changes as well as the content of untracked\n> > files when pressing Enter on a file in the status view. To update the\n> > status of a file (unstaged->staged, untracked->staged, etc) you now\n> > have to press 'u'.\n> >\n> > Hope this helps.\n>\n> Works like a charm ! Thanks for the implementation.\n\nGood to hear.\n\nNow, I have to figure out how to clone git-gui's ability to stage\nindividual diff (c)hunks ... :)\n\n> Btw, I'm using\n> git (and tig) on MacosX and got it compiled by using the same remarks\n> you mention for FreeBSD, so may be you could add this to the INSTALL\n> document...\n\nYes, it might be a good idea to add it, but I would like to add\na configure script to figure this sort of thing out automatically.\n\n-- \nJonas Fonseca\n"}]}