[PATCH 4 of 4 evolve-ext V2] fold: add squash as a possible alias

Jordi Gutiérrez Hermoso jordigh at octave.org
Mon Apr 14 15:48:45 CDT 2014


# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh at octave.org>
# Date 1397160122 14400
#      Thu Apr 10 16:02:02 2014 -0400
# Branch stable
# Node ID 7b7a160efe1e4607c30aba937553083e9d5890bf
# Parent  09b4808632bc218f3078ae86e18ac0190f9ccc29
fold: add squash as a possible alias

In order to respect the habituation of the majority of DVCS users and
to make this feature more easily discoverable, the very common
"squash" terminology should be added as a synonym to "fold". Since git
does not have a squash command, this should be safe.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1715,7 +1715,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 + commitopts2,
     # allow to choose the seed ?


More information about the Mercurial-devel mailing list