Diff for "TipsAndTricks"

Available tips: TableOfContents

Ignore files from Emacs/XEmacs

Add the following to .hgignore:

syntax: glob
*~

syntax: regexp
(.*/)?\#[^/]*\#$

Make a clean copy of a source tree, like CVS export

hg clone source export
rm -rf export/.hg

or using the archive command

cd source
hg archive ../export

The same thing, but for a tagged release

hg clone --noupdate source export-tagged
cd export-tagged
hg update mytag
rm -rf .hg

or using the archive command

cd source
hg archive -r mytag ../export-tagged

You did an "hg add" on a file but do not want to commit it

hg revert # take out of source control
hg rm -f  # remove it

See diffs when editing commit message with VIM

Make a private copy of the 'hgeditor' script provided with mercurial and replace the call to the editor with following command:

vim "+e $HGTMP/diff" '+set buftype=help filetype=diff' "+vsplit $HGTMP/msg" || exit $?

This will start up VIM in vertical split mode with commit message in the left pane and diff in the right pane. The buftype=help setting for diff window tells vim to exit when all other windows are closed, so when you write and quit the log with :x (:wq - they are equivalent), vim exits. If you have syntax highlight set up, the diff will be properly highlighted.

This setting is suitable for wide terminals. If you have a narrow terminal, you may want to replace the +vsplit above with +split or add nowrap to the +set.

See diffstat of pulled changes

Place the following script (named "pull-diffstat" here) somewhere in your $PATH:

test -n "$HG_NODE" || exit 0
TIP=`hg tip --template '{node|short}'`
PARENT=`hg parents --template '{node|short}' -r $HG_NODE | head -1`
test -n "$PARENT" || exit 0
echo "diffstat for $PARENT to $TIP"
hg diff -r $PARENT -r tip | diffstat

Add a changegroup entry to the [hooks] section of hgrc:

[hooks]
changegroup = pull-diffstat

Now you will see a diffstat of the new changes to your repo every time you do "hg pull".

Compare (diff) two branches

Use the -p option to either incoming or outgoing. Example:

cd /path/to/repo1
hg incoming -p /path/to/repo2

One liner to remove unknown files with a pattern

To make these work, replace the ls -l with the command you wish to execute (ie. rm). You can also tweak the parameters passed to hg status to filter by something other than unknown files (see hg help status).

hg status -nu0 | grep -z pattern | xargs -0r ls -l

The above command requires a current version of GNU grep. If you don't have one, you can use the following:

hg status -nu | grep pattern | tr '\n' '\0' | xargs -0r ls -l

Keyword expansion according to file revision

This is an example on how you can achieve filewise keyword expansion (similar to CVS) with an [encode] filter and the pretxncommit-hook. Comes in handy when you want to keep track of different file revisions in the same repository.

For demonstration we use just one keyword: "Hg".

• $Hg$

It will be expanded by the script "hgpretxncommit.sh" (see below) to:

• $Hg: <basename of file>,v <short hash> <date> $

You need an [encode] filter that "reverts" the expansion in your hgrc.

Simple example hgrc for a repository containing python files:

[encode]
*.py = sed 's/[$]Hg[^$]*[$]/\$Hg\$/'
[hooks]
pretxncommit = hgpretxncommit.sh

In "hgpretxncommit.sh" you have to tweak the $excl variable according to your needs. The script doesn't look at files matching $excl.

set -e
test $? -eq 0 -a -n "$HG_NODE" || exit 1
excl='^\.hg\|\.\(p\(df\|ng\)\|jpg\)$'
cset="${HG_NODE:0:12}"
isodate=`hg tip --template='{date|isodate}'`
for f in `hg status --modified --added --no-status \
    | grep --invert-match "$excl" 2>/dev/null`; do
    bn="${f##*/}"
    sed -i~ -e "s!\([$]Hg\)[^$]*[$]!\1: $bn,v $cset $isodate \$!" "$f"
done
exit $?

hg diff does not support -foo option like gnu diff does

I use the following bash function to put the diff options I like most

hgdi ()
{
  for i in `hg status -marn "$@"`
  do
    diff -ubwd <(hg cat "$i") "$i"
  done
}

upgrading a repository to revlogng in place

Here's a quick and dirty script to upgrade a mercurial repository in place. Note: the current undo information will be lost.

function upgradehg () (
  if test -n "$1"
  then
    local repo="$1"
    local tmprepo="$1".tmp
  else
    local repo="."
    local tmprepo="../hgupgrade.tmp"
  fi

  set -e
  hg clone --pull -U "$repo" "$tmprepo"
  cp "$repo"/.hg/{hgrc,dirstate} "$tmprepo"/.hg
  mv "$repo"/.hg "$repo"/.hg.orig
  mv "$tmprepo"/.hg "$repo"/.hg
  rmdir "$tmprepo"
  echo "Upgrade complete. A backup of your original repository is now in $repo/\.hg.orig"
)

Accessing ssh controlled repositories from a Windows Client

NOTE: The following works for cases when the private keys are not Password phrase encrypted.

1. Grab putty.exe and plink.exe from [http://www.chiark.greenend.org.uk/~sgtatham/putty/ PuTTY] website.

2. Connect to remote ssh host over ssh using PuTTY once and have PuTTY save it's key as a known host.

3. Add the following to the [ui] section of your ~/Mercurial.ini file

   ssh=/path/to/plink.exe -ssh -i "/path/to/your/private/key"

4. Profit!!!

This didn't work for me with the latest windows version, maybe because I'm using key authentication with a passphrase. I got cygwin ssh to work though. Follow the instructions for this on [wiki:WindowsInstall WindowsInstall ssh help]. -- krupan DateTime(2006-12-15T22:13:42Z)

To get your passphrase-locked SSH keys to work properly under PuTTY, you'll need to go through the following steps.

1. Download putty.exe, puttygen.exe, pageant.exe, and plink.exe from the [http://www.chiark.greenend.org.uk/~sgtatham/putty/ PuTTY website]. You may want pscp.exe as well if you plan to do SCP, but it's not necessary for running Mercurial.

2. Copy your SSH private key onto your Windows machine.

3. PuTTY uses its own private format for SSH private keys, so you'll need to convert your private key. Run puttygen.exe and choose Import key from the Conversions menu.

4. Import your private key; enter its passphrase when prompted.
5. Change the key comment to something meaningful.

6. Click the Save private key button and save the .PPK file somewhere.

7. Run pageant.exe. The pageant icon (a computer wearing a hat) will show up in the status tray.

8. Right-click the pageant icon and choose Add Key.

9. Choose the .PPK file you saved earlier and type in its passphrase.

10. Follow steps 2 & 3 above: connect to the remote host, save its key, and edit your Mercurial.ini file.

11. Enjoy your newly-secure SSH authentication on Windows!

    • -- RobinMunn

Note that pageant.exe caches your unlocked key in memory, which could conceivably make its way into your swap file. Be aware of the security implications of that fact. (For example, if your computer is ever stolen, it would be wise to consider that SSH key compromised and change it as soon as possible).

Concatenating multiple changeset into one changeset.

Suppose you have a repository with a number of changesets which you want to combine into a single changeset.

This can be done as follows using only the basic operations of mercurial, namely clone, push, pull.

For simplicity, let us assume that the repository in question has a single head, and you want to combine the last k revisions into a single revision.

For concreteness, let us call the base revision R, and the ending revision R+k.

Let us furthermore assume the repository has no local changes.

The strategy is to take advantage of mercurial's support for repositories with more than one head. What we do is create a branch whose root revision is R and which consists of just one changeset (actually it can be multiple changesets, the principle is the same, but for simplicity let us assume one).

Diagramatically, this looks like

R+k
 |
  |
   |     R+k (concatenated)
    |     |
     --R--

The procedure is as follows.

1. hg update R
   • This updates the working directory to revision R. Specifically, this means that the contents of the working directory are changed to that of revision R, and that R becomes the parent of the working directory.
2. hg revert -r tip
   • This reverts the working directory revert to its contents at tip. Since the parent of the working directory is still R, this means that the combined contents of all changesets between R and R+k show up as the modifications in the working directory.
3. hg ci -m "Combined changesets between R and R+k"
   • At this point, committing these modifications will create a changeset containing all combined changesets between revisions R and R+k.
4. hg clone -r tip oldrepo newrepo
   • This assumes you want to get rid of your individual changesets (which are a dangling branch in oldrepo) and just keep the combined changeset. newrepo will now just have the combined changeset. newrepo will look like

             R+k (concatenated)
              |
           R--

     (Would an example here help?)

Save a push URL so that you don't need to enter it each time

It is possible to store a default push URL that will be used when you type just "hg push". Edit .hg/hgrc and add something like :

[paths]
default-push = ssh://hg@example.com/path

Recreate hardlinks between two mercurial repositories

When repositories are cloned locally, their data files will be hardlinked so that they only use the space of a single repository. Unfortunately, subsequent pulls into either repository will break hardlinks for any files touched by the new changesets, even if both repositories end up pulling the same changes. Here's a quick and dirty way to recreate those hardlinks and reclaim that wasted space:

import os, sys

class ConfigError(Exception): pass

def usage():
    print """relink <source> <destination>
    Hard-link files from source to destination"""

class Config:
    def __init__(self, args):
        if len(args) != 3:
            raise ConfigError("wrong number of arguments")
        self.src = os.path.abspath(args[1])
        self.dst = os.path.abspath(args[2])
        for d in (self.src, self.dst):
            if not os.path.exists(os.path.join(d, '.hg')):
                raise ConfigError("%s: not a mercurial repository" % d)

try:
    cfg = Config(sys.argv)
except ConfigError, inst:
    print str(inst)
    usage()
    sys.exit(1)

seplen = len(os.path.sep)
relinked = 0
savedbytes = 0
CHUNKLEN = 4096
for dirpath, dirnames, filenames in os.walk(os.path.join(cfg.src, '.hg')):
    relpath = dirpath[len(cfg.src) + seplen:]
    for filename in filenames:
        if not (filename.endswith('.i') or filename.endswith('.d')):
            continue
        src = os.path.join(dirpath, filename)
        tgt = os.path.join(cfg.dst, relpath, filename)
        try:
            ts = os.stat(tgt)
        except OSError:
            continue
        ss = os.stat(src)
        if ss.st_ino == ts.st_ino:
            continue
        if ss.st_dev != ts.st_dev:
            raise Exception('Source and destination are on different devices')
        if ss.st_size != ts.st_size:
            continue
        sfp = file(src)
        tfp = file(tgt)
        sin = sfp.read(CHUNKLEN)
        while sin:
            tin = tfp.read(CHUNKLEN)
            if sin != tin:
                break
            sin = sfp.read(CHUNKLEN)
        if sin:
            continue
        try:
            os.rename(tgt, tgt + '.bak')
            os.link(src, tgt)
            print 'Relinked %s' % os.path.join(relpath, filename)
            relinked += 1
            savedbytes += ts.st_size
            os.remove(tgt + '.bak')
        except OSError, inst:
            print '%s: %s' % (tgt, str(inst))

print 'Relinked %d files (%d bytes reclaimed)' % (relinked, savedbytes)