Mercurial > evolve

changeset 4520:36632d514af2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Apr 2019 02:21:09 +0200
parents bea4c5c3b50c (diff) e23f85bc43ed (current diff)
children f6099a171a9d ede9b37572f0
files hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 5 files changed, 73 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py	Fri Apr 12 02:20:24 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Fri Apr 12 02:21:09 2019 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '8.5.1.dev'
+__version__ = '8.6.0.dev'
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Fri Apr 12 02:20:24 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Apr 12 02:21:09 2019 +0200
@@ -179,7 +179,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.14.1.dev'
+__version__ = '0.15.0.dev'
 
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'
--- a/tests/test-split.t	Fri Apr 12 02:20:24 2019 +0200
+++ b/tests/test-split.t	Fri Apr 12 02:21:09 2019 +0200
@@ -779,9 +779,18 @@
 
 (remaining changes gathered with unmatched one)
 
+adding content in files to make sure that it prompt us to select the changes,
+as it won't prompt if a file has no changes at hunk level and passed in cli
+(for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX"
+for files which are explicitly mentioned by user)
+  $ echo sp2 > SPLIT2
+  $ echo sp3 > SPLIT3
+  $ echo sp4 > SPLIT4
+  $ hg amend
+
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > c
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -790,13 +799,18 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] c
+
   $ hg status --change '.~1'
   A SPLIT2
   $ hg status --change '.'
@@ -810,7 +824,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > y
   > y
   > EOF
@@ -820,18 +834,25 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] y
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record this change to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
+
   $ hg status --change '.~2'
   A SPLIT2
   $ hg status --change '.~1'
@@ -854,11 +875,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
   
   no more change to split
   $ hg status --change '.~1'
@@ -874,7 +899,7 @@
 
   $ hg split SPLIT2 SPLIT3 << EOF
   > y
-  > n
+  > s
   > d
   > EOF
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
@@ -883,11 +908,15 @@
   adding SPLIT4
   diff --git a/SPLIT2 b/SPLIT2
   new file mode 100644
-  examine changes to 'SPLIT2'? [Ynesfdaq?] y
+  @@ -0,0 +1,1 @@
+  +sp2
+  record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
   
   diff --git a/SPLIT3 b/SPLIT3
   new file mode 100644
-  examine changes to 'SPLIT3'? [Ynesfdaq?] n
+  @@ -0,0 +1,1 @@
+  +sp3
+  record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
   
   continue splitting? [Ycdq?] d
   discarding remaining changes
--- a/tests/test-topic.t	Fri Apr 12 02:20:24 2019 +0200
+++ b/tests/test-topic.t	Fri Apr 12 02:21:09 2019 +0200
@@ -860,6 +860,10 @@
   3: featureA
   $ tlog 'featureA#topic[0]'
   3: featureA
+  $ tlog 'featureA#topic[:]'
+  1: featureA
+  2: featureA
+  3: featureA
 
   $ tlog '2#t[-2]'
   $ tlog '2#t[-1]'
@@ -869,6 +873,10 @@
   $ tlog '2#t[1]'
   3: featureA
   $ tlog '2#t[2]'
+  $ tlog '2#t[-1:1]'
+  1: featureA
+  2: featureA
+  3: featureA
 
 stack subscript relation
 
@@ -898,6 +906,28 @@
 
   $ tlog 'featureA#s[0]'
   0: 
+  $ tlog 'featureA#s[0:0]'
+  0: 
+  $ tlog 'featureA#s[:]'
+  1: featureA
+  2: featureA
+  3: featureA
+  $ tlog 'featureA#s[2:]'
+  2: featureA
+  3: featureA
+  $ tlog 'featureA#s[:2]'
+  1: featureA
+  2: featureA
+  $ tlog 'featureA#s[0:1]'
+  0: 
+  1: featureA
+  $ tlog 'featureA#s[-1:0]'
+  0: 
+  3: featureA
+  $ tlog 'featureA#s[-3:3]'
+  1: featureA
+  2: featureA
+  3: featureA
   $ tlog 'featureA#s[1] and featureA#s[-3]'
   1: featureA
   $ tlog 'featureA#s[2] and featureA#s[-2]'
--- a/tests/test-uncommit-interactive.t	Fri Apr 12 02:20:24 2019 +0200
+++ b/tests/test-uncommit-interactive.t	Fri Apr 12 02:21:09 2019 +0200
@@ -780,12 +780,9 @@
 
   $ hg uncommit -i a << DONE
   > y
-  > y
   > DONE
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
   @@ -9,3 +9,4 @@
    4
    5
@@ -846,13 +843,10 @@
 
   $ hg uncommit -i a << DONE
   > y
-  > y
   > n
   > DONE
   diff --git a/a b/a
   2 hunks, 2 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
   @@ -1,3 +1,4 @@
   +-3
    -2