Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 44442:6306baa7d19a
commit: print debug message when clearing dirstate and wdir clean
This case is a little weird, so let's have a debug message.
Differential Revision: https://phab.mercurial-scm.org/D8231
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 05 Mar 2020 08:37:08 -0800 |
| parents | 6a34e438461b |
| children | 336ec75ed1ac |
comparison
equal
deleted
inserted
replaced
| 44441:8cdd0b9629e3 | 44442:6306baa7d19a |
|---|---|
| 2954 or merge | 2954 or merge |
| 2955 or cctx.files() | 2955 or cctx.files() |
| 2956 or self.ui.configbool(b'ui', b'allowemptycommit') | 2956 or self.ui.configbool(b'ui', b'allowemptycommit') |
| 2957 ) | 2957 ) |
| 2958 if not allowemptycommit: | 2958 if not allowemptycommit: |
| 2959 self.ui.debug(b'nothing to commit, clearing merge state\n') | |
| 2959 ms.reset() | 2960 ms.reset() |
| 2960 return None | 2961 return None |
| 2961 | 2962 |
| 2962 if merge and cctx.deleted(): | 2963 if merge and cctx.deleted(): |
| 2963 raise error.Abort(_(b"cannot commit merge with missing files")) | 2964 raise error.Abort(_(b"cannot commit merge with missing files")) |