[Qt-creator] Qt Creator and version control: Invoke visual diff viewer on diff

[Alfonso Chartier]

Thanks for the clarification Eike.

One feature I'd like to request for the diff viewer (assuming you aren't
already planning on implementing this), is the ability to modify the files
being diff-ed. I'm thinking of something similar to Meld where you can
click the right or left arrows to copy a code block from one file into the
other. The option to replace the content of an entire file with the other
would also be nice (it would essentially be a quick way to revert).

I mention this because I think I'd probably still find myself using Meld
with Qt Creator 2.8 if there is no built-in ability to modify/update the
diff-ed files like this.

Best,

Alfonso


On Wed, Apr 17, 2013 at 2:11 AM, Ziller Eike <Eike.Ziller at digia.com> wrote:

>
> On 17.04.2013, at 09:14, Gena Bug <archaerolog at mail.ru> wrote:
>
> > On Tue April 16 2013 22:26:56 Alfonso Chartier wrote:
> >> Thank Eike. I see the Tools / Diff... menu now. I like how the visual
> diff
> >> is integrated into the IDE (as opposed to calling an external program an
> >> opening a separate window).
> >>
> >> I was wondering though, do you have plans to allow the user to do a git
> >> diff on the current file? Currently you are required to browse to the
> two
> >> files separately, which takes quite a bit of time. If there were a quick
> >> way to just do a diff against the repo for the currently-open file that
> >> would be great (maybe add an entry to the right-click menu or Tools /
> Git
> >> menu).
> > Hmm, have you ever tried Alt+G, Alt+D combination for the current file?
> (Or
> > whatever combination is set in Options->Environment->Keyboard (search
> "diff")).
> > Also it's presented in the Tools->Git->Current File menu…
>
>
> And, adding to that, quoting André from this thread:
> "[…] and that the plan is to fully integrate that with the other plugins
> in the 2.8 cycle."
>
> That translates to "use this diff editor also in places where we currently
> show the colored diff output", like when git diff'ing.
>
> ++ Eike
>
> >
> >> I realize this is still experimental, so if you already have plans for
> >> this, please disregard my comment. :)
> >>
> >> Best,
> >>
> >> Alfonso
> >>
> >> On Tue, Apr 16, 2013 at 12:52 AM, Ziller Eike <Eike.Ziller at digia.com>
> wrote:
> >>> On 15.04.2013, at 20:50, Alfonso Chartier <alfonso.chartier at gmail.com>
> >>>
> >>> wrote:
> >>>> Hi all,
> >>>>
> >>>> I am very much interested in trying the experimental visual diff
> viewer
> >>>
> >>> but am unable to find it in the Qt Creator 2.7 UI (I don't see it under
> >>> Tools / Git and nothing specific to it is listed under the Installed
> >>> Plugins list). How can I try it out/invoke it?
> >>>
> >>> The plugin is "About Plugins > Qt Creator > DiffEditor"
> >>> Afaik it adds a menu item Tools > Diff… and an editor for mimetype
> >>> "text/x-patch".
> >>>
> >>> Br, Eike
> >>>
> >>>> On Mon, Apr 15, 2013 at 12:18 AM, Dini Chillet <
> dini.chillet at fukuda.ch>
> >>>
> >>> wrote:
> >>>> Hi all,
> >>>>
> >>>> I just tried the "diff viewer".
> >>>> Its so great, we are waiting for this feature since the beginning.
> >>>>
> >>>> How can we make feedback?
> >>>> I know, it is experimental, so maybe this is the good time to make
> some
> >>>
> >>> suggestions, isnt it?
> >>>
> >>>> Thanks
> >>>> Best Regards.
> >>>> Dini
> >>>>
> >>>> On 03/05/2013 09:00 PM, André Pönitz wrote:
> >>>>> On Mon, Mar 04, 2013 at 06:10:17PM -0800, Alfonso Chartier wrote:
> >>>>>> Hi,
> >>>>>>
> >>>>>> I am wondering if there is an easy way to bring up a visual diff
> >>>>>> viewer when the diff operation is invoked. Currently, performing a
> >>>>>> diff (Alt + S, Alt + D) brings up a read-only text-based diff in the
> >>>>>> editor. It would be great if a visual diff viewer could be launched
> >>>>>> instead (e.g., Meld).
> >>>>>>
> >>>>>> Is there an easy way to configure this? I did not notice any options
> >>>>>> for this under Tools / Options / Version Control.
> >>>>>
> >>>>> You can configure external tools in Tools->Options->Environemnt
> >>>>> ->External Tools, and also assign keyboard short cuts for
> >>>>> launching them
> >>>>>
> >>>>> Note also that 2.7 will have an experimental diff viewer plugin
> >>>>> and that the plan is to fully integrate that with the other
> >>>>> plugins in the 2.8 cycle.
> >>>>>
> >>>>> Andre'
> >>>>>
> >>>>> _______________________________________________
> >>>>> Qt-creator mailing list
> >>>>>
> >>>>> Qt-creator at qt-project.org
> >>>>> http://lists.qt-project.org/mailman/listinfo/qt-creator
> >>>>
> >>>> _______________________________________________
> >>>> Qt-creator mailing list
> >>>> Qt-creator at qt-project.org
> >>>> http://lists.qt-project.org/mailman/listinfo/qt-creator
> >>>
> >>> --
> >>> Eike Ziller, Senior Software Engineer - Digia, Qt
> >>>
> >>> Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin
> >>> Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius
> >>> Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht
> >>> Charlottenburg, HRB 144331 B
> > _______________________________________________
> > Qt-creator mailing list
> > Qt-creator at qt-project.org
> > http://lists.qt-project.org/mailman/listinfo/qt-creator
>
> --
> Eike Ziller, Senior Software Engineer - Digia, Qt
>
> Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin
> Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius
> Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht
> Charlottenburg, HRB 144331 B
>
> _______________________________________________
> Qt-creator mailing list
> Qt-creator at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/qt-creator
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/qt-creator/attachments/20130417/badcf86f/attachment.html>