Patchwork D8231: commit: print debug message when clearing dirstate and wdir clean

login
register
mail settings
Submitter phabricator
Date March 5, 2020, 4:41 p.m.
Message ID <differential-rev-PHID-DREV-gx7wwdf5232nspgoz6df-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45507/
State Superseded
Headers show

Comments

phabricator - March 5, 2020, 4:41 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8231

AFFECTED FILES
  mercurial/localrepo.py
  tests/test-graft.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -758,6 +758,7 @@ 
    branchmerge: True, force: True, partial: False
    ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87
   starting 4 threads for background file closing (?)
+  nothing to commit, clearing merge state
   note: graft of 13:7a4785234d87 created no changes to commit
   $ hg log -r 'destination(13)'
 All copies of a cset
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2956,6 +2956,7 @@ 
                 or self.ui.configbool(b'ui', b'allowemptycommit')
             )
             if not allowemptycommit:
+                self.ui.debug(b'nothing to commit, clearing merge state\n')
                 ms.reset()
                 return None