Hi,
Some of you may remember our discussion at dinner about using git/SVN with LaTeX documents. One of the problems that was mentioned was line-based diff - whenever the formatting of the paragraph changes all of the lines are marked as modified, even if the content did not change.
* git diff --color-words
I found very nice solution to the problem: in git diff you can use the option --color-words which performs word-based diff and highlights the changes in colors.
* gitattributes
You can also put the following line into your .gitattributes file:
*.tex diff=tex
which treats some tags (likes \section{}) as separate words even if there is no whitespace in between.
I am almost converted to git - thanks for opening my eyes ;)
Cheers,
Bartek
Wednesday, October 20, 2010
Wednesday, October 6, 2010
PyAS - nuggets
PyAS - Nuggets
Ipython cpaste magic func to paste in code.
cython -a -> annotated html with colours for how long things take ... click to expand
Ipython cpaste magic func to paste in code.
cython -a -> annotated html with colours for how long things take ... click to expand
Tuesday, October 5, 2010
Git & github getting started
Global setup:
Download and install Git
git config --global user.name "Your Name"
git config --global user.email eilif@gmx.de
Next steps:
mkdir test
cd test
git init
touch README
git add README
git commit -m 'first commit'
git remote add origin git@github.com:markovg/test.git
git push origin master
Existing Git Repo?
cd existing_git_repo
git remote add origin git@github.com:markovg/test.git
git push origin master
Importing a Subversion Repo?
Click here
When you're done:
Continue
Download and install Git
git config --global user.name "Your Name"
git config --global user.email eilif@gmx.de
Next steps:
mkdir test
cd test
git init
touch README
git add README
git commit -m 'first commit'
git remote add origin git@github.com:markovg/test.git
git push origin master
Existing Git Repo?
cd existing_git_repo
git remote add origin git@github.com:markovg/test.git
git push origin master
Importing a Subversion Repo?
Click here
When you're done:
Continue
Friday, October 1, 2010
Emacs tricks: cua-mode
cua-mode:
You cut some code from a website and it has a few columns of junk at the front, enter cua-mode
M-x cua-mode
Set marker, C-RET enters column mode. Select the block, C-x to cut.
You cut some code from a website and it has a few columns of junk at the front, enter cua-mode
M-x cua-mode
Set marker, C-RET enters column mode. Select the block, C-x to cut.
Saturday, September 11, 2010
python crypt authenticate htpasswd/htdigest
A python snippet to authenticate against a htpasswd hash in Python:
from crypt import crypt
pw = '2600'
htpasswd = 'Jywn1PBEdYjkg'
authd = crypt(pw,htpasswd)==htpasswd
assert authd
authd = crypt('wrongpw',htpasswd)==htpasswd
assert authd==False
Friday, September 10, 2010
freenx and GLX
How to get freenx working with GLX & OpenGL?
me@computer:~$ glxgears
Error: couldn't get an RGB, Double-buffered visual
Try this:
$ export LIBGL_ALWAYS_INDIRECT=1
Then things should be just peachy!
me@computer:~$ glxgears
Error: couldn't get an RGB, Double-buffered visual
Try this:
$ export LIBGL_ALWAYS_INDIRECT=1
Then things should be just peachy!
Monday, September 6, 2010
distutils/setuptools python setup.py install -> automatic .deb generation
I used the python-stdeb in the ubuntu 10.04 repo to install itself using the
newest version from the git repo:
http://github.com/astraw/stdeb.git
Steps:
1) Add the following to ~/.pydistutils.cfg:
vvvvvvvvvvvvvvvv
[global]
command-packages: stdeb.command
^^^^^^^^^^^^^^
2) If necessary, edit a stdeb.cfg file which contains the options for debian/control.
The stdeb git repo already has a sensible stdeb.cfg file, but for another project,
the following might be appropriate:
[DEFAULT]
Depends: python-numpy
XS-Python-Version: >= 2.6
Provides: python-myproject
3) python setup.py bdist_deb
4) dpkg -i deb_dist/python-stdeb_0.6.0+git-1_all.deb
NB: comparing that .deb
with the one in the
apt cache:
/var/cache/apt/archives/python-stdeb_0.5.1-1_all.deb
Shows similar install paths ... so I think everythings ok
NB:
Another possibility would be:
$ sudo checkinstall --install=no python setup.py install
But I suppose stdeb is more savvy in its pythonic ways ...
newest version from the git repo:
http://github.com/astraw/stdeb.git
Steps:
1) Add the following to ~/.pydistutils.cfg:
vvvvvvvvvvvvvvvv
[global]
command-packages: stdeb.command
^^^^^^^^^^^^^^
2) If necessary, edit a stdeb.cfg file which contains the options for debian/control.
The stdeb git repo already has a sensible stdeb.cfg file, but for another project,
the following might be appropriate:
[DEFAULT]
Depends: python-numpy
XS-Python-Version: >= 2.6
Provides: python-myproject
3) python setup.py bdist_deb
4) dpkg -i deb_dist/python-stdeb_0.6.0+git-1_all.deb
NB: comparing that .deb
with the one in the
apt cache:
/var/cache/apt/archives/python-stdeb_0.5.1-1_all.deb
Shows similar install paths ... so I think everythings ok
NB:
Another possibility would be:
$ sudo checkinstall --install=no python setup.py install
But I suppose stdeb is more savvy in its pythonic ways ...
Labels:
checkinstall,
debian,
distutils,
setup.py,
setuptools,
stdeb,
ubuntu
Subscribe to:
Posts (Atom)