meld diff does not work with hg

Bug #298120 reported by Andrew
10
This bug affects 1 person
Affects Status Importance Assigned to Milestone
meld
Fix Released
Medium
meld (Debian)
Fix Released
Undecided
Unassigned
meld (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

Binary package hint: meld

Meld cannot diff files with mercurial / hg. Steps to reproduce:

create an hg repository
commit a file
make a difference
run 'meld .' from the directory
double click the changed file

you get an error like:

"Could not read from /home/me/hg/-r 2c9a73550084 file.xml

The error was:
[Errno 2] No such file or directory: '/home/me/hg/-r 2c9a73550084 file.xml'"

It looks as if meld is inserting the revision argument inside the path between the base directory and the file that is being diff'd.

Ubuntu: Intrepid
Meld Version: 1.1.5.1-2ubuntu2
Mercurial Version: 1.0.1-5.1

I have seen this in Hardy too, but just reporting it now

Revision history for this message
Andrew (andrew-rw-robinson) wrote :
Changed in meld:
status: Unknown → Confirmed
Revision history for this message
Michael Budde (mbudde) wrote :

A new upstream release have been uploaded to Jaunty archives. I was not able to reproduce this bug following the instructions in the bug report. Please test the new version and report if this bug still reproducible.

Revision history for this message
jay mortensen (jxzlpad) wrote :

this problem still exists in intrepid. i did a fresh install of meld 1.1.5.1-2ubuntu2 and mercurial 1.0.1-5.1 on intrepid today via synaptic and had the same problem.

i applied the one-line patch referenced in Andrew's comment
http://svn.gnome.org/viewvc/meld/trunk/vc/mercurial.py?r1=927&r2=949
by hand, and it fixed the problem

Changed in meld (Ubuntu):
status: New → Confirmed
Changed in meld:
status: Unknown → Fix Released
Revision history for this message
Michael Budde (mbudde) wrote :

This bug should be fixed in meld 1.3.0-1 which has just been sync'd from debian.

Changed in meld (Ubuntu):
status: Confirmed → Fix Released
Revision history for this message
Andrew (andrew-rw-robinson) wrote :

Finally verified that it is indeed fixed in Jaunty, thank you

Changed in meld (Ubuntu):
status: Fix Released → Confirmed
status: Confirmed → Fix Released
Revision history for this message
Artur Rona (ari-tczew) wrote :

 meld (1.3.0-1) unstable; urgency=low

   * New upstream release (Closes: #528327)
     - Copy/paste behaviour fixes (Closes: #523576)
     - Dotfiles and removals handled in darcs (Closes: #509069)
     - Can handle Mercurial repos (Closes: #428843)
     - Up/Down patch used to skip changes (Closes: #511027)
     - Handle last line when highlighting properly (Closes: #465804)
   * Update message and depends for new python-gtksourceview2 package
   * Resync makefile.patch
   * Remove python-gnome dependency

 -- Ross Burton <email address hidden> Tue, 02 Jun 2009 10:00:20 +0100

Changed in meld (Debian):
importance: Unknown → Undecided
status: Confirmed → New
status: New → Fix Released
Changed in meld:
importance: Unknown → Medium
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.