Edgewall Software
Modify ↓

Opened 10 years ago

Closed 9 years ago

#12051 closed defect (fixed)

Generalized diffs for Mercurial repositories

Reported by: anonymous Owned by: Jun Omae
Priority: normal Milestone: plugin - mercurial
Component: plugin/mercurial Version: 1.0-stable
Severity: normal Keywords: diff
Cc: Branch:
Release Notes:

Fix not working diff view between changesets on Mercurial repository.

API Changes:
Internal Changes:

Description

Generalized diffs for Mercurial repositories don't seem to be implemented.

diff:mercurial-plugin@0:44

Attachments (0)

Change History (4)

comment:1 by Jun Omae, 10 years ago

Keywords: diff added
Type: enhancement → defect

It seems that MercurialRepository.get_changes() is broken. The following patch would probably fix it.

  • tracext/hg/backend.py 

    diff -r ed4f0932196b tracext/hg/backend.py
    a b  
    844844            # TODO: Should we follow rename and copy?
    845845            # As temporary workaround, simply compare entry names.
    846846            changes = []
    847             str_new_path = self.to_s(new_path)
    848             str_old_path = self.to_s(old_path)
     847            str_new_path = new_node.str_path
     848            str_old_path = old_node.str_path
    849849            # additions and edits
    850850            for str_path in new_node.manifest:
    851851                # changes out of scope

Currently, mercurial-plugin has no unit tests. We should add unit tests.

comment:2 by Jun Omae, 10 years ago

That issue is introduced in [5003d9004d1c/mercurial-plugin]. Also, mercurial-plugin@0.12 doesn't have it.

Last edited 10 years ago by Jun Omae (previous) (diff)

comment:3 by Jun Omae, 9 years ago

Owner: set to Jun Omae
Status: new → assigned
Version: → 1.0-stable

I'll apply the patch in comment:1 after I confirm fixing it again.

comment:4 by Jun Omae, 9 years ago

Release Notes: modified (diff)
Resolution: → fixed
Status: assigned → closed

Fixed in [7be798c48b82/mercurial-plugin].

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Jun Omae.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from Jun Omae to the specified user.

Add Comment
E-mail address and name can be saved in the Preferences .
Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.