Mercurial > public > mercurial-scm > hg-stable
diff hgext/mq.py @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
| author | Gilles Moris <gilles.moris@free.fr> |
|---|---|
| date | Sat, 10 Jul 2010 21:23:00 +0200 |
| parents | 3e561b6af810 |
| children | a286a4ecbfeb 77f1f206e135 |
line wrap: on
line diff
--- a/hgext/mq.py Sat Jul 31 11:36:24 2010 +0900 +++ b/hgext/mq.py Sat Jul 10 21:23:00 2010 +0200 @@ -1051,12 +1051,16 @@ self.check_localchanges(repo) if move: - try: - index = self.series.index(patch, start) - fullpatch = self.full_series[index] - del self.full_series[index] - except ValueError: - raise util.Abort(_("patch '%s' not found") % patch) + if not patch: + raise util.Abort(_("please specify the patch to move")) + for i, rpn in enumerate(self.full_series[start:]): + # strip markers for patch guards + if self.guard_re.split(rpn, 1)[0] == patch: + break + index = start + i + assert index < len(self.full_series) + fullpatch = self.full_series[index] + del self.full_series[index] self.full_series.insert(start, fullpatch) self.parse_series() self.series_dirty = 1