[PATCH 2 of 2 Evolve] fold: add squash as a possible alias

Jordi Gutiérrez Hermoso jordigh at octave.org
Thu Mar 13 14:41:02 CDT 2014


# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh at octave.org>
# Date 1394663198 14400
#      Wed Mar 12 18:26:38 2014 -0400
# Node ID 0524e1b37fe1c053d7bfe45e0256075cec380dc9
# Parent  196c2801544045102ce87b2ede3c385f1cc61138
fold: add squash as a possible alias

10 years ago, when svn was the dominant free VCS, we made a concession
for svn. Now that git is the dominant free VCS, we should make a
concession towards git terminology. Most people call "squash" what we
have so far called "fold", so an alias is in order.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1927,7 +1927,7 @@
     finally:
         lockmod.release(lock, wlock)
 
- at command('^fold',
+ at command('^fold|squash',
     [('r', 'rev', [], _("explicitly specify the full set of revision to fold")),
     ] + commitopts,
     # allow to choose the seed ?


More information about the Mercurial-devel mailing list