changeset 2483:db565cc05987

merge with stable

--- a/README	Fri May 26 10:25:16 2017 +0200
+++ b/README	Fri May 26 16:12:07 2017 +0200
@@ -117,6 +117,11 @@
 
  - olog: add an 'obslog' alias
 
+6.2.2 - in progress
+-------------------
+
+  * evolve: fix --rev handling in --list mode
+
 6.2.1 -- 2017-05-23
 -------------------
 

--- a/hgext3rd/evolve/__init__.py	Fri May 26 10:25:16 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri May 26 16:12:07 2017 +0200
@@ -70,6 +70,13 @@
   # (recommended 'off' for developer repositories)
   # (recommended 'yes' for server (default))
   obshashrange.warm-cache = no
+
+It is recommended to enable the blackbox extension to gather useful
+data about the experiment. It is shipped with Mercurial so no extra
+install needed.
+
+    [extensions]
+    blackbox =
 """
 
 evolutionhelptext = """
@@ -810,7 +817,10 @@
             message = old.description()
 
         user = commitopts.get('user') or old.user()
-        date = commitopts.get('date') or None # old.date()
+        # TODO: In case not date is given, we should take the old commit date
+        # if we are working one one changeset or mimic the fold behavior about
+        # date
+        date = commitopts.get('date') or None
         extra = dict(commitopts.get('extra', old.extra()))
         extra['branch'] = head.branch()
 
@@ -1310,7 +1320,7 @@
 
     revs = repo.revs('+'.join("%s()" % t for t in troublecategories))
     if opts.get('rev'):
-        revs = revs & repo.revs(opts.get('rev'))
+        revs = scmutil.revrange(repo, opts.get('rev'))
 
     fm = ui.formatter('evolvelist', opts)
     for rev in revs:

--- a/tests/test-evolve-list.t	Fri May 26 10:25:16 2017 +0200
+++ b/tests/test-evolve-list.t	Fri May 26 16:12:07 2017 +0200
@@ -72,6 +72,10 @@
   a922b3733e98: b
     divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
   
+  $ hg evolve --list --rev c882616e9d84
+  c882616e9d84: b
+    divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
+  
   $ hg phase -p a922b3733e98
   $ hg evolve --list
   c882616e9d84: b

--- a/tests/test-evolve.t	Fri May 26 10:25:16 2017 +0200
+++ b/tests/test-evolve.t	Fri May 26 16:12:07 2017 +0200
@@ -1597,8 +1597,11 @@
   |
   ~
 
-TODO: don't create a new commit in this case
-  $ hg metaedit --config defaults.metaedit=
+TODO: don't create a new commit in this case, we should take the date of the
+old commit (we add a default date with a value to show that metaedit is taking
+the current date to generate the hash, this way we still have a stable hash
+but highlight the bug)
+  $ hg metaedit --config defaults.metaedit= --config devel.default-date="42 0"
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'
   36: add uu