Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compare history versions #103

Closed
wants to merge 14 commits into from
Closed

Conversation

macro1
Copy link
Collaborator

@macro1 macro1 commented Jul 6, 2014

Some initial work on an admin view to compare historical versions. I was having some trouble with compatibility with 1.3 and 1.4 versions of Django admin, so for now I'm ignoring 1.3.

Will resolve #54.

@treyhunner
Copy link
Member

👍 for dropping 1.3 and 1.4 compatibility

@macro1
Copy link
Collaborator Author

macro1 commented Jul 12, 2014

I happen to see one of the diffs Groklaw has... I may try to do something like that instead of the word diff that's in this PR currently. I think it'll be a two step diff: Line comparison and words within lines that both changed.

@treyhunner
Copy link
Member

I think side-by-side might be better than inline.

@macro1
Copy link
Collaborator Author

macro1 commented Jul 12, 2014

Yeah. One side having the removals, the other the additions. The problem with side-by-side is you need to line up the paragraphs for larger diff's.

@macro1
Copy link
Collaborator Author

macro1 commented Jul 13, 2014

@treyhunner, we should probably add Python 3.4 with Django 1.7 to the matrix. Want me to add that here as well?

@treyhunner
Copy link
Member

@macro1 yes please

@treyhunner
Copy link
Member

It's kind of ugly but I think this is much better than nothing.



@register.simple_tag
def diff_table(a, b, line_split="\n"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add unit tests for this?

@macro1
Copy link
Collaborator Author

macro1 commented Dec 8, 2014

This may be helpful: https://github.com/jeffkaufman/icdiff/blob/master/icdiff

I was already looking at HtmlDiff when I was working on this, but checking his changes may be helpful.

@jlachowski
Copy link

Hi,
what is the status of this? will it be merged into the master?

@treyhunner
Copy link
Member

I'd love to see someone recreate these changes after #277 is merged.

@rossmechanic
Copy link
Collaborator

Closed this with an accepted issue (#396) and will put up an updated PR soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Give ability to compare two history versions
4 participants