This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7786

update: add --abort option in hg update command (issue4404)
Needs RevisionPublic

Authored by khanchi97 on Jan 3 2020, 10:05 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Summary

Here is, what --abort option is basically doing:

  1. hg resolve --unmark, then
  2. hg resolve --all --tool :local
  3. hg up <original ctx> --tool :local

Where,
step 1) is to mark all the files conflicted as unresolved (marking *all*
files to make sure that it also mark the files which might have been
resolved by user in meantime)

step 2) resolve all the conflicting files using --tool :local

step 3) update to the revision where it was checkedout before running the
hg update, using --tool :local

Use of --tool :local while updating to old revision (step3) make sure that
it will not hit merge conflict at the time of update. And since we are using
the same tool (:local) as we used at the time of resolution (step2) it makes
sure that we have exact changes in working directory as it was before IIUC.

Added tests demonstrate the behaviour of new flag.

Diff Detail

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

Event Timeline

khanchi97 created this revision.Jan 3 2020, 10:05 AM
mharbison72 requested changes to this revision.Jan 4 2020, 1:59 AM
mharbison72 added a subscriber: mharbison72.

This looks like a respin of D6735. Can you take a look at my comments in there about subrepos, and incorporate the appropriate tests? (I also didn't side by side compare the existing tests, so I'm not sure if there are things tested in that revision that aren't tested here.)

This revision now requires changes to proceed.Jan 4 2020, 1:59 AM

Revision Contents
Changeset List

Diff 19034

mercurial/commands.py

continuefunc=shelvemod.hgcontinueunshelve, continuefunc=shelvemod.hgcontinueunshelve,
cmdmsg=_(b'unshelve already in progress'), cmdmsg=_(b'unshelve already in progress'),
) )
@command( @command(
b'update|up|checkout|co', b'update|up|checkout|co',
[ [
(b'a', b'abort', None, _(b'abort the interrupted update')),
(b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')), (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
(b'c', b'check', None, _(b'require clean working directory')), (b'c', b'check', None, _(b'require clean working directory')),
(b'm', b'merge', None, _(b'merge uncommitted changes')), (b'm', b'merge', None, _(b'merge uncommitted changes')),
(b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')), (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
(b'r', b'rev', b'', _(b'revision'), _(b'REV')), (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
] ]
+ mergetoolopts, + mergetoolopts,
_(b'[-C|-c|-m] [-d DATE] [[-r] REV]'), _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.
""" """
rev = opts.get('rev') rev = opts.get('rev')
date = opts.get('date') date = opts.get('date')
clean = opts.get('clean') clean = opts.get('clean')
check = opts.get('check') check = opts.get('check')
merge = opts.get('merge') merge = opts.get('merge')
abort = opts.get('abort')
if rev and node: if rev and node:
raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))
if abort:
overrides = {(b'ui', b'forcemerge'): b':local', (b'ui', 'quiet'): True}
with repo.wlock(), ui.configoverride(overrides, b'update'):
ms = mergemod.mergestate.read(repo)
if not ms.active():
raise error.Abort(_(b'no interrupted update exists'))
resolve(ui, repo, **{'unmark': True})
resolve(ui, repo, **{'all': True, 'tool':':local'})
# hg update to orig revision
local = ms.localctx
updatecheck = b'none'
hg.updatetotally(ui, repo, local, local, updatecheck=updatecheck)
ms.clean(repo)
ui.status(_(b'update aborted\n'))
return 0
if ui.configbool(b'commands', b'update.requiredest'): if ui.configbool(b'commands', b'update.requiredest'):
if not node and not rev and not date: if not node and not rev and not date:
raise error.Abort( raise error.Abort(
_(b'you must specify a destination'), _(b'you must specify a destination'),
hint=_(b'for example: hg update ".::"'), hint=_(b'for example: hg update ".::"'),
) )
if rev is None or rev == b'': if rev is None or rev == b'':

tests/test-completion.t

shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
summary: remote summary: remote
tag: force, local, rev, remove, edit, message, date, user tag: force, local, rev, remove, edit, message, date, user
tags: template tags: template
tip: patch, git, style, template tip: patch, git, style, template
unbundle: update unbundle: update
unshelve: abort, continue, interactive, keep, name, tool, date unshelve: abort, continue, interactive, keep, name, tool, date
update: clean, check, merge, date, rev, tool update: abort, clean, check, merge, date, rev, tool
verify: full verify: full
version: template version: template
$ hg init a $ hg init a
$ cd a $ cd a
$ echo fee > fee $ echo fee > fee
$ hg ci -q -Amfee $ hg ci -q -Amfee
$ hg tag fee $ hg tag fee

tests/test-update-branches.t

> [defaults] > [defaults]
> update = --check > update = --check
> EOF > EOF
$ hg co 2 $ hg co 2
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg co --no-check 2 $ hg co --no-check 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
$ cd ..
Test hg update --abort option
$ hg init issue4404
$ cd issue4404
$ echo "before\nmiddle" > file
$ hg add file
$ hg commit -mbefore
$ echo "after\nmiddle" > file
$ hg commit -mafter
$ echo "edited\nmiddle\nlast" > file
$ echo foo > foo
$ hg add foo
$ hg diff
diff -r fd93e7c2e3ea file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@
-after
+edited
middle
+last
diff -r fd93e7c2e3ea foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
$ hg update 0 --no-check
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ hg diff
diff -r f013c8cc5b24 file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,7 @@
+<<<<<<< working copy: fd93e7c2e3ea - test: after
+edited
+=======
before
+>>>>>>> destination: f013c8cc5b24 - test: before
middle
+last
diff -r f013c8cc5b24 foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
$ hg up --abort
update aborted
Make sure diff is same as it was before running hg update
$ hg diff
diff -r fd93e7c2e3ea file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@
-after
+edited
middle
+last
diff -r fd93e7c2e3ea foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+foo
Error out if there is no interrupted update
$ hg up --abort
abort: no interrupted update exists
[255]