Denis Akhiyarov den-run-ai

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

Sublime Text 2 - Useful Shortcuts

Tested in Mac OS X: super == command

Open/Goto

super+t: go to file
super+ctrl+p: go to project
super+r: go to methods

A "virtualenv activate" for Anaconda environments

I've been using the Anaconda python package from continuum.io recently and found it to be a good way to get all the complex compiled libs you need for a scientific python environment. Even better, their conda tool lets you create environments much like virtualenv, but without having to re-compile stuff like numpy, which gets old very very quickly with virtualenv and can be a nightmare to get correctly set up on OSX.

The only thing missing was an easy way to switch environments - their docs suggest running python executables from the install folder, which I find a bit of a pain. Coincidentally I came across this article - Virtualenv's bin/activate is Doing It Wrong - which desribes a simple way to launch a sub-shell with certain environment variables set. Now simple was the key word for me since my bash-fu isn't very strong, but I managed to come up with the script below. Put this in a text file called conda-work

MIT License

Copyright (c) [year] [fullname]

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

	"""
	This module implements the Lowess function for nonparametric regression.

	Functions:
	lowess Fit a smooth nonparametric regression curve to a scatterplot.

	For more information, see

	William S. Cleveland: "Robust locally weighted regression and smoothing
	scatterplots", Journal of the American Statistical Association, December 1979,

	__all__ = (
	####### Class Objects

	#CoGetClassObject - Normal, not wrapped
	'CoDllGetClassObject', #Get ClassObject from a DLL file

	####### ClassFactory::CreateInstance Wrappers

	'CoCreateInstanceFromFactory', #Create an object via IClassFactory::CreateInstance
	'CoCreateInstanceFromFactoryLicenced', #Create a licenced object via IClassFactory2::CreateInstanceLic

	import sqlalchemy as sa
	import sqlalchemy.orm as orm
	from sqlalchemy.ext.declarative import declarative_base
	from sqlalchemy.ext.declarative import declared_attr
	from sqlalchemy.orm import scoped_session, sessionmaker

	DBSession = scoped_session(sessionmaker())
	class BaseMixin(object):
	query = DBSession.query_property()
	id = sa.Column(sa.Integer, primary_key=True)

	import os

	from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
	from IPython.frontend.qt.kernelmanager import QtKernelManager
	from IPython.frontend.qt.inprocess_kernelmanager import QtInProcessKernelManager
	from IPython.kernel.zmq.ipkernel import Kernel
	from IPython.kernel.inprocess.ipkernel import InProcessKernel
	from IPython.lib import guisupport

	import os

	from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
	from IPython.frontend.qt.kernelmanager import QtKernelManager
	from IPython.frontend.qt.inprocess_kernelmanager import QtInProcessKernelManager
	from IPython.kernel.zmq.ipkernel import Kernel
	from IPython.kernel.inprocess.ipkernel import InProcessKernel
	from IPython.lib import guisupport

	{
	"cmd": ["$file"],
	"working_dir": "$file_path",
	"selector": "source.dosbatch"
	}