This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8200

pull: add `--confirm` flag to confirm before writing changes
ClosedPublic

Authored by pulkit on Feb 29 2020, 2:31 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGbd7b2c8d06cc: pull: add `--confirm` flag to confirm before writing changes
rHG9386b71a1f98: pull: add `--confirm` flag to confirm before writing changes
rHG476c8e427975: pull: add `--confirm` flag to confirm before writing changes
Summary

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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Feb 29 2020, 2:31 AM
durin42 added a subscriber: durin42.Mar 3 2020, 1:26 PM
durin42 added inline comments.
mercurial/exchange.py
1807

I think this should probably respect HGPLAIN. Thoughts?

(Note that doing so will require some reworking, because you probably want HGPLAIN=1 hg pull --confirm to confirm, and it wouldn't if you just respect HGPLAIN on this line.)

marmoute added a subscriber: marmoute.Mar 4 2020, 2:48 PM
marmoute added inline comments.
mercurial/exchange.py
1807

From IRC discussion, HGPLAIN should result in the config option to be ignored, but the command line flag to be enforced.

durin42 requested changes to this revision.Mar 4 2020, 5:07 PM

(marking as needs-changes since we've got consensus)

This revision now requires changes to proceed.Mar 4 2020, 5:07 PM
pulkit updated this revision to Diff 20501.Mar 5 2020, 4:11 AM
pulkit added a commit: rHG476c8e427975: pull: add `--confirm` flag to confirm before writing changes.Mar 11 2020, 12:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG476c8e427975: pull: add `--confirm` flag to confirm before writing changes (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 20406

mercurial/commands.py

_(b'update to new branch head if new descendants were pulled'), _(b'update to new branch head if new descendants were pulled'),
), ),
( (
b'f', b'f',
b'force', b'force',
None, None,
_(b'run even when remote repository is unrelated'), _(b'run even when remote repository is unrelated'),
), ),
(b'', b'confirm', None, _(b'confirm pull before applying changes'),),
( (
b'r', b'r',
b'rev', b'rev',
[], [],
_(b'a remote changeset intended to be added'), _(b'a remote changeset intended to be added'),
_(b'REV'), _(b'REV'),
), ),
(b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')), (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
node = fnodes[i].result() node = fnodes[i].result()
nodes.append(node) nodes.append(node)
if rev == checkout: if rev == checkout:
checkout = node checkout = node
wlock = util.nullcontextmanager() wlock = util.nullcontextmanager()
if opts.get(b'update'): if opts.get(b'update'):
wlock = repo.wlock() wlock = repo.wlock()
with wlock: overrides = {}
if opts.get(b'confirm'):
overrides = {(b'pull', b'confirm'): True}
with wlock, ui.configoverride(overrides, b'pull'):
pullopargs.update(opts.get(b'opargs', {})) pullopargs.update(opts.get(b'opargs', {}))
modheads = exchange.pull( modheads = exchange.pull(
repo, repo,
other, other,
heads=nodes, heads=nodes,
force=opts.get(b'force'), force=opts.get(b'force'),
bookmarks=opts.get(b'bookmark', ()), bookmarks=opts.get(b'bookmark', ()),
opargs=pullopargs, opargs=pullopargs,

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'progress', b'refresh', default=0.1, b'progress', b'refresh', default=0.1,
) )
coreconfigitem( coreconfigitem(
b'progress', b'width', default=dynamicdefault, b'progress', b'width', default=dynamicdefault,
) )
coreconfigitem( coreconfigitem(
b'pull', b'confirm', default=False,
)
coreconfigitem(
b'push', b'pushvars.server', default=False, b'push', b'pushvars.server', default=False,
) )
coreconfigitem( coreconfigitem(
b'rewrite', b'rewrite',
b'backup-bundle', b'backup-bundle',
default=True, default=True,
alias=[(b'ui', b'history-editing-backup')], alias=[(b'ui', b'history-editing-backup')],
) )

mercurial/exchange.py

# exchange.py - utility to exchange data between repos. # exchange.py - utility to exchange data between repos.
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import weakref
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid, nullid,
nullrev, nullrev,
) )
from .thirdparty import attr from .thirdparty import attr
break break
if all(unficl.hasnode(n) for n in pullop.rheads): if all(unficl.hasnode(n) for n in pullop.rheads):
break break
new_heads = headsofdiff(unficl.heads(), old_heads) new_heads = headsofdiff(unficl.heads(), old_heads)
pullop.common = headsofunion(new_heads, pullop.common) pullop.common = headsofunion(new_heads, pullop.common)
pullop.rheads = set(pullop.rheads) - pullop.common 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( def pull(
repo, repo,
remote, remote,
heads=None, heads=None,
force=False, force=False,
bookmarks=(), bookmarks=(),
opargs=None, opargs=None,
streamclonerequested=None, streamclonerequested=None,
) % (b', '.join(sorted(missing))) ) % (b', '.join(sorted(missing)))
raise error.Abort(msg) raise error.Abort(msg)
pullop.trmanager = transactionmanager(repo, b'pull', remote.url()) pullop.trmanager = transactionmanager(repo, b'pull', remote.url())
wlock = util.nullcontextmanager() wlock = util.nullcontextmanager()
if not bookmod.bookmarksinstore(repo): if not bookmod.bookmarksinstore(repo):
wlock = repo.wlock() wlock = repo.wlock()
with wlock, repo.lock(), pullop.trmanager: with wlock, repo.lock(), pullop.trmanager:
if repo.ui.configbool(b"pull", b"confirm"):
durin42Unsubmitted
Not Done

I think this should probably respect HGPLAIN. Thoughts?

(Note that doing so will require some reworking, because you probably want HGPLAIN=1 hg pull --confirm to confirm, and it wouldn't if you just respect HGPLAIN on this line.)

durin42: I think this should probably respect HGPLAIN. Thoughts? (Note that doing so will require some…
marmouteUnsubmitted
Not Done

From IRC discussion, HGPLAIN should result in the config option to be ignored, but the command line flag to be enforced.

marmoute: From IRC discussion, HGPLAIN should result in the config option to be ignored, but the command…
add_confirm_callback(repo, pullop)
# Use the modern wire protocol, if available. # Use the modern wire protocol, if available.
if remote.capable(b'command-changesetdata'): if remote.capable(b'command-changesetdata'):
exchangev2.pull(pullop) exchangev2.pull(pullop)
else: else:
# This should ideally be in _pullbundle2(). However, it needs to run # This should ideally be in _pullbundle2(). However, it needs to run
# before discovery to avoid extra work. # before discovery to avoid extra work.
_maybeapplyclonebundle(pullop) _maybeapplyclonebundle(pullop)
streamclone.maybeperformlegacystreamclone(pullop) streamclone.maybeperformlegacystreamclone(pullop)

relnotes/next

== New Features == == New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of * `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag. 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 * `hg log` now defaults to using an '%' symbol for commits involved
in unresolved merge conflicts. That includes unresolved conflicts in unresolved merge conflicts. That includes unresolved conflicts
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
precedence, so what used to be marked '@' still is. precedence, so what used to be marked '@' still is.
* New `conflictlocal()` and `conflictother()` revsets return the * New `conflictlocal()` and `conflictother()` revsets return the
commits that are being merged, when there are conflicts. Also works commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`. for conflicts caused by e.g. `hg graft`.

tests/test-completion.t

locate: rev, print0, fullpath, include, exclude locate: rev, print0, fullpath, include, exclude
log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude
manifest: rev, all, template manifest: rev, all, template
merge: force, rev, preview, abort, tool merge: force, rev, preview, abort, tool
outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
parents: rev, style, template parents: rev, style, template
paths: template paths: template
phase: public, draft, secret, force, rev 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 push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure
recover: verify recover: verify
remove: after, force, subrepos, include, exclude, dry-run remove: after, force, subrepos, include, exclude, dry-run
rename: after, force, include, exclude, dry-run rename: after, force, include, exclude, dry-run
resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
revert: all, date, rev, no-backup, interactive, include, exclude, dry-run revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
rollback: dry-run, force rollback: dry-run, force
root: template root: template

tests/test-obsolete-distributed.t

e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'}
7f6b0a6f5c25345a83870963efd827c1798a5959 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'client'} 7f6b0a6f5c25345a83870963efd827c1798a5959 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'client'}
client side: pull from the server client side: pull from the server
(the new successors should take over) (the new successors should take over)
$ hg up 'desc("ROOT")' $ hg up 'desc("ROOT")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 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 pulling from $TESTTMP/distributed-chain-building/server
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes 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) added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
new changesets 391a2bf12b1b (1 drafts) new changesets 391a2bf12b1b (1 drafts)
(run 'hg heads' to see heads) (run 'hg heads' to see heads)
$ hg log -G $ hg log -G
o 4:391a2bf12b1b c_B1 o 4:391a2bf12b1b c_B1
| |

tests/test-obsolete.t

0:1f0dee641bb7 (public) [ ] add a 0:1f0dee641bb7 (public) [ ] add a
1:7c3bad9141dc (public) [ ] add b 1:7c3bad9141dc (public) [ ] add b
2:245bde4270cd (public) [ ] add original_c 2:245bde4270cd (public) [ ] add original_c
6:6f9641995072 (draft) [tip ] add n3w_3_c 6:6f9641995072 (draft) [tip ] add n3w_3_c
Try to pull markers Try to pull markers
(extinct changeset are excluded but marker are pushed) (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 pulling from ../tmpb
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes 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) added 4 changesets with 4 changes to 4 files (+1 heads)
5 new obsolescence markers 5 new obsolescence markers
new changesets 1f0dee641bb7:6f9641995072 (1 drafts) new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg debugobsolete $ hg debugobsolete
1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}

tests/test-phases-exchange.t

| | | |
| o 2 public a-C - 54acac6f23ab | o 2 public a-C - 54acac6f23ab
|/ |/
o 1 public a-B - 548a3d25dbf0 o 1 public a-B - 548a3d25dbf0
| |
o 0 public a-A - 054250a37db4 o 0 public a-A - 054250a37db4
$ cd ../mu $ cd ../mu
$ hg pull ../nu $ hg pull ../nu --confirm --config ui.interactive=True<<EOF
> y
> EOF
pulling from ../nu pulling from ../nu
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes 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 added 2 changesets with 2 changes to 2 files
new changesets d6bcb4f74035:145e75495359 (2 drafts) new changesets d6bcb4f74035:145e75495359 (2 drafts)
4 local changesets published 4 local changesets published
test-debug-phase: move rev 0: 1 -> 0 test-debug-phase: move rev 0: 1 -> 0
test-debug-phase: move rev 1: 1 -> 0 test-debug-phase: move rev 1: 1 -> 0
test-debug-phase: move rev 3: 1 -> 0 test-debug-phase: move rev 3: 1 -> 0
test-debug-phase: move rev 4: 1 -> 0 test-debug-phase: move rev 4: 1 -> 0
test-debug-phase: new rev 5: x -> 1 test-debug-phase: new rev 5: x -> 1

tests/test-pull-r.t

$ cat <<EOF >> $HGRCPATH
> [ui]
> interactive = true
> EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo foo > foo $ echo foo > foo
$ hg ci -qAm 'add foo' $ hg ci -qAm 'add foo'
$ echo >> foo $ echo >> foo
$ hg ci -m 'change foo' $ hg ci -m 'change foo'
$ hg up -qC 0 $ hg up -qC 0
$ echo bar > bar $ echo bar > bar
$ echo hello >> foo $ echo hello >> foo
$ hg ci -mx1 $ hg ci -mx1
created new head created new head
$ hg ci -mx2 --close-branch $ hg ci -mx2 --close-branch
$ cd ../repo3 $ cd ../repo3
$ hg heads -q --closed $ hg heads -q --closed
2:effea6de0384 2:effea6de0384
1:ed1b79f46b9a 1:ed1b79f46b9a
$ hg pull $ hg pull --confirm << EOF
> n
> EOF
pulling from $TESTTMP/repo2 pulling from $TESTTMP/repo2
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes 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 added 2 changesets with 1 changes to 1 files
new changesets 8c900227dd5d:00cfe9073916 new changesets 8c900227dd5d:00cfe9073916
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg heads -q --closed $ hg heads -q --closed
4:00cfe9073916 4:00cfe9073916
2:effea6de0384 2:effea6de0384
1:ed1b79f46b9a 1:ed1b79f46b9a