junghans / cwdiff

A (w)diff wrapper to support directories and colorize the output

Welcome to Christoph's GitHub profile

Other profiles:

---

cwdiff's Issues

--diffopts not working

--diffopts -anything fails...

because here

--diffopts)
diff_opts="$2"
shift ;;

you need to shift 2 times, ie,

--diffopts)
diff_opts="$2"
shift 2;;

Patch for /cwdiff

Original issue 3 created by junghans on 2011-05-10T12:11:22.000Z:

Don't die if we diff binary files. Solves a problem with Mercurial WordDiff http://mercurial.selenic.com/wiki/WordDiff

Currently, if there is any binary file in a diff between two revisions, the cwdiff fails and outputs an empty string.
The patch fixes the problem.

"wdiff: too many file arguments" error

Change 9fd6b12 completely breaks cwdiff for me. It essentially results in wdiff '' -n file1 file2 and thus in the error "wdiff: too many file arguments".

I believe the quotes around $wdiff_opts should be removed. They can only ever work if $wdiff_opts contains exactly one option.

line 216: wdiff: command not found

the wdiff command is not found in the cwdiff

$hg wdiff

404 when using ~amd64 keyword

Original issue 2 created by junghans on 2011-01-18T20:33:14.000Z:

What steps will reproduce the problem?

1. emerge -av google-talkplugin

What is the expected output? What do you see instead?

>>> Downloading 'http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_1.7.1.0-1_amd64.deb'
--2011-01-18 15:16:48-- http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_1.7.1.0-1_amd64.deb
Resolving dl.google.com... 74.125.115.190, 74.125.115.91, 74.125.115.136, ...
Connecting to dl.google.com|74.125.115.190|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2011-01-18 15:16:48 ERROR 404: Not Found.

What version of the product are you using? On what operating system?

Please provide any additional information below.

Headers output separate from their diff...

moving the print out into the diff header line case (out of the else) fixed it for the most part.

So' no version available for google-talkplugin

Original issue 1 created by junghans on 2010-08-23T12:26:08.000Z:

What steps will reproduce the problem?

1. emerge google-talkplugin
2. start chromium

What is the expected output? What do you see instead?
[000:130] Waiting for GoogleTalkPlugin to start...
/opt/google/talkplugin/GoogleTalkPlugin: /usr/lib32/libcrypto.so.0.9.8: no version information available (required by /opt/google/talkplugin/GoogleTalkPlugin)
/opt/google/talkplugin/GoogleTalkPlugin: /usr/lib32/libssl.so.0.9.8: no version information available (required by /opt/google/talkplugin/GoogleTalkPlugin)

What version of the product are you using? On what operating system?
1.4.1.0.1

Please provide any additional information below.
[I] app-emulation/emul-linux-x86-baselibs
Available versions: 20100220!s 20100409!s 20100611!s
Installed versions: 20100611!s(07:56:23 23/08/10)

Line ending with `{` is flipped to `}`

Easy 100% repro for me:

$ echo foo > cat
$ echo bar { > dog
$ cwdiff cat dog
foobar }