This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8646

update: suggest --merge while `hg up` across topo branches
Changes PlannedPublic

Authored by khanchi97 on Jun 21 2020, 10:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Before this patch, during hg up across topological branches with
dirty working directory we suggested the user to "commit or update
--clean to discard"

I think suggesting --merge is better than --clean (which discard
changes with no backup). We can keep all the three options, but
probably then we will have sacrifice length of message.

Diff Detail

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

Event Timeline

khanchi97 created this revision.Jun 21 2020, 10:12 PM
martinvonz added a subscriber: martinvonz.Jun 22 2020, 1:04 AM

We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?

khanchi97 added a comment.Jun 22 2020, 2:22 AM
In D8646#129176, @martinvonz wrote:

We have not made this change before because there is no hg update --abort. Do we have that feature yet (I haven't followed all the changes recently)?

Ah, okay. I see. No, we don't have that feature yet. I sent a patch for hg update --abort but I got stuck in a subrepo case where we can lose some changes. I think now I am gonna revisit that case again, and try to figure out the fix or will start a discussion on that. Thanks :)
(both of these have some discussion on it https://phab.mercurial-scm.org/D7786 https://phab.mercurial-scm.org/D6735)

mjacob added a subscriber: mjacob.Jun 23 2020, 9:00 AM

I think it would be a good idea to mention both --clean and --merge, but mentioning only --merge is better than mentioning only --clean.

marmoute added a subscriber: marmoute.Jul 15 2020, 12:29 PM
In D8646#129257, @mjacob wrote:

I think it would be a good idea to mention both --clean and --merge, but mentioning only --merge is better than mentioning only --clean.

+1 on that.

I hope we can get this soon.

marmoute added a comment.Jul 15 2020, 12:31 PM

also: can we move this to "change planned" so that it stop showing up in yadda?

khanchi97 planned changes to this revision.Jul 16 2020, 2:40 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)
Mtests/test-merge5.t (2 lines)
Mtests/test-update-branches.t (14 lines)

Diff 21674

mercurial/merge.py

# Branching is a bit strange to ensure we do the minimal # Branching is a bit strange to ensure we do the minimal
# amount of call to obsutil.foreground. # amount of call to obsutil.foreground.
foreground = obsutil.foreground(repo, [p1.node()]) foreground = obsutil.foreground(repo, [p1.node()])
# note: the <node> variable contains a random identifier # note: the <node> variable contains a random identifier
if repo[node].node() in foreground: if repo[node].node() in foreground:
pass # allow updating to successors pass # allow updating to successors
else: else:
msg = _(b"uncommitted changes") msg = _(b"uncommitted changes")
hint = _(b"commit or update --clean to discard changes") hint = _(b"commit or update --merge to take along changes")
raise error.UpdateAbort(msg, hint=hint) raise error.UpdateAbort(msg, hint=hint)
else: else:
# Allow jumping branches if clean and specific rev given # Allow jumping branches if clean and specific rev given
pass pass
if overwrite: if overwrite:
pas = [wc] pas = [wc]
elif not branchmerge: elif not branchmerge:

tests/test-merge5.t

$ hg update -c 2 $ hg update -c 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mv a c $ mv a c
Should abort: Should abort:
$ hg update 1 $ hg update 1
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
[255] [255]
$ mv c a $ mv c a
Should succeed: Should succeed:
$ hg update 1 $ hg update 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-update-branches.t

$ revtest 'none dirtysub linear' dirtysub 1 2 $ revtest 'none dirtysub linear' dirtysub 1 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
M sub/suba M sub/suba
$ revtest 'none dirty same' dirty 2 3 $ revtest 'none dirty same' dirty 2 3
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
parent=2 parent=2
M foo M foo
$ revtest 'none dirtysub same' dirtysub 2 3 $ revtest 'none dirtysub same' dirtysub 2 3
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
parent=2 parent=2
M sub/suba M sub/suba
$ revtest 'none dirty cross' dirty 3 4 $ revtest 'none dirty cross' dirty 3 4
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
parent=3 parent=3
M foo M foo
$ norevtest 'none dirty cross' dirty 2 $ norevtest 'none dirty cross' dirty 2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "bd10386d478c: 2" updated to "bd10386d478c: 2"
1 other heads for branch "default" 1 other heads for branch "default"
parent=2 parent=2
M foo M foo
$ revtest 'none dirtysub cross' dirtysub 3 4 $ revtest 'none dirtysub cross' dirtysub 3 4
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
parent=3 parent=3
M sub/suba M sub/suba
$ revtest '-C dirty linear' dirty 1 2 -C $ revtest '-C dirty linear' dirty 1 2 -C
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2 parent=2
$ revtest '-c dirty linear' dirty 1 2 -c $ revtest '-c dirty linear' dirty 1 2 -c
$ hg rm foo $ hg rm foo
$ hg up -q 4 $ hg up -q 4
Uses default value of "linear" when value is misspelled Uses default value of "linear" when value is misspelled
$ echo 'update.check = linyar' >> .hg/hgrc $ echo 'update.check = linyar' >> .hg/hgrc
$ revtest 'dirty cross' dirty 3 4 $ revtest 'dirty cross' dirty 3 4
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
parent=3 parent=3
M foo M foo
Setup for later tests Setup for later tests
$ revtest 'none dirty linear' dirty 1 2 -c $ revtest 'none dirty linear' dirty 1 2 -c
abort: uncommitted changes abort: uncommitted changes
parent=1 parent=1
M foo M foo
$ hg bookmarks $ hg bookmarks
* bm 5:ff252e8273df * bm 5:ff252e8273df
Test that we abort before we warn about the hidden commit if the working Test that we abort before we warn about the hidden commit if the working
directory is dirty directory is dirty
$ echo conflict > a $ echo conflict > a
$ hg up --hidden 3 $ hg up --hidden 3
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
[255] [255]
Test that we still warn also when there are conflicts Test that we still warn also when there are conflicts
$ hg up -m --hidden 3 $ hg up -m --hidden 3
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
$ hg up 5 $ hg up 5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test that 5 is not detected as a valid destination from 2 Test that 5 is not detected as a valid destination from 2
$ hg up --quiet 0 $ hg up --quiet 0
$ hg up --quiet 2 $ hg up --quiet 2
$ hg up 5 $ hg up 5
abort: uncommitted changes abort: uncommitted changes
(commit or update --clean to discard changes) (commit or update --merge to take along changes)
[255] [255]
Test that we don't crash when updating from a pruned changeset (i.e. has no Test that we don't crash when updating from a pruned changeset (i.e. has no
successors). Behavior should probably be that we update to the first successors). Behavior should probably be that we update to the first
non-obsolete parent but that will be decided later. non-obsolete parent but that will be decided later.
$ hg id --debug -r 2 $ hg id --debug -r 2
bd10386d478cd5a9faf2e604114c8e6da62d3889 bd10386d478cd5a9faf2e604114c8e6da62d3889
$ hg up --quiet 0 $ hg up --quiet 0