This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8231

commit: print debug message when clearing dirstate and wdir clean
ClosedPublic

Authored by martinvonz on Mar 5 2020, 11:41 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6306baa7d19a: commit: print debug message when clearing dirstate and wdir clean
Summary

This case is a little weird, so let's have a debug message.

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.Mar 5 2020, 11:41 AM
pulkit accepted this revision.Mar 5 2020, 12:22 PM
This revision is now accepted and ready to land.Mar 5 2020, 12:22 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (1 line)
Mtests/test-graft.t (1 line)

Diff 20538

mercurial/localrepo.py

allowemptycommit = ( allowemptycommit = (
wctx.branch() != wctx.p1().branch() wctx.branch() != wctx.p1().branch()
or extra.get(b'close') or extra.get(b'close')
or merge or merge
or cctx.files() or cctx.files()
or self.ui.configbool(b'ui', b'allowemptycommit') or self.ui.configbool(b'ui', b'allowemptycommit')
) )
if not allowemptycommit: if not allowemptycommit:
self.ui.debug(b'nothing to commit, clearing merge state\n')
ms.reset() ms.reset()
return None return None
if merge and cctx.deleted(): if merge and cctx.deleted():
raise error.Abort(_(b"cannot commit merge with missing files")) raise error.Abort(_(b"cannot commit merge with missing files"))
if editor: if editor:
cctx._text = editor(self, cctx, subs) cctx._text = editor(self, cctx, subs)

tests/test-graft.t

src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
on remote side: on remote side:
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
nothing to commit, clearing merge state
note: graft of 13:7a4785234d87 created no changes to commit note: graft of 13:7a4785234d87 created no changes to commit
$ hg log -r 'destination(13)' $ hg log -r 'destination(13)'
All copies of a cset All copies of a cset
$ hg log -r 'origin(13) or destination(origin(13))' $ hg log -r 'origin(13) or destination(origin(13))'
changeset: 2:5c095ad7e90f changeset: 2:5c095ad7e90f
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2