This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6737

shelve: add --unresolved flag to shelve mergestate with unresolved files
Needs RevisionPublic

Authored by navaneeth.suresh on Aug 17 2019, 4:38 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

Until now, shelve used to abort on trying to shelve a mergestate.
This patch adds an --unresolved flag to shelve and use the changeset
extras to store the mergestate.

After shelving, and the working directory is updated to p1().

hg shelve will abort when:

  1. No merge is active on calling with --unresolved.
  2. No unresolved files found in active merge on calling with --unresolved.
  3. Merge is active on calling without --unresolved.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

baymax requested changes to this revision.Jan 24 2020, 12:31 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

Revision Contents
Changeset List

Diff 16814

mercurial/commands.py

_('use the given name for the shelved commit'), _('NAME')), _('use the given name for the shelved commit'), _('NAME')),
('p', 'patch', None, ('p', 'patch', None,
_('output patches for changes (provide the names of the shelved ' _('output patches for changes (provide the names of the shelved '
'changes as positional arguments)')), 'changes as positional arguments)')),
('i', 'interactive', None, ('i', 'interactive', None,
_('interactive mode')), _('interactive mode')),
('', 'stat', None, ('', 'stat', None,
_('output diffstat-style summary of changes (provide the names of ' _('output diffstat-style summary of changes (provide the names of '
'the shelved changes as positional arguments)') 'the shelved changes as positional arguments)')),
('', 'unresolved', None,
_('shelve mergestate with unresolved files')
)] + cmdutil.walkopts, )] + cmdutil.walkopts,
_('hg shelve [OPTION]... [FILE]...'), _('hg shelve [OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_WORKING_DIRECTORY) helpcategory=command.CATEGORY_WORKING_DIRECTORY)
def shelve(ui, repo, *pats, **opts): def shelve(ui, repo, *pats, **opts):
'''save and set aside changes from the working directory '''save and set aside changes from the working directory
Shelving takes files that "hg status" reports as not clean, saves Shelving takes files that "hg status" reports as not clean, saves
the modifications to a bundle (a shelved change), and reverts the the modifications to a bundle (a shelved change), and reverts the

mercurial/shelve.py

if phases.supportinternal(repo): if phases.supportinternal(repo):
tr.close() tr.close()
else: else:
_aborttransaction(repo, tr) _aborttransaction(repo, tr)
def createcmd(ui, repo, pats, opts): def createcmd(ui, repo, pats, opts):
"""subcommand that creates a new shelve""" """subcommand that creates a new shelve"""
with repo.wlock(): with repo.wlock():
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo, skipmerge=True)
return _docreatecmd(ui, repo, pats, opts) return _docreatecmd(ui, repo, pats, opts)
def _docreatecmd(ui, repo, pats, opts): def _docreatecmd(ui, repo, pats, opts):
wctx = repo[None] wctx = repo[None]
parents = wctx.parents() parents = wctx.parents()
unresolved = opts.get('unresolved')
parent = parents[0] parent = parents[0]
origbranch = wctx.branch() origbranch = wctx.branch()
ms = merge.mergestate.read(repo)
if unresolved:
if not ms.active():
raise error.Abort(_('no active mergestate found'))
elif not list(ms.unresolved()):
raise error.Abort(_('no unresolved '
'files found in the mergestate'))
elif ms.active():
raise error.Abort(_('mergestate found\n'
'try with --unresolved to shelve conflicts'))
if parent.node() != nodemod.nullid: if parent.node() != nodemod.nullid:
desc = "changes to: %s" % parent.description().split('\n', 1)[0] desc = "changes to: %s" % parent.description().split('\n', 1)[0]
else: else:
desc = '(changes in empty repository)' desc = '(changes in empty repository)'
if not opts.get('message'): if not opts.get('message'):
opts['message'] = desc opts['message'] = desc
lock = tr = activebookmark = None lock = tr = activebookmark = None
try: try:
lock = repo.lock() lock = repo.lock()
# use an uncommitted transaction to generate the bundle to avoid # use an uncommitted transaction to generate the bundle to avoid
# pull races. ensure we don't print the abort message to stderr. # pull races. ensure we don't print the abort message to stderr.
tr = repo.transaction('shelve', report=lambda x: None) tr = repo.transaction('shelve', report=lambda x: None)
interactive = opts.get('interactive', False) interactive = opts.get('interactive', False)
includeunknown = (opts.get('unknown', False) and includeunknown = (opts.get('unknown', False) and
not opts.get('addremove', False)) not opts.get('addremove', False))
name = getshelvename(repo, parent, opts) name = getshelvename(repo, parent, opts)
activebookmark = _backupactivebookmark(repo) activebookmark = _backupactivebookmark(repo)
extra = {'internal': 'shelve'} extra = {'internal': 'shelve'}
if unresolved:
extra['unresolved-merge'] = True
_storeunresolvedmerge(ui, repo, name, extra)
ms.reset()
if includeunknown: if includeunknown:
_includeunknownfiles(repo, pats, opts, extra) _includeunknownfiles(repo, pats, opts, extra)
if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts): if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
# In non-bare shelve we don't store newly created branch # In non-bare shelve we don't store newly created branch
# at bundled commit # at bundled commit
repo.dirstate.setbranch(repo['.'].branch()) repo.dirstate.setbranch(repo['.'].branch())
if not ui.plain(): if not ui.plain():
width = ui.termwidth() width = ui.termwidth()
namelabel = 'shelve.newest' namelabel = 'shelve.newest'
ui.pager('shelve') ui.pager('shelve')
for mtime, name in listshelves(repo): for mtime, name in listshelves(repo):
sname = util.split(name)[1] sname = util.split(name)[1]
if pats and sname not in pats: if pats and sname not in pats:
continue continue
#TODO: add method to distinguish unresolved shelves from others.
ui.write(sname, label=namelabel) ui.write(sname, label=namelabel)
namelabel = 'shelve.name' namelabel = 'shelve.name'
if ui.quiet: if ui.quiet:
ui.write('\n') ui.write('\n')
continue continue
ui.write(' ' * (16 - len(sname))) ui.write(' ' * (16 - len(sname)))
used = 16 used = 16
date = dateutil.makedate(mtime) date = dateutil.makedate(mtime)

tests/test-completion.t

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
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, unresolved, 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: clean, check, merge, date, rev, tool

tests/test-shelve-unresolved.t

  • This file was added.
$ addunresolvedmerge() {
> echo A >> $1
> echo A >> $2
> hg ci -m A
> echo B >> $1
> echo B >> $2
> hg ci -m B
> hg up $3
> echo C >> $1
> echo C >> $2
> hg ci -m C
> hg merge -r $(($3+1))
> }
Test shelve with unresolved mergestate
$ cat >> $HGRCPATH <<EOF
> [extensions]
> shelve =
> EOF
$ hg init shelve-unresolved
$ cd shelve-unresolved
$ echo A >> file1
$ echo A >> file2
$ hg ci -Am A
adding file1
adding file2
$ echo foo >> bar
$ hg add bar
-- should abort on absence of mergestate
$ hg shelve --unresolved
abort: no active mergestate found
[255]
$ hg forget bar
$ echo B >> file1
$ echo B >> file2
$ hg ci -m B
$ hg up 0
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo C >> file1
$ echo C >> file2
$ hg ci -m C
created new head
$ hg merge
merging file1
merging file2
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
-- let's partially solve the conflicts
$ cat > file1 <<EOF
> A
> B
> C
> EOF
$ hg resolve -m file1
-- mark file2 as resolved to check abort
$ hg resolve -m file2
(no more unresolved files)
$ hg log -G
@ changeset: 2:69004294ad57
| tag: tip
| parent: 0:c32ef6121744
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: C
|
| @ changeset: 1:fd9a4049234b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: B
|
o changeset: 0:c32ef6121744
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A
$ cat file1
A
B
C
$ hg diff
diff -r 69004294ad57 file1
--- a/file1 Thu Jan 01 00:00:00 1970 +0000
+++ b/file1 Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@
A
+B
C
diff -r 69004294ad57 file2
--- a/file2 Thu Jan 01 00:00:00 1970 +0000
+++ b/file2 Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,6 @@
A
+<<<<<<< working copy: 69004294ad57 - test: C
C
+=======
+B
+>>>>>>> merge rev: fd9a4049234b - test: B
-- should abort on absence of conflicts
$ hg shelve
abort: mergestate found
try with --unresolved to shelve conflicts
[255]
$ hg shelve --unresolved
abort: no unresolved files found in the mergestate
[255]
$ hg resolve -u file2
$ hg resolve -l
R file1
U file2
-- should suggest --unresolved on shelving with mergestate
$ hg shelve
abort: mergestate found
try with --unresolved to shelve conflicts
[255]
$ hg shelve --unresolved
shelved as default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat file1
A
C
$ hg log -G
@ changeset: 2:69004294ad57
| tag: tip
| parent: 0:c32ef6121744
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: C
|
| o changeset: 1:fd9a4049234b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: B
|
o changeset: 0:c32ef6121744
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A
$ hg shelve --list
default (1s ago) changes to: C
$ hg shelve --patch
default (1s ago) changes to: C
diff --git a/file1 b/file1
--- a/file1
+++ b/file1
@@ -1,2 +1,3 @@
A
+B
C
diff --git a/file2 b/file2
--- a/file2
+++ b/file2
@@ -1,2 +1,6 @@
A
+<<<<<<< working copy: 69004294ad57 - test: C
C
+=======
+B
+>>>>>>> merge rev: fd9a4049234b - test: B

tests/test-shelve.t

-m --message TEXT use text as shelve message -m --message TEXT use text as shelve message
-n --name NAME use the given name for the shelved commit -n --name NAME use the given name for the shelved commit
-p --patch output patches for changes (provide the names of the -p --patch output patches for changes (provide the names of the
shelved changes as positional arguments) shelved changes as positional arguments)
-i --interactive interactive mode -i --interactive interactive mode
--stat output diffstat-style summary of changes (provide --stat output diffstat-style summary of changes (provide
the names of the shelved changes as positional the names of the shelved changes as positional
arguments) arguments)
--unresolved shelve mergestate with unresolved files
-I --include PATTERN [+] include names matching the given patterns -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns
--mq operate on patch repository --mq operate on patch repository
(some details hidden, use --verbose to show complete help) (some details hidden, use --verbose to show complete help)
shelving in an empty repo should be possible shelving in an empty repo should be possible
(this tests also that editor is not invoked, if '--edit' is not (this tests also that editor is not invoked, if '--edit' is not