My .emacs is now in Mercurial

A while ago I decided to start maintaining my .emacs file under revision control. I picked git because it seemed like the cool thing to do. I put it on gitorious so that I could easily sync it with my home and work machines, and it was public in the off chance that it might help out some other emacs user. Today I converted it from git to mercurial, because for some reason

hg incoming

is more intuitive and easier for me to remember than

git fetch && git log ..origin/master

Maybe I'm weird that way. Anyway, the new repo is on bitbucket. That is all.

Comments

Anonymous said…
how do you do with the various private data (password et cetera) within your .emacs?
October 18, 2010 at 4:06 AM
Anonymous said…
Why do you not simply define a git alias for that chain?
October 18, 2010 at 4:58 AM
Richard said…
Seems a strange criteria for moving to something like mercurial over the excellent and fast git. You dont need to remember anything like that : use magit inside emacs to do it for you ;)
October 18, 2010 at 5:29 AM
Bryan said…
I didn't switch just for that one command, that was just the straw that broke the camel's back last night. Part of me says, "hey, you are smart hacker, don't be intimidated by git's, um, interesting command sytax, it's no worse than other unix tools like, say, find." But another part of me say, "what are those cryptic commands buying me that I don't get from intuitive mercurial? Not much."

This article explains the user interface differences pretty well.

So yeah, I could do the work to learn git equivalents to mercurial, and even make git aliases to make it look like mercurial, *or* I could just use mercurial. And don't worry, mercurial is excellent and fast too.

There are also mercurial patch queues, with which I have recently fallen in love. Steve Losh articulates their advantages masterfully.

Also, so far I don't have any passwords in my .emacs. If I ever have a need to do that I'll probably just put them in a separate file that my .emacs loads, and not check that file in.
October 18, 2010 at 8:07 AM
bank000 said…
my solution is to encrypt my password file by gnupg and I make a script to encrypt/decrypt when check in/out for convient. Hope it will helps.
October 18, 2010 at 6:27 PM
Post a Comment

Popular posts from this blog

SystemVerilog Fork Disable "Gotchas"

This is a long post with a lot of SystemVerilog code. The purpose of this entry is to hopefully save you from beating your head against the wall trying to figure out some of the subtleties of SystemVerilog processes (basically, threads). Subtleties like these are commonly referred to in the industry as "Gotchas" which makes them sound so playful and fun, but they really aren't either. I encourage you to run these examples with your simulator (if you have access to one) so that a) you can see the results first hand and better internalize what's going on, and b) you can tell me in the comments if this code works fine for you and I'll know I should go complain to my simulator vendor. OK, I'll start with a warm-up that everyone who writes any Verilog or SystemVerilog at all should be aware of, tasks are static by default. If you do this: module top; task do_stuff ( int wait_time); #wait_time $display ( "waited %0d, then did stuff" , wa
Read more

'git revert' Is Not Equivalent To 'svn revert'

I just learned that if you have some changes in your working tree that you want to get rid of, you don't type 'git revert' like you might guess. No, that's what cvs, subversion, mercurial, and bazaar (to name a few) use revert to mean, but not git. With git, revert is used to undo actual commits. Thankfully, you can undo your revert with another 'git revert', I just learned. So let me repeat to be clear, if you have changes to your working files that you want to abandon, DO NOT do this: git revert HEAD That will undo your last commit. Do this instead: git reset --hard HEAD I'm glad I have that straightened out now. I'm wondering if /etc was really a good place for me to start out playing with git. UPDATE: Nearly two years later and I'm still getting comments on this. I'm glad I've been able to help people out this way. The discussion in the comments is good, and one thing I'd like to point out is that I now always use
Read more

Git Rebase Explained

Image
Introduction Rebase is a helpful git command that can be used to turn a branchy two-headed version history into an easy to follow linear one. A linear history is much easier for a human eye to follow and a human brain to understand. Rebase is a very safe command to use, despite some fear that people have about it. This post should explain how rebase works and clear up any misunderstandings about it. Rebase Basics The short summary of rebase is that it cuts commits out of the git history and reconnects them somewhere else. Let's say the common scenario comes up: you commit a change to the main branch of a repository, you then run  git fetch , and in come a couple changes that other people made on the main branch. If your commit is version 46f and the others that just came in on the fetch are versions ef9 and 4a2, your version history might look like this: The main branch now has two heads, 46f and 4a2. You can run  git rebase  to disconnect your commit from version d88 and connect i
Read more