Mercurial > public > mercurial-scm > hg

diff hgext/mq.py @ 41399:5cb8158a61f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: use p1() instead of parents() when we only need the first parent Differential Revision: https://phab.mercurial-scm.org/D5708
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 25 Jan 2019 23:22:23 -0800
parents b5f5dc0fa908
children bd3f03d8cc9f
line wrap: on
line diff
--- a/hgext/mq.py	Fri Jan 25 23:43:11 2019 -0800
+++ b/hgext/mq.py	Fri Jan 25 23:22:23 2019 -0800
@@ -970,7 +970,7 @@
                         repo.dirstate.remove(f)
                     for f in merged:
                         repo.dirstate.merge(f)
-                    p1, p2 = repo.dirstate.parents()
+                    p1 = repo.dirstate.p1()
                     repo.setparents(p1, merge)
 
             if all_files and '.hgsubstate' in all_files: