author | Matt Mackall <mpm@selenic.com> |
Mon, 07 Aug 2006 23:53:04 -0500 | |
changeset 2824 | ca06d35af65e |
parent 2822 | 30f59f4a327e |
child 2830 | 49988d9f0758 |
permissions | -rw-r--r-- |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1 |
|
1808 | 2 |
# queue.py - patch queues for mercurial |
3 |
# |
|
4 |
# Copyright 2005 Chris Mason <mason@suse.com> |
|
5 |
# |
|
6 |
# This software may be used and distributed according to the terms |
|
7 |
# of the GNU General Public License, incorporated herein by reference. |
|
8 |
||
2554
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
9 |
'''patch management and development |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
10 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
11 |
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
|
12 |
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
|
13 |
applied patches (subset of known patches). |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
14 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
15 |
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
|
16 |
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
|
17 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
18 |
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
|
19 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
20 |
prepare repository to work with patches qinit |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
21 |
create new patch qnew |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
22 |
import existing patch qimport |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
23 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
24 |
print patch series qseries |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
25 |
print applied patches qapplied |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
26 |
print name of top applied patch qtop |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
27 |
|
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
28 |
add known patch to applied stack qpush |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
29 |
remove patch from applied stack qpop |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
30 |
refresh contents of top applied patch qrefresh |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
31 |
''' |
8264c2034970
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2531
diff
changeset
|
32 |
|
1808 | 33 |
from mercurial.demandload import * |
34 |
demandload(globals(), "os sys re struct traceback errno bz2") |
|
35 |
from mercurial.i18n import gettext as _ |
|
36 |
from mercurial import ui, hg, revlog, commands, util |
|
37 |
||
38 |
versionstr = "0.45" |
|
39 |
||
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
40 |
commands.norepo += " qclone qversion" |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
41 |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
42 |
class StatusEntry: |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
43 |
def __init__(self, rev, name=None): |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
44 |
if not name: |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
45 |
self.rev, self.name = rev.split(':') |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
46 |
else: |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
47 |
self.rev, self.name = rev, name |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
48 |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
49 |
def __str__(self): |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
50 |
return self.rev + ':' + self.name |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
51 |
|
1808 | 52 |
class queue: |
53 |
def __init__(self, ui, path, patchdir=None): |
|
54 |
self.basepath = path |
|
55 |
if patchdir: |
|
56 |
self.path = patchdir |
|
57 |
else: |
|
58 |
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
|
59 |
self.opener = util.opener(self.path) |
1808 | 60 |
self.ui = ui |
61 |
self.applied = [] |
|
62 |
self.full_series = [] |
|
63 |
self.applied_dirty = 0 |
|
64 |
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
|
65 |
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
|
66 |
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
|
67 |
|
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
|
68 |
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
|
69 |
self.full_series = self.opener(self.series_path).read().splitlines() |
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
70 |
self.parse_series() |
1808 | 71 |
|
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
|
72 |
if os.path.exists(os.path.join(self.path, self.status_path)): |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
73 |
self.applied = [StatusEntry(l) |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
74 |
for l in self.opener(self.status_path).read().splitlines()] |
1808 | 75 |
|
76 |
def find_series(self, patch): |
|
77 |
pre = re.compile("(\s*)([^#]+)") |
|
78 |
index = 0 |
|
79 |
for l in self.full_series: |
|
80 |
m = pre.match(l) |
|
81 |
if m: |
|
82 |
s = m.group(2) |
|
83 |
s = s.rstrip() |
|
84 |
if s == patch: |
|
85 |
return index |
|
86 |
index += 1 |
|
87 |
return None |
|
88 |
||
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
89 |
def parse_series(self): |
1808 | 90 |
self.series = [] |
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
91 |
for l in self.full_series: |
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
92 |
s = l.split('#', 1)[0].strip() |
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
93 |
if s: |
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
94 |
self.series.append(s) |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
95 |
|
1808 | 96 |
def save_dirty(self): |
2772
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
97 |
def write_list(items, path): |
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
98 |
fp = self.opener(path, 'w') |
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
99 |
for i in items: |
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
100 |
print >> fp, i |
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
101 |
fp.close() |
2776 | 102 |
if self.applied_dirty: write_list(map(str, self.applied), self.status_path) |
2772
4720e79486d3
mq: simplify save_dirty
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2771
diff
changeset
|
103 |
if self.series_dirty: write_list(self.full_series, self.series_path) |
1808 | 104 |
|
105 |
def readheaders(self, patch): |
|
106 |
def eatdiff(lines): |
|
107 |
while lines: |
|
108 |
l = lines[-1] |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
109 |
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
|
110 |
l.startswith("Index:") or |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
111 |
l.startswith("===========")): |
1808 | 112 |
del lines[-1] |
113 |
else: |
|
114 |
break |
|
115 |
def eatempty(lines): |
|
116 |
while lines: |
|
117 |
l = lines[-1] |
|
118 |
if re.match('\s*$', l): |
|
119 |
del lines[-1] |
|
120 |
else: |
|
121 |
break |
|
122 |
||
123 |
pf = os.path.join(self.path, patch) |
|
124 |
message = [] |
|
125 |
comments = [] |
|
126 |
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
|
127 |
date = None |
1808 | 128 |
format = None |
129 |
subject = None |
|
130 |
diffstart = 0 |
|
131 |
||
132 |
for line in file(pf): |
|
133 |
line = line.rstrip() |
|
134 |
if diffstart: |
|
135 |
if line.startswith('+++ '): |
|
136 |
diffstart = 2 |
|
137 |
break |
|
138 |
if line.startswith("--- "): |
|
139 |
diffstart = 1 |
|
140 |
continue |
|
141 |
elif format == "hgpatch": |
|
142 |
# parse values when importing the result of an hg export |
|
143 |
if line.startswith("# User "): |
|
144 |
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
|
145 |
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
|
146 |
date = line[7:] |
1808 | 147 |
elif not line.startswith("# ") and line: |
148 |
message.append(line) |
|
149 |
format = None |
|
150 |
elif line == '# HG changeset patch': |
|
151 |
format = "hgpatch" |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
152 |
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
|
153 |
line.startswith("subject: "))): |
1808 | 154 |
subject = line[9:] |
155 |
format = "tag" |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
156 |
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
|
157 |
line.startswith("from: "))): |
1808 | 158 |
user = line[6:] |
159 |
format = "tag" |
|
160 |
elif format == "tag" and line == "": |
|
161 |
# when looking for tags (subject: from: etc) they |
|
162 |
# end once you find a blank line in the source |
|
163 |
format = "tagdone" |
|
2301
7c2623aedeb4
Strip empty lines and trailing spaces around commit messages.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2300
diff
changeset
|
164 |
elif message or line: |
1808 | 165 |
message.append(line) |
166 |
comments.append(line) |
|
167 |
||
168 |
eatdiff(message) |
|
169 |
eatdiff(comments) |
|
170 |
eatempty(message) |
|
171 |
eatempty(comments) |
|
172 |
||
173 |
# make sure message isn't empty |
|
174 |
if format and format.startswith("tag") and subject: |
|
175 |
message.insert(0, "") |
|
176 |
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
|
177 |
return (message, comments, user, date, diffstart > 1) |
1808 | 178 |
|
179 |
def mergeone(self, repo, mergeq, head, patch, rev, wlock): |
|
180 |
# 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
|
181 |
(err, n) = self.apply(repo, [ patch ], update_status=False, |
1808 | 182 |
strict=True, merge=rev, wlock=wlock) |
183 |
||
184 |
if err == 0: |
|
185 |
return (err, n) |
|
186 |
||
187 |
if n is None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
188 |
raise util.Abort(_("apply failed for patch %s") % patch) |
1808 | 189 |
|
190 |
self.ui.warn("patch didn't work out, merging %s\n" % patch) |
|
191 |
||
192 |
# apply failed, strip away that rev and merge. |
|
2822
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
193 |
hg.clean(repo, head, wlock=wlock) |
1808 | 194 |
self.strip(repo, n, update=False, backup='strip', wlock=wlock) |
195 |
||
196 |
c = repo.changelog.read(rev) |
|
2822
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
197 |
ret = hg.merge(repo, rev, wlock=wlock) |
1808 | 198 |
if ret: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
199 |
raise util.Abort(_("update returned %d") % ret) |
1808 | 200 |
n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) |
201 |
if n == None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
202 |
raise util.Abort(_("repo commit failed")) |
1808 | 203 |
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
|
204 |
message, comments, user, date, patchfound = mergeq.readheaders(patch) |
1808 | 205 |
except: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
206 |
raise util.Abort(_("unable to read %s") % patch) |
1808 | 207 |
|
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
|
208 |
patchf = self.opener(patch, "w") |
1808 | 209 |
if comments: |
210 |
comments = "\n".join(comments) + '\n\n' |
|
211 |
patchf.write(comments) |
|
212 |
commands.dodiff(patchf, self.ui, repo, head, n) |
|
213 |
patchf.close() |
|
214 |
return (0, n) |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
215 |
|
1808 | 216 |
def qparents(self, repo, rev=None): |
217 |
if rev is None: |
|
218 |
(p1, p2) = repo.dirstate.parents() |
|
219 |
if p2 == revlog.nullid: |
|
220 |
return p1 |
|
221 |
if len(self.applied) == 0: |
|
222 |
return None |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
223 |
return revlog.bin(self.applied[-1].rev) |
1808 | 224 |
pp = repo.changelog.parents(rev) |
225 |
if pp[1] != revlog.nullid: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
226 |
arevs = [ x.rev for x in self.applied ] |
1808 | 227 |
p0 = revlog.hex(pp[0]) |
228 |
p1 = revlog.hex(pp[1]) |
|
229 |
if p0 in arevs: |
|
230 |
return pp[0] |
|
231 |
if p1 in arevs: |
|
232 |
return pp[1] |
|
233 |
return pp[0] |
|
234 |
||
235 |
def mergepatch(self, repo, mergeq, series, wlock): |
|
236 |
if len(self.applied) == 0: |
|
237 |
# each of the patches merged in will have two parents. This |
|
238 |
# can confuse the qrefresh, qdiff, and strip code because it |
|
239 |
# needs to know which parent is actually in the patch queue. |
|
240 |
# so, we insert a merge marker with only one parent. This way |
|
241 |
# the first patch in the queue is never a merge patch |
|
242 |
# |
|
243 |
pname = ".hg.patches.merge.marker" |
|
244 |
n = repo.commit(None, '[mq]: merge marker', user=None, force=1, |
|
245 |
wlock=wlock) |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
246 |
self.applied.append(StatusEntry(revlog.hex(n), pname)) |
1808 | 247 |
self.applied_dirty = 1 |
248 |
||
249 |
head = self.qparents(repo) |
|
250 |
||
251 |
for patch in series: |
|
2696 | 252 |
patch = mergeq.lookup(patch, strict=True) |
1808 | 253 |
if not patch: |
254 |
self.ui.warn("patch %s does not exist\n" % patch) |
|
255 |
return (1, None) |
|
256 |
||
257 |
info = mergeq.isapplied(patch) |
|
258 |
if not info: |
|
259 |
self.ui.warn("patch %s is not applied\n" % patch) |
|
260 |
return (1, None) |
|
261 |
rev = revlog.bin(info[1]) |
|
262 |
(err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) |
|
263 |
if head: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
264 |
self.applied.append(StatusEntry(revlog.hex(head), patch)) |
1808 | 265 |
self.applied_dirty = 1 |
266 |
if err: |
|
267 |
return (err, head) |
|
268 |
return (0, head) |
|
269 |
||
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
270 |
def patch(self, repo, patchfile): |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
271 |
'''Apply patchfile to the working directory. |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
272 |
patchfile: file name of patch''' |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
273 |
try: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
274 |
pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch') |
2786
f4d916351366
Add portable shell-quoting function; teach mq to use it.
Brendan Cully <brendan@kublai.com>
parents:
2776
diff
changeset
|
275 |
f = os.popen("%s -d %s -p1 --no-backup-if-mismatch < %s" % |
f4d916351366
Add portable shell-quoting function; teach mq to use it.
Brendan Cully <brendan@kublai.com>
parents:
2776
diff
changeset
|
276 |
(pp, util.shellquote(repo.root), util.shellquote(patchfile))) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
277 |
except: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
278 |
self.ui.warn("patch failed, unable to continue (try -v)\n") |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
279 |
return (None, [], False) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
280 |
files = [] |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
281 |
fuzz = False |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
282 |
for l in f: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
283 |
l = l.rstrip('\r\n'); |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
284 |
if self.ui.verbose: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
285 |
self.ui.warn(l + "\n") |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
286 |
if l[:14] == 'patching file ': |
2787
8ec1b1f0a5f7
mq: use more portable util.parse_patch_output instead of handrolled version.
Brendan Cully <brendan@kublai.com>
parents:
2786
diff
changeset
|
287 |
pf = os.path.normpath(util.parse_patch_output(l)) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
288 |
if pf not in files: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
289 |
files.append(pf) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
290 |
printed_file = False |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
291 |
file_str = l |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
292 |
elif l.find('with fuzz') >= 0: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
293 |
if not printed_file: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
294 |
self.ui.warn(file_str + '\n') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
295 |
printed_file = True |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
296 |
self.ui.warn(l + '\n') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
297 |
fuzz = True |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
298 |
elif l.find('saving rejects to file') >= 0: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
299 |
self.ui.warn(l + '\n') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
300 |
elif l.find('FAILED') >= 0: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
301 |
if not printed_file: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
302 |
self.ui.warn(file_str + '\n') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
303 |
printed_file = True |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
304 |
self.ui.warn(l + '\n') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
305 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
306 |
return (not f.close(), files, fuzz) |
2791
4c39568007f9
mq: codingstyle
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2790
diff
changeset
|
307 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
308 |
def apply(self, repo, series, list=False, update_status=True, |
1808 | 309 |
strict=False, patchdir=None, merge=None, wlock=None): |
310 |
# TODO unify with commands.py |
|
311 |
if not patchdir: |
|
312 |
patchdir = self.path |
|
313 |
err = 0 |
|
314 |
if not wlock: |
|
315 |
wlock = repo.wlock() |
|
316 |
lock = repo.lock() |
|
317 |
tr = repo.transaction() |
|
318 |
n = None |
|
319 |
for patch in series: |
|
320 |
self.ui.warn("applying %s\n" % patch) |
|
321 |
pf = os.path.join(patchdir, patch) |
|
322 |
||
323 |
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
|
324 |
message, comments, user, date, patchfound = self.readheaders(patch) |
1808 | 325 |
except: |
326 |
self.ui.warn("Unable to read %s\n" % pf) |
|
327 |
err = 1 |
|
328 |
break |
|
329 |
||
330 |
if not message: |
|
331 |
message = "imported patch %s\n" % patch |
|
332 |
else: |
|
333 |
if list: |
|
334 |
message.append("\nimported patch %s" % patch) |
|
335 |
message = '\n'.join(message) |
|
336 |
||
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
337 |
(patcherr, files, fuzz) = self.patch(repo, pf) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
338 |
patcherr = not patcherr |
1808 | 339 |
|
340 |
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
|
341 |
# 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
|
342 |
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
|
343 |
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
|
344 |
repo.dirstate.setparents(p1, merge) |
1808 | 345 |
if len(files) > 0: |
2728
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
346 |
cwd = repo.getcwd() |
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
347 |
cfiles = files |
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
348 |
if cwd: |
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
349 |
cfiles = [util.pathto(cwd, f) for f in files] |
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
350 |
commands.addremove_lock(self.ui, repo, cfiles, |
1808 | 351 |
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
|
352 |
n = repo.commit(files, message, user, date, force=1, lock=lock, |
1808 | 353 |
wlock=wlock) |
354 |
||
355 |
if n == None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
356 |
raise util.Abort(_("repo commit failed")) |
1808 | 357 |
|
358 |
if update_status: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
359 |
self.applied.append(StatusEntry(revlog.hex(n), patch)) |
1808 | 360 |
|
361 |
if patcherr: |
|
362 |
if not patchfound: |
|
363 |
self.ui.warn("patch %s is empty\n" % patch) |
|
364 |
err = 0 |
|
365 |
else: |
|
366 |
self.ui.warn("patch failed, rejects left in working dir\n") |
|
367 |
err = 1 |
|
368 |
break |
|
369 |
||
370 |
if fuzz and strict: |
|
371 |
self.ui.warn("fuzz found when applying patch, stopping\n") |
|
372 |
err = 1 |
|
373 |
break |
|
374 |
tr.close() |
|
375 |
return (err, n) |
|
376 |
||
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
377 |
def delete(self, repo, patch, force=False): |
2696 | 378 |
patch = self.lookup(patch, strict=True) |
1808 | 379 |
info = self.isapplied(patch) |
380 |
if info: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
381 |
raise util.Abort(_("cannot delete applied patch %s") % patch) |
1808 | 382 |
if patch not in self.series: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
383 |
raise util.Abort(_("patch %s not in series file") % patch) |
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
384 |
if force: |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
385 |
r = self.qrepo() |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
386 |
if r: |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
387 |
r.remove([patch], True) |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
388 |
else: |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
389 |
os.unlink(os.path.join(self.path, patch)) |
1808 | 390 |
i = self.find_series(patch) |
391 |
del self.full_series[i] |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
392 |
self.parse_series() |
1808 | 393 |
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
|
394 |
|
1808 | 395 |
def check_toppatch(self, repo): |
396 |
if len(self.applied) > 0: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
397 |
top = revlog.bin(self.applied[-1].rev) |
1808 | 398 |
pp = repo.dirstate.parents() |
399 |
if top not in pp: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
400 |
raise util.Abort(_("queue top not at same revision as working directory")) |
1808 | 401 |
return top |
402 |
return None |
|
403 |
def check_localchanges(self, repo): |
|
404 |
(c, a, r, d, u) = repo.changes(None, None) |
|
405 |
if c or a or d or r: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
406 |
raise util.Abort(_("local changes found, refresh first")) |
1808 | 407 |
def new(self, repo, patch, msg=None, force=None): |
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
408 |
if os.path.exists(os.path.join(self.path, patch)): |
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
409 |
raise util.Abort(_('patch "%s" already exists') % patch) |
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
410 |
commitfiles = [] |
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
411 |
(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
|
412 |
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
|
413 |
if not force: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
414 |
raise util.Abort(_("local changes found, refresh first")) |
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
415 |
commitfiles = c + a + r |
1808 | 416 |
self.check_toppatch(repo) |
417 |
wlock = repo.wlock() |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
418 |
insert = self.full_series_end() |
1808 | 419 |
if msg: |
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
420 |
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
|
421 |
wlock=wlock) |
1808 | 422 |
else: |
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, |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
424 |
"New patch: %s" % patch, force=True, wlock=wlock) |
1808 | 425 |
if n == None: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
426 |
raise util.Abort(_("repo commit failed")) |
1808 | 427 |
self.full_series[insert:insert] = [patch] |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
428 |
self.applied.append(StatusEntry(revlog.hex(n), patch)) |
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
429 |
self.parse_series() |
1808 | 430 |
self.series_dirty = 1 |
431 |
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
|
432 |
p = self.opener(patch, "w") |
1808 | 433 |
if msg: |
434 |
msg = msg + "\n" |
|
435 |
p.write(msg) |
|
436 |
p.close() |
|
437 |
wlock = None |
|
438 |
r = self.qrepo() |
|
439 |
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
|
440 |
if commitfiles: |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
441 |
self.refresh(repo, msg=None, short=True) |
1808 | 442 |
|
443 |
def strip(self, repo, rev, update=True, backup="all", wlock=None): |
|
444 |
def limitheads(chlog, stop): |
|
445 |
"""return the list of all nodes that have no children""" |
|
446 |
p = {} |
|
447 |
h = [] |
|
448 |
stoprev = 0 |
|
449 |
if stop in chlog.nodemap: |
|
450 |
stoprev = chlog.rev(stop) |
|
451 |
||
452 |
for r in range(chlog.count() - 1, -1, -1): |
|
453 |
n = chlog.node(r) |
|
454 |
if n not in p: |
|
455 |
h.append(n) |
|
456 |
if n == stop: |
|
457 |
break |
|
458 |
if r < stoprev: |
|
459 |
break |
|
460 |
for pn in chlog.parents(n): |
|
461 |
p[pn] = 1 |
|
462 |
return h |
|
463 |
||
464 |
def bundle(cg): |
|
465 |
backupdir = repo.join("strip-backup") |
|
466 |
if not os.path.isdir(backupdir): |
|
467 |
os.mkdir(backupdir) |
|
468 |
name = os.path.join(backupdir, "%s" % revlog.short(rev)) |
|
469 |
name = savename(name) |
|
470 |
self.ui.warn("saving bundle to %s\n" % name) |
|
471 |
# TODO, exclusive open |
|
472 |
f = open(name, "wb") |
|
473 |
try: |
|
474 |
f.write("HG10") |
|
475 |
z = bz2.BZ2Compressor(9) |
|
476 |
while 1: |
|
477 |
chunk = cg.read(4096) |
|
478 |
if not chunk: |
|
479 |
break |
|
480 |
f.write(z.compress(chunk)) |
|
481 |
f.write(z.flush()) |
|
482 |
except: |
|
483 |
os.unlink(name) |
|
484 |
raise |
|
485 |
f.close() |
|
486 |
return name |
|
487 |
||
488 |
def stripall(rev, revnum): |
|
489 |
cl = repo.changelog |
|
490 |
c = cl.read(rev) |
|
491 |
mm = repo.manifest.read(c[0]) |
|
492 |
seen = {} |
|
493 |
||
494 |
for x in xrange(revnum, cl.count()): |
|
495 |
c = cl.read(cl.node(x)) |
|
496 |
for f in c[3]: |
|
497 |
if f in seen: |
|
498 |
continue |
|
499 |
seen[f] = 1 |
|
500 |
if f in mm: |
|
501 |
filerev = mm[f] |
|
502 |
else: |
|
503 |
filerev = 0 |
|
504 |
seen[f] = filerev |
|
505 |
# we go in two steps here so the strip loop happens in a |
|
506 |
# sensible order. When stripping many files, this helps keep |
|
507 |
# our disk access patterns under control. |
|
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
508 |
seen_list = seen.keys() |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
509 |
seen_list.sort() |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
510 |
for f in seen_list: |
1808 | 511 |
ff = repo.file(f) |
512 |
filerev = seen[f] |
|
513 |
if filerev != 0: |
|
514 |
if filerev in ff.nodemap: |
|
515 |
filerev = ff.rev(filerev) |
|
516 |
else: |
|
517 |
filerev = 0 |
|
518 |
ff.strip(filerev, revnum) |
|
519 |
||
520 |
if not wlock: |
|
521 |
wlock = repo.wlock() |
|
522 |
lock = repo.lock() |
|
523 |
chlog = repo.changelog |
|
524 |
# TODO delete the undo files, and handle undo of merge sets |
|
525 |
pp = chlog.parents(rev) |
|
526 |
revnum = chlog.rev(rev) |
|
527 |
||
528 |
if update: |
|
2699
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
529 |
(c, a, r, d, u) = repo.changes(None, None) |
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
530 |
if c or a or d or r: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
531 |
raise util.Abort(_("local changes found")) |
1808 | 532 |
urev = self.qparents(repo, rev) |
2822
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
533 |
hg.clean(repo, urev, wlock=wlock) |
1808 | 534 |
repo.dirstate.write() |
535 |
||
536 |
# save is a list of all the branches we are truncating away |
|
537 |
# that we actually want to keep. changegroup will be used |
|
538 |
# to preserve them and add them back after the truncate |
|
539 |
saveheads = [] |
|
540 |
savebases = {} |
|
541 |
||
542 |
heads = limitheads(chlog, rev) |
|
543 |
seen = {} |
|
544 |
||
545 |
# search through all the heads, finding those where the revision |
|
546 |
# we want to strip away is an ancestor. Also look for merges |
|
547 |
# that might be turned into new heads by the strip. |
|
548 |
while heads: |
|
549 |
h = heads.pop() |
|
550 |
n = h |
|
551 |
while True: |
|
552 |
seen[n] = 1 |
|
553 |
pp = chlog.parents(n) |
|
554 |
if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: |
|
555 |
if pp[1] not in seen: |
|
556 |
heads.append(pp[1]) |
|
557 |
if pp[0] == revlog.nullid: |
|
558 |
break |
|
559 |
if chlog.rev(pp[0]) < revnum: |
|
560 |
break |
|
561 |
n = pp[0] |
|
562 |
if n == rev: |
|
563 |
break |
|
564 |
r = chlog.reachable(h, rev) |
|
565 |
if rev not in r: |
|
566 |
saveheads.append(h) |
|
567 |
for x in r: |
|
568 |
if chlog.rev(x) > revnum: |
|
569 |
savebases[x] = 1 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
570 |
|
1808 | 571 |
# create a changegroup for all the branches we need to keep |
2792
a3c6e7888abf
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2791
diff
changeset
|
572 |
if backup == "all": |
1808 | 573 |
backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') |
574 |
bundle(backupch) |
|
575 |
if saveheads: |
|
576 |
backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') |
|
577 |
chgrpfile = bundle(backupch) |
|
578 |
||
579 |
stripall(rev, revnum) |
|
580 |
||
581 |
change = chlog.read(rev) |
|
582 |
repo.manifest.strip(repo.manifest.rev(change[0]), revnum) |
|
583 |
chlog.strip(revnum, revnum) |
|
584 |
if saveheads: |
|
585 |
self.ui.status("adding branch\n") |
|
586 |
commands.unbundle(self.ui, repo, chgrpfile, update=False) |
|
2792
a3c6e7888abf
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2791
diff
changeset
|
587 |
if backup != "strip": |
1808 | 588 |
os.unlink(chgrpfile) |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
589 |
|
1808 | 590 |
def isapplied(self, patch): |
591 |
"""returns (index, rev, patch)""" |
|
592 |
for i in xrange(len(self.applied)): |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
593 |
a = self.applied[i] |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
594 |
if a.name == patch: |
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
595 |
return (i, a.rev, a.name) |
1808 | 596 |
return None |
597 |
||
2696 | 598 |
# if the exact patch name does not exist, we try a few |
599 |
# variations. If strict is passed, we try only #1 |
|
600 |
# |
|
601 |
# 1) a number to indicate an offset in the series file |
|
602 |
# 2) a unique substring of the patch name was given |
|
603 |
# 3) patchname[-+]num to indicate an offset in the series file |
|
604 |
def lookup(self, patch, strict=False): |
|
605 |
def partial_name(s): |
|
606 |
if s in self.series: |
|
607 |
return s |
|
2765
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
608 |
matches = [x for x in self.series if s in x] |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
609 |
if len(matches) > 1: |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
610 |
self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
611 |
for m in matches: |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
612 |
self.ui.warn(' %s\n' % m) |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
613 |
return None |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
614 |
if matches: |
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
615 |
return matches[0] |
2696 | 616 |
if len(self.series) > 0 and len(self.applied) > 0: |
617 |
if s == 'qtip': |
|
618 |
return self.series[self.series_end()-1] |
|
619 |
if s == 'qbase': |
|
620 |
return self.series[0] |
|
621 |
return None |
|
1808 | 622 |
if patch == None: |
623 |
return None |
|
2696 | 624 |
|
625 |
# we don't want to return a partial match until we make |
|
626 |
# sure the file name passed in does not exist (checked below) |
|
627 |
res = partial_name(patch) |
|
628 |
if res and res == patch: |
|
629 |
return res |
|
630 |
||
1808 | 631 |
if not os.path.isfile(os.path.join(self.path, patch)): |
632 |
try: |
|
633 |
sno = int(patch) |
|
634 |
except(ValueError, OverflowError): |
|
2696 | 635 |
pass |
636 |
else: |
|
637 |
if sno < len(self.series): |
|
638 |
patch = self.series[sno] |
|
639 |
return patch |
|
640 |
if not strict: |
|
641 |
# return any partial match made above |
|
642 |
if res: |
|
643 |
return res |
|
644 |
minus = patch.rsplit('-', 1) |
|
645 |
if len(minus) > 1: |
|
646 |
res = partial_name(minus[0]) |
|
647 |
if res: |
|
648 |
i = self.series.index(res) |
|
649 |
try: |
|
650 |
off = int(minus[1] or 1) |
|
651 |
except(ValueError, OverflowError): |
|
652 |
pass |
|
653 |
else: |
|
654 |
if i - off >= 0: |
|
655 |
return self.series[i - off] |
|
656 |
plus = patch.rsplit('+', 1) |
|
657 |
if len(plus) > 1: |
|
658 |
res = partial_name(plus[0]) |
|
659 |
if res: |
|
660 |
i = self.series.index(res) |
|
661 |
try: |
|
662 |
off = int(plus[1] or 1) |
|
663 |
except(ValueError, OverflowError): |
|
664 |
pass |
|
665 |
else: |
|
666 |
if i + off < len(self.series): |
|
667 |
return self.series[i + off] |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
668 |
raise util.Abort(_("patch %s not in series") % patch) |
1808 | 669 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
670 |
def push(self, repo, patch=None, force=False, list=False, |
1808 | 671 |
mergeq=None, wlock=None): |
672 |
if not wlock: |
|
673 |
wlock = repo.wlock() |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
674 |
patch = self.lookup(patch) |
1808 | 675 |
if patch and self.isapplied(patch): |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
676 |
self.ui.warn(_("patch %s is already applied\n") % patch) |
1808 | 677 |
sys.exit(1) |
678 |
if self.series_end() == len(self.series): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
679 |
self.ui.warn(_("patch series fully applied\n")) |
1808 | 680 |
sys.exit(1) |
681 |
if not force: |
|
682 |
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
|
683 |
|
1808 | 684 |
self.applied_dirty = 1; |
685 |
start = self.series_end() |
|
686 |
if start > 0: |
|
687 |
self.check_toppatch(repo) |
|
688 |
if not patch: |
|
689 |
patch = self.series[start] |
|
690 |
end = start + 1 |
|
691 |
else: |
|
692 |
end = self.series.index(patch, start) + 1 |
|
693 |
s = self.series[start:end] |
|
694 |
if mergeq: |
|
695 |
ret = self.mergepatch(repo, mergeq, s, wlock) |
|
696 |
else: |
|
697 |
ret = self.apply(repo, s, list, wlock=wlock) |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
698 |
top = self.applied[-1].name |
1808 | 699 |
if ret[0]: |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
700 |
self.ui.write("Errors during apply, please fix and refresh %s\n" % |
1808 | 701 |
top) |
702 |
else: |
|
703 |
self.ui.write("Now at: %s\n" % top) |
|
704 |
return ret[0] |
|
705 |
||
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
706 |
def pop(self, repo, patch=None, force=False, update=True, all=False, |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
707 |
wlock=None): |
1808 | 708 |
def getfile(f, rev): |
709 |
t = repo.file(f).read(rev) |
|
710 |
try: |
|
711 |
repo.wfile(f, "w").write(t) |
|
712 |
except IOError: |
|
2086
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
713 |
try: |
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
714 |
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
|
715 |
except OSError, err: |
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
716 |
if err.errno != errno.EEXIST: raise |
1808 | 717 |
repo.wfile(f, "w").write(t) |
718 |
||
719 |
if not wlock: |
|
720 |
wlock = repo.wlock() |
|
721 |
if patch: |
|
722 |
# index, rev, patch |
|
723 |
info = self.isapplied(patch) |
|
724 |
if not info: |
|
725 |
patch = self.lookup(patch) |
|
726 |
info = self.isapplied(patch) |
|
727 |
if not info: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
728 |
raise util.Abort(_("patch %s is not applied") % patch) |
1808 | 729 |
if len(self.applied) == 0: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
730 |
self.ui.warn(_("no patches applied\n")) |
1808 | 731 |
sys.exit(1) |
732 |
||
733 |
if not update: |
|
734 |
parents = repo.dirstate.parents() |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
735 |
rr = [ revlog.bin(x.rev) for x in self.applied ] |
1808 | 736 |
for p in parents: |
737 |
if p in rr: |
|
738 |
self.ui.warn("qpop: forcing dirstate update\n") |
|
739 |
update = True |
|
740 |
||
741 |
if not force and update: |
|
742 |
self.check_localchanges(repo) |
|
743 |
||
744 |
self.applied_dirty = 1; |
|
745 |
end = len(self.applied) |
|
746 |
if not patch: |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
747 |
if all: |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
748 |
popi = 0 |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
749 |
else: |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
750 |
popi = len(self.applied) - 1 |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
751 |
else: |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
752 |
popi = info[0] + 1 |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
753 |
if popi >= end: |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
754 |
self.ui.warn("qpop: %s is already at the top\n" % patch) |
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
755 |
return |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
756 |
info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] |
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
757 |
|
1808 | 758 |
start = info[0] |
759 |
rev = revlog.bin(info[1]) |
|
760 |
||
761 |
# we know there are no local changes, so we can make a simplified |
|
762 |
# form of hg.update. |
|
763 |
if update: |
|
764 |
top = self.check_toppatch(repo) |
|
765 |
qp = self.qparents(repo, rev) |
|
766 |
changes = repo.changelog.read(qp) |
|
767 |
mf1 = repo.manifest.readflags(changes[0]) |
|
768 |
mmap = repo.manifest.read(changes[0]) |
|
769 |
(c, a, r, d, u) = repo.changes(qp, top) |
|
770 |
if d: |
|
771 |
raise util.Abort("deletions found between repo revs") |
|
772 |
for f in c: |
|
773 |
getfile(f, mmap[f]) |
|
774 |
for f in r: |
|
775 |
getfile(f, mmap[f]) |
|
776 |
util.set_exec(repo.wjoin(f), mf1[f]) |
|
777 |
repo.dirstate.update(c + r, 'n') |
|
778 |
for f in a: |
|
779 |
try: os.unlink(repo.wjoin(f)) |
|
780 |
except: raise |
|
781 |
try: os.removedirs(os.path.dirname(repo.wjoin(f))) |
|
782 |
except: pass |
|
783 |
if a: |
|
784 |
repo.dirstate.forget(a) |
|
785 |
repo.dirstate.setparents(qp, revlog.nullid) |
|
786 |
self.strip(repo, rev, update=False, backup='strip', wlock=wlock) |
|
787 |
del self.applied[start:end] |
|
788 |
if len(self.applied): |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
789 |
self.ui.write("Now at: %s\n" % self.applied[-1].name) |
1808 | 790 |
else: |
791 |
self.ui.write("Patch queue now empty\n") |
|
792 |
||
793 |
def diff(self, repo, files): |
|
794 |
top = self.check_toppatch(repo) |
|
795 |
if not top: |
|
796 |
self.ui.write("No patches applied\n") |
|
797 |
return |
|
798 |
qp = self.qparents(repo, top) |
|
799 |
commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) |
|
800 |
||
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
801 |
def refresh(self, repo, msg=None, short=False): |
1808 | 802 |
if len(self.applied) == 0: |
803 |
self.ui.write("No patches applied\n") |
|
804 |
return |
|
805 |
wlock = repo.wlock() |
|
806 |
self.check_toppatch(repo) |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
807 |
(top, patch) = (self.applied[-1].rev, self.applied[-1].name) |
1808 | 808 |
top = revlog.bin(top) |
809 |
cparents = repo.changelog.parents(top) |
|
810 |
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
|
811 |
message, comments, user, date, patchfound = self.readheaders(patch) |
1808 | 812 |
|
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
|
813 |
patchf = self.opener(patch, "w") |
2745
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
814 |
msg = msg.rstrip() |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
815 |
if msg: |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
816 |
if comments: |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
817 |
# Remove existing message. |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
818 |
ci = 0 |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
819 |
for mi in range(len(message)): |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
820 |
while message[mi] != comments[ci]: |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
821 |
ci += 1 |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
822 |
del comments[ci] |
1bac2bfe081a
Change patch header as well as commit message with qrefresh -m or -l.
Brendan Cully <brendan@kublai.com>
parents:
2742
diff
changeset
|
823 |
comments.append(msg) |
1808 | 824 |
if comments: |
825 |
comments = "\n".join(comments) + '\n\n' |
|
826 |
patchf.write(comments) |
|
827 |
||
828 |
tip = repo.changelog.tip() |
|
829 |
if top == tip: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
830 |
# if the top of our patch queue is also the tip, there is an |
1808 | 831 |
# optimization here. We update the dirstate in place and strip |
832 |
# off the tip commit. Then just commit the current directory |
|
833 |
# tree. We can also send repo.commit the list of files |
|
834 |
# changed to speed up the diff |
|
835 |
# |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
836 |
# in short mode, we only diff the files included in the |
1808 | 837 |
# patch already |
838 |
# |
|
839 |
# this should really read: |
|
840 |
#(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) |
|
841 |
# but we do it backwards to take advantage of manifest/chlog |
|
842 |
# 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
|
843 |
# |
1808 | 844 |
(cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) |
845 |
if short: |
|
846 |
filelist = cc + aa + dd |
|
847 |
else: |
|
848 |
filelist = None |
|
849 |
(c, a, r, d, u) = repo.changes(None, None, filelist) |
|
850 |
||
851 |
# we might end up with files that were added between tip and |
|
852 |
# the dirstate parent, but then changed in the local dirstate. |
|
853 |
# in this case, we want them to only show up in the added section |
|
854 |
for x in c: |
|
855 |
if x not in aa: |
|
856 |
cc.append(x) |
|
857 |
# we might end up with files added by the local dirstate that |
|
858 |
# were deleted by the patch. In this case, they should only |
|
859 |
# show up in the changed section. |
|
860 |
for x in a: |
|
861 |
if x in dd: |
|
862 |
del dd[dd.index(x)] |
|
863 |
cc.append(x) |
|
864 |
else: |
|
865 |
aa.append(x) |
|
866 |
# make sure any files deleted in the local dirstate |
|
867 |
# are not in the add or change column of the patch |
|
868 |
forget = [] |
|
869 |
for x in d + r: |
|
870 |
if x in aa: |
|
871 |
del aa[aa.index(x)] |
|
872 |
forget.append(x) |
|
873 |
continue |
|
874 |
elif x in cc: |
|
875 |
del cc[cc.index(x)] |
|
876 |
dd.append(x) |
|
877 |
||
878 |
c = list(util.unique(cc)) |
|
879 |
r = list(util.unique(dd)) |
|
880 |
a = list(util.unique(aa)) |
|
881 |
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
|
882 |
commands.dodiff(patchf, self.ui, repo, patchparent, None, |
1808 | 883 |
filelist, changes=(c, a, r, [], u)) |
884 |
patchf.close() |
|
885 |
||
886 |
changes = repo.changelog.read(tip) |
|
887 |
repo.dirstate.setparents(*cparents) |
|
888 |
repo.dirstate.update(a, 'a') |
|
889 |
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
|
890 |
repo.dirstate.update(c, 'n') |
1808 | 891 |
repo.dirstate.forget(forget) |
892 |
||
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
893 |
if not msg: |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
894 |
if not message: |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
895 |
message = "patch queue: %s\n" % patch |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
896 |
else: |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
897 |
message = "\n".join(message) |
1808 | 898 |
else: |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
899 |
message = msg |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
900 |
|
1808 | 901 |
self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
902 |
n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
903 |
self.applied[-1] = StatusEntry(revlog.hex(n), patch) |
1808 | 904 |
self.applied_dirty = 1 |
905 |
else: |
|
906 |
commands.dodiff(patchf, self.ui, repo, patchparent, None) |
|
907 |
patchf.close() |
|
908 |
self.pop(repo, force=True, wlock=wlock) |
|
909 |
self.push(repo, force=True, wlock=wlock) |
|
910 |
||
911 |
def init(self, repo, create=False): |
|
912 |
if os.path.isdir(self.path): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
913 |
raise util.Abort(_("patch queue directory already exists")) |
1808 | 914 |
os.mkdir(self.path) |
915 |
if create: |
|
916 |
return self.qrepo(create=True) |
|
917 |
||
918 |
def unapplied(self, repo, patch=None): |
|
919 |
if patch and patch not in self.series: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
920 |
raise util.Abort(_("patch %s is not in series file") % patch) |
1808 | 921 |
if not patch: |
922 |
start = self.series_end() |
|
923 |
else: |
|
924 |
start = self.series.index(patch) + 1 |
|
2774
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
925 |
return [(i, self.series[i]) for i in xrange(start, len(self.series))] |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
926 |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
927 |
def qseries(self, repo, missing=None, summary=False): |
1808 | 928 |
start = self.series_end() |
929 |
if not missing: |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
930 |
for i in range(len(self.series)): |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
931 |
patch = self.series[i] |
1808 | 932 |
if self.ui.verbose: |
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
933 |
if i < start: |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
934 |
status = 'A' |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
935 |
else: |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
936 |
status = 'U' |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
937 |
self.ui.write('%d %s ' % (i, status)) |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
938 |
if summary: |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
939 |
msg = self.readheaders(patch)[0] |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
940 |
msg = msg and ': ' + msg[0] or ': ' |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
941 |
else: |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
942 |
msg = '' |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
943 |
self.ui.write('%s%s\n' % (patch, msg)) |
1808 | 944 |
else: |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
945 |
msng_list = [] |
1808 | 946 |
for root, dirs, files in os.walk(self.path): |
947 |
d = root[len(self.path) + 1:] |
|
948 |
for f in files: |
|
949 |
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
|
950 |
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
|
951 |
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
|
952 |
and not fl.startswith('.')): |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
953 |
msng_list.append(fl) |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
954 |
msng_list.sort() |
2790
e5e23cae6e09
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2789
diff
changeset
|
955 |
for x in msng_list: |
e5e23cae6e09
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2789
diff
changeset
|
956 |
if self.ui.verbose: |
e5e23cae6e09
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2789
diff
changeset
|
957 |
self.ui.write("D ") |
e5e23cae6e09
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2789
diff
changeset
|
958 |
self.ui.write("%s\n" % x) |
1808 | 959 |
|
960 |
def issaveline(self, l): |
|
961 |
name = l.split(':')[1] |
|
962 |
if name == '.hg.patches.save.line': |
|
963 |
return True |
|
964 |
||
965 |
def qrepo(self, create=False): |
|
966 |
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
|
967 |
return hg.repository(self.ui, path=self.path, create=create) |
1808 | 968 |
|
969 |
def restore(self, repo, rev, delete=None, qupdate=None): |
|
970 |
c = repo.changelog.read(rev) |
|
971 |
desc = c[4].strip() |
|
972 |
lines = desc.splitlines() |
|
973 |
i = 0 |
|
974 |
datastart = None |
|
975 |
series = [] |
|
976 |
applied = [] |
|
977 |
qpp = None |
|
978 |
for i in xrange(0, len(lines)): |
|
979 |
if lines[i] == 'Patch Data:': |
|
980 |
datastart = i + 1 |
|
981 |
elif lines[i].startswith('Dirstate:'): |
|
982 |
l = lines[i].rstrip() |
|
983 |
l = l[10:].split(' ') |
|
984 |
qpp = [ hg.bin(x) for x in l ] |
|
985 |
elif datastart != None: |
|
986 |
l = lines[i].rstrip() |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
987 |
se = StatusEntry(l) |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
988 |
file_ = se.name |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
989 |
if se.rev: |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
990 |
applied.append(se) |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
991 |
series.append(file_) |
1808 | 992 |
if datastart == None: |
993 |
self.ui.warn("No saved patch data found\n") |
|
994 |
return 1 |
|
995 |
self.ui.warn("restoring status: %s\n" % lines[0]) |
|
996 |
self.full_series = series |
|
997 |
self.applied = applied |
|
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
998 |
self.parse_series() |
1808 | 999 |
self.series_dirty = 1 |
1000 |
self.applied_dirty = 1 |
|
1001 |
heads = repo.changelog.heads() |
|
1002 |
if delete: |
|
1003 |
if rev not in heads: |
|
1004 |
self.ui.warn("save entry has children, leaving it alone\n") |
|
1005 |
else: |
|
1006 |
self.ui.warn("removing save entry %s\n" % hg.short(rev)) |
|
1007 |
pp = repo.dirstate.parents() |
|
1008 |
if rev in pp: |
|
1009 |
update = True |
|
1010 |
else: |
|
1011 |
update = False |
|
1012 |
self.strip(repo, rev, update=update, backup='strip') |
|
1013 |
if qpp: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1014 |
self.ui.warn("saved queue repository parents: %s %s\n" % |
1808 | 1015 |
(hg.short(qpp[0]), hg.short(qpp[1]))) |
1016 |
if qupdate: |
|
1017 |
print "queue directory updating" |
|
1018 |
r = self.qrepo() |
|
1019 |
if not r: |
|
1020 |
self.ui.warn("Unable to load queue repository\n") |
|
1021 |
return 1 |
|
2822
30f59f4a327e
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com>
parents:
2804
diff
changeset
|
1022 |
hg.clean(r, qpp[0]) |
1808 | 1023 |
|
1024 |
def save(self, repo, msg=None): |
|
1025 |
if len(self.applied) == 0: |
|
1026 |
self.ui.warn("save: no patches applied, exiting\n") |
|
1027 |
return 1 |
|
1028 |
if self.issaveline(self.applied[-1]): |
|
1029 |
self.ui.warn("status is already saved\n") |
|
1030 |
return 1 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1031 |
|
1808 | 1032 |
ar = [ ':' + x for x in self.full_series ] |
1033 |
if not msg: |
|
1034 |
msg = "hg patches saved state" |
|
1035 |
else: |
|
1036 |
msg = "hg patches: " + msg.rstrip('\r\n') |
|
1037 |
r = self.qrepo() |
|
1038 |
if r: |
|
1039 |
pp = r.dirstate.parents() |
|
1040 |
msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) |
|
1041 |
msg += "\n\nPatch Data:\n" |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1042 |
text = msg + "\n".join(str(self.applied)) + '\n' + (ar and "\n".join(ar) |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1043 |
+ '\n' or "") |
1808 | 1044 |
n = repo.commit(None, text, user=None, force=1) |
1045 |
if not n: |
|
1046 |
self.ui.warn("repo commit failed\n") |
|
1047 |
return 1 |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1048 |
self.applied.append(StatusEntry(revlog.hex(n),'.hg.patches.save.line')) |
1808 | 1049 |
self.applied_dirty = 1 |
1050 |
||
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1051 |
def full_series_end(self): |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1052 |
if len(self.applied) > 0: |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1053 |
p = self.applied[-1].name |
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1054 |
end = self.find_series(p) |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1055 |
if end == None: |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1056 |
return len(self.full_series) |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1057 |
return end + 1 |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1058 |
return 0 |
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1059 |
|
1808 | 1060 |
def series_end(self): |
1061 |
end = 0 |
|
1062 |
if len(self.applied) > 0: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1063 |
p = self.applied[-1].name |
1808 | 1064 |
try: |
1065 |
end = self.series.index(p) |
|
1066 |
except ValueError: |
|
1067 |
return 0 |
|
1068 |
return end + 1 |
|
1069 |
return end |
|
1070 |
||
1071 |
def qapplied(self, repo, patch=None): |
|
1072 |
if patch and patch not in self.series: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1073 |
raise util.Abort(_("patch %s is not in series file") % patch) |
1808 | 1074 |
if not patch: |
1075 |
end = len(self.applied) |
|
1076 |
else: |
|
1077 |
end = self.series.index(patch) + 1 |
|
1078 |
for x in xrange(end): |
|
1079 |
p = self.appliedname(x) |
|
1080 |
self.ui.write("%s\n" % p) |
|
1081 |
||
1082 |
def appliedname(self, index): |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1083 |
pname = self.applied[index].name |
1808 | 1084 |
if not self.ui.verbose: |
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1085 |
p = pname |
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1086 |
else: |
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1087 |
p = str(self.series.index(pname)) + " " + p |
1808 | 1088 |
return p |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1089 |
|
1808 | 1090 |
def top(self, repo): |
1091 |
if len(self.applied): |
|
1092 |
p = self.appliedname(-1) |
|
1093 |
self.ui.write(p + '\n') |
|
1094 |
else: |
|
1095 |
self.ui.write("No patches applied\n") |
|
1096 |
||
1097 |
def next(self, repo): |
|
1098 |
end = self.series_end() |
|
1099 |
if end == len(self.series): |
|
1100 |
self.ui.write("All patches applied\n") |
|
1101 |
else: |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1102 |
p = self.series[end] |
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1103 |
if self.ui.verbose: |
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1104 |
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
|
1105 |
self.ui.write(p + '\n') |
1808 | 1106 |
|
1107 |
def prev(self, repo): |
|
1108 |
if len(self.applied) > 1: |
|
1109 |
p = self.appliedname(-2) |
|
1110 |
self.ui.write(p + '\n') |
|
1111 |
elif len(self.applied) == 1: |
|
1112 |
self.ui.write("Only one patch applied\n") |
|
1113 |
else: |
|
1114 |
self.ui.write("No patches applied\n") |
|
1115 |
||
1116 |
def qimport(self, repo, files, patch=None, existing=None, force=None): |
|
1117 |
if len(files) > 1 and patch: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1118 |
raise util.Abort(_('option "-n" not valid when importing multiple ' |
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1119 |
'files')) |
1808 | 1120 |
i = 0 |
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1121 |
added = [] |
1808 | 1122 |
for filename in files: |
1123 |
if existing: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1124 |
if not patch: |
1808 | 1125 |
patch = filename |
1126 |
if not os.path.isfile(os.path.join(self.path, patch)): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1127 |
raise util.Abort(_("patch %s does not exist") % patch) |
1808 | 1128 |
else: |
1129 |
try: |
|
1130 |
text = file(filename).read() |
|
1131 |
except IOError: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1132 |
raise util.Abort(_("unable to read %s") % patch) |
1808 | 1133 |
if not patch: |
1134 |
patch = os.path.split(filename)[1] |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1135 |
if not force and os.path.exists(os.path.join(self.path, patch)): |
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1136 |
raise util.Abort(_('patch "%s" already exists') % patch) |
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
|
1137 |
patchf = self.opener(patch, "w") |
1808 | 1138 |
patchf.write(text) |
1139 |
if patch in self.series: |
|
2710
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1140 |
raise util.Abort(_('patch %s is already in the series file') |
ca97be5babf8
mq: do not allow to qnew a patch twice
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2699
diff
changeset
|
1141 |
% patch) |
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1142 |
index = self.full_series_end() + i |
1808 | 1143 |
self.full_series[index:index] = [patch] |
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
1144 |
self.parse_series() |
1808 | 1145 |
self.ui.warn("adding %s to series file\n" % patch) |
1146 |
i += 1 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1147 |
added.append(patch) |
1808 | 1148 |
patch = None |
1149 |
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
|
1150 |
qrepo = self.qrepo() |
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1151 |
if qrepo: |
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1152 |
qrepo.add(added) |
1808 | 1153 |
|
1154 |
def delete(ui, repo, patch, **opts): |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1155 |
"""remove a patch from the series file |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1156 |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1157 |
The patch must not be applied. |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1158 |
With -f, deletes the patch file as well as the series entry.""" |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1159 |
q = repo.mq |
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1160 |
q.delete(repo, patch, force=opts.get('force')) |
1808 | 1161 |
q.save_dirty() |
1162 |
return 0 |
|
1163 |
||
1164 |
def applied(ui, repo, patch=None, **opts): |
|
1165 |
"""print the patches already applied""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1166 |
repo.mq.qapplied(repo, patch) |
1808 | 1167 |
return 0 |
1168 |
||
1169 |
def unapplied(ui, repo, patch=None, **opts): |
|
1170 |
"""print the patches not yet applied""" |
|
2774
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1171 |
for i, p in repo.mq.unapplied(repo, patch): |
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1172 |
if ui.verbose: |
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1173 |
ui.write("%d " % i) |
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1174 |
ui.write("%s\n" % p) |
1808 | 1175 |
|
1176 |
def qimport(ui, repo, *filename, **opts): |
|
1177 |
"""import a patch""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1178 |
q = repo.mq |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1179 |
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
|
1180 |
existing=opts['existing'], force=opts['force']) |
1808 | 1181 |
q.save_dirty() |
1182 |
return 0 |
|
1183 |
||
1184 |
def init(ui, repo, **opts): |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1185 |
"""init a new queue repository |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1186 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1187 |
The queue repository is unversioned by default. If -c is |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1188 |
specified, qinit will create a separate nested repository |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1189 |
for patches. Use qcommit to commit changes to this queue |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1190 |
repository.""" |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1191 |
q = repo.mq |
1808 | 1192 |
r = q.init(repo, create=opts['create_repo']) |
1193 |
q.save_dirty() |
|
1194 |
if r: |
|
1195 |
fp = r.wopener('.hgignore', 'w') |
|
1196 |
print >> fp, 'syntax: glob' |
|
1197 |
print >> fp, 'status' |
|
1198 |
fp.close() |
|
1199 |
r.wopener('series', 'w').close() |
|
1200 |
r.add(['.hgignore', 'series']) |
|
1201 |
return 0 |
|
1202 |
||
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1203 |
def clone(ui, source, dest=None, **opts): |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1204 |
'''clone main and patch repository at same time |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1205 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1206 |
If source is local, destination will have no patches applied. If |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1207 |
source is remote, this command can not check if patches are |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1208 |
applied in source, so cannot guarantee that patches are not |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1209 |
applied in destination. If you clone remote repository, be sure |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1210 |
before that it has no patches applied. |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1211 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1212 |
Source patch repository is looked for in <src>/.hg/patches by |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1213 |
default. Use -p <url> to change. |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1214 |
''' |
2766
c5ac397f7671
fix call to commands.setremoteconfig
Bryan O'Sullivan <bos@serpentine.com>
parents:
2765
diff
changeset
|
1215 |
commands.setremoteconfig(ui, opts) |
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1216 |
if dest is None: |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1217 |
dest = hg.defaultdest(source) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1218 |
sr = hg.repository(ui, ui.expandpath(source)) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1219 |
qbase, destrev = None, None |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1220 |
if sr.local(): |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1221 |
reposetup(ui, sr) |
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1222 |
if sr.mq.applied: |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1223 |
qbase = revlog.bin(sr.mq.applied[0].rev) |
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1224 |
if not hg.islocal(dest): |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1225 |
destrev = sr.parents(qbase)[0] |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1226 |
ui.note(_('cloning main repo\n')) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1227 |
sr, dr = hg.clone(ui, sr, dest, |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1228 |
pull=opts['pull'], |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1229 |
rev=destrev, |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1230 |
update=False, |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1231 |
stream=opts['uncompressed']) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1232 |
ui.note(_('cloning patch repo\n')) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1233 |
spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1234 |
dr.url() + '/.hg/patches', |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1235 |
pull=opts['pull'], |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1236 |
update=not opts['noupdate'], |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1237 |
stream=opts['uncompressed']) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1238 |
if dr.local(): |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1239 |
if qbase: |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1240 |
ui.note(_('stripping applied patches from destination repo\n')) |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1241 |
reposetup(ui, dr) |
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1242 |
dr.mq.strip(dr, qbase, update=False, backup=None) |
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1243 |
if not opts['noupdate']: |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1244 |
ui.note(_('updating destination repo\n')) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
2772
diff
changeset
|
1245 |
hg.update(dr, dr.changelog.tip()) |
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1246 |
|
1808 | 1247 |
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
|
1248 |
"""commit changes in the queue repository""" |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1249 |
q = repo.mq |
1808 | 1250 |
r = q.qrepo() |
1251 |
if not r: raise util.Abort('no queue repository') |
|
1252 |
commands.commit(r.ui, r, *pats, **opts) |
|
1253 |
||
1254 |
def series(ui, repo, **opts): |
|
1255 |
"""print the entire series file""" |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1256 |
repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
1808 | 1257 |
return 0 |
1258 |
||
1259 |
def top(ui, repo, **opts): |
|
1260 |
"""print the name of the current patch""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1261 |
repo.mq.top(repo) |
1808 | 1262 |
return 0 |
1263 |
||
1264 |
def next(ui, repo, **opts): |
|
1265 |
"""print the name of the next patch""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1266 |
repo.mq.next(repo) |
1808 | 1267 |
return 0 |
1268 |
||
1269 |
def prev(ui, repo, **opts): |
|
1270 |
"""print the name of the previous patch""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1271 |
repo.mq.prev(repo) |
1808 | 1272 |
return 0 |
1273 |
||
1274 |
def new(ui, repo, patch, **opts): |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1275 |
"""create a new patch |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1276 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1277 |
qnew creates a new patch on top of the currently-applied patch |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1278 |
(if any). It will refuse to run if there are any outstanding |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1279 |
changes unless -f is specified, in which case the patch will |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1280 |
be initialised with them. |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1281 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1282 |
-m or -l set the patch header as well as the commit message. |
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1283 |
If neither is specified, the patch header is empty and the |
2770
5f8259e4d292
Clean up qnew help text.
Brendan Cully <brendan@kublai.com>
parents:
2767
diff
changeset
|
1284 |
commit message is 'New patch: PATCH'""" |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1285 |
q = repo.mq |
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1286 |
message = commands.logmessage(opts) |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1287 |
q.new(repo, patch, msg=message, force=opts['force']) |
1808 | 1288 |
q.save_dirty() |
1289 |
return 0 |
|
1290 |
||
1291 |
def refresh(ui, repo, **opts): |
|
1292 |
"""update the current patch""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1293 |
q = repo.mq |
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1294 |
message = commands.logmessage(opts) |
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1295 |
if opts['edit']: |
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1296 |
if message: |
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1297 |
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1298 |
patch = q.applied[-1].name |
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1299 |
(message, comment, user, date, hasdiff) = q.readheaders(patch) |
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1300 |
message = ui.edit('\n'.join(message), user or ui.username()) |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1301 |
q.refresh(repo, msg=message, short=opts['short']) |
1808 | 1302 |
q.save_dirty() |
1303 |
return 0 |
|
1304 |
||
1305 |
def diff(ui, repo, *files, **opts): |
|
1306 |
"""diff of the current patch""" |
|
2097
4d2c2597876f
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2086
diff
changeset
|
1307 |
# deep in the dirstate code, the walkhelper method wants a list, not a tuple |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1308 |
repo.mq.diff(repo, list(files)) |
1808 | 1309 |
return 0 |
1310 |
||
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1311 |
def fold(ui, repo, *files, **opts): |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1312 |
"""fold the named patches into the current patch |
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1313 |
|
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1314 |
Patches must not yet be applied. Each patch will be successively |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1315 |
applied to the current patch in the order given. If all the |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1316 |
patches apply successfully, the current patch will be refreshed |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1317 |
with the new cumulative patch, and the folded patches will |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1318 |
be deleted. With -f/--force, the folded patch files will |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1319 |
be removed afterwards. |
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1320 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1321 |
The header for each folded patch will be concatenated with |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1322 |
the current patch header, separated by a line of '* * *'.""" |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1323 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1324 |
q = repo.mq |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1325 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1326 |
if not files: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1327 |
raise util.Abort(_('qfold requires at least one patch name')) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1328 |
if not q.check_toppatch(repo): |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1329 |
raise util.Abort(_('No patches applied\n')) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1330 |
|
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1331 |
message = commands.logmessage(opts) |
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1332 |
if opts['edit']: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1333 |
if message: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1334 |
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1335 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1336 |
parent = q.lookup('qtip') |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1337 |
patches = [] |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1338 |
messages = [] |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1339 |
for f in files: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1340 |
patch = q.lookup(f) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1341 |
if patch in patches or patch == parent: |
2792
a3c6e7888abf
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2791
diff
changeset
|
1342 |
ui.warn(_('Skipping already folded patch %s') % patch) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1343 |
if q.isapplied(patch): |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1344 |
raise util.Abort(_('qfold cannot fold already applied patch %s') % patch) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1345 |
patches.append(patch) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1346 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1347 |
for patch in patches: |
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1348 |
if not message: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1349 |
messages.append(q.readheaders(patch)[0]) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1350 |
pf = os.path.join(q.path, patch) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1351 |
(patchsuccess, files, fuzz) = q.patch(repo, pf) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1352 |
if not patchsuccess: |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1353 |
raise util.Abort(_('Error folding patch %s') % patch) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1354 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1355 |
if not message: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1356 |
message, comments, user = q.readheaders(parent)[0:3] |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1357 |
for msg in messages: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1358 |
message.append('* * *') |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1359 |
message.extend(msg) |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1360 |
message = '\n'.join(message) |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1361 |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1362 |
if opts['edit']: |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1363 |
message = ui.edit(message, user or ui.username()) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1364 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1365 |
q.refresh(repo, msg=message) |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1366 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1367 |
for patch in patches: |
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1368 |
q.delete(repo, patch, force=opts['force']) |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1369 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1370 |
q.save_dirty() |
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1371 |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1372 |
def header(ui, repo, patch=None): |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1373 |
"""Print the header of the topmost or specified patch""" |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1374 |
q = repo.mq |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1375 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1376 |
if patch: |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1377 |
patch = q.lookup(patch) |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1378 |
else: |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1379 |
if not q.applied: |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1380 |
ui.write('No patches applied\n') |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1381 |
return |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1382 |
patch = q.lookup('qtip') |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1383 |
message = repo.mq.readheaders(patch)[0] |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1384 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1385 |
ui.write('\n'.join(message) + '\n') |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1386 |
|
1808 | 1387 |
def lastsavename(path): |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1388 |
(directory, base) = os.path.split(path) |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1389 |
names = os.listdir(directory) |
1808 | 1390 |
namere = re.compile("%s.([0-9]+)" % base) |
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1391 |
maxindex = None |
1808 | 1392 |
maxname = None |
1393 |
for f in names: |
|
1394 |
m = namere.match(f) |
|
1395 |
if m: |
|
1396 |
index = int(m.group(1)) |
|
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1397 |
if maxindex == None or index > maxindex: |
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1398 |
maxindex = index |
1808 | 1399 |
maxname = f |
1400 |
if maxname: |
|
2789
86c54b7cd331
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2787
diff
changeset
|
1401 |
return (os.path.join(directory, maxname), maxindex) |
1808 | 1402 |
return (None, None) |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1403 |
|
1808 | 1404 |
def savename(path): |
1405 |
(last, index) = lastsavename(path) |
|
1406 |
if last is None: |
|
1407 |
index = 0 |
|
1408 |
newpath = path + ".%d" % (index + 1) |
|
1409 |
return newpath |
|
1410 |
||
1411 |
def push(ui, repo, patch=None, **opts): |
|
1412 |
"""push the next patch onto the stack""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1413 |
q = repo.mq |
1808 | 1414 |
mergeq = None |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1415 |
|
1808 | 1416 |
if opts['all']: |
1417 |
patch = q.series[-1] |
|
1418 |
if opts['merge']: |
|
1419 |
if opts['name']: |
|
1420 |
newpath = opts['name'] |
|
1421 |
else: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1422 |
newpath, i = lastsavename(q.path) |
1808 | 1423 |
if not newpath: |
1424 |
ui.warn("no saved queues found, please use -n\n") |
|
1425 |
return 1 |
|
1426 |
mergeq = queue(ui, repo.join(""), newpath) |
|
1427 |
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
|
1428 |
ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
1808 | 1429 |
mergeq=mergeq) |
1430 |
q.save_dirty() |
|
1431 |
return ret |
|
1432 |
||
1433 |
def pop(ui, repo, patch=None, **opts): |
|
1434 |
"""pop the current patch off the stack""" |
|
1435 |
localupdate = True |
|
1436 |
if opts['name']: |
|
1437 |
q = queue(ui, repo.join(""), repo.join(opts['name'])) |
|
1438 |
ui.warn('using patch queue: %s\n' % q.path) |
|
1439 |
localupdate = False |
|
1440 |
else: |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1441 |
q = repo.mq |
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
1442 |
q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
1808 | 1443 |
q.save_dirty() |
1444 |
return 0 |
|
1445 |
||
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1446 |
def rename(ui, repo, patch, name=None, **opts): |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1447 |
"""rename a patch |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1448 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1449 |
With one argument, renames the current patch to PATCH1. |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1450 |
With two arguments, renames PATCH1 to PATCH2.""" |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1451 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1452 |
q = repo.mq |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1453 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1454 |
if not name: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1455 |
name = patch |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1456 |
patch = None |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1457 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1458 |
if name in q.series: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1459 |
raise util.Abort(_('A patch named %s already exists in the series file') % name) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1460 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1461 |
absdest = os.path.join(q.path, name) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1462 |
if os.path.exists(absdest): |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1463 |
raise util.Abort(_('%s already exists') % absdest) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1464 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1465 |
if patch: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1466 |
patch = q.lookup(patch) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1467 |
else: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1468 |
if not q.applied: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1469 |
ui.write(_('No patches applied\n')) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1470 |
return |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1471 |
patch = q.lookup('qtip') |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1472 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1473 |
if ui.verbose: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1474 |
ui.write('Renaming %s to %s\n' % (patch, name)) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1475 |
i = q.find_series(patch) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1476 |
q.full_series[i] = name |
2767
60683ab1ed33
mq: rename read_series as parse_series, make simpler and faster
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2766
diff
changeset
|
1477 |
q.parse_series() |
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1478 |
q.series_dirty = 1 |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1479 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1480 |
info = q.isapplied(patch) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1481 |
if info: |
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1482 |
q.applied[info[0]] = StatusEntry(info[1], name) |
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1483 |
q.applied_dirty = 1 |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1484 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1485 |
util.rename(os.path.join(q.path, patch), absdest) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1486 |
r = q.qrepo() |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1487 |
if r: |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1488 |
wlock = r.wlock() |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1489 |
if r.dirstate.state(name) == 'r': |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1490 |
r.undelete([name], wlock) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1491 |
r.copy(patch, name, wlock) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1492 |
r.remove([patch], False, wlock) |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1493 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1494 |
q.save_dirty() |
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1495 |
|
1808 | 1496 |
def restore(ui, repo, rev, **opts): |
1497 |
"""restore the queue state saved by a rev""" |
|
1498 |
rev = repo.lookup(rev) |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1499 |
q = repo.mq |
1808 | 1500 |
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
|
1501 |
qupdate=opts['update']) |
1808 | 1502 |
q.save_dirty() |
1503 |
return 0 |
|
1504 |
||
1505 |
def save(ui, repo, **opts): |
|
1506 |
"""save current queue state""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1507 |
q = repo.mq |
2804
4b20daa25f15
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully <brendan@kublai.com>
parents:
2803
diff
changeset
|
1508 |
message = commands.logmessage(opts) |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1509 |
ret = q.save(repo, msg=message) |
1808 | 1510 |
if ret: |
1511 |
return ret |
|
1512 |
q.save_dirty() |
|
1513 |
if opts['copy']: |
|
1514 |
path = q.path |
|
1515 |
if opts['name']: |
|
1516 |
newpath = os.path.join(q.basepath, opts['name']) |
|
1517 |
if os.path.exists(newpath): |
|
1518 |
if not os.path.isdir(newpath): |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1519 |
raise util.Abort(_('destination %s exists and is not ' |
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1520 |
'a directory') % newpath) |
1808 | 1521 |
if not opts['force']: |
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1522 |
raise util.Abort(_('destination %s exists, ' |
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1523 |
'use -f to force') % newpath) |
1808 | 1524 |
else: |
1525 |
newpath = savename(path) |
|
1526 |
ui.warn("copy %s to %s\n" % (path, newpath)) |
|
1527 |
util.copyfiles(path, newpath) |
|
1528 |
if opts['empty']: |
|
1529 |
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
|
1530 |
os.unlink(os.path.join(q.path, q.status_path)) |
1808 | 1531 |
except: |
1532 |
pass |
|
1533 |
return 0 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1534 |
|
1808 | 1535 |
def strip(ui, repo, rev, **opts): |
1536 |
"""strip a revision and all later revs on the same branch""" |
|
1537 |
rev = repo.lookup(rev) |
|
1538 |
backup = 'all' |
|
1539 |
if opts['backup']: |
|
1540 |
backup = 'strip' |
|
1541 |
elif opts['nobackup']: |
|
1542 |
backup = 'none' |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1543 |
repo.mq.strip(repo, rev, backup=backup) |
1808 | 1544 |
return 0 |
1545 |
||
1546 |
def version(ui, q=None): |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1547 |
"""print the version number of the mq extension""" |
1808 | 1548 |
ui.write("mq version %s\n" % versionstr) |
1549 |
return 0 |
|
1550 |
||
1551 |
def reposetup(ui, repo): |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1552 |
class MqRepo(repo.__class__): |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1553 |
def tags(self): |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1554 |
if self.tagscache: |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1555 |
return self.tagscache |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1556 |
|
2742
2f13f8d3fe80
mq: correct the use of super
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2738
diff
changeset
|
1557 |
tagscache = super(MqRepo, self).tags() |
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1558 |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1559 |
q = self.mq |
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1560 |
if not q.applied: |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1561 |
return tagscache |
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1562 |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1563 |
mqtags = [(patch.rev, patch.name) for patch in q.applied] |
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1564 |
mqtags.append((mqtags[-1][0], 'qtip')) |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1565 |
mqtags.append((mqtags[0][0], 'qbase')) |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1566 |
for patch in mqtags: |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1567 |
if patch[1] in tagscache: |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1568 |
self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1569 |
else: |
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1570 |
tagscache[patch[1]] = revlog.bin(patch[0]) |
2682
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1571 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1572 |
return tagscache |
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1573 |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1574 |
repo.__class__ = MqRepo |
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1575 |
repo.mq = queue(ui, repo.join("")) |
1808 | 1576 |
|
1577 |
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
|
1578 |
"qapplied": (applied, [], 'hg qapplied [PATCH]'), |
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1579 |
"qclone": (clone, |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1580 |
[('', 'pull', None, _('use pull protocol to copy metadata')), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1581 |
('U', 'noupdate', None, _('do not update the new working directories')), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1582 |
('', 'uncompressed', None, |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1583 |
_('use uncompressed transfer (fast over LAN)')), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1584 |
('e', 'ssh', '', _('specify ssh command to use')), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1585 |
('p', 'patches', '', _('location of source patch repo')), |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1586 |
('', 'remotecmd', '', |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1587 |
_('specify hg command to run on the remote side'))], |
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1588 |
'hg qclone [OPTION]... SOURCE [DEST]'), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1589 |
"qcommit|qci": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1590 |
(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
|
1591 |
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
|
1592 |
'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
|
1593 |
"^qdiff": (diff, [], 'hg qdiff [FILE]...'), |
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1594 |
"qdelete": |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1595 |
(delete, |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1596 |
[('f', 'force', None, _('delete patch file'))], |
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1597 |
'hg qdelete [-f] PATCH'), |
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1598 |
'qfold': |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1599 |
(fold, |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1600 |
[('e', 'edit', None, _('edit patch header')), |
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1601 |
('f', 'force', None, _('delete folded patch files')), |
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1602 |
('m', 'message', '', _('set patch header to <text>')), |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1603 |
('l', 'logfile', '', _('set patch header to contents of <file>'))], |
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1604 |
'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), |
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1605 |
'qheader': (header, [], |
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1606 |
_('hg qheader [PATCH]')), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1607 |
"^qimport": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1608 |
(qimport, |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1609 |
[('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
|
1610 |
('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
|
1611 |
('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
|
1612 |
'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
|
1613 |
"^qinit": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1614 |
(init, |
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1615 |
[('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
|
1616 |
'hg qinit [-c]'), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1617 |
"qnew": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1618 |
(new, |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1619 |
[('m', 'message', '', _('use <text> as commit message')), |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1620 |
('l', 'logfile', '', _('read the commit message from <file>')), |
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1621 |
('f', 'force', None, _('import uncommitted changes into patch'))], |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1622 |
'hg qnew [-m TEXT] [-l FILE] [-f] PATCH'), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1623 |
"qnext": (next, [], 'hg qnext'), |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1624 |
"qprev": (prev, [], 'hg qprev'), |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1625 |
"^qpop": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1626 |
(pop, |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1627 |
[('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
|
1628 |
('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
|
1629 |
('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
|
1630 |
'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
|
1631 |
"^qpush": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1632 |
(push, |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1633 |
[('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
|
1634 |
('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
|
1635 |
('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
|
1636 |
('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
|
1637 |
('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
|
1638 |
'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
|
1639 |
"^qrefresh": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1640 |
(refresh, |
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1641 |
[('e', 'edit', None, _('edit commit message')), |
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1642 |
('m', 'message', '', _('change commit message with <text>')), |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1643 |
('l', 'logfile', '', _('change commit message with <file> content')), |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1644 |
('s', 'short', None, 'short refresh')], |
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1645 |
'hg qrefresh [-e] [-m TEXT] [-l FILE] [-s]'), |
2751
7d1de4545728
mq: add qmv as alias for qrename
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2750
diff
changeset
|
1646 |
'qrename|qmv': |
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1647 |
(rename, [], 'hg qrename PATCH1 [PATCH2]'), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1648 |
"qrestore": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1649 |
(restore, |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1650 |
[('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
|
1651 |
('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
|
1652 |
'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
|
1653 |
"qsave": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1654 |
(save, |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1655 |
[('m', 'message', '', _('use <text> as commit message')), |
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1656 |
('l', 'logfile', '', _('read the commit message from <file>')), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1657 |
('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
|
1658 |
('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
|
1659 |
('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
|
1660 |
('f', 'force', None, 'force copy')], |
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1661 |
'hg qsave [-m TEXT] [-l FILE] [-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
|
1662 |
"qseries": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1663 |
(series, |
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1664 |
[('m', 'missing', None, 'print patches not in series'), |
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1665 |
('s', 'summary', None, _('print first line of patch header'))], |
2185
5acd648770d0
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2097
diff
changeset
|
1666 |
'hg qseries [-m]'), |
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1667 |
"^strip": |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1668 |
(strip, |
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1669 |
[('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
|
1670 |
('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
|
1671 |
('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
|
1672 |
'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
|
1673 |
"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
|
1674 |
"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
|
1675 |
"qversion": (version, [], 'hg qversion') |
1808 | 1676 |
} |
1677 |