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

login
register
mail settings
Submitter Jordi Gutiérrez Hermoso
Date April 14, 2014, 8:48 p.m.
Message ID <7b7a160efe1e4607c30a.1397508525@Iris>
Download mbox | patch
Permalink /patch/4345/
State Deferred
Headers show

Comments

Jordi Gutiérrez Hermoso - April 14, 2014, 8:48 p.m.
# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@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.
Pierre-Yves David - April 23, 2014, 12:48 a.m.
On 04/14/2014 01:48 PM, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh@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

Sounds reasonable

Can you update the help test with some saying "sometiem refered as 
"squash"" ?

Patch

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)
 
-@command('^fold',
+@command('^fold|squash',
     [('r', 'rev', [], _("explicitly specify the full set of revision to fold")),
     ] + commitopts + commitopts2,
     # allow to choose the seed ?