diff

Equivalent of linux 'diff' in Apache Pig

非 Y 不嫁゛ 提交于 2019-12-04 13:40:45
I want to be able to do a standard diff on two large files. I've got something that will work but it's not nearly as quick as diff on the command line. A = load 'A' as (line); B = load 'B' as (line); JOINED = join A by line full outer, B by line; DIFF = FILTER JOINED by A::line is null or B::line is null; DIFF2 = FOREACH DIFF GENERATE (A::line is null?B::line : A::line), (A::line is null?'REMOVED':'ADDED'); STORE DIFF2 into 'diff'; Anyone got any better ways to do this? I use the following approaches. (My JOIN approach is very similar but this method does not replicate the behavior of diff

Mercurial extdiff one at a time

那年仲夏 提交于 2019-12-04 13:39:12
I am using winmerge as my extdiff tool, like this: [extdiff] cmd.winmerge = C:\Program Files\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl The thing is, when I run hg winmerge it seems that it sends all of the files at once, while for example in Git, when I do a diff it calls the difftool with one modified file at a time. Can I get the same behaviour in Mercurial? Like explained in Mercurial: The Definitive Guide , extdiff creates two snapshot of the source tree and call the diff tool on them. You're tool has to support directory diff for it to work, but like explained, you can use

How to diff Windows permissions

隐身守侯 提交于 2019-12-04 13:01:22
I have a small issue with Windows permissions (or rather, I'm trying to troubleshoot an issue which I think has to do with Windows permissions) and would like to compare and contrast permissions on different machines (one does not have the issue and one does), is there a tool that can do this for me? Or some hidden functionality that I don't know about? In Linux I'd do ls -l, dump it into a file and use the diff command, what about Windows? David Try the cacls utility ( cacls /? for usage). There are a couple of different versions, depending on your version of Windows be it XP, Vista, 7, or 8,

Basic file version diff algorithm

廉价感情. 提交于 2019-12-04 12:15:41
问题 I'm looking for a solution to compare two versions of the same file to get a representation of the changes/differences. 回答1: If it's plain text, then Google's diff-match-patch library ought to do what you want (it has a C# version). If it's binary data, then look into the things people do to apply updates to executables (bsdiff and Courgette). They look for the minimum difference between two files so that a smaller update can be sent out to end users. Sounds similar to your needs. 回答2: For

How to highlight the differences between subsequent lines in a file?

 ̄綄美尐妖づ 提交于 2019-12-04 11:53:58
I do a lot of urgent analysis of large logfile analysis. Often this will require tailing a log and looking for changes. I'm keen to have a solution that will highlight these changes to make it easier for the eye to track. I have investigated tools and there doesn't appear to be anything out there that does what I am looking for. I've written some scripts in Perl that do it roughly, but I would like a more complete solution. Can anyone recommend a tool for this? I wrote a Python script for this purpose that utilizes difflib.SequenceMatcher : #!/usr/bin/python3 from difflib import

Convert diff to markdown with strikeout?

不打扰是莪最后的温柔 提交于 2019-12-04 11:27:57
问题 I'd like to convert the output of diff (on a Markdown file) to Markdown with <strike> and <em> tags, so that I can see what has been removed from or added to a new version of a document. (This kind of treatment is very common for legal documents.) Example of hoped-for output: Why do we We study programming languages ? not Not in order to ... One of the many difficulties is that diff's output is line-oriented, where I want to see differences in individual words. Does anyone have suggestions as

Git diffing crashes on Windows when submodules exist

限于喜欢 提交于 2019-12-04 11:20:15
Using msysgit on windows, whenever I do git diff on a repository that has a submodule or several, the command prompt (and also PowerShell) crash. Is this a known but and is there a fix/workaround? Can I exclude submodules from diff? Also: PS Z:\www\gittest> git --version git version 1.7.6.msysgit.0 EDIT: This has also been reported on the msysgit google group. I can't reproduce such issues with diff and submodules, but if you don't care about submodules diff, you can do: git diff --ignore-submodules I fixed this by installing Microsoft kb2458000 (The conhost.exe process crashes when an

How to configure Beyond Compare 3 for Eclipse conflict resolution?

落花浮王杯 提交于 2019-12-04 10:49:53
问题 What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution? In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts. The default parameters are: "${yours}" "${theirs}" "${base}" "${merged}" And it suggests TortoiseMerge settings of this: /theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}" But what is the appropriate config for Beyond Compare? 回答1: Looks like this is

.gitattributes not making a difference, trying to skip files when using git difftool

那年仲夏 提交于 2019-12-04 10:48:44
问题 I've read the Git Pro website and I've read multiple answers on StackOverflow, but sadly I am simply unable to make .gitattributes work for me. Whenever I'm using git difftool , it will attempt to display the difference between binary files, such as image files (PNG). I have tried a variety of combinations in my .gitattributes file, but whenever I run my git difftool command, it still attempt to compare the binary files. In my repository's folder, I have: .git .gitattributes [my project's

Google courgette compiled binary for windows

假如想象 提交于 2019-12-04 10:15:48
问题 I've been using bsdiff and i'm very happy with it, and I want to try Google's Courgette. It seems like a large effort to fetch/compile the entire Chromium project just to get that binary out. Does anyone know of a compiled version I can test out, or a fork that's easier to get? 回答1: I've tried all last night and today, grrhhhhh:( You can download Courgette src (without the entire Chromium) https://chromium.googlesource.com/chromium/src/courgette/+/master and then use GN and Ninja to build it