This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8289

resolve: add a --clear option for clearing the merge state
Changes PlannedPublic

Authored by martinvonz on Mar 13 2020, 5:20 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

E.g. after running hg co -m and resolving merge conflicts, the merge
state will still exist. That can be seen when running hg resolve -l
or hg status -v (a.k.a. morestatus). There's currently no good way
of clearing it (hg co -C . works, but is not an option if you have a
dirty working copy). This patch adds hg resolve --clear specifically
for clearing the merge state.

Diff Detail

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

Event Timeline

martinvonz created this revision.Mar 13 2020, 5:20 PM
martinvonz edited the summary of this revision. (Show Details)Mar 17 2020, 6:05 PM
martinvonz updated this revision to Diff 20820.
pulkit added a subscriber: pulkit.Mar 19 2020, 4:30 AM

I like the idea. IIRC, Ryan from FB hit similar issues in a sprint some years ago and came up with hg up --finish or something like that.

Maybe we should not let user clear the mergestate and suggest continue/<cmd-name> --continue if it's not result of update command. Thoughts?

marmoute added a subscriber: marmoute.Mar 19 2020, 7:43 PM
In D8289#124009, @pulkit wrote:

I like the idea. IIRC, Ryan from FB hit similar issues in a sprint some years ago and came up with hg up --finish or something like that.
Maybe we should not let user clear the mergestate and suggest continue/<cmd-name> --continue if it's not result of update command. Thoughts?

Ho, that's a good idea. It looks like hg update --merge is the only command that do not have --continue support. So instead of adding a whole new flag and action to this exception, removing the exception seems like a better move. What do you think @martinvonz ?

martinvonz planned changes to this revision.Mar 19 2020, 7:55 PM
In D8289#124060, @marmoute wrote:
In D8289#124009, @pulkit wrote:

I like the idea. IIRC, Ryan from FB hit similar issues in a sprint some years ago and came up with hg up --finish or something like that.
Maybe we should not let user clear the mergestate and suggest continue/<cmd-name> --continue if it's not result of update command. Thoughts?

Ho, that's a good idea. It looks like hg update --merge is the only command that do not have --continue support. So instead of adding a whole new flag and action to this exception, removing the exception seems like a better move. What do you think @martinvonz ?

Yeah, I agree (sorry, was busy with other stuff today). It should be easy to change this patch from hg resolve --clear to hg update --continue. I might add the hg continue support as separate patch on top.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (26 lines)
Mrelnotes/next (4 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-resolve.t (25 lines)

Diff 20778

mercurial/commands.py

with repo.wlock(False): with repo.wlock(False):
return cmdutil.copy(ui, repo, pats, opts, rename=True) return cmdutil.copy(ui, repo, pats, opts, rename=True)
@command( @command(
b'resolve', b'resolve',
[ [
(b'a', b'all', None, _(b'select all unresolved files')), (b'a', b'all', None, _(b'select all unresolved files')),
(b'', b'clear', None, _(b'clear resolved merge state')),
(b'l', b'list', None, _(b'list state of files needing merge')), (b'l', b'list', None, _(b'list state of files needing merge')),
(b'm', b'mark', None, _(b'mark files as resolved')), (b'm', b'mark', None, _(b'mark files as resolved')),
(b'u', b'unmark', None, _(b'mark files as unresolved')), (b'u', b'unmark', None, _(b'mark files as unresolved')),
(b'n', b'no-status', None, _(b'hide status prefix')), (b'n', b'no-status', None, _(b'hide status prefix')),
(b'', b're-merge', None, _(b're-merge files')), (b'', b're-merge', None, _(b're-merge files')),
] ]
+ mergetoolopts + mergetoolopts
+ walkopts + walkopts
- :hg:`resolve -u [FILE]...`: mark a file as unresolved. The - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
default is to mark all resolved files. default is to mark all resolved files.
- :hg:`resolve -l`: list files which had or still have conflicts. - :hg:`resolve -l`: list files which had or still have conflicts.
In the printed list, ``U`` = unresolved and ``R`` = resolved. In the printed list, ``U`` = unresolved and ``R`` = resolved.
You can use ``set:unresolved()`` or ``set:resolved()`` to filter You can use ``set:unresolved()`` or ``set:resolved()`` to filter
the list. See :hg:`help filesets` for details. the list. See :hg:`help filesets` for details.
- :hg:`resolve --clear`: clear the merge state.
This is not allowed when there are unresolved files. Note that
:hg:`commit` will also clear the conflicts, so this option is primarily
useful when you cannot commit because the working copy is clean.
.. note:: .. note::
Mercurial will not let you commit files with unresolved merge Mercurial will not let you commit files with unresolved merge
conflicts. You must use :hg:`resolve -m ...` before you can conflicts. You must use :hg:`resolve -m ...` before you can
commit after a conflicting merge. commit after a conflicting merge.
.. container:: verbose .. container:: verbose
Template: Template:
The following keywords are supported in addition to the common template The following keywords are supported in addition to the common template
keywords and functions. See also :hg:`help templates`. keywords and functions. See also :hg:`help templates`.
:mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``. :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
:path: String. Repository-absolute path of the file. :path: String. Repository-absolute path of the file.
Returns 0 on success, 1 if any files fail a resolve attempt. Returns 0 on success, 1 if any files fail a resolve attempt.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
confirm = ui.configbool(b'commands', b'resolve.confirm') confirm = ui.configbool(b'commands', b'resolve.confirm')
flaglist = b'all mark unmark list no_status re_merge'.split() flaglist = b'all clear mark unmark list no_status re_merge'.split()
all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist] all, clear, mark, unmark, show, nostatus, remerge = [
opts.get(o) for o in flaglist
]
actioncount = len(list(filter(None, [show, mark, unmark, remerge]))) actioncount = len(list(filter(None, [clear, show, mark, unmark, remerge])))
if actioncount > 1: if actioncount > 1:
raise error.Abort(_(b"too many actions specified")) raise error.Abort(_(b"too many actions specified"))
elif actioncount == 0 and ui.configbool( elif actioncount == 0 and ui.configbool(
b'commands', b'resolve.explicit-re-merge' b'commands', b'resolve.explicit-re-merge'
): ):
hint = _(b'use --mark, --unmark, --list or --re-merge') hint = _(b'use --mark, --unmark, --list or --re-merge')
raise error.Abort(_(b'no action specified'), hint=hint) raise error.Abort(_(b'no action specified'), hint=hint)
if pats and all: if pats and all:
raise error.Abort(_(b"can't specify --all and patterns")) raise error.Abort(_(b"can't specify --all and patterns"))
if not (all or pats or show or mark or unmark): if not (all or pats or clear or show or mark or unmark):
raise error.Abort( raise error.Abort(
_(b'no files or directories specified'), _(b'no files or directories specified'),
hint=b'use --all to re-merge all unresolved files', hint=b'use --all to re-merge all unresolved files',
) )
if confirm: if confirm:
if all: if all:
if ui.promptchoice( if ui.promptchoice(
b'mark all resolved files as unresolved (yn)?' b'mark all resolved files as unresolved (yn)?'
b'$$ &Yes $$ &No' b'$$ &Yes $$ &No'
) )
): ):
raise error.Abort(_(b'user quit')) raise error.Abort(_(b'user quit'))
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
if clear:
ms = mergemod.mergestate.read(repo)
if ms.unresolvedcount():
raise error.Abort(_(b'unresolved merge conflicts'))
ms.reset()
return 0
if show: if show:
ui.pager(b'resolve') ui.pager(b'resolve')
fm = ui.formatter(b'resolve', opts) fm = ui.formatter(b'resolve', opts)
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
wctx = repo[None] wctx = repo[None]
m = scmutil.match(wctx, pats, opts) m = scmutil.match(wctx, pats, opts)
# Labels and keys based on merge state. Unresolved path conflicts show # Labels and keys based on merge state. Unresolved path conflicts show

relnotes/next

revlog-compression=zstd, zlib revlog-compression=zstd, zlib
Will use `zstd` compression for new repositories is available, and will Will use `zstd` compression for new repositories is available, and will
simply fall back to `zlib` if not. simply fall back to `zlib` if not.
* `hg debugmergestate` output is now templated, which may be useful * `hg debugmergestate` output is now templated, which may be useful
e.g. for IDEs that want to help the user resolve merge conflicts. e.g. for IDEs that want to help the user resolve merge conflicts.
* New `hg resolve --clear` for clearing the merge state. The merge
state is normally cleared on commit. The new option can be useful
when you can't commit because the working copy is clean.
== New Experimental Features == == New Experimental Features ==
* `hg copy` now supports a `--at-rev` argument to mark files as * `hg copy` now supports a `--at-rev` argument to mark files as
copied in the specified commit. It only works with `--after` for copied in the specified commit. It only works with `--after` for
now (i.e., it's only useful for marking files copied using non-hg now (i.e., it's only useful for marking files copied using non-hg
`cp` as copied). `cp` as copied).

tests/test-completion.t

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, confirm, 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, clear, 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
serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
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

tests/test-resolve.t

abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve) (use 'hg resolve' to resolve)
[255] [255]
$ hg merge --force 2 $ hg merge --force 2
abort: outstanding merge conflicts abort: outstanding merge conflicts
(use 'hg resolve' to resolve) (use 'hg resolve' to resolve)
[255] [255]
test `hg resolve --clear`
$ hg up -qC 0
$ echo quux >> file1
$ hg up 1
merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
aborts if there are unresolved files
$ hg resolve --clear
abort: unresolved merge conflicts
[255]
clears resolved conflicts
$ echo resolved > file1
$ hg resolve -m file1
(no more unresolved files)
$ hg resolve -l
R file1
$ hg resolve --clear
$ hg resolve -l
no effect if there
$ hg resolve --clear
$ hg resolve -l
set up conflict-free merge set up conflict-free merge
$ hg up -qC 3 $ hg up -qC 3
$ hg merge 1 $ hg merge 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
resolve --all should do nothing in merge without conflicts resolve --all should do nothing in merge without conflicts