Textual Diff?

Hi,

can I get a textual diff from within IDEA? I checked out a public SVN repository and did some local enhancements. I can see my diffs in the nice graphical window but how do I get a 'diff -u' output to submit it as a patch through email? Can I do that with IDEA or do I have to download an SVN client?

Thx
Matthias

11 comments
Comment actions Permalink

I was considering writing a plugin similar to the Commit Changes dialog,
that would create a textual diff of the selected files and send it via email
(optionally in colour) for a code review to one or more people. I'm not likely
to find the time to do this in the near future though so if someone is interested
in picking up this idea it would be great!

Hi,

can I get a textual diff from within IDEA? I checked out a public SVN
repository and did some local enhancements. I can see my diffs in the
nice graphical window but how do I get a 'diff -u' output to submit it
as a patch through email? Can I do that with IDEA or do I have to
download an SVN client?

Thx
Matthias



0
Comment actions Permalink

Thanks. Actually the diff itself would be enough for me. I can send an email myself.

So can I take your answer as a "no, not possible right now" ?

Matthias

0
Comment actions Permalink

You could launch diff as an external tool.

0
Comment actions Permalink

You could launch diff as an external tool.


diff what against what? SVN->Show History->Jump To Source does not reveal the temp file name (copy path copies the path of my local file). The macro FilePath also evaluates to the path of my local copy, not the path of the file that holds the repository version.

So the shortest way to do that is

  • SVN->Show History->Jump To Source

  • Save as other file

  • invoke diff manually


Looks like a feature request ...

Thanks
Matthias

0
Comment actions Permalink

Hi Matthias,

ME> Looks like a feature request ...

Creating patches is/was planeed for this release. But then, again, it was
planned for the previous one (and then de-scoped), and the one before that,
I believe...

Jetbrains, can we get a firm answer whether you'll do this or not? I even
thought about writing a plugin last year, but then gave up when you announced
it would be in 5.0 (after much debate and delay). Is it still in scope for
Demetra?

Best,
Andrei


0
Comment actions Permalink

Matthias Ernst wrote:
>>You could launch diff as an external tool.


diff what against what? SVN->Show History->Jump To Source does not reveal the temp file name (copy path copies the path of my local file). The macro FilePath also evaluates to the path of my local copy, not the path of the file that holds the repository version.


Why not just run "svn diff" from external tools?

Install the svn command line tools.

Settings -> External Tools -> Add...
Name = "svn diff"
Group = "svn"
Program = "svn"
Parameters = "diff $FilePath$"

OK -> OK -> Close

Right click directory in project tree -> svn -> svn diff


Good luck.

Kreiger



Attachment(s):
signature.asc
0
Comment actions Permalink

I'm pretty sure patches was never on the Demetra release plan (although it was on Pallada and Irida). I would guess it's been descoped with extreme predjudice, but I have no inside knowlege.

--Dave Griffith

0
Comment actions Permalink

Dave Griffith wrote:

I'm pretty sure patches was never on the Demetra release plan
(although it was on Pallada and Irida).


According to the JIRA issue it is still planned for Demetra:
http://www.jetbrains.net/jira/browse/IDEADEV-2660
Not that that means it will go in. Patches always seem to be on the
bottom of the list for new IDEA versions and keep falling of:-)

Bas

0
Comment actions Permalink

Hi Dave,

DG> I'm pretty sure patches was never on the Demetra release plan

Jira still shows it planned for Demetra, let's hope it makes it to the finish
line this time.

Best,
Andrei

http://www.jetbrains.net/jira/browse/IDEADEV-2660


0
Comment actions Permalink

Whoops. You're right. I was going by the top-level roadmap.

--Dave Griffith

0
Comment actions Permalink

Why not just run "svn diff" from external tools?


Sure. I could download a command line svn client and a cvs client and a perforce client. Still no patches for the local history. Sorry, but that is something I would hope to get from the IDE. It has this wonderful graphical diff view, all the info is there. Why not 'View as text'?

Thx
Matthias

0

Please sign in to leave a comment.