Stack Overflow
Stack Overflow

Questions tagged [kaleidoscope]

Kaleidoscope is a proprietary visual diff tool for Mac, which works with Git, SVN, Mercurial, and others.

Kaleidoscope is a popular file comparison tool for the Mac.

This tag is not for kaleidoscopes (the optical instruments that make colored patterns when rotated).

12 questions
14
votes
1 answer

Git difftool in Windows to see list of all changed files in addition to file diffs (a la Kaleidoscope)?

When I do a git difftool, Kaleidoscope shows me all the files that have changed in the left sidebar: (source: kaleidoscopeapp.com) Is there any diff-tool in Windows that would show me such a list of files? (I don't want the tool to open all the…
Debajit
  • 46,327
  • 33
  • 91
  • 100
4
votes
1 answer

smartgit and ksdiff integration

I'd like using the Kaleidoscope/ksdiff as my conflict solver in smartgit. I've tried configuring by myself but I can't. So, what is the line instruction that I need to put at arguments input on edit conflict solver configuration? Screenshot:
Rafael Praxedes Gomes
  • 81
  • 7
4
votes
0 answers

Can I use ksdiff over ssh?

I've configured my .gitconfig using Kakeidoscope's integration tool. This basically installs ksdiff, adds it to bash enviroment and updates .gitconfig to use ksdiff as difftool and mergetool. All this works fine until I ssh my remote box. That…
Jose Browne
  • 4,482
  • 3
  • 28
  • 29
3
votes
2 answers

How to make Kaleidoscope diff app's ksdiff work with Mercurial / hg

Kaleidoscope is a really useful diff tool for Mac. It integrates with git difftool by adding this to your ~/.gitconfig: [difftool "Kaleidoscope"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" prompt =…
aaronstacy
  • 6,189
  • 13
  • 59
  • 72
2
votes
1 answer

Kaleidoscope effect using Python and OpenCV

Does anyone know a general algorithm to accomplish this, or even some source code? Ideally, it'd be customizable, eg; number of sides/reflections, selecting what part of the image to sample for the kaleidoscope, etc Example of the effect:
bananaman
  • 147
  • 1
  • 9
2
votes
2 answers

llvm run Kaleidoscope examples

I am using mac osX. I downloaded llvm from git repo and now I am trying to build examples (chapter 6). I installed llvm: when running: which llvm-config I get /usr/local/bin/llvm-config when running clang++ -g toy.cpp `llvm-config --cxxflags…
Atyoum Ustainof
  • 394
  • 1
  • 8
2
votes
1 answer

View a pull request with Kaleidoscope

I would prefer to look at the contents of a pending github pull request in Kaleidoscope instead of the github UI. Is there a way to do this?
gusto
  • 314
  • 3
  • 9
1
vote
1 answer

Using ksdiff as THOR_MERGE tool in zshell

I'm trying to run the rails update script with the following in my .zshrc file (for use in merge conflicts): export THOR_MERGE="/usr/local/bin/ksdiff --merge --output $MERGED -- $LOCAL $REMOTE" Kaleidoscope opens up in merge mode however after…
stratis
  • 7,750
  • 13
  • 53
  • 94
0
votes
0 answers

Resolving an issue with Kaleidoscope JIT compilation

This question is about an error thrown by KaleidoscopeJIT.h. I am currently following the LLVM tutorial here but adding some more classes and objects to the design. Since I am using an older version of LLVM, I am borrowing some of the code from the…
Keane Moraes
  • 1
  • 1
  • 3
0
votes
1 answer

How to use a particular version of llvm out of different versions?

I have installed llvm 6,7,10,11 on my linux(Ubuntu 20.04) machine along with same clang versions. Different projects require different versions of llvm. How to compile c++ programs using a particular version of clang and llvm? For example: currently…
rama
  • 15
  • 6
0
votes
1 answer

Kaleidoscope Example Code Compile Errors on MacOS with LLVM(8|10)

Compiling kaleidoscope tutorial code fails with clang++ -g -O3 toy.cpp $(llvm-config --cxxflags) -std=c++17 (as the example goes) and outputs the following error: Undefined symbols for architecture x86_64: "llvm::DisableABIBreakingChecks",…
Ron Kahuu
  • 63
  • 5
0
votes
0 answers

Installing Kaleidescope Requires Git credentials

I have a Git repository that I have been using with stored credentials, but after installing Kaleidoscope I have to input my Git credentials each time I use Git. How do I solve this? I have tried using several methods to cache the username and…
BlackHatSamurai
  • 23,275
  • 22
  • 95
  • 156