Edgewall Software

Ticket #1014 (closed enhancement: duplicate)

Opened 4 years ago

Last modified 3 years ago

Diff between arbitrary revisions in the File module

Reported by: thomas.petazzoni@… Owned by: cboos
Priority: normal Milestone:
Component: version control/changeset view Version: 0.8
Severity: normal Keywords:
Cc:

Description

It would be nice to be able to get a diff between two arbitrary revisions for a given file in the sourcecode module. Currently, sourcecode module only allows to see the diff between two successive revisions, but sometimes it's nice to be able to do so between two arbitrary revisions.

I've been told that it would be time consuming on the server, but for some usage, for example, internal use in a company, security problems like DoS are not an issue.

Attachments

Change History

Changed 4 years ago by cboos@…

  • summary changed from Diff between arbitrary revisions in the sourcecode module to Diff between arbitrary revisions in the File module

This is a long standing issue...

There are multiple things that could be done on the topic of diffs:

  • from the Revision Log, be able to select two arbitrary revisions and diff between them. For instance, given a branch, one could select the start rev and last rev to see all what has happened on that branch
  • from the File view, highlight the differences between the version shown and another one (ancestor or successor)

As we already have a ticket for the first way (#199), I think this ticket should be devoted to the second way.

To that effect, I think a little bit of clarification is needed in the summary. What is called sourcecode module by thomas is the File module, I guess. I'm not sure to what he refers when he says that currently one can already see the diff of two successive revs. That's the Changeset module, which is quite a different beast, and more amenable to something like #199.

Changed 4 years ago by Thomas Petazzoni

What I mean by currently one can already see the diff of two successive revs is that the Changeset module allows to see :

  • all the changes of the changeset
  • the changes of the changeset on a particular file (which is in fact the diff of a file between two successive revisions)

Changed 3 years ago by cboos

  • owner changed from jonas to cboos
  • status changed from new to assigned

I think I misunderstood the original reporter's request due to his usage of the term sourcecode module.

I believe what he wanted was simply #199, so this should have been closed as a duplicate in the first place.

On the other hand, what I suggested in my previous comment has been implemented in the TracDiff branch: from the browser module, there's now a direct access to the diff with between the current and the previous revision of the current node, by the way of a Last Changes link.

This link goes to what I call the restricted changeset view, i.e. a subset of a given changeset where only the changes on the paths related to that given node are shown.

From there, a Previous diff link goes to the restricted changeset view for the previous changeset in the node's history.

This makes it easy to go through the change history of a path of interest (a file or a directory).

Changed 3 years ago by cboos

  • status changed from assigned to closed
  • type changed from defect to enhancement
  • resolution set to duplicate

from the browser module, there's now a direct access to the diff with between the current and the previous revision of the current node, by the way of a Last Changes link.

Will be Last Change

From there, a Previous diff link goes to the restricted changeset view for the previous changeset in the node's history.

Will be Previous Change

Now resolving this ticket as a duplicate of #199.

Add/Change #1014 (Diff between arbitrary revisions in the File module)

Author



Change Properties
<Author field>
Action
as closed
Next status will be 'reopened'
 
Note: See TracTickets for help on using tickets.