This is an archive of the discontinued Mercurial Phabricator instance.

Differential D204

commit: don't let failed commit with --addremove update dirstate (issue5645)
ClosedPublic

Authored by martinvonz on Jul 31 2017, 7:58 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5ac845ca059a: commit: don't let failed commit with --addremove update dirstate (issue5645)
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 31 2017, 7:58 PM
durin42 accepted this revision.Aug 1 2017, 4:18 PM
This revision is now accepted and ready to land.Aug 1 2017, 4:18 PM
Closed by commit rHG5ac845ca059a: commit: don't let failed commit with --addremove update dirstate (issue5645) (authored by martinvonz). · Explain WhyAug 1 2017, 4:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 482

mercurial/cmdutil.py

short, short,
) )
from . import ( from . import (
bookmarks, bookmarks,
changelog, changelog,
copies, copies,
crecord as crecordmod, crecord as crecordmod,
dirstateguard,
encoding, encoding,
error, error,
formatter, formatter,
graphmod, graphmod,
match as matchmod, match as matchmod,
obsolete, obsolete,
patch, patch,
pathutil, pathutil,
def commit(ui, repo, commitfunc, pats, opts): def commit(ui, repo, commitfunc, pats, opts):
'''commit the specified files or all outstanding changes''' '''commit the specified files or all outstanding changes'''
date = opts.get('date') date = opts.get('date')
if date: if date:
opts['date'] = util.parsedate(date) opts['date'] = util.parsedate(date)
message = logmessage(ui, opts) message = logmessage(ui, opts)
matcher = scmutil.match(repo[None], pats, opts) matcher = scmutil.match(repo[None], pats, opts)
dsguard = None
# extract addremove carefully -- this function can be called from a command # extract addremove carefully -- this function can be called from a command
# that doesn't support addremove # that doesn't support addremove
try:
if opts.get('addremove'): if opts.get('addremove'):
dsguard = dirstateguard.dirstateguard(repo, 'commit')
if scmutil.addremove(repo, matcher, "", opts) != 0: if scmutil.addremove(repo, matcher, "", opts) != 0:
raise error.Abort( raise error.Abort(
_("failed to mark all new/missing files as added/removed")) _("failed to mark all new/missing files as added/removed"))
return commitfunc(ui, repo, message, matcher, opts) r = commitfunc(ui, repo, message, matcher, opts)
if dsguard:
dsguard.close()
return r
finally:
if dsguard:
dsguard.release()
def samefile(f, ctx1, ctx2): def samefile(f, ctx1, ctx2):
if f in ctx1.manifest(): if f in ctx1.manifest():
a = ctx1.filectx(f) a = ctx1.filectx(f)
if f in ctx2.manifest(): if f in ctx2.manifest():
b = ctx2.filectx(f) b = ctx2.filectx(f)
return (not a.cmp(b) return (not a.cmp(b)
and a.flags() == b.flags()) and a.flags() == b.flags())

tests/test-commit.t

$ echo foo > newfile $ echo foo > newfile
$ hg status $ hg status
? newfile ? newfile
$ HGEDITOR=false hg ci --addremove $ HGEDITOR=false hg ci --addremove
adding newfile adding newfile
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1
[255] [255]
$ hg status $ hg status
A newfile ? newfile
Make sure we do not obscure unknown requires file entries (issue2649) Make sure we do not obscure unknown requires file entries (issue2649)
$ echo foo >> foo $ echo foo >> foo
$ echo fake >> .hg/requires $ echo fake >> .hg/requires
$ hg commit -m bla $ hg commit -m bla
abort: repository requires features unknown to this Mercurial: fake! abort: repository requires features unknown to this Mercurial: fake!
(see https://mercurial-scm.org/wiki/MissingRequirement for more information) (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

tests/test-flagprocessor.t

$ hg debugdata base64-gzip-noop 0 $ hg debugdata base64-gzip-noop 0
eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol)
# TEST: ensure a missing processor is handled # TEST: ensure a missing processor is handled
$ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop
$ hg commit -Aqm 'fail+base64+gzip+noop' $ hg commit -Aqm 'fail+base64+gzip+noop'
abort: missing processor for flag '0x1'! abort: missing processor for flag '0x1'!
[255] [255]
$ hg forget fail-base64-gzip-noop
$ rm fail-base64-gzip-noop $ rm fail-base64-gzip-noop
# TEST: ensure we cannot register several flag processors on the same flag # TEST: ensure we cannot register several flag processors on the same flag
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> extension=$TESTDIR/flagprocessorext.py > extension=$TESTDIR/flagprocessorext.py
> duplicate=$TESTDIR/flagprocessorext.py > duplicate=$TESTDIR/flagprocessorext.py
> EOF > EOF

tests/test-username-newline.t

$ hg init $ hg init
$ touch a $ touch a
$ unset HGUSER $ unset HGUSER
$ echo "[ui]" >> .hg/hgrc $ echo "[ui]" >> .hg/hgrc
$ echo "username= foo" >> .hg/hgrc $ echo "username= foo" >> .hg/hgrc
$ echo " bar1" >> .hg/hgrc $ echo " bar1" >> .hg/hgrc
$ hg ci -Am m $ hg ci -Am m
adding a adding a
abort: username 'foo\nbar1' contains a newline abort: username 'foo\nbar1' contains a newline
[255] [255]
$ rm .hg/hgrc $ rm .hg/hgrc
$ HGUSER=`(echo foo; echo bar2)` hg ci -Am m $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
adding a
abort: username 'foo\nbar2' contains a newline abort: username 'foo\nbar2' contains a newline
[255] [255]
$ hg ci -Am m -u "`(echo foo; echo bar3)`" $ hg ci -Am m -u "`(echo foo; echo bar3)`"
adding a
transaction abort! transaction abort!
rollback completed rollback completed
abort: username 'foo\nbar3' contains a newline! abort: username 'foo\nbar3' contains a newline!
[255] [255]