upstream/mercurial-mirror Commit - r40226:31dfa7da

absorb: prompt user to accept absorb changes by default...

Mark Thomas -

r40226:31dfa7da default

parent child

hgext/absorb.py

0 +9 -3

                     chunks = cmdutil.recordfilter(ui, origchunks)[0]
                     targetctx = overlaydiffcontext(stack[-1], chunks)
                 fm = None
-                if opts.get('print_changes'):
+                if opts.get('print_changes') or not opts.get('apply_changes'):
                     fm = ui.formatter('absorb', opts)
                 state.diffwith(targetctx, matcher, fm)
                 if fm is not None:
                                  label='absorb.description')
                     fm.end()
                 if not opts.get('dry_run'):
+                    if not opts.get('apply_changes'):
+                        if ui.promptchoice("apply changes (yn)? $$ &Yes $$ &No", default=1):
+                            raise error.Abort(_('absorb cancelled\n'))
                     state.apply()
                     if state.commit():
                         state.printchunkstats()
                 return state
             @command('^absorb',
-                     [('p', 'print-changes', None,
+                     [('a', 'apply-changes', None,
-                       _('print which changesets are modified by which changes')),
+                       _('apply changes without prompting for confirmation')),
+                      ('p', 'print-changes', None,
+                       _('just print which changesets are modified by which changes')),
                       ('i', 'interactive', None,
                        _('interactively select which chunks to apply (EXPERIMENTAL)')),
                       ('e', 'edit-lines', None,

tests/test-absorb-edit-lines.t

0 +3 -3

             absorb --edit-lines will run the editor if filename is provided:
-              $ hg absorb --edit-lines
+              $ hg absorb --edit-lines --apply-changes
               nothing applied
               [1]
-              $ HGEDITOR=cat hg absorb --edit-lines a
+              $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a
               HG: editing a
               HG: "y" means the line to the right exists in the changeset to the top
               HG:
               >     y   : f
               >     yyy : g
               > EOF
-              $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines a
+              $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a
               $ hg cat -r 0 a
               d
               e

tests/test-absorb-phase.t

0 +1 -1

               $ hg update C -q
               $ printf B1 > B
-              $ hg absorb -q
+              $ hg absorb -aq
               $ hg log -G -T '{desc} {phase}'
               @  C secret

tests/test-absorb-rename.t

0 +7 -7

 0b888b00216c a: 3
               $ sedi 's/$/a/' a
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for a
                       @@ -0,3 +0,3 @@
               eff892d -1
               $ sedi 's/a/A/' a
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for a
                       @@ -0,3 +0,3 @@
                       -1a
               $ sedi 's/$/a/' a
               $ sedi 's/$/b/' b
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for a
                       @@ -0,1 +0,1 @@
               eff892d -1
               $ sedi 's/$/a/' a
               $ sedi 's/$/a/' b
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for a
                       @@ -0,2 +0,2 @@
                       -1
               $ sedi 's/$/a/' a
               $ sedi 's/$/c/' c
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for a
                       @@ -0,2 +0,2 @@
 f9 -1
             run absorb again would apply the change to c
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for c
                       @@ -0,1 +0,1 @@
               7060601 -1
               $ sedi 's/$/e/' e
               $ sedi 's/$/d/' d
-              $ hg absorb -pq
+              $ hg absorb -apq
               showing changes for d
                       @@ -0,2 +0,2 @@
 f9 -1

tests/test-absorb-strip.t

0 +1 -1

               $ hg up E -q
               $ echo 1 >> B
               $ echo 2 >> D
-              $ hg absorb
+              $ hg absorb -a
               saved backup bundle to * (glob)
 of 2 chunk(s) applied

tests/test-absorb.t

0 +30 -17

             Run absorb:
-              $ hg absorb
+              $ hg absorb --apply-changes
               saved backup bundle to * (glob)
 of 2 chunk(s) applied
               $ hg annotate a
               > 2b
               > 4d
               > EOF
-              $ hg absorb
+              $ echo y | hg absorb --config ui.interactive=1
+              showing changes for a
+                      @@ -0,1 +0,0 @@
+              f548282 -1a
+                      @@ -2,1 +1,0 @@
+              ff5d556 -3
+                      @@ -4,1 +2,0 @@
+e5416 -5e
+changesets affected
+e5416 commit 5
+              ff5d556 commit 3
+              f548282 commit 1
+              apply changes (yn)?  y
               saved backup bundle to * (glob)
 of 3 chunk(s) applied
               $ hg annotate a
             Non 1:1 map changes will be ignored:
               $ echo 1 > a
-              $ hg absorb
+              $ hg absorb --apply-changes
               nothing applied
               [1]
               > 4d
               > insert aftert 4d
               > EOF
-              $ hg absorb -q
+              $ hg absorb -q --apply-changes
               $ hg status
               $ hg annotate a
 : insert before 2b
                  b2                        2:946e4bc87915
                * ba                        2:946e4bc87915
               $ sedi 's/insert/INSERT/' a
-              $ hg absorb -q
+              $ hg absorb -q --apply-changes
               $ hg status
               $ hg bookmarks
                  b1                        1:a4183e9b3d31
               $ touch c
               $ hg add c
               $ hg rm b
-              $ hg absorb
+              $ hg absorb --apply-changes
               nothing applied
               [1]
               $ sedi 's/INSERT/Insert/' a
-              $ hg absorb
+              $ hg absorb --apply-changes
               saved backup bundle to * (glob)
 of 2 chunk(s) applied
               $ hg status
 changesets affected
 b4e0e commit 4
-              $ hg absorb
+              $ hg absorb --apply-changes
               saved backup bundle to * (glob)
 of 2 chunk(s) applied
               $ hg diff -U 0
               $ echo 2 >> m1
               $ echo 2 >> m2
-              $ hg absorb
+              $ hg absorb --apply-changes
               abort: no mutable changeset to change
               [255]
               $ hg revert -q -C m1 m2
               $ hg status
               M a
               M b
-              $ hg absorb a
+              $ hg absorb --apply-changes a
               saved backup bundle to * (glob)
 of 1 chunk(s) applied
               $ hg status
               M b
-              $ hg absorb --exclude b
+              $ hg absorb --apply-changes --exclude b
               nothing applied
               [1]
-              $ hg absorb b
+              $ hg absorb --apply-changes b
               saved backup bundle to * (glob)
 of 1 chunk(s) applied
               $ hg status
               > add-noise=1
               > EOF
-              $ hg --config absorb.max-stack-size=3 absorb
+              $ hg --config absorb.max-stack-size=3 absorb -a
               absorb: only the recent 3 changesets will be analysed
 of 2 chunk(s) applied
               $ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
 :99cfab7da5ff commit b 1 74cfa6294160149d60adbf7582b99ce37a4597ec
 :fec2b3bd9e08 commit a 2 28f10dcf96158f84985358a2e5d5b3505ca69c22
 :f9a81da8dc53 commit a 1
-              $ hg absorb
+              $ hg absorb --apply-changes
 of 1 chunk(s) applied
               $ hg log -T '{rev}:{node|short} {desc} {get(extras, "absorb_source")}\n'
 :e1c8c1e030a4 commit b 2 3dfde4199b4610ea6e3c6fa9f5bdad8939d69524
 changesets affected
 b4ae7 foo
-              $ hg absorb
+              $ hg absorb --apply-changes
 of 1 chunk(s) applied
               $ hg diff -c .
               diff --git a/foo.py b/foo.py
 db b3
               1154859 b12
               bfafb49 a12
-              $ hg absorb -v | grep became
+              $ hg absorb -av | grep became
 :bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652
 :115485984805: 2 file(s) changed, became 5:0c930dfab74c
 :30970dbf7b40: became empty and was dropped
 changesets affected
 dbe7f a1234
               f1c23dd a123
-              $ hg absorb --verbose
+              $ hg absorb --apply-changes --verbose
 :f1c23dd5d08d: became empty and was dropped
 :82dbe7fd19f0: became empty and was dropped
               a: 1 of 1 chunk(s) applied

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages