Mercurial > evolve

changeset 934:f13facb01ac5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Thu, 10 Apr 2014 16:02:02 -0400
parents e5baeb8fefec
children a03ea39aca2a
files README hgext/evolve.py tests/test-tutorial.t
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/README	Mon Apr 14 15:46:27 2014 -0400
+++ b/README	Thu Apr 10 16:02:02 2014 -0400
@@ -54,6 +54,7 @@
 - adds a --obsolete flag to import (requieres Mercurial 3.0)
 - prune: update to successor rather than parent when pruning '.' with -s
 - fold: add missing --message and --logfile option
+- fold: add squash as an alias
 
 3.3.1 -- 2014-04-23
 
--- a/hgext/evolve.py	Mon Apr 14 15:46:27 2014 -0400
+++ b/hgext/evolve.py	Thu Apr 10 16:02:02 2014 -0400
@@ -1771,7 +1771,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 ?
--- a/tests/test-tutorial.t	Mon Apr 14 15:46:27 2014 -0400
+++ b/tests/test-tutorial.t	Thu Apr 10 16:02:02 2014 -0400
@@ -468,6 +468,8 @@
   $ hg help fold
   hg fold rev
   
+  aliases: squash
+  
   Fold multiple revisions into a single one
   
       The revisions from your current working directory to the given one are