Patchwork [4,of,9,standalone-strip] mq: use the new checklocalchange in the strip command

login
register
mail settings
Submitter Pierre-Yves David
Date Sept. 25, 2013, 9:26 p.m.
Message ID <99c7c15112d6d2a0b4cb.1380144407@vulgaris>
Download mbox | patch
Permalink /patch/2633/
State Accepted
Commit 378567bf9f7453247a73cb669c25833f12097201
Headers show

Comments

Pierre-Yves David - Sept. 25, 2013, 9:26 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1380130373 -7200
#      Wed Sep 25 19:32:53 2013 +0200
# Node ID 99c7c15112d6d2a0b4cbf4a9f87de28f48ab566c
# Parent  6ebf8c08f31e3c0148cfd961609e219419e78df9
mq: use the new checklocalchange in the strip command

The strip command never use the `refresh` argument. So we can use the function
we just extracted.

Patch

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1100,11 +1100,11 @@  class queue(object):
         try:
             wlock = repo.wlock()
             lock = repo.lock()
 
             if update:
-                self.checklocalchanges(repo, force=force, refresh=False)
+                checklocalchanges(repo, force=force)
                 urev = self.qparents(repo, revs[0])
                 hg.clean(repo, urev)
                 repo.dirstate.write()
 
             repair.strip(self.ui, repo, revs, backup)