##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r37870:8327fd79 default
r38817:bb54db4a @96 default
Show More
test-context-metadata.t
51 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-context-metadata.t
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 Tests about metadataonlyctx
$ hg init
$ echo A > A
$ hg commit -A A -m 'Add A'
$ echo B > B
$ hg commit -A B -m 'Add B'
$ hg rm A
$ echo C > C
$ echo B2 > B
$ hg add C -q
$ hg commit -m 'Remove A'
$ cat > metaedit.py <<EOF
> from __future__ import absolute_import
Gregory Szorc
py3: port metaedit extension to Python 3...
r36065 > from mercurial import context, pycompat, registrar
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 > cmdtable = {}
> command = registrar.command(cmdtable)
Gregory Szorc
py3: port metaedit extension to Python 3...
r36065 > @command(b'metaedit')
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 > def metaedit(ui, repo, arg):
> # Modify commit message to "FOO"
Gregory Szorc
py3: port metaedit extension to Python 3...
r36065 > with repo.wlock(), repo.lock(), repo.transaction(b'metaedit'):
> old = repo[b'.']
> kwargs = dict(s.split(b'=', 1) for s in arg.split(b';'))
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 > if 'parents' in kwargs:
Martin von Zweigbergk
tests: pass parent revision as integer to repo[x] in test-context-metadata.t...
r37870 > kwargs[b'parents'] = map(int, kwargs[b'parents'].split(b','))
Gregory Szorc
py3: port metaedit extension to Python 3...
r36065 > new = context.metadataonlyctx(repo, old,
> **pycompat.strkwargs(kwargs))
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 > new.commit()
> EOF
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'text=Changed'
$ hg log -r tip
changeset: 3:ad83e9e00ec9
tag: tip
parent: 1:3afb7afe6632
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Changed
Jun Wu
check-code: forbid "\S" in egrep regular expression...
r34063 $ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'parents=0' 2>&1 | egrep '^RuntimeError'
Jun Wu
metadataonlyctx: don't crash when reusing the manifest with deletions...
r34001 RuntimeError: can't reuse the manifest: its p1 doesn't match the new ctx p1
$ hg --config extensions.metaedit=$TESTTMP/metaedit.py metaedit 'user=foo <foo@example.com>'
$ hg log -r tip
changeset: 4:1f86eaeca92b
tag: tip
parent: 1:3afb7afe6632
user: foo <foo@example.com>
date: Thu Jan 01 00:00:00 1970 +0000
summary: Remove A