Mercurial > hg
changeset 44545:bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
This introduces a new flag to pull command `--confirm` and also a config option
named `pull.confirm` which if used will prompt user describing changes which are
pulled and asking whether to accept them or not.
Differential Revision: https://phab.mercurial-scm.org/D8200
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sat, 29 Feb 2020 12:58:38 +0530 |
| parents | 13da36d77a3f |
| children | 20d74eebe56c |
| files | mercurial/commands.py mercurial/configitems.py mercurial/exchange.py relnotes/next tests/test-completion.t tests/test-obsolete-distributed.t tests/test-obsolete.t tests/test-phases-exchange.t tests/test-pull-r.t |
| diffstat | 9 files changed, 158 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Feb 29 12:58:13 2020 +0530 +++ b/mercurial/commands.py Sat Feb 29 12:58:38 2020 +0530 @@ -5344,6 +5344,7 @@ None, _(b'run even when remote repository is unrelated'), ), + (b'', b'confirm', None, _(b'confirm pull before applying changes'),), ( b'r', b'rev', @@ -5460,6 +5461,7 @@ force=opts.get(b'force'), bookmarks=opts.get(b'bookmark', ()), opargs=pullopargs, + confirm=opts.get(b'confirm'), ).cgresult # brev is a name, which might be a bookmark to be activated at
--- a/mercurial/configitems.py Sat Feb 29 12:58:13 2020 +0530 +++ b/mercurial/configitems.py Sat Feb 29 12:58:38 2020 +0530 @@ -1067,6 +1067,9 @@ b'progress', b'width', default=dynamicdefault, ) coreconfigitem( + b'pull', b'confirm', default=False, +) +coreconfigitem( b'push', b'pushvars.server', default=False, ) coreconfigitem(
--- a/mercurial/exchange.py Sat Feb 29 12:58:13 2020 +0530 +++ b/mercurial/exchange.py Sat Feb 29 12:58:38 2020 +0530 @@ -8,6 +8,7 @@ from __future__ import absolute_import import collections +import weakref from .i18n import _ from .node import ( @@ -1705,6 +1706,25 @@ pullop.rheads = set(pullop.rheads) - pullop.common +def add_confirm_callback(repo, pullop): + """ adds a finalize callback to transaction which can be used to show stats + to user and confirm the pull before committing transaction """ + + tr = pullop.trmanager.transaction() + scmutil.registersummarycallback( + repo, tr, txnname=b'pull', as_validator=True + ) + reporef = weakref.ref(repo.unfiltered()) + + def prompt(tr): + repo = reporef() + cm = _(b'accept incoming changes (yn)?$$ &Yes $$ &No') + if repo.ui.promptchoice(cm): + raise error.Abort("user aborted") + + tr.addvalidator(b'900-pull-prompt', prompt) + + def pull( repo, remote, @@ -1716,6 +1736,7 @@ includepats=None, excludepats=None, depth=None, + confirm=None, ): """Fetch repository data from a remote. @@ -1740,6 +1761,8 @@ ``depth`` is an integer indicating the DAG depth of history we're interested in. If defined, for each revision specified in ``heads``, we will fetch up to this many of its ancestors and data associated with them. + ``confirm`` is a boolean indicating whether the pull should be confirmed + before committing the transaction. This overrides HGPLAIN. Returns the ``pulloperation`` created for this pull. """ @@ -1786,6 +1809,11 @@ if not bookmod.bookmarksinstore(repo): wlock = repo.wlock() with wlock, repo.lock(), pullop.trmanager: + if confirm or ( + repo.ui.configbool(b"pull", b"confirm") and not repo.ui.plain() + ): + add_confirm_callback(repo, pullop) + # Use the modern wire protocol, if available. if remote.capable(b'command-changesetdata'): exchangev2.pull(pullop)
--- a/relnotes/next Sat Feb 29 12:58:13 2020 +0530 +++ b/relnotes/next Sat Feb 29 12:58:38 2020 +0530 @@ -3,6 +3,9 @@ * `hg purge`/`hg clean` can now delete ignored files instead of untracked files, with the new -i flag. + * `hg pull` now has a `--confirm` flag to prompt before applying changes. + Config option `pull.confirm` is also added for that. + * `hg log` now defaults to using an '%' symbol for commits involved in unresolved merge conflicts. That includes unresolved conflicts caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
--- a/tests/test-completion.t Sat Feb 29 12:58:13 2020 +0530 +++ b/tests/test-completion.t Sat Feb 29 12:58:38 2020 +0530 @@ -345,7 +345,7 @@ parents: rev, style, template paths: template phase: public, draft, secret, force, rev - pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure + pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure recover: verify remove: after, force, subrepos, include, exclude, dry-run
--- a/tests/test-obsolete-distributed.t Sat Feb 29 12:58:13 2020 +0530 +++ b/tests/test-obsolete-distributed.t Sat Feb 29 12:58:38 2020 +0530 @@ -138,12 +138,37 @@ $ hg up 'desc("ROOT")' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg pull + $ hg pull --confirm --config ui.interactive=True << EOF + > n + > EOF pulling from $TESTTMP/distributed-chain-building/server searching for changes adding changesets adding manifests adding file changes + adding 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + obsoleting 1 changesets + new changesets 391a2bf12b1b (1 drafts) + accept incoming changes (yn)? n + transaction abort! + rollback completed + abort: user aborted + [255] + + $ hg pull --confirm --config ui.interactive=True << EOF + > y + > EOF + pulling from $TESTTMP/distributed-chain-building/server + searching for changes + adding changesets + adding manifests + adding file changes + adding 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers + obsoleting 1 changesets + new changesets 391a2bf12b1b (1 drafts) + accept incoming changes (yn)? y added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets
--- a/tests/test-obsolete.t Sat Feb 29 12:58:13 2020 +0530 +++ b/tests/test-obsolete.t Sat Feb 29 12:58:38 2020 +0530 @@ -377,15 +377,53 @@ 2:245bde4270cd (public) [ ] add original_c 6:6f9641995072 (draft) [tip ] add n3w_3_c -Try to pull markers +Try to pull markers while testing pull --confirm (extinct changeset are excluded but marker are pushed) - $ hg pull ../tmpb + $ hg pull ../tmpb --confirm --config ui.interactive=true <<EOF + > n + > EOF pulling from ../tmpb requesting all changes adding changesets adding manifests adding file changes + adding 4 changesets with 4 changes to 4 files (+1 heads) + 5 new obsolescence markers + new changesets 1f0dee641bb7:6f9641995072 (1 drafts) + accept incoming changes (yn)? n + transaction abort! + rollback completed + abort: user aborted + [255] + $ HGPLAIN=1 hg pull ../tmpb --confirm --config ui.interactive=true <<EOF + > n + > EOF + pulling from ../tmpb + requesting all changes + adding changesets + adding manifests + adding file changes + adding 4 changesets with 4 changes to 4 files (+1 heads) + 5 new obsolescence markers + new changesets 1f0dee641bb7:6f9641995072 (1 drafts) + accept incoming changes (yn)? n + transaction abort! + rollback completed + abort: user aborted + [255] + $ hg pull ../tmpb --confirm --config ui.interactive=true <<EOF + > y + > EOF + pulling from ../tmpb + requesting all changes + adding changesets + adding manifests + adding file changes + adding 4 changesets with 4 changes to 4 files (+1 heads) + 5 new obsolescence markers + new changesets 1f0dee641bb7:6f9641995072 (1 drafts) + accept incoming changes (yn)? y added 4 changesets with 4 changes to 4 files (+1 heads) 5 new obsolescence markers new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
--- a/tests/test-phases-exchange.t Sat Feb 29 12:58:13 2020 +0530 +++ b/tests/test-phases-exchange.t Sat Feb 29 12:58:38 2020 +0530 @@ -326,12 +326,18 @@ o 0 public a-A - 054250a37db4 $ cd ../mu - $ hg pull ../nu + $ hg pull ../nu --confirm --config ui.interactive=True<<EOF + > y + > EOF pulling from ../nu searching for changes adding changesets adding manifests adding file changes + adding 2 changesets with 2 changes to 2 files + new changesets d6bcb4f74035:145e75495359 (2 drafts) + 4 local changesets will be published + accept incoming changes (yn)? y added 2 changesets with 2 changes to 2 files new changesets d6bcb4f74035:145e75495359 (2 drafts) 4 local changesets published
--- a/tests/test-pull-r.t Sat Feb 29 12:58:13 2020 +0530 +++ b/tests/test-pull-r.t Sat Feb 29 12:58:38 2020 +0530 @@ -1,3 +1,9 @@ + $ cat <<EOF >> $HGRCPATH + > [ui] + > interactive = true + > EOF + + $ hg init repo $ cd repo $ echo foo > foo @@ -42,12 +48,47 @@ $ hg heads -q --closed 2:effea6de0384 1:ed1b79f46b9a - $ hg pull + $ hg pull --confirm << EOF + > n + > EOF pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes + adding 2 changesets with 1 changes to 1 files + new changesets 8c900227dd5d:00cfe9073916 + accept incoming changes (yn)? n + transaction abort! + rollback completed + abort: user aborted + [255] + $ hg pull --config pull.confirm=true << EOF + > n + > EOF + pulling from $TESTTMP/repo2 + searching for changes + adding changesets + adding manifests + adding file changes + adding 2 changesets with 1 changes to 1 files + new changesets 8c900227dd5d:00cfe9073916 + accept incoming changes (yn)? n + transaction abort! + rollback completed + abort: user aborted + [255] + $ hg pull --confirm << EOF + > y + > EOF + pulling from $TESTTMP/repo2 + searching for changes + adding changesets + adding manifests + adding file changes + adding 2 changesets with 1 changes to 1 files + new changesets 8c900227dd5d:00cfe9073916 + accept incoming changes (yn)? y added 2 changesets with 1 changes to 1 files new changesets 8c900227dd5d:00cfe9073916 (run 'hg update' to get a working copy) @@ -56,6 +97,12 @@ 2:effea6de0384 1:ed1b79f46b9a +pull--confirm config option should be ignored if HGPLAIN is set + $ HGPLAIN=1 hg pull --config pull.confirm=True + pulling from $TESTTMP/repo2 + searching for changes + no changes found + $ cd .. $ hg init copy