##// END OF EJS Templates
patch: don't separate \r and \n when colorizing diff output...
patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

File last commit:

r37870:8327fd79 default
r38649:e1987261 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