ananthakumaran / monky

Magit for Hg
http://ananthakumaran.in/monky/index.html
GNU General Public License v3.0
154 stars 30 forks source link

Status buffer does not show names of modified files #8

Closed adept closed 13 years ago

adept commented 13 years ago

When I do "monky-status" in the working copy with couple of untracked files and couple of modified files I dont see the names of modified files:

Untracked files:
    dates_and_times.pdf
    xdot.py

Changes:
    Modified   nil
    Modified   nil

When I press Tab on "Modified" line I could see the diff and infer the file name from the first line of the diff output.

I tried debuggin monky-insert-changes. Seems like monky-wash-sequence and monky-with-wash-status are ok (after all, "Untracked files" are displayed properly). I tried tracing monky-insert-diff, but got lost in the macros :(

Is it a known problem?

I am running monky from git as of 15 Sep 2011 on GNU Emacs 23.2.1 (x86_64-redhat-linux-gnu, GTK+ Version 2.10.4) of 2010-08-06 (CentOS 5.5)

ananthakumaran commented 13 years ago

seems like

(defun monky-diff-line-file ()
  (cond ((looking-at "^diff -r \\(.*\\) \\(.*\\)$")
     (match-string-no-properties 2))
    (t
     nil)))

returns nil. What is your mercury version?

adept commented 13 years ago

Ha! Indeed it does. Because that line in my output says "diff --git a/somefile.org b/somefile.org". Which is, in turn, because of the options set in my ~/.hgrc:

[diff]
git = true
nodates = true

I wonder if it is possible to override options for diff to some sane default easily?

ananthakumaran commented 13 years ago

i thought monky will ignore .hgrc config. I have to debug it.

adept commented 13 years ago

Found this http://mercurial.selenic.com/bts/issue2114 . Looks like it is not fixed. My hg is 1.9, btw.

adept commented 13 years ago

As a kludge, setting HGRCPATH to non-existing dir works, but this is sort of overkill, IMO

ananthakumaran commented 13 years ago

setting HGRCPATH is not a good idea. It will introduce other problems.

i am setting HGPLAIN already. so hg should not change default output(seems like a bug in hg).

for now using hg diff --config diff.git=Off will solve the issue.

i will change and commit soon.