hgext/mq.py
author Brendan Cully <brendan@kublai.com>
Wed, 26 Jul 2006 12:22:04 -0700
changeset 2682 4e2dc5c16e61
parent 2677 ec05ce9cbf47
child 2694 0fb28dbf0dc7
permissions -rw-r--r--
Add mq patch names to tagscache instead of overriding lookup. This makes mq patch names visible in hg log and hg tags. It also resolves the names only once, rather than on every lookup.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     1
# queue.py - patch queues for mercurial
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     2
#
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     3
# Copyright 2005 Chris Mason <mason@suse.com>
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     4
#
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     5
# This software may be used and distributed according to the terms
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     6
# of the GNU General Public License, incorporated herein by reference.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
     7
2554
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
     8
'''patch management and development
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
     9
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    10
This extension lets you work with a stack of patches in a Mercurial
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    11
repository.  It manages two stacks of patches - all known patches, and
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    12
applied patches (subset of known patches).
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    13
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    14
Known patches are represented as patch files in the .hg/patches
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    15
directory.  Applied patches are both patch files and changesets.
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    16
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    17
Common tasks (use "hg help command" for more details):
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    18
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    19
prepare repository to work with patches   qinit
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    20
create new patch                          qnew
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    21
import existing patch                     qimport
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    22
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    23
print patch series                        qseries
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    24
print applied patches                     qapplied
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    25
print name of top applied patch           qtop
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    26
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    27
add known patch to applied stack          qpush
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    28
remove patch from applied stack           qpop
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    29
refresh contents of top applied patch     qrefresh
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    30
'''
8264c2034970 help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2531
diff changeset
    31
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    32
from mercurial.demandload import *
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    33
demandload(globals(), "os sys re struct traceback errno bz2")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    34
from mercurial.i18n import gettext as _
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    35
from mercurial import ui, hg, revlog, commands, util
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    36
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    37
versionstr = "0.45"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    38
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    39
repomap = {}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    40
2047
ebf1ecb5f4e8 Register qversion as a non repository related command
Edouard Gomez <ed.gomez@free.fr>
parents: 1863
diff changeset
    41
commands.norepo += " qversion"
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    42
class queue:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    43
    def __init__(self, ui, path, patchdir=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    44
        self.basepath = path
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    45
        if patchdir:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    46
            self.path = patchdir
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    47
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    48
            self.path = os.path.join(path, "patches")
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    49
        self.opener = util.opener(self.path)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    50
        self.ui = ui
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    51
        self.applied = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    52
        self.full_series = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    53
        self.applied_dirty = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    54
        self.series_dirty = 0
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    55
        self.series_path = "series"
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    56
        self.status_path = "status"
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
    57
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    58
        if os.path.exists(os.path.join(self.path, self.series_path)):
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    59
            self.full_series = self.opener(self.series_path).read().splitlines()
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    60
        self.read_series(self.full_series)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    61
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    62
        if os.path.exists(os.path.join(self.path, self.status_path)):
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
    63
            self.applied = self.opener(self.status_path).read().splitlines()
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    64
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    65
    def find_series(self, patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    66
        pre = re.compile("(\s*)([^#]+)")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    67
        index = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    68
        for l in self.full_series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    69
            m = pre.match(l)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    70
            if m:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    71
                s = m.group(2)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    72
                s = s.rstrip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    73
                if s == patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    74
                    return index
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    75
            index += 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    76
        return None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    77
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    78
    def read_series(self, list):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    79
        def matcher(list):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    80
            pre = re.compile("(\s*)([^#]+)")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    81
            for l in list:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    82
                m = pre.match(l)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    83
                if m:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    84
                    s = m.group(2)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    85
                    s = s.rstrip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    86
                    if len(s) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    87
                        yield s
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    88
        self.series = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    89
        self.series = [ x for x in matcher(list) ]
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
    90
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    91
    def save_dirty(self):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    92
        if self.applied_dirty:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    93
            if len(self.applied) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    94
                nl = "\n"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    95
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    96
                nl = ""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    97
            f = self.opener(self.status_path, "w")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    98
            f.write("\n".join(self.applied) + nl)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
    99
        if self.series_dirty:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   100
            if len(self.full_series) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   101
                nl = "\n"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   102
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   103
                nl = ""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   104
            f = self.opener(self.series_path, "w")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   105
            f.write("\n".join(self.full_series) + nl)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   106
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   107
    def readheaders(self, patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   108
        def eatdiff(lines):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   109
            while lines:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   110
                l = lines[-1]
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   111
                if (l.startswith("diff -") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   112
                    l.startswith("Index:") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   113
                    l.startswith("===========")):
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   114
                    del lines[-1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   115
                else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   116
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   117
        def eatempty(lines):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   118
            while lines:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   119
                l = lines[-1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   120
                if re.match('\s*$', l):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   121
                    del lines[-1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   122
                else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   123
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   124
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   125
        pf = os.path.join(self.path, patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   126
        message = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   127
        comments = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   128
        user = None
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   129
        date = None
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   130
        format = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   131
        subject = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   132
        diffstart = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   133
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   134
        for line in file(pf):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   135
            line = line.rstrip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   136
            if diffstart:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   137
                if line.startswith('+++ '):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   138
                    diffstart = 2
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   139
                break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   140
            if line.startswith("--- "):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   141
                diffstart = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   142
                continue
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   143
            elif format == "hgpatch":
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   144
                # parse values when importing the result of an hg export
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   145
                if line.startswith("# User "):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   146
                    user = line[7:]
2300
52b9b6751b2c Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2299
diff changeset
   147
                elif line.startswith("# Date "):
52b9b6751b2c Use "# Date" instead of "# Timestamp" for dated export/import of patches.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2299
diff changeset
   148
                    date = line[7:]
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   149
                elif not line.startswith("# ") and line:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   150
                    message.append(line)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   151
                    format = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   152
            elif line == '# HG changeset patch':
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   153
                format = "hgpatch"
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   154
            elif (format != "tagdone" and (line.startswith("Subject: ") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   155
                                           line.startswith("subject: "))):
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   156
                subject = line[9:]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   157
                format = "tag"
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   158
            elif (format != "tagdone" and (line.startswith("From: ") or
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   159
                                           line.startswith("from: "))):
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   160
                user = line[6:]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   161
                format = "tag"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   162
            elif format == "tag" and line == "":
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   163
                # when looking for tags (subject: from: etc) they
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   164
                # end once you find a blank line in the source
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   165
                format = "tagdone"
2301
7c2623aedeb4 Strip empty lines and trailing spaces around commit messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2300
diff changeset
   166
            elif message or line:
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   167
                message.append(line)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   168
            comments.append(line)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   169
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   170
        eatdiff(message)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   171
        eatdiff(comments)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   172
        eatempty(message)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   173
        eatempty(comments)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   174
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   175
        # make sure message isn't empty
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   176
        if format and format.startswith("tag") and subject:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   177
            message.insert(0, "")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   178
            message.insert(0, subject)
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   179
        return (message, comments, user, date, diffstart > 1)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   180
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   181
    def mergeone(self, repo, mergeq, head, patch, rev, wlock):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   182
        # first try just applying the patch
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   183
        (err, n) = self.apply(repo, [ patch ], update_status=False,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   184
                              strict=True, merge=rev, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   185
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   186
        if err == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   187
            return (err, n)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   188
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   189
        if n is None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   190
            self.ui.warn("apply failed for patch %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   191
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   192
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   193
        self.ui.warn("patch didn't work out, merging %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   194
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   195
        # apply failed, strip away that rev and merge.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   196
        repo.update(head, allow=False, force=True, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   197
        self.strip(repo, n, update=False, backup='strip', wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   198
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   199
        c = repo.changelog.read(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   200
        ret = repo.update(rev, allow=True, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   201
        if ret:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   202
            self.ui.warn("update returned %d\n" % ret)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   203
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   204
        n = repo.commit(None, c[4], c[1], force=1, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   205
        if n == None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   206
            self.ui.warn("repo commit failed\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   207
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   208
        try:
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   209
            message, comments, user, date, patchfound = mergeq.readheaders(patch)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   210
        except:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   211
            self.ui.warn("Unable to read %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   212
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   213
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   214
        patchf = self.opener(patch, "w")
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   215
        if comments:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   216
            comments = "\n".join(comments) + '\n\n'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   217
            patchf.write(comments)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   218
        commands.dodiff(patchf, self.ui, repo, head, n)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   219
        patchf.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   220
        return (0, n)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   221
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   222
    def qparents(self, repo, rev=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   223
        if rev is None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   224
            (p1, p2) = repo.dirstate.parents()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   225
            if p2 == revlog.nullid:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   226
                return p1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   227
            if len(self.applied) == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   228
                return None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   229
            (top, patch) = self.applied[-1].split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   230
            top = revlog.bin(top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   231
            return top
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   232
        pp = repo.changelog.parents(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   233
        if pp[1] != revlog.nullid:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   234
            arevs = [ x.split(':')[0] for x in self.applied ]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   235
            p0 = revlog.hex(pp[0])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   236
            p1 = revlog.hex(pp[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   237
            if p0 in arevs:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   238
                return pp[0]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   239
            if p1 in arevs:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   240
                return pp[1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   241
        return pp[0]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   242
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   243
    def mergepatch(self, repo, mergeq, series, wlock):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   244
        if len(self.applied) == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   245
            # each of the patches merged in will have two parents.  This
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   246
            # can confuse the qrefresh, qdiff, and strip code because it
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   247
            # needs to know which parent is actually in the patch queue.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   248
            # so, we insert a merge marker with only one parent.  This way
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   249
            # the first patch in the queue is never a merge patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   250
            #
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   251
            pname = ".hg.patches.merge.marker"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   252
            n = repo.commit(None, '[mq]: merge marker', user=None, force=1,
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   253
                            wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   254
            self.applied.append(revlog.hex(n) + ":" + pname)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   255
            self.applied_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   256
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   257
        head = self.qparents(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   258
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   259
        for patch in series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   260
            patch = mergeq.lookup(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   261
            if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   262
                self.ui.warn("patch %s does not exist\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   263
                return (1, None)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   264
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   265
            info = mergeq.isapplied(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   266
            if not info:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   267
                self.ui.warn("patch %s is not applied\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   268
                return (1, None)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   269
            rev = revlog.bin(info[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   270
            (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   271
            if head:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   272
                self.applied.append(revlog.hex(head) + ":" + patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   273
                self.applied_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   274
            if err:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   275
                return (err, head)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   276
        return (0, head)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   277
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   278
    def apply(self, repo, series, list=False, update_status=True,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   279
              strict=False, patchdir=None, merge=None, wlock=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   280
        # TODO unify with commands.py
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   281
        if not patchdir:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   282
            patchdir = self.path
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   283
        pwd = os.getcwd()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   284
        os.chdir(repo.root)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   285
        err = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   286
        if not wlock:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   287
            wlock = repo.wlock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   288
        lock = repo.lock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   289
        tr = repo.transaction()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   290
        n = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   291
        for patch in series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   292
            self.ui.warn("applying %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   293
            pf = os.path.join(patchdir, patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   294
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   295
            try:
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   296
                message, comments, user, date, patchfound = self.readheaders(patch)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   297
            except:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   298
                self.ui.warn("Unable to read %s\n" % pf)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   299
                err = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   300
                break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   301
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   302
            if not message:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   303
                message = "imported patch %s\n" % patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   304
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   305
                if list:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   306
                    message.append("\nimported patch %s" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   307
                message = '\n'.join(message)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   308
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   309
            try:
2270
afd7c4ec000f Fix issue240: mq: qpush fails on Solaris
Danek Duvall <danek.duvall@sun.com>
parents: 2185
diff changeset
   310
                pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch')
afd7c4ec000f Fix issue240: mq: qpush fails on Solaris
Danek Duvall <danek.duvall@sun.com>
parents: 2185
diff changeset
   311
                f = os.popen("%s -p1 --no-backup-if-mismatch < '%s'" % (pp, pf))
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   312
            except:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   313
                self.ui.warn("patch failed, unable to continue (try -v)\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   314
                err = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   315
                break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   316
            files = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   317
            fuzz = False
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   318
            for l in f:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   319
                l = l.rstrip('\r\n');
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   320
                if self.ui.verbose:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   321
                    self.ui.warn(l + "\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   322
                if l[:14] == 'patching file ':
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   323
                    pf = os.path.normpath(l[14:])
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   324
                    # when patch finds a space in the file name, it puts
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   325
                    # single quotes around the filename.  strip them off
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   326
                    if pf[0] == "'" and pf[-1] == "'":
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   327
                        pf = pf[1:-1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   328
                    if pf not in files:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   329
                        files.append(pf)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   330
                    printed_file = False
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   331
                    file_str = l
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   332
                elif l.find('with fuzz') >= 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   333
                    if not printed_file:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   334
                        self.ui.warn(file_str + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   335
                        printed_file = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   336
                    self.ui.warn(l + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   337
                    fuzz = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   338
                elif l.find('saving rejects to file') >= 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   339
                    self.ui.warn(l + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   340
                elif l.find('FAILED') >= 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   341
                    if not printed_file:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   342
                        self.ui.warn(file_str + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   343
                        printed_file = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   344
                    self.ui.warn(l + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   345
            patcherr = f.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   346
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   347
            if merge and len(files) > 0:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   348
                # Mark as merged and update dirstate parent info
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   349
                repo.dirstate.update(repo.dirstate.filterfiles(files), 'm')
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   350
                p1, p2 = repo.dirstate.parents()
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   351
                repo.dirstate.setparents(p1, merge)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   352
            if len(files) > 0:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   353
                commands.addremove_lock(self.ui, repo, files,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   354
                                        opts={}, wlock=wlock)
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   355
            n = repo.commit(files, message, user, date, force=1, lock=lock,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   356
                            wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   357
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   358
            if n == None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   359
                self.ui.warn("repo commit failed\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   360
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   361
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   362
            if update_status:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   363
                self.applied.append(revlog.hex(n) + ":" + patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   364
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   365
            if patcherr:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   366
                if not patchfound:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   367
                    self.ui.warn("patch %s is empty\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   368
                    err = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   369
                else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   370
                    self.ui.warn("patch failed, rejects left in working dir\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   371
                    err = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   372
                break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   373
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   374
            if fuzz and strict:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   375
                self.ui.warn("fuzz found when applying patch, stopping\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   376
                err = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   377
                break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   378
        tr.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   379
        os.chdir(pwd)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   380
        return (err, n)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   381
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   382
    def delete(self, repo, patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   383
        patch = self.lookup(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   384
        info = self.isapplied(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   385
        if info:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   386
            self.ui.warn("cannot delete applied patch %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   387
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   388
        if patch not in self.series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   389
            self.ui.warn("patch %s not in series file\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   390
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   391
        i = self.find_series(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   392
        del self.full_series[i]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   393
        self.read_series(self.full_series)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   394
        self.series_dirty = 1
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   395
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   396
    def check_toppatch(self, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   397
        if len(self.applied) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   398
            (top, patch) = self.applied[-1].split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   399
            top = revlog.bin(top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   400
            pp = repo.dirstate.parents()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   401
            if top not in pp:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   402
                self.ui.warn("queue top not at dirstate parents. top %s dirstate %s %s\n" %( revlog.short(top), revlog.short(pp[0]), revlog.short(pp[1])))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   403
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   404
            return top
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   405
        return None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   406
    def check_localchanges(self, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   407
        (c, a, r, d, u) = repo.changes(None, None)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   408
        if c or a or d or r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   409
            self.ui.write("Local changes found, refresh first\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   410
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   411
    def new(self, repo, patch, msg=None, force=None):
2511
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   412
        commitfiles = []
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   413
        (c, a, r, d, u) = repo.changes(None, None)
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   414
        if c or a or d or r:
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   415
            if not force:
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   416
                raise util.Abort(_("Local changes found, refresh first"))
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   417
            else:
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   418
                commitfiles = c + a + r
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   419
        self.check_toppatch(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   420
        wlock = repo.wlock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   421
        insert = self.series_end()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   422
        if msg:
2511
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   423
            n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True,
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   424
                            wlock=wlock)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   425
        else:
2511
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   426
            n = repo.commit(commitfiles,
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   427
                            "New patch: %s" % patch, force=True, wlock=wlock)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   428
        if n == None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   429
            self.ui.warn("repo commit failed\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   430
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   431
        self.full_series[insert:insert] = [patch]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   432
        self.applied.append(revlog.hex(n) + ":" + patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   433
        self.read_series(self.full_series)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   434
        self.series_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   435
        self.applied_dirty = 1
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   436
        p = self.opener(patch, "w")
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   437
        if msg:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   438
            msg = msg + "\n"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   439
            p.write(msg)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   440
        p.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   441
        wlock = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   442
        r = self.qrepo()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   443
        if r: r.add([patch])
2511
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   444
        if commitfiles:
041d8f0a8437 mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents: 2488
diff changeset
   445
            self.refresh(repo, short=True)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   446
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   447
    def strip(self, repo, rev, update=True, backup="all", wlock=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   448
        def limitheads(chlog, stop):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   449
            """return the list of all nodes that have no children"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   450
            p = {}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   451
            h = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   452
            stoprev = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   453
            if stop in chlog.nodemap:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   454
                stoprev = chlog.rev(stop)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   455
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   456
            for r in range(chlog.count() - 1, -1, -1):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   457
                n = chlog.node(r)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   458
                if n not in p:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   459
                    h.append(n)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   460
                if n == stop:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   461
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   462
                if r < stoprev:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   463
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   464
                for pn in chlog.parents(n):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   465
                    p[pn] = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   466
            return h
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   467
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   468
        def bundle(cg):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   469
            backupdir = repo.join("strip-backup")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   470
            if not os.path.isdir(backupdir):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   471
                os.mkdir(backupdir)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   472
            name = os.path.join(backupdir, "%s" % revlog.short(rev))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   473
            name = savename(name)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   474
            self.ui.warn("saving bundle to %s\n" % name)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   475
            # TODO, exclusive open
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   476
            f = open(name, "wb")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   477
            try:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   478
                f.write("HG10")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   479
                z = bz2.BZ2Compressor(9)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   480
                while 1:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   481
                    chunk = cg.read(4096)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   482
                    if not chunk:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   483
                        break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   484
                    f.write(z.compress(chunk))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   485
                f.write(z.flush())
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   486
            except:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   487
                os.unlink(name)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   488
                raise
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   489
            f.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   490
            return name
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   491
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   492
        def stripall(rev, revnum):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   493
            cl = repo.changelog
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   494
            c = cl.read(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   495
            mm = repo.manifest.read(c[0])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   496
            seen = {}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   497
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   498
            for x in xrange(revnum, cl.count()):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   499
                c = cl.read(cl.node(x))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   500
                for f in c[3]:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   501
                    if f in seen:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   502
                        continue
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   503
                    seen[f] = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   504
                    if f in mm:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   505
                        filerev = mm[f]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   506
                    else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   507
                        filerev = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   508
                    seen[f] = filerev
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   509
            # we go in two steps here so the strip loop happens in a
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   510
            # sensible order.  When stripping many files, this helps keep
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   511
            # our disk access patterns under control.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   512
            list = seen.keys()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   513
            list.sort()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   514
            for f in list:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   515
                ff = repo.file(f)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   516
                filerev = seen[f]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   517
                if filerev != 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   518
                    if filerev in ff.nodemap:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   519
                        filerev = ff.rev(filerev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   520
                    else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   521
                        filerev = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   522
                ff.strip(filerev, revnum)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   523
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   524
        if not wlock:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   525
            wlock = repo.wlock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   526
        lock = repo.lock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   527
        chlog = repo.changelog
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   528
        # TODO delete the undo files, and handle undo of merge sets
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   529
        pp = chlog.parents(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   530
        revnum = chlog.rev(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   531
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   532
        if update:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   533
            urev = self.qparents(repo, rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   534
            repo.update(urev, allow=False, force=True, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   535
            repo.dirstate.write()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   536
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   537
        # save is a list of all the branches we are truncating away
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   538
        # that we actually want to keep.  changegroup will be used
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   539
        # to preserve them and add them back after the truncate
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   540
        saveheads = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   541
        savebases = {}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   542
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   543
        tip = chlog.tip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   544
        heads = limitheads(chlog, rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   545
        seen = {}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   546
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   547
        # search through all the heads, finding those where the revision
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   548
        # we want to strip away is an ancestor.  Also look for merges
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   549
        # that might be turned into new heads by the strip.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   550
        while heads:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   551
            h = heads.pop()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   552
            n = h
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   553
            while True:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   554
                seen[n] = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   555
                pp = chlog.parents(n)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   556
                if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   557
                    if pp[1] not in seen:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   558
                        heads.append(pp[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   559
                if pp[0] == revlog.nullid:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   560
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   561
                if chlog.rev(pp[0]) < revnum:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   562
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   563
                n = pp[0]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   564
                if n == rev:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   565
                    break
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   566
            r = chlog.reachable(h, rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   567
            if rev not in r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   568
                saveheads.append(h)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   569
                for x in r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   570
                    if chlog.rev(x) > revnum:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   571
                        savebases[x] = 1
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   572
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   573
        # create a changegroup for all the branches we need to keep
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   574
        if backup is "all":
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   575
            backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   576
            bundle(backupch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   577
        if saveheads:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   578
            backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   579
            chgrpfile = bundle(backupch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   580
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   581
        stripall(rev, revnum)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   582
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   583
        change = chlog.read(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   584
        repo.manifest.strip(repo.manifest.rev(change[0]), revnum)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   585
        chlog.strip(revnum, revnum)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   586
        if saveheads:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   587
            self.ui.status("adding branch\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   588
            commands.unbundle(self.ui, repo, chgrpfile, update=False)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   589
            if backup is not "strip":
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   590
                os.unlink(chgrpfile)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   591
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   592
    def isapplied(self, patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   593
        """returns (index, rev, patch)"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   594
        for i in xrange(len(self.applied)):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   595
            p = self.applied[i]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   596
            a = p.split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   597
            if a[1] == patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   598
                return (i, a[0], a[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   599
        return None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   600
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   601
    def lookup(self, patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   602
        if patch == None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   603
            return None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   604
        if patch in self.series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   605
            return patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   606
        if not os.path.isfile(os.path.join(self.path, patch)):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   607
            try:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   608
                sno = int(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   609
            except(ValueError, OverflowError):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   610
                self.ui.warn("patch %s not in series\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   611
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   612
            if sno >= len(self.series):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   613
                self.ui.warn("patch number %d is out of range\n" % sno)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   614
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   615
            patch = self.series[sno]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   616
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   617
            self.ui.warn("patch %s not in series\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   618
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   619
        return patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   620
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   621
    def push(self, repo, patch=None, force=False, list=False,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   622
             mergeq=None, wlock=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   623
        if not wlock:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   624
            wlock = repo.wlock()
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   625
        patch = self.lookup(patch)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   626
        if patch and self.isapplied(patch):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   627
            self.ui.warn("patch %s is already applied\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   628
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   629
        if self.series_end() == len(self.series):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   630
            self.ui.warn("File series fully applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   631
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   632
        if not force:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   633
            self.check_localchanges(repo)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   634
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   635
        self.applied_dirty = 1;
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   636
        start = self.series_end()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   637
        if start > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   638
            self.check_toppatch(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   639
        if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   640
            patch = self.series[start]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   641
            end = start + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   642
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   643
            end = self.series.index(patch, start) + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   644
        s = self.series[start:end]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   645
        if mergeq:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   646
            ret = self.mergepatch(repo, mergeq, s, wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   647
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   648
            ret = self.apply(repo, s, list, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   649
        top = self.applied[-1].split(':')[1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   650
        if ret[0]:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   651
            self.ui.write("Errors during apply, please fix and refresh %s\n" %
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   652
                          top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   653
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   654
            self.ui.write("Now at: %s\n" % top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   655
        return ret[0]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   656
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   657
    def pop(self, repo, patch=None, force=False, update=True, wlock=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   658
        def getfile(f, rev):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   659
            t = repo.file(f).read(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   660
            try:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   661
                repo.wfile(f, "w").write(t)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   662
            except IOError:
2086
8742352db413 mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2047
diff changeset
   663
                try:
8742352db413 mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2047
diff changeset
   664
                    os.makedirs(os.path.dirname(repo.wjoin(f)))
8742352db413 mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2047
diff changeset
   665
                except OSError, err:
8742352db413 mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2047
diff changeset
   666
                    if err.errno != errno.EEXIST: raise
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   667
                repo.wfile(f, "w").write(t)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   668
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   669
        if not wlock:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   670
            wlock = repo.wlock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   671
        if patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   672
            # index, rev, patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   673
            info = self.isapplied(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   674
            if not info:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   675
                patch = self.lookup(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   676
            info = self.isapplied(patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   677
            if not info:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   678
                self.ui.warn("patch %s is not applied\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   679
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   680
        if len(self.applied) == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   681
            self.ui.warn("No patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   682
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   683
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   684
        if not update:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   685
            parents = repo.dirstate.parents()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   686
            rr = [ revlog.bin(x.split(':')[0]) for x in self.applied ]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   687
            for p in parents:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   688
                if p in rr:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   689
                    self.ui.warn("qpop: forcing dirstate update\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   690
                    update = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   691
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   692
        if not force and update:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   693
            self.check_localchanges(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   694
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   695
        self.applied_dirty = 1;
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   696
        end = len(self.applied)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   697
        if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   698
            info = [len(self.applied) - 1] + self.applied[-1].split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   699
        start = info[0]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   700
        rev = revlog.bin(info[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   701
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   702
        # we know there are no local changes, so we can make a simplified
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   703
        # form of hg.update.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   704
        if update:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   705
            top = self.check_toppatch(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   706
            qp = self.qparents(repo, rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   707
            changes = repo.changelog.read(qp)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   708
            mf1 = repo.manifest.readflags(changes[0])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   709
            mmap = repo.manifest.read(changes[0])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   710
            (c, a, r, d, u) = repo.changes(qp, top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   711
            if d:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   712
                raise util.Abort("deletions found between repo revs")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   713
            for f in c:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   714
                getfile(f, mmap[f])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   715
            for f in r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   716
                getfile(f, mmap[f])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   717
                util.set_exec(repo.wjoin(f), mf1[f])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   718
            repo.dirstate.update(c + r, 'n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   719
            for f in a:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   720
                try: os.unlink(repo.wjoin(f))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   721
                except: raise
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   722
                try: os.removedirs(os.path.dirname(repo.wjoin(f)))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   723
                except: pass
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   724
            if a:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   725
                repo.dirstate.forget(a)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   726
            repo.dirstate.setparents(qp, revlog.nullid)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   727
        self.strip(repo, rev, update=False, backup='strip', wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   728
        del self.applied[start:end]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   729
        if len(self.applied):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   730
            self.ui.write("Now at: %s\n" % self.applied[-1].split(':')[1])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   731
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   732
            self.ui.write("Patch queue now empty\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   733
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   734
    def diff(self, repo, files):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   735
        top = self.check_toppatch(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   736
        if not top:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   737
            self.ui.write("No patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   738
            return
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   739
        qp = self.qparents(repo, top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   740
        commands.dodiff(sys.stdout, self.ui, repo, qp, None, files)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   741
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   742
    def refresh(self, repo, short=False):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   743
        if len(self.applied) == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   744
            self.ui.write("No patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   745
            return
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   746
        wlock = repo.wlock()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   747
        self.check_toppatch(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   748
        qp = self.qparents(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   749
        (top, patch) = self.applied[-1].split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   750
        top = revlog.bin(top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   751
        cparents = repo.changelog.parents(top)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   752
        patchparent = self.qparents(repo, top)
2299
dacf718e1d48 Add timestamp field to export format. Make import and mq use it.
Danek Duvall <danek.duvall@sun.com>
parents: 2270
diff changeset
   753
        message, comments, user, date, patchfound = self.readheaders(patch)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   754
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   755
        patchf = self.opener(patch, "w")
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   756
        if comments:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   757
            comments = "\n".join(comments) + '\n\n'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   758
            patchf.write(comments)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   759
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   760
        tip = repo.changelog.tip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   761
        if top == tip:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   762
            # if the top of our patch queue is also the tip, there is an
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   763
            # optimization here.  We update the dirstate in place and strip
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   764
            # off the tip commit.  Then just commit the current directory
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   765
            # tree.  We can also send repo.commit the list of files
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   766
            # changed to speed up the diff
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   767
            #
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   768
            # in short mode, we only diff the files included in the
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   769
            # patch already
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   770
            #
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   771
            # this should really read:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   772
            #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   773
            # but we do it backwards to take advantage of manifest/chlog
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   774
            # caching against the next repo.changes call
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   775
            #
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   776
            (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   777
            if short:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   778
                filelist = cc + aa + dd
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   779
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   780
                filelist = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   781
            (c, a, r, d, u) = repo.changes(None, None, filelist)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   782
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   783
            # we might end up with files that were added between tip and
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   784
            # the dirstate parent, but then changed in the local dirstate.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   785
            # in this case, we want them to only show up in the added section
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   786
            for x in c:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   787
                if x not in aa:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   788
                    cc.append(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   789
            # we might end up with files added by the local dirstate that
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   790
            # were deleted by the patch.  In this case, they should only
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   791
            # show up in the changed section.
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   792
            for x in a:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   793
                if x in dd:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   794
                    del dd[dd.index(x)]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   795
                    cc.append(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   796
                else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   797
                    aa.append(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   798
            # make sure any files deleted in the local dirstate
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   799
            # are not in the add or change column of the patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   800
            forget = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   801
            for x in d + r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   802
                if x in aa:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   803
                    del aa[aa.index(x)]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   804
                    forget.append(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   805
                    continue
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   806
                elif x in cc:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   807
                    del cc[cc.index(x)]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   808
                dd.append(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   809
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   810
            c = list(util.unique(cc))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   811
            r = list(util.unique(dd))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   812
            a = list(util.unique(aa))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   813
            filelist = list(util.unique(c + r + a ))
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   814
            commands.dodiff(patchf, self.ui, repo, patchparent, None,
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   815
                            filelist, changes=(c, a, r, [], u))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   816
            patchf.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   817
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   818
            changes = repo.changelog.read(tip)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   819
            repo.dirstate.setparents(*cparents)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   820
            repo.dirstate.update(a, 'a')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   821
            repo.dirstate.update(r, 'r')
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   822
            repo.dirstate.update(c, 'n')
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   823
            repo.dirstate.forget(forget)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   824
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   825
            if not message:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   826
                message = "patch queue: %s\n" % patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   827
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   828
                message = "\n".join(message)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   829
            self.strip(repo, top, update=False, backup='strip', wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   830
            n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   831
            self.applied[-1] = revlog.hex(n) + ':' + patch
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   832
            self.applied_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   833
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   834
            commands.dodiff(patchf, self.ui, repo, patchparent, None)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   835
            patchf.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   836
            self.pop(repo, force=True, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   837
            self.push(repo, force=True, wlock=wlock)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   838
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   839
    def init(self, repo, create=False):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   840
        if os.path.isdir(self.path):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   841
            raise util.Abort("patch queue directory already exists")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   842
        os.mkdir(self.path)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   843
        if create:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   844
            return self.qrepo(create=True)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   845
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   846
    def unapplied(self, repo, patch=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   847
        if patch and patch not in self.series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   848
            self.ui.warn("%s not in the series file\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   849
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   850
        if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   851
            start = self.series_end()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   852
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   853
            start = self.series.index(patch) + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   854
        for p in self.series[start:]:
2677
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
   855
            if self.ui.verbose:
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
   856
                self.ui.write("%d " % self.series.index(p))
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   857
            self.ui.write("%s\n" % p)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   858
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   859
    def qseries(self, repo, missing=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   860
        start = self.series_end()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   861
        if not missing:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   862
            for p in self.series[:start]:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   863
                if self.ui.verbose:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   864
                    self.ui.write("%d A " % self.series.index(p))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   865
                self.ui.write("%s\n" % p)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   866
            for p in self.series[start:]:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   867
                if self.ui.verbose:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   868
                    self.ui.write("%d U " % self.series.index(p))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   869
                self.ui.write("%s\n" %  p)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   870
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   871
            list = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   872
            for root, dirs, files in os.walk(self.path):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   873
                d = root[len(self.path) + 1:]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   874
                for f in files:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   875
                    fl = os.path.join(d, f)
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   876
                    if (fl not in self.series and
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   877
                        fl not in (self.status_path, self.series_path)
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
   878
                        and not fl.startswith('.')):
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   879
                        list.append(fl)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   880
            list.sort()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   881
            if list:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   882
                for x in list:
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   883
                    if self.ui.verbose:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   884
                        self.ui.write("D ")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   885
                    self.ui.write("%s\n" % x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   886
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   887
    def issaveline(self, l):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   888
        name = l.split(':')[1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   889
        if name == '.hg.patches.save.line':
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   890
            return True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   891
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   892
    def qrepo(self, create=False):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   893
        if create or os.path.isdir(os.path.join(self.path, ".hg")):
1839
876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1810
diff changeset
   894
            return hg.repository(self.ui, path=self.path, create=create)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   895
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   896
    def restore(self, repo, rev, delete=None, qupdate=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   897
        c = repo.changelog.read(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   898
        desc = c[4].strip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   899
        lines = desc.splitlines()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   900
        i = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   901
        datastart = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   902
        series = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   903
        applied = []
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   904
        qpp = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   905
        for i in xrange(0, len(lines)):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   906
            if lines[i] == 'Patch Data:':
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   907
                datastart = i + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   908
            elif lines[i].startswith('Dirstate:'):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   909
                l = lines[i].rstrip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   910
                l = l[10:].split(' ')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   911
                qpp = [ hg.bin(x) for x in l ]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   912
            elif datastart != None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   913
                l = lines[i].rstrip()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   914
                index = l.index(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   915
                id = l[:index]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   916
                file = l[index + 1:]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   917
                if id:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   918
                    applied.append(l)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   919
                series.append(file)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   920
        if datastart == None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   921
            self.ui.warn("No saved patch data found\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   922
            return 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   923
        self.ui.warn("restoring status: %s\n" % lines[0])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   924
        self.full_series = series
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   925
        self.applied = applied
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   926
        self.read_series(self.full_series)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   927
        self.series_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   928
        self.applied_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   929
        heads = repo.changelog.heads()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   930
        if delete:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   931
            if rev not in heads:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   932
                self.ui.warn("save entry has children, leaving it alone\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   933
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   934
                self.ui.warn("removing save entry %s\n" % hg.short(rev))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   935
                pp = repo.dirstate.parents()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   936
                if rev in pp:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   937
                    update = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   938
                else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   939
                    update = False
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   940
                self.strip(repo, rev, update=update, backup='strip')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   941
        if qpp:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   942
            self.ui.warn("saved queue repository parents: %s %s\n" %
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   943
                         (hg.short(qpp[0]), hg.short(qpp[1])))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   944
            if qupdate:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   945
                print "queue directory updating"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   946
                r = self.qrepo()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   947
                if not r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   948
                    self.ui.warn("Unable to load queue repository\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   949
                    return 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   950
                r.update(qpp[0], allow=False, force=True)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   951
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   952
    def save(self, repo, msg=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   953
        if len(self.applied) == 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   954
            self.ui.warn("save: no patches applied, exiting\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   955
            return 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   956
        if self.issaveline(self.applied[-1]):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   957
            self.ui.warn("status is already saved\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   958
            return 1
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   959
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   960
        ar = [ ':' + x for x in self.full_series ]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   961
        if not msg:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   962
            msg = "hg patches saved state"
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   963
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   964
            msg = "hg patches: " + msg.rstrip('\r\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   965
        r = self.qrepo()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   966
        if r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   967
            pp = r.dirstate.parents()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   968
            msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1]))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   969
        msg += "\n\nPatch Data:\n"
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   970
        text = msg + "\n".join(self.applied) + '\n' + (ar and "\n".join(ar)
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
   971
                                                       + '\n' or "")
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   972
        n = repo.commit(None, text, user=None, force=1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   973
        if not n:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   974
            self.ui.warn("repo commit failed\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   975
            return 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   976
        self.applied.append(revlog.hex(n) + ":" + '.hg.patches.save.line')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   977
        self.applied_dirty = 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   978
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   979
    def series_end(self):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   980
        end = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   981
        if len(self.applied) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   982
            (top, p) = self.applied[-1].split(':')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   983
            try:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   984
                end = self.series.index(p)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   985
            except ValueError:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   986
                return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   987
            return end + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   988
        return end
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   989
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   990
    def qapplied(self, repo, patch=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   991
        if patch and patch not in self.series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   992
            self.ui.warn("%s not in the series file\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   993
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   994
        if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   995
            end = len(self.applied)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   996
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   997
            end = self.series.index(patch) + 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   998
        for x in xrange(end):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
   999
            p = self.appliedname(x)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1000
            self.ui.write("%s\n" % p)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1001
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1002
    def appliedname(self, index):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1003
        p = self.applied[index]
2677
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1004
        pname = p.split(':')[1]
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1005
        if not self.ui.verbose:
2677
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1006
            p = pname
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1007
        else:
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1008
            p = str(self.series.index(pname)) + " " + p
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1009
        return p
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1010
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1011
    def top(self, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1012
        if len(self.applied):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1013
            p = self.appliedname(-1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1014
            self.ui.write(p + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1015
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1016
            self.ui.write("No patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1017
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1018
    def next(self, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1019
        end = self.series_end()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1020
        if end == len(self.series):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1021
            self.ui.write("All patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1022
        else:
2677
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1023
            p = self.series[end]
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1024
            if self.ui.verbose:
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1025
                self.ui.write("%d " % self.series.index(p))
ec05ce9cbf47 mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents: 2664
diff changeset
  1026
            self.ui.write(p + '\n')
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1027
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1028
    def prev(self, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1029
        if len(self.applied) > 1:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1030
            p = self.appliedname(-2)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1031
            self.ui.write(p + '\n')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1032
        elif len(self.applied) == 1:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1033
            self.ui.write("Only one patch applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1034
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1035
            self.ui.write("No patches applied\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1036
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1037
    def qimport(self, repo, files, patch=None, existing=None, force=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1038
        if len(files) > 1 and patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1039
            self.ui.warn("-n option not valid when importing multiple files\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1040
            sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1041
        i = 0
2488
2785aeb51be4 mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2301
diff changeset
  1042
        added = []
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1043
        for filename in files:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1044
            if existing:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1045
                if not patch:
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1046
                    patch = filename
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1047
                if not os.path.isfile(os.path.join(self.path, patch)):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1048
                    self.ui.warn("patch %s does not exist\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1049
                    sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1050
            else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1051
                try:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1052
                    text = file(filename).read()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1053
                except IOError:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1054
                    self.ui.warn("Unable to read %s\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1055
                    sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1056
                if not patch:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1057
                    patch = os.path.split(filename)[1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1058
                if not force and os.path.isfile(os.path.join(self.path, patch)):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1059
                    self.ui.warn("patch %s already exists\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1060
                    sys.exit(1)
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
  1061
                patchf = self.opener(patch, "w")
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1062
                patchf.write(text)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1063
            if patch in self.series:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1064
                self.ui.warn("patch %s is already in the series file\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1065
                sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1066
            index = self.series_end() + i
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1067
            self.full_series[index:index] = [patch]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1068
            self.read_series(self.full_series)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1069
            self.ui.warn("adding %s to series file\n" % patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1070
            i += 1
2488
2785aeb51be4 mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2301
diff changeset
  1071
            added.append(patch)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1072
            patch = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1073
        self.series_dirty = 1
2488
2785aeb51be4 mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2301
diff changeset
  1074
        qrepo = self.qrepo()
2785aeb51be4 mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2301
diff changeset
  1075
        if qrepo:
2785aeb51be4 mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2301
diff changeset
  1076
            qrepo.add(added)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1077
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1078
def delete(ui, repo, patch, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1079
    """remove a patch from the series file"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1080
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1081
    q.delete(repo, patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1082
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1083
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1084
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1085
def applied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1086
    """print the patches already applied"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1087
    repomap[repo].qapplied(repo, patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1088
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1089
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1090
def unapplied(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1091
    """print the patches not yet applied"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1092
    repomap[repo].unapplied(repo, patch)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1093
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1094
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1095
def qimport(ui, repo, *filename, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1096
    """import a patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1097
    q = repomap[repo]
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1098
    q.qimport(repo, filename, patch=opts['name'],
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1099
              existing=opts['existing'], force=opts['force'])
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1100
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1101
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1102
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1103
def init(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1104
    """init a new queue repository"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1105
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1106
    r = q.init(repo, create=opts['create_repo'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1107
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1108
    if r:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1109
        fp = r.wopener('.hgignore', 'w')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1110
        print >> fp, 'syntax: glob'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1111
        print >> fp, 'status'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1112
        fp.close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1113
        r.wopener('series', 'w').close()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1114
        r.add(['.hgignore', 'series'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1115
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1116
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1117
def commit(ui, repo, *pats, **opts):
2526
37785f986260 mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2488
diff changeset
  1118
    """commit changes in the queue repository"""
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1119
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1120
    r = q.qrepo()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1121
    if not r: raise util.Abort('no queue repository')
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1122
    commands.commit(r.ui, r, *pats, **opts)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1123
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1124
def series(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1125
    """print the entire series file"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1126
    repomap[repo].qseries(repo, missing=opts['missing'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1127
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1128
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1129
def top(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1130
    """print the name of the current patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1131
    repomap[repo].top(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1132
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1133
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1134
def next(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1135
    """print the name of the next patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1136
    repomap[repo].next(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1137
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1138
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1139
def prev(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1140
    """print the name of the previous patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1141
    repomap[repo].prev(repo)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1142
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1143
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1144
def new(ui, repo, patch, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1145
    """create a new patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1146
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1147
    q.new(repo, patch, msg=opts['message'], force=opts['force'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1148
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1149
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1150
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1151
def refresh(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1152
    """update the current patch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1153
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1154
    q.refresh(repo, short=opts['short'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1155
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1156
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1157
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1158
def diff(ui, repo, *files, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1159
    """diff of the current patch"""
2097
4d2c2597876f Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2086
diff changeset
  1160
    # deep in the dirstate code, the walkhelper method wants a list, not a tuple
4d2c2597876f Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 2086
diff changeset
  1161
    repomap[repo].diff(repo, list(files))
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1162
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1163
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1164
def lastsavename(path):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1165
    (dir, base) = os.path.split(path)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1166
    names = os.listdir(dir)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1167
    namere = re.compile("%s.([0-9]+)" % base)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1168
    max = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1169
    maxname = None
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1170
    for f in names:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1171
        m = namere.match(f)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1172
        if m:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1173
            index = int(m.group(1))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1174
            if max == None or index > max:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1175
                max = index
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1176
                maxname = f
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1177
    if maxname:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1178
        return (os.path.join(dir, maxname), max)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1179
    return (None, None)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1180
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1181
def savename(path):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1182
    (last, index) = lastsavename(path)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1183
    if last is None:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1184
        index = 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1185
    newpath = path + ".%d" % (index + 1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1186
    return newpath
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1187
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1188
def push(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1189
    """push the next patch onto the stack"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1190
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1191
    mergeq = None
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1192
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1193
    if opts['all']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1194
        patch = q.series[-1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1195
    if opts['merge']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1196
        if opts['name']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1197
            newpath = opts['name']
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1198
        else:
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1199
            newpath, i = lastsavename(q.path)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1200
        if not newpath:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1201
            ui.warn("no saved queues found, please use -n\n")
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1202
            return 1
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1203
        mergeq = queue(ui, repo.join(""), newpath)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1204
        ui.warn("merging with queue at: %s\n" % mergeq.path)
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1205
    ret = q.push(repo, patch, force=opts['force'], list=opts['list'],
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1206
                 mergeq=mergeq)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1207
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1208
    return ret
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1209
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1210
def pop(ui, repo, patch=None, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1211
    """pop the current patch off the stack"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1212
    localupdate = True
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1213
    if opts['name']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1214
        q = queue(ui, repo.join(""), repo.join(opts['name']))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1215
        ui.warn('using patch queue: %s\n' % q.path)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1216
        localupdate = False
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1217
    else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1218
        q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1219
    if opts['all'] and len(q.applied) > 0:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1220
        patch = q.applied[0].split(':')[1]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1221
    q.pop(repo, patch, force=opts['force'], update=localupdate)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1222
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1223
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1224
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1225
def restore(ui, repo, rev, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1226
    """restore the queue state saved by a rev"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1227
    rev = repo.lookup(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1228
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1229
    q.restore(repo, rev, delete=opts['delete'],
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1230
              qupdate=opts['update'])
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1231
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1232
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1233
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1234
def save(ui, repo, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1235
    """save current queue state"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1236
    q = repomap[repo]
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1237
    ret = q.save(repo, msg=opts['message'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1238
    if ret:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1239
        return ret
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1240
    q.save_dirty()
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1241
    if opts['copy']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1242
        path = q.path
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1243
        if opts['name']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1244
            newpath = os.path.join(q.basepath, opts['name'])
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1245
            if os.path.exists(newpath):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1246
                if not os.path.isdir(newpath):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1247
                    ui.warn("destination %s exists and is not a directory\n" %
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1248
                            newpath)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1249
                    sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1250
                if not opts['force']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1251
                    ui.warn("destination %s exists, use -f to force\n" %
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1252
                            newpath)
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1253
                    sys.exit(1)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1254
        else:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1255
            newpath = savename(path)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1256
        ui.warn("copy %s to %s\n" % (path, newpath))
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1257
        util.copyfiles(path, newpath)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1258
    if opts['empty']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1259
        try:
1852
fdf9cbf56ec7 Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1839
diff changeset
  1260
            os.unlink(os.path.join(q.path, q.status_path))
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1261
        except:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1262
            pass
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1263
    return 0
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1264
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1265
def strip(ui, repo, rev, **opts):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1266
    """strip a revision and all later revs on the same branch"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1267
    rev = repo.lookup(rev)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1268
    backup = 'all'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1269
    if opts['backup']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1270
        backup = 'strip'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1271
    elif opts['nobackup']:
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1272
        backup = 'none'
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1273
    repomap[repo].strip(repo, rev, backup=backup)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1274
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1275
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1276
def version(ui, q=None):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1277
    """print the version number"""
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1278
    ui.write("mq version %s\n" % versionstr)
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1279
    return 0
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1280
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1281
def reposetup(ui, repo):
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1282
    repomap[repo] = queue(ui, repo.join(""))
2682
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1283
    oldtags = repo.tags
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1284
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1285
    def qtags():
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1286
        if repo.tagscache:
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1287
            return repo.tagscache
2663
96950d39171d Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents: 2554
diff changeset
  1288
2682
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1289
        tagscache = oldtags()
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1290
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1291
        q = repomap[repo]
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1292
        if len(q.applied) == 0:
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1293
            return tagscache
2664
9b8df8dceeed Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents: 2663
diff changeset
  1294
2682
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1295
        mqtags = [patch.split(':') for patch in q.applied]
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1296
        mqtags.append((mqtags[-1][0], 'qtip'))
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1297
        mqtags.append((mqtags[0][0], 'qbase'))
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1298
        for patch in mqtags:
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1299
            if patch[1] in tagscache:
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1300
                repo.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1])
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1301
            else:
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1302
                tagscache[patch[1]] = revlog.bin(patch[0])
2664
9b8df8dceeed Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents: 2663
diff changeset
  1303
2682
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1304
        return tagscache
2663
96950d39171d Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents: 2554
diff changeset
  1305
2682
4e2dc5c16e61 Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents: 2677
diff changeset
  1306
    repo.tags = qtags
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1307
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1308
cmdtable = {
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1309
    "qapplied": (applied, [], 'hg qapplied [PATCH]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1310
    "qcommit|qci":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1311
        (commit,
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1312
         commands.table["^commit|ci"][1],
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1313
         'hg qcommit [OPTION]... [FILE]...'),
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1314
    "^qdiff": (diff, [], 'hg qdiff [FILE]...'),
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1315
    "qdelete": (delete, [], 'hg qdelete PATCH'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1316
    "^qimport":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1317
        (qimport,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1318
         [('e', 'existing', None, 'import file in patch dir'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1319
          ('n', 'name', '', 'patch file name'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1320
          ('f', 'force', None, 'overwrite existing files')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1321
         'hg qimport [-e] [-n NAME] [-f] FILE...'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1322
    "^qinit":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1323
        (init,
2526
37785f986260 mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2488
diff changeset
  1324
         [('c', 'create-repo', None, 'create queue repository')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1325
         'hg qinit [-c]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1326
    "qnew":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1327
        (new,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1328
         [('m', 'message', '', 'commit message'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1329
          ('f', 'force', None, 'force')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1330
         'hg qnew [-m TEXT] [-f] PATCH'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1331
    "qnext": (next, [], 'hg qnext'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1332
    "qprev": (prev, [], 'hg qprev'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1333
    "^qpop":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1334
        (pop,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1335
         [('a', 'all', None, 'pop all patches'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1336
          ('n', 'name', '', 'queue name to pop'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1337
          ('f', 'force', None, 'forget any local changes')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1338
         'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1339
    "^qpush":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1340
        (push,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1341
         [('f', 'force', None, 'apply if the patch has rejects'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1342
          ('l', 'list', None, 'list patch name in commit text'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1343
          ('a', 'all', None, 'apply all patches'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1344
          ('m', 'merge', None, 'merge from another queue'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1345
          ('n', 'name', '', 'merge queue name')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1346
         'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1347
    "^qrefresh":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1348
        (refresh,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1349
         [('s', 'short', None, 'short refresh')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1350
         'hg qrefresh [-s]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1351
    "qrestore":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1352
        (restore,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1353
         [('d', 'delete', None, 'delete save entry'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1354
          ('u', 'update', None, 'update queue working dir')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1355
         'hg qrestore [-d] [-u] REV'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1356
    "qsave":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1357
        (save,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1358
         [('m', 'message', '', 'commit message'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1359
          ('c', 'copy', None, 'copy patch directory'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1360
          ('n', 'name', '', 'copy directory name'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1361
          ('e', 'empty', None, 'clear queue status file'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1362
          ('f', 'force', None, 'force copy')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1363
         'hg qsave [-m TEXT] [-c] [-n NAME] [-e] [-f]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1364
    "qseries":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1365
        (series,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1366
         [('m', 'missing', None, 'print patches not in series')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1367
         'hg qseries [-m]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1368
    "^strip":
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1369
        (strip,
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1370
         [('f', 'force', None, 'force multi-head removal'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1371
          ('b', 'backup', None, 'bundle unrelated changesets'),
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1372
          ('n', 'nobackup', None, 'no backups')],
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1373
         'hg strip [-f] [-b] [-n] REV'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1374
    "qtop": (top, [], 'hg qtop'),
2185
5acd648770d0 Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2097
diff changeset
  1375
    "qunapplied": (unapplied, [], 'hg qunapplied [PATCH]'),
1810
7596611ab3d5 Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1808
diff changeset
  1376
    "qversion": (version, [], 'hg qversion')
1808
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1377
}
7036cd7f770d Add mq extension
mason@suse.com
parents:
diff changeset
  1378