Merge with crew-stable

hgext/mq.py

@@ -1208,12 +1208,14 b' class queue(object):'
         if newdate:
             newdate = '%d %d' % util.parsedate(newdate)
         wlock = repo.wlock()
+
         try:
             self.check_toppatch(repo)
             (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name)
             top = bin(top)
             if repo.changelog.heads(top) != [top]:
                 raise util.Abort(_("cannot refresh a revision with children"))
+
             cparents = repo.changelog.parents(top)
             patchparent = self.qparents(repo, top)
             ph = patchheader(self.join(patchfn))
@@ -1232,27 +1234,20 b' class queue(object):'
             if comments:
                 patchf.write(comments)
 
-            tip = repo.changelog.tip()
-            if top == tip:
-                # if the top of our patch queue is also the tip, there is an
-                # optimization here.  We update the dirstate in place and strip
-                # off the tip commit.  Then just commit the current directory
-                # tree.  We can also send repo.commit the list of files
-                # changed to speed up the diff
-                #
-                # in short mode, we only diff the files included in the
-                # patch already plus specified files
+            # update the dirstate in place, strip off the qtip commit
+            # and then commit.
                 #
                 # this should really read:
                 #   mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4]
                 # but we do it backwards to take advantage of manifest/chlog
                 # caching against the next repo.status call
-                #
-                mm, aa, dd, aa2 = repo.status(patchparent, tip)[:4]
-                changes = repo.changelog.read(tip)
+            mm, aa, dd, aa2 = repo.status(patchparent, top)[:4]
+            changes = repo.changelog.read(top)
                 man = repo.manifest.read(changes[0])
                 aaa = aa[:]
                 matchfn = cmdutil.match(repo, pats, opts)
+            # in short mode, we only diff the files included in the
+            # patch already plus specified files
                 if opts.get('short'):
                     # if amending a patch, we start with existing
                     # files plus specified files - unfiltered
@@ -1264,7 +1259,7 b' class queue(object):'
                 m, a, r, d = repo.status(match=match)[:4]
 
                 # we might end up with files that were added between
-                # tip and the dirstate parent, but then changed in the
+            # qtip and the dirstate parent, but then changed in the
                 # local dirstate. in this case, we want them to only
                 # show up in the added section
                 for x in m:
@@ -1311,7 +1306,7 b' class queue(object):'
                             if src is not None and src in repo.dirstate:
                                 copies.setdefault(src, []).append(dst)
                             repo.dirstate.add(dst)
-                        # remember the copies between patchparent and tip
+                    # remember the copies between patchparent and qtip
                         for dst in aaa:
                             f = repo.file(dst)
                             src = f.renamed(man[dst])
@@ -1381,24 +1376,6 b' class queue(object):'
                     self.ui.warn(_('refresh interrupted while patch was popped! '
                                    '(revert --all, qpush to recover)\n'))
                     raise
-            else:
-                self.printdiff(repo, diffopts, patchparent, fp=patchf)
-                patchf.rename()
-                added = repo.status()[1]
-                for a in added:
-                    f = repo.wjoin(a)
-                    try:
-                        os.unlink(f)
-                    except OSError, e:
-                        if e.errno != errno.ENOENT:
-                            raise
-                    try: os.removedirs(os.path.dirname(f))
-                    except: pass
-                    # forget the file copies in the dirstate
-                    # push should readd the files later on
-                    repo.dirstate.forget(a)
-                self.pop(repo, force=True)
-                self.push(repo, force=True)
         finally:
             wlock.release()
             self.removeundo(repo)

tests/test-mq-qrefresh

@@ -155,6 +155,31 b' hg qrefresh'
 hg qdiff --nodates
 cd ..
 
+echo '% issue2025: qrefresh does not honor filtering options when tip != qtip'
+hg init repo-2025
+cd repo-2025
+echo a > a
+echo b > b
+hg ci -qAm addab
+echo a >> a
+echo b >> b
+hg qnew -f patch
+hg up -qC 0
+echo c > c
+hg ci -qAm addc
+hg up -qC 1
+echo '% refresh with tip != qtip'
+hg --config diff.nodates=1 qrefresh -I b 2>&1 \
+    | sed 's/saving bundle.*/saving bundle.../g'
+echo '% status after refresh'
+hg st
+echo '% b after refresh'
+cat b
+echo '% patch file after refresh'
+cat .hg/patches/patch
+cd ..
+
+
 echo % issue1441 with git patches
 hg init repo-1441-git
 cd repo-1441-git

tests/test-mq-qrefresh.out

@@ -259,6 +259,26 b' diff -r 000000000000 b'
 +++ b/b
 @@ -0,0 +1,1 @@
 +a
+% issue2025: qrefresh does not honor filtering options when tip != qtip
+% refresh with tip != qtip
+saving bundle...
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+% status after refresh
+M a
+% b after refresh
+b
+b
+% patch file after refresh
+diff -r 1a60229be7ac b
+--- a/b
++++ b/b
+@@ -1,1 +1,2 @@
+ b
++b
 % issue1441 with git patches
 diff --git a/b b/b
 new file mode 100644

tests/test-mq.out

@@ -392,16 +392,11 b' copy to copy'
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-popping bar
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-patch queue now empty
-(working directory not at a head)
-applying bar
-now at: bar
 diff --git a/bar b/bar
 new file mode 100644
 --- /dev/null
@@ -427,16 +422,11 b' diff --git a/foo b/baz'
 % test file move chains in the slow path
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-popping bar
 adding branch
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-patch queue now empty
-(working directory not at a head)
-applying bar
-now at: bar
 diff --git a/foo b/bleh
 rename from foo
 rename to bleh