Mercurial > hg > mercurial-crew-with-dirclash
annotate hgext/mq.py @ 2776:ae726521717c
merge with brendan.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Thu, 03 Aug 2006 11:12:02 -0700 |
| parents | ee48e5ef8753 663094f5595b |
| children | f4d916351366 |
| rev | line source |
|---|---|
|
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. | |
| 193 repo.update(head, allow=False, force=True, wlock=wlock) | |
| 194 self.strip(repo, n, update=False, backup='strip', wlock=wlock) | |
| 195 | |
| 196 c = repo.changelog.read(rev) | |
| 197 ret = repo.update(rev, allow=True, wlock=wlock) | |
| 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') |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
275 f = os.popen("%s -d '%s' -p1 --no-backup-if-mismatch < '%s'" % |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
276 (pp, repo.root, patchfile)) |
|
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 ': |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
287 pf = os.path.normpath(l[14:]) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
288 # when patch finds a space in the file name, it puts |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
289 # single quotes around the filename. strip them off |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
290 if pf[0] == "'" and pf[-1] == "'": |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
291 pf = pf[1:-1] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
292 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
|
293 files.append(pf) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
294 printed_file = False |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
295 file_str = l |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
296 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
|
297 if not printed_file: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
298 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
|
299 printed_file = True |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
300 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
|
301 fuzz = True |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
302 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
|
303 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
|
304 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
|
305 if not printed_file: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
306 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
|
307 printed_file = True |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
308 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
|
309 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
310 return (not f.close(), files, fuzz) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
311 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
312 def apply(self, repo, series, list=False, update_status=True, |
| 1808 | 313 strict=False, patchdir=None, merge=None, wlock=None): |
| 314 # TODO unify with commands.py | |
| 315 if not patchdir: | |
| 316 patchdir = self.path | |
| 317 err = 0 | |
| 318 if not wlock: | |
| 319 wlock = repo.wlock() | |
| 320 lock = repo.lock() | |
| 321 tr = repo.transaction() | |
| 322 n = None | |
| 323 for patch in series: | |
| 324 self.ui.warn("applying %s\n" % patch) | |
| 325 pf = os.path.join(patchdir, patch) | |
| 326 | |
| 327 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
|
328 message, comments, user, date, patchfound = self.readheaders(patch) |
| 1808 | 329 except: |
| 330 self.ui.warn("Unable to read %s\n" % pf) | |
| 331 err = 1 | |
| 332 break | |
| 333 | |
| 334 if not message: | |
| 335 message = "imported patch %s\n" % patch | |
| 336 else: | |
| 337 if list: | |
| 338 message.append("\nimported patch %s" % patch) | |
| 339 message = '\n'.join(message) | |
| 340 | |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
341 (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
|
342 patcherr = not patcherr |
| 1808 | 343 |
| 344 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
|
345 # 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
|
346 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
|
347 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
|
348 repo.dirstate.setparents(p1, merge) |
| 1808 | 349 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
|
350 cwd = repo.getcwd() |
|
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
351 cfiles = files |
|
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
352 if cwd: |
|
5d134f04060f
mq: allow to apply patches in subdir of repo again
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2725
diff
changeset
|
353 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
|
354 commands.addremove_lock(self.ui, repo, cfiles, |
| 1808 | 355 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
|
356 n = repo.commit(files, message, user, date, force=1, lock=lock, |
| 1808 | 357 wlock=wlock) |
| 358 | |
| 359 if n == None: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
360 raise util.Abort(_("repo commit failed")) |
| 1808 | 361 |
| 362 if update_status: | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
363 self.applied.append(StatusEntry(revlog.hex(n), patch)) |
| 1808 | 364 |
| 365 if patcherr: | |
| 366 if not patchfound: | |
| 367 self.ui.warn("patch %s is empty\n" % patch) | |
| 368 err = 0 | |
| 369 else: | |
| 370 self.ui.warn("patch failed, rejects left in working dir\n") | |
| 371 err = 1 | |
| 372 break | |
| 373 | |
| 374 if fuzz and strict: | |
| 375 self.ui.warn("fuzz found when applying patch, stopping\n") | |
| 376 err = 1 | |
| 377 break | |
| 378 tr.close() | |
| 379 return (err, n) | |
| 380 | |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
381 def delete(self, repo, patch, force=False): |
| 2696 | 382 patch = self.lookup(patch, strict=True) |
| 1808 | 383 info = self.isapplied(patch) |
| 384 if info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
385 raise util.Abort(_("cannot delete applied patch %s") % patch) |
| 1808 | 386 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
|
387 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
|
388 if force: |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
389 r = self.qrepo() |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
390 if r: |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
391 r.remove([patch], True) |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
392 else: |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
393 os.unlink(os.path.join(self.path, patch)) |
| 1808 | 394 i = self.find_series(patch) |
| 395 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
|
396 self.parse_series() |
| 1808 | 397 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
|
398 |
| 1808 | 399 def check_toppatch(self, repo): |
| 400 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
|
401 top = revlog.bin(self.applied[-1].rev) |
| 1808 | 402 pp = repo.dirstate.parents() |
| 403 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
|
404 raise util.Abort(_("queue top not at same revision as working directory")) |
| 1808 | 405 return top |
| 406 return None | |
| 407 def check_localchanges(self, repo): | |
| 408 (c, a, r, d, u) = repo.changes(None, None) | |
| 409 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
|
410 raise util.Abort(_("local changes found, refresh first")) |
| 1808 | 411 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
|
412 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
|
413 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
|
414 commitfiles = [] |
|
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
415 (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
|
416 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
|
417 if not force: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
418 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
|
419 commitfiles = c + a + r |
| 1808 | 420 self.check_toppatch(repo) |
| 421 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
|
422 insert = self.full_series_end() |
| 1808 | 423 if msg: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
424 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
|
425 wlock=wlock) |
| 1808 | 426 else: |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
427 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
|
428 "New patch: %s" % patch, force=True, wlock=wlock) |
| 1808 | 429 if n == None: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
430 raise util.Abort(_("repo commit failed")) |
| 1808 | 431 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
|
432 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
|
433 self.parse_series() |
| 1808 | 434 self.series_dirty = 1 |
| 435 self.applied_dirty = 1 | |
|
1852
fdf9cbf56ec7
Fix mq's usage of opener, which don't allow absolute paths now.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1839
diff
changeset
|
436 p = self.opener(patch, "w") |
| 1808 | 437 if msg: |
| 438 msg = msg + "\n" | |
| 439 p.write(msg) | |
| 440 p.close() | |
| 441 wlock = None | |
| 442 r = self.qrepo() | |
| 443 if r: r.add([patch]) | |
|
2511
041d8f0a8437
mq: hg qnew -f should refresh the new patch
Chris Mason <mason@suse.com>
parents:
2488
diff
changeset
|
444 if commitfiles: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
445 self.refresh(repo, msg=None, short=True) |
| 1808 | 446 |
| 447 def strip(self, repo, rev, update=True, backup="all", wlock=None): | |
| 448 def limitheads(chlog, stop): | |
| 449 """return the list of all nodes that have no children""" | |
| 450 p = {} | |
| 451 h = [] | |
| 452 stoprev = 0 | |
| 453 if stop in chlog.nodemap: | |
| 454 stoprev = chlog.rev(stop) | |
| 455 | |
| 456 for r in range(chlog.count() - 1, -1, -1): | |
| 457 n = chlog.node(r) | |
| 458 if n not in p: | |
| 459 h.append(n) | |
| 460 if n == stop: | |
| 461 break | |
| 462 if r < stoprev: | |
| 463 break | |
| 464 for pn in chlog.parents(n): | |
| 465 p[pn] = 1 | |
| 466 return h | |
| 467 | |
| 468 def bundle(cg): | |
| 469 backupdir = repo.join("strip-backup") | |
| 470 if not os.path.isdir(backupdir): | |
| 471 os.mkdir(backupdir) | |
| 472 name = os.path.join(backupdir, "%s" % revlog.short(rev)) | |
| 473 name = savename(name) | |
| 474 self.ui.warn("saving bundle to %s\n" % name) | |
| 475 # TODO, exclusive open | |
| 476 f = open(name, "wb") | |
| 477 try: | |
| 478 f.write("HG10") | |
| 479 z = bz2.BZ2Compressor(9) | |
| 480 while 1: | |
| 481 chunk = cg.read(4096) | |
| 482 if not chunk: | |
| 483 break | |
| 484 f.write(z.compress(chunk)) | |
| 485 f.write(z.flush()) | |
| 486 except: | |
| 487 os.unlink(name) | |
| 488 raise | |
| 489 f.close() | |
| 490 return name | |
| 491 | |
| 492 def stripall(rev, revnum): | |
| 493 cl = repo.changelog | |
| 494 c = cl.read(rev) | |
| 495 mm = repo.manifest.read(c[0]) | |
| 496 seen = {} | |
| 497 | |
| 498 for x in xrange(revnum, cl.count()): | |
| 499 c = cl.read(cl.node(x)) | |
| 500 for f in c[3]: | |
| 501 if f in seen: | |
| 502 continue | |
| 503 seen[f] = 1 | |
| 504 if f in mm: | |
| 505 filerev = mm[f] | |
| 506 else: | |
| 507 filerev = 0 | |
| 508 seen[f] = filerev | |
| 509 # we go in two steps here so the strip loop happens in a | |
| 510 # sensible order. When stripping many files, this helps keep | |
| 511 # our disk access patterns under control. | |
| 512 list = seen.keys() | |
| 513 list.sort() | |
| 514 for f in list: | |
| 515 ff = repo.file(f) | |
| 516 filerev = seen[f] | |
| 517 if filerev != 0: | |
| 518 if filerev in ff.nodemap: | |
| 519 filerev = ff.rev(filerev) | |
| 520 else: | |
| 521 filerev = 0 | |
| 522 ff.strip(filerev, revnum) | |
| 523 | |
| 524 if not wlock: | |
| 525 wlock = repo.wlock() | |
| 526 lock = repo.lock() | |
| 527 chlog = repo.changelog | |
| 528 # TODO delete the undo files, and handle undo of merge sets | |
| 529 pp = chlog.parents(rev) | |
| 530 revnum = chlog.rev(rev) | |
| 531 | |
| 532 if update: | |
|
2699
f8bcaf5696d5
mq: strip should not blow away local changes
Chris Mason <mason@suse.com>
parents:
2698
diff
changeset
|
533 (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
|
534 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
|
535 raise util.Abort(_("local changes found")) |
| 1808 | 536 urev = self.qparents(repo, rev) |
| 537 repo.update(urev, allow=False, force=True, wlock=wlock) | |
| 538 repo.dirstate.write() | |
| 539 | |
| 540 # save is a list of all the branches we are truncating away | |
| 541 # that we actually want to keep. changegroup will be used | |
| 542 # to preserve them and add them back after the truncate | |
| 543 saveheads = [] | |
| 544 savebases = {} | |
| 545 | |
| 546 tip = chlog.tip() | |
| 547 heads = limitheads(chlog, rev) | |
| 548 seen = {} | |
| 549 | |
| 550 # search through all the heads, finding those where the revision | |
| 551 # we want to strip away is an ancestor. Also look for merges | |
| 552 # that might be turned into new heads by the strip. | |
| 553 while heads: | |
| 554 h = heads.pop() | |
| 555 n = h | |
| 556 while True: | |
| 557 seen[n] = 1 | |
| 558 pp = chlog.parents(n) | |
| 559 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum: | |
| 560 if pp[1] not in seen: | |
| 561 heads.append(pp[1]) | |
| 562 if pp[0] == revlog.nullid: | |
| 563 break | |
| 564 if chlog.rev(pp[0]) < revnum: | |
| 565 break | |
| 566 n = pp[0] | |
| 567 if n == rev: | |
| 568 break | |
| 569 r = chlog.reachable(h, rev) | |
| 570 if rev not in r: | |
| 571 saveheads.append(h) | |
| 572 for x in r: | |
| 573 if chlog.rev(x) > revnum: | |
| 574 savebases[x] = 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
575 |
| 1808 | 576 # create a changegroup for all the branches we need to keep |
| 577 if backup is "all": | |
| 578 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | |
| 579 bundle(backupch) | |
| 580 if saveheads: | |
| 581 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | |
| 582 chgrpfile = bundle(backupch) | |
| 583 | |
| 584 stripall(rev, revnum) | |
| 585 | |
| 586 change = chlog.read(rev) | |
| 587 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | |
| 588 chlog.strip(revnum, revnum) | |
| 589 if saveheads: | |
| 590 self.ui.status("adding branch\n") | |
| 591 commands.unbundle(self.ui, repo, chgrpfile, update=False) | |
| 592 if backup is not "strip": | |
| 593 os.unlink(chgrpfile) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
594 |
| 1808 | 595 def isapplied(self, patch): |
| 596 """returns (index, rev, patch)""" | |
| 597 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
|
598 a = self.applied[i] |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
599 if a.name == patch: |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
600 return (i, a.rev, a.name) |
| 1808 | 601 return None |
| 602 | |
| 2696 | 603 # if the exact patch name does not exist, we try a few |
| 604 # variations. If strict is passed, we try only #1 | |
| 605 # | |
| 606 # 1) a number to indicate an offset in the series file | |
| 607 # 2) a unique substring of the patch name was given | |
| 608 # 3) patchname[-+]num to indicate an offset in the series file | |
| 609 def lookup(self, patch, strict=False): | |
| 610 def partial_name(s): | |
| 611 if s in self.series: | |
| 612 return s | |
|
2765
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
613 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
|
614 if len(matches) > 1: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
615 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
|
616 for m in matches: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
617 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
|
618 return None |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
619 if matches: |
|
0327bd1c831c
mq: print matches if patch name not unique
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2757
diff
changeset
|
620 return matches[0] |
| 2696 | 621 if len(self.series) > 0 and len(self.applied) > 0: |
| 622 if s == 'qtip': | |
| 623 return self.series[self.series_end()-1] | |
| 624 if s == 'qbase': | |
| 625 return self.series[0] | |
| 626 return None | |
| 1808 | 627 if patch == None: |
| 628 return None | |
| 2696 | 629 |
| 630 # we don't want to return a partial match until we make | |
| 631 # sure the file name passed in does not exist (checked below) | |
| 632 res = partial_name(patch) | |
| 633 if res and res == patch: | |
| 634 return res | |
| 635 | |
| 1808 | 636 if not os.path.isfile(os.path.join(self.path, patch)): |
| 637 try: | |
| 638 sno = int(patch) | |
| 639 except(ValueError, OverflowError): | |
| 2696 | 640 pass |
| 641 else: | |
| 642 if sno < len(self.series): | |
| 643 patch = self.series[sno] | |
| 644 return patch | |
| 645 if not strict: | |
| 646 # return any partial match made above | |
| 647 if res: | |
| 648 return res | |
| 649 minus = patch.rsplit('-', 1) | |
| 650 if len(minus) > 1: | |
| 651 res = partial_name(minus[0]) | |
| 652 if res: | |
| 653 i = self.series.index(res) | |
| 654 try: | |
| 655 off = int(minus[1] or 1) | |
| 656 except(ValueError, OverflowError): | |
| 657 pass | |
| 658 else: | |
| 659 if i - off >= 0: | |
| 660 return self.series[i - off] | |
| 661 plus = patch.rsplit('+', 1) | |
| 662 if len(plus) > 1: | |
| 663 res = partial_name(plus[0]) | |
| 664 if res: | |
| 665 i = self.series.index(res) | |
| 666 try: | |
| 667 off = int(plus[1] or 1) | |
| 668 except(ValueError, OverflowError): | |
| 669 pass | |
| 670 else: | |
| 671 if i + off < len(self.series): | |
| 672 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
|
673 raise util.Abort(_("patch %s not in series") % patch) |
| 1808 | 674 |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
675 def push(self, repo, patch=None, force=False, list=False, |
| 1808 | 676 mergeq=None, wlock=None): |
| 677 if not wlock: | |
| 678 wlock = repo.wlock() | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
679 patch = self.lookup(patch) |
| 1808 | 680 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
|
681 self.ui.warn(_("patch %s is already applied\n") % patch) |
| 1808 | 682 sys.exit(1) |
| 683 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
|
684 self.ui.warn(_("patch series fully applied\n")) |
| 1808 | 685 sys.exit(1) |
| 686 if not force: | |
| 687 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
|
688 |
| 1808 | 689 self.applied_dirty = 1; |
| 690 start = self.series_end() | |
| 691 if start > 0: | |
| 692 self.check_toppatch(repo) | |
| 693 if not patch: | |
| 694 patch = self.series[start] | |
| 695 end = start + 1 | |
| 696 else: | |
| 697 end = self.series.index(patch, start) + 1 | |
| 698 s = self.series[start:end] | |
| 699 if mergeq: | |
| 700 ret = self.mergepatch(repo, mergeq, s, wlock) | |
| 701 else: | |
| 702 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
|
703 top = self.applied[-1].name |
| 1808 | 704 if ret[0]: |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
705 self.ui.write("Errors during apply, please fix and refresh %s\n" % |
| 1808 | 706 top) |
| 707 else: | |
| 708 self.ui.write("Now at: %s\n" % top) | |
| 709 return ret[0] | |
| 710 | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
711 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
|
712 wlock=None): |
| 1808 | 713 def getfile(f, rev): |
| 714 t = repo.file(f).read(rev) | |
| 715 try: | |
| 716 repo.wfile(f, "w").write(t) | |
| 717 except IOError: | |
|
2086
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
718 try: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
719 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
|
720 except OSError, err: |
|
8742352db413
mq: do not fail if directory to create exists
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2047
diff
changeset
|
721 if err.errno != errno.EEXIST: raise |
| 1808 | 722 repo.wfile(f, "w").write(t) |
| 723 | |
| 724 if not wlock: | |
| 725 wlock = repo.wlock() | |
| 726 if patch: | |
| 727 # index, rev, patch | |
| 728 info = self.isapplied(patch) | |
| 729 if not info: | |
| 730 patch = self.lookup(patch) | |
| 731 info = self.isapplied(patch) | |
| 732 if not info: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
733 raise util.Abort(_("patch %s is not applied") % patch) |
| 1808 | 734 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
|
735 self.ui.warn(_("no patches applied\n")) |
| 1808 | 736 sys.exit(1) |
| 737 | |
| 738 if not update: | |
| 739 parents = repo.dirstate.parents() | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
740 rr = [ revlog.bin(x.rev) for x in self.applied ] |
| 1808 | 741 for p in parents: |
| 742 if p in rr: | |
| 743 self.ui.warn("qpop: forcing dirstate update\n") | |
| 744 update = True | |
| 745 | |
| 746 if not force and update: | |
| 747 self.check_localchanges(repo) | |
| 748 | |
| 749 self.applied_dirty = 1; | |
| 750 end = len(self.applied) | |
| 751 if not patch: | |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
752 if all: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
753 popi = 0 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
754 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
755 popi = len(self.applied) - 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
756 else: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
757 popi = info[0] + 1 |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
758 if popi >= end: |
|
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
759 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
|
760 return |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
761 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
|
762 |
| 1808 | 763 start = info[0] |
| 764 rev = revlog.bin(info[1]) | |
| 765 | |
| 766 # we know there are no local changes, so we can make a simplified | |
| 767 # form of hg.update. | |
| 768 if update: | |
| 769 top = self.check_toppatch(repo) | |
| 770 qp = self.qparents(repo, rev) | |
| 771 changes = repo.changelog.read(qp) | |
| 772 mf1 = repo.manifest.readflags(changes[0]) | |
| 773 mmap = repo.manifest.read(changes[0]) | |
| 774 (c, a, r, d, u) = repo.changes(qp, top) | |
| 775 if d: | |
| 776 raise util.Abort("deletions found between repo revs") | |
| 777 for f in c: | |
| 778 getfile(f, mmap[f]) | |
| 779 for f in r: | |
| 780 getfile(f, mmap[f]) | |
| 781 util.set_exec(repo.wjoin(f), mf1[f]) | |
| 782 repo.dirstate.update(c + r, 'n') | |
| 783 for f in a: | |
| 784 try: os.unlink(repo.wjoin(f)) | |
| 785 except: raise | |
| 786 try: os.removedirs(os.path.dirname(repo.wjoin(f))) | |
| 787 except: pass | |
| 788 if a: | |
| 789 repo.dirstate.forget(a) | |
| 790 repo.dirstate.setparents(qp, revlog.nullid) | |
| 791 self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | |
| 792 del self.applied[start:end] | |
| 793 if len(self.applied): | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
794 self.ui.write("Now at: %s\n" % self.applied[-1].name) |
| 1808 | 795 else: |
| 796 self.ui.write("Patch queue now empty\n") | |
| 797 | |
| 798 def diff(self, repo, files): | |
| 799 top = self.check_toppatch(repo) | |
| 800 if not top: | |
| 801 self.ui.write("No patches applied\n") | |
| 802 return | |
| 803 qp = self.qparents(repo, top) | |
| 804 commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) | |
| 805 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
806 def refresh(self, repo, msg=None, short=False): |
| 1808 | 807 if len(self.applied) == 0: |
| 808 self.ui.write("No patches applied\n") | |
| 809 return | |
| 810 wlock = repo.wlock() | |
| 811 self.check_toppatch(repo) | |
| 812 qp = self.qparents(repo) | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
813 (top, patch) = (self.applied[-1].rev, self.applied[-1].name) |
| 1808 | 814 top = revlog.bin(top) |
| 815 cparents = repo.changelog.parents(top) | |
| 816 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
|
817 message, comments, user, date, patchfound = self.readheaders(patch) |
| 1808 | 818 |
|
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
|
819 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
|
820 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
|
821 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
|
822 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
|
823 # 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
|
824 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
|
825 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
|
826 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
|
827 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
|
828 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
|
829 comments.append(msg) |
| 1808 | 830 if comments: |
| 831 comments = "\n".join(comments) + '\n\n' | |
| 832 patchf.write(comments) | |
| 833 | |
| 834 tip = repo.changelog.tip() | |
| 835 if top == tip: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
836 # if the top of our patch queue is also the tip, there is an |
| 1808 | 837 # optimization here. We update the dirstate in place and strip |
| 838 # off the tip commit. Then just commit the current directory | |
| 839 # tree. We can also send repo.commit the list of files | |
| 840 # changed to speed up the diff | |
| 841 # | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
842 # in short mode, we only diff the files included in the |
| 1808 | 843 # patch already |
| 844 # | |
| 845 # this should really read: | |
| 846 #(cc, dd, aa, aa2, uu) = repo.changes(tip, patchparent) | |
| 847 # but we do it backwards to take advantage of manifest/chlog | |
| 848 # 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
|
849 # |
| 1808 | 850 (cc, aa, dd, aa2, uu) = repo.changes(patchparent, tip) |
| 851 if short: | |
| 852 filelist = cc + aa + dd | |
| 853 else: | |
| 854 filelist = None | |
| 855 (c, a, r, d, u) = repo.changes(None, None, filelist) | |
| 856 | |
| 857 # we might end up with files that were added between tip and | |
| 858 # the dirstate parent, but then changed in the local dirstate. | |
| 859 # in this case, we want them to only show up in the added section | |
| 860 for x in c: | |
| 861 if x not in aa: | |
| 862 cc.append(x) | |
| 863 # we might end up with files added by the local dirstate that | |
| 864 # were deleted by the patch. In this case, they should only | |
| 865 # show up in the changed section. | |
| 866 for x in a: | |
| 867 if x in dd: | |
| 868 del dd[dd.index(x)] | |
| 869 cc.append(x) | |
| 870 else: | |
| 871 aa.append(x) | |
| 872 # make sure any files deleted in the local dirstate | |
| 873 # are not in the add or change column of the patch | |
| 874 forget = [] | |
| 875 for x in d + r: | |
| 876 if x in aa: | |
| 877 del aa[aa.index(x)] | |
| 878 forget.append(x) | |
| 879 continue | |
| 880 elif x in cc: | |
| 881 del cc[cc.index(x)] | |
| 882 dd.append(x) | |
| 883 | |
| 884 c = list(util.unique(cc)) | |
| 885 r = list(util.unique(dd)) | |
| 886 a = list(util.unique(aa)) | |
| 887 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
|
888 commands.dodiff(patchf, self.ui, repo, patchparent, None, |
| 1808 | 889 filelist, changes=(c, a, r, [], u)) |
| 890 patchf.close() | |
| 891 | |
| 892 changes = repo.changelog.read(tip) | |
| 893 repo.dirstate.setparents(*cparents) | |
| 894 repo.dirstate.update(a, 'a') | |
| 895 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
|
896 repo.dirstate.update(c, 'n') |
| 1808 | 897 repo.dirstate.forget(forget) |
| 898 | |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
899 if not msg: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
900 if not message: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
901 message = "patch queue: %s\n" % patch |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
902 else: |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
903 message = "\n".join(message) |
| 1808 | 904 else: |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
905 message = msg |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
906 |
| 1808 | 907 self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
| 908 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
|
909 self.applied[-1] = StatusEntry(revlog.hex(n), patch) |
| 1808 | 910 self.applied_dirty = 1 |
| 911 else: | |
| 912 commands.dodiff(patchf, self.ui, repo, patchparent, None) | |
| 913 patchf.close() | |
| 914 self.pop(repo, force=True, wlock=wlock) | |
| 915 self.push(repo, force=True, wlock=wlock) | |
| 916 | |
| 917 def init(self, repo, create=False): | |
| 918 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
|
919 raise util.Abort(_("patch queue directory already exists")) |
| 1808 | 920 os.mkdir(self.path) |
| 921 if create: | |
| 922 return self.qrepo(create=True) | |
| 923 | |
| 924 def unapplied(self, repo, patch=None): | |
| 925 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
|
926 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 927 if not patch: |
| 928 start = self.series_end() | |
| 929 else: | |
| 930 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
|
931 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
|
932 |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
933 def qseries(self, repo, missing=None, summary=False): |
| 1808 | 934 start = self.series_end() |
| 935 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
|
936 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
|
937 patch = self.series[i] |
| 1808 | 938 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
|
939 if i < start: |
|
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
940 status = 'A' |
|
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 status = 'U' |
|
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('%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
|
944 if summary: |
|
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
945 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
|
946 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
|
947 else: |
|
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
948 msg = '' |
|
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
949 self.ui.write('%s%s\n' % (patch, msg)) |
| 1808 | 950 else: |
| 951 list = [] | |
| 952 for root, dirs, files in os.walk(self.path): | |
| 953 d = root[len(self.path) + 1:] | |
| 954 for f in files: | |
| 955 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
|
956 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
|
957 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
|
958 and not fl.startswith('.')): |
| 1808 | 959 list.append(fl) |
| 960 list.sort() | |
| 961 if list: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
962 for x in list: |
| 1808 | 963 if self.ui.verbose: |
| 964 self.ui.write("D ") | |
| 965 self.ui.write("%s\n" % x) | |
| 966 | |
| 967 def issaveline(self, l): | |
| 968 name = l.split(':')[1] | |
| 969 if name == '.hg.patches.save.line': | |
| 970 return True | |
| 971 | |
| 972 def qrepo(self, create=False): | |
| 973 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
|
974 return hg.repository(self.ui, path=self.path, create=create) |
| 1808 | 975 |
| 976 def restore(self, repo, rev, delete=None, qupdate=None): | |
| 977 c = repo.changelog.read(rev) | |
| 978 desc = c[4].strip() | |
| 979 lines = desc.splitlines() | |
| 980 i = 0 | |
| 981 datastart = None | |
| 982 series = [] | |
| 983 applied = [] | |
| 984 qpp = None | |
| 985 for i in xrange(0, len(lines)): | |
| 986 if lines[i] == 'Patch Data:': | |
| 987 datastart = i + 1 | |
| 988 elif lines[i].startswith('Dirstate:'): | |
| 989 l = lines[i].rstrip() | |
| 990 l = l[10:].split(' ') | |
| 991 qpp = [ hg.bin(x) for x in l ] | |
| 992 elif datastart != None: | |
| 993 l = lines[i].rstrip() | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
994 se = StatusEntry(l) |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
995 id = se.rev |
|
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
996 file = se.name |
| 1808 | 997 if id: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
998 applied.append(se) |
| 1808 | 999 series.append(file) |
| 1000 if datastart == None: | |
| 1001 self.ui.warn("No saved patch data found\n") | |
| 1002 return 1 | |
| 1003 self.ui.warn("restoring status: %s\n" % lines[0]) | |
| 1004 self.full_series = series | |
| 1005 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
|
1006 self.parse_series() |
| 1808 | 1007 self.series_dirty = 1 |
| 1008 self.applied_dirty = 1 | |
| 1009 heads = repo.changelog.heads() | |
| 1010 if delete: | |
| 1011 if rev not in heads: | |
| 1012 self.ui.warn("save entry has children, leaving it alone\n") | |
| 1013 else: | |
| 1014 self.ui.warn("removing save entry %s\n" % hg.short(rev)) | |
| 1015 pp = repo.dirstate.parents() | |
| 1016 if rev in pp: | |
| 1017 update = True | |
| 1018 else: | |
| 1019 update = False | |
| 1020 self.strip(repo, rev, update=update, backup='strip') | |
| 1021 if qpp: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1022 self.ui.warn("saved queue repository parents: %s %s\n" % |
| 1808 | 1023 (hg.short(qpp[0]), hg.short(qpp[1]))) |
| 1024 if qupdate: | |
| 1025 print "queue directory updating" | |
| 1026 r = self.qrepo() | |
| 1027 if not r: | |
| 1028 self.ui.warn("Unable to load queue repository\n") | |
| 1029 return 1 | |
| 1030 r.update(qpp[0], allow=False, force=True) | |
| 1031 | |
| 1032 def save(self, repo, msg=None): | |
| 1033 if len(self.applied) == 0: | |
| 1034 self.ui.warn("save: no patches applied, exiting\n") | |
| 1035 return 1 | |
| 1036 if self.issaveline(self.applied[-1]): | |
| 1037 self.ui.warn("status is already saved\n") | |
| 1038 return 1 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1039 |
| 1808 | 1040 ar = [ ':' + x for x in self.full_series ] |
| 1041 if not msg: | |
| 1042 msg = "hg patches saved state" | |
| 1043 else: | |
| 1044 msg = "hg patches: " + msg.rstrip('\r\n') | |
| 1045 r = self.qrepo() | |
| 1046 if r: | |
| 1047 pp = r.dirstate.parents() | |
| 1048 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
| 1049 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
|
1050 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
|
1051 + '\n' or "") |
| 1808 | 1052 n = repo.commit(None, text, user=None, force=1) |
| 1053 if not n: | |
| 1054 self.ui.warn("repo commit failed\n") | |
| 1055 return 1 | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1056 self.applied.append(StatusEntry(revlog.hex(n),'.hg.patches.save.line')) |
| 1808 | 1057 self.applied_dirty = 1 |
| 1058 | |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1059 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
|
1060 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
|
1061 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
|
1062 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
|
1063 if end == None: |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1064 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
|
1065 return end + 1 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1066 return 0 |
|
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1067 |
| 1808 | 1068 def series_end(self): |
| 1069 end = 0 | |
| 1070 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
|
1071 p = self.applied[-1].name |
| 1808 | 1072 try: |
| 1073 end = self.series.index(p) | |
| 1074 except ValueError: | |
| 1075 return 0 | |
| 1076 return end + 1 | |
| 1077 return end | |
| 1078 | |
| 1079 def qapplied(self, repo, patch=None): | |
| 1080 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
|
1081 raise util.Abort(_("patch %s is not in series file") % patch) |
| 1808 | 1082 if not patch: |
| 1083 end = len(self.applied) | |
| 1084 else: | |
| 1085 end = self.series.index(patch) + 1 | |
| 1086 for x in xrange(end): | |
| 1087 p = self.appliedname(x) | |
| 1088 self.ui.write("%s\n" % p) | |
| 1089 | |
| 1090 def appliedname(self, index): | |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1091 pname = self.applied[index].name |
| 1808 | 1092 if not self.ui.verbose: |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1093 p = pname |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1094 else: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1095 p = str(self.series.index(pname)) + " " + p |
| 1808 | 1096 return p |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1097 |
| 1808 | 1098 def top(self, repo): |
| 1099 if len(self.applied): | |
| 1100 p = self.appliedname(-1) | |
| 1101 self.ui.write(p + '\n') | |
| 1102 else: | |
| 1103 self.ui.write("No patches applied\n") | |
| 1104 | |
| 1105 def next(self, repo): | |
| 1106 end = self.series_end() | |
| 1107 if end == len(self.series): | |
| 1108 self.ui.write("All patches applied\n") | |
| 1109 else: | |
|
2677
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1110 p = self.series[end] |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1111 if self.ui.verbose: |
|
ec05ce9cbf47
mq: uniform verbose display of patche[s].
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2664
diff
changeset
|
1112 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
|
1113 self.ui.write(p + '\n') |
| 1808 | 1114 |
| 1115 def prev(self, repo): | |
| 1116 if len(self.applied) > 1: | |
| 1117 p = self.appliedname(-2) | |
| 1118 self.ui.write(p + '\n') | |
| 1119 elif len(self.applied) == 1: | |
| 1120 self.ui.write("Only one patch applied\n") | |
| 1121 else: | |
| 1122 self.ui.write("No patches applied\n") | |
| 1123 | |
| 1124 def qimport(self, repo, files, patch=None, existing=None, force=None): | |
| 1125 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
|
1126 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
|
1127 'files')) |
| 1808 | 1128 i = 0 |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1129 added = [] |
| 1808 | 1130 for filename in files: |
| 1131 if existing: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1132 if not patch: |
| 1808 | 1133 patch = filename |
| 1134 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
|
1135 raise util.Abort(_("patch %s does not exist") % patch) |
| 1808 | 1136 else: |
| 1137 try: | |
| 1138 text = file(filename).read() | |
| 1139 except IOError: | |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1140 raise util.Abort(_("unable to read %s") % patch) |
| 1808 | 1141 if not patch: |
| 1142 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
|
1143 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
|
1144 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
|
1145 patchf = self.opener(patch, "w") |
| 1808 | 1146 patchf.write(text) |
| 1147 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
|
1148 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
|
1149 % patch) |
|
2698
c1123e83c8e2
mq: fix qnew and qimport to deal with series file comments
Chris Mason <mason@suse.com>
parents:
2697
diff
changeset
|
1150 index = self.full_series_end() + i |
| 1808 | 1151 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
|
1152 self.parse_series() |
| 1808 | 1153 self.ui.warn("adding %s to series file\n" % patch) |
| 1154 i += 1 | |
|
2488
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1155 added.append(patch) |
| 1808 | 1156 patch = None |
| 1157 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
|
1158 qrepo = self.qrepo() |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1159 if qrepo: |
|
2785aeb51be4
mq: add qimported patches if patch dir is a repo
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2301
diff
changeset
|
1160 qrepo.add(added) |
| 1808 | 1161 |
| 1162 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
|
1163 """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
|
1164 |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1165 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
|
1166 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
|
1167 q = repo.mq |
|
2752
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1168 q.delete(repo, patch, force=opts.get('force')) |
| 1808 | 1169 q.save_dirty() |
| 1170 return 0 | |
| 1171 | |
| 1172 def applied(ui, repo, patch=None, **opts): | |
| 1173 """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
|
1174 repo.mq.qapplied(repo, patch) |
| 1808 | 1175 return 0 |
| 1176 | |
| 1177 def unapplied(ui, repo, patch=None, **opts): | |
| 1178 """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
|
1179 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
|
1180 if ui.verbose: |
|
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1181 ui.write("%d " % i) |
|
663094f5595b
mq: make queue.unapplied useful as api
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2772
diff
changeset
|
1182 ui.write("%s\n" % p) |
| 1808 | 1183 |
| 1184 def qimport(ui, repo, *filename, **opts): | |
| 1185 """import a patch""" | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1186 q = repo.mq |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1187 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
|
1188 existing=opts['existing'], force=opts['force']) |
| 1808 | 1189 q.save_dirty() |
| 1190 return 0 | |
| 1191 | |
| 1192 def init(ui, repo, **opts): | |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1193 """init a new queue repository |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1194 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1195 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
|
1196 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
|
1197 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
|
1198 repository.""" |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1199 q = repo.mq |
| 1808 | 1200 r = q.init(repo, create=opts['create_repo']) |
| 1201 q.save_dirty() | |
| 1202 if r: | |
| 1203 fp = r.wopener('.hgignore', 'w') | |
| 1204 print >> fp, 'syntax: glob' | |
| 1205 print >> fp, 'status' | |
| 1206 fp.close() | |
| 1207 r.wopener('series', 'w').close() | |
| 1208 r.add(['.hgignore', 'series']) | |
| 1209 return 0 | |
| 1210 | |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1211 def clone(ui, source, dest=None, **opts): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1212 '''clone main and patch repository at same time |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1213 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1214 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
|
1215 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
|
1216 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
|
1217 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
|
1218 before that it has no patches applied. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1219 |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1220 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
|
1221 default. Use -p <url> to change. |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1222 ''' |
|
2766
c5ac397f7671
fix call to commands.setremoteconfig
Bryan O'Sullivan <bos@serpentine.com>
parents:
2765
diff
changeset
|
1223 commands.setremoteconfig(ui, opts) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1224 if dest is None: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1225 dest = hg.defaultdest(source) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1226 sr = hg.repository(ui, ui.expandpath(source)) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1227 qbase, destrev = None, None |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1228 if sr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1229 reposetup(ui, sr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1230 if sr.mq.applied: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1231 qbase = revlog.bin(sr.mq.applied[0].rev) |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1232 if not hg.islocal(dest): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1233 destrev = sr.parents(qbase)[0] |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1234 ui.note(_('cloning main repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1235 sr, dr = hg.clone(ui, sr, dest, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1236 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1237 rev=destrev, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1238 update=False, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1239 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1240 ui.note(_('cloning patch repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1241 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
|
1242 dr.url() + '/.hg/patches', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1243 pull=opts['pull'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1244 update=not opts['noupdate'], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1245 stream=opts['uncompressed']) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1246 if dr.local(): |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1247 if qbase: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1248 ui.note(_('stripping applied patches from destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1249 reposetup(ui, dr) |
|
2725
9ffee4f07323
mq: update to handle repomap not longer used
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2724
diff
changeset
|
1250 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
|
1251 if not opts['noupdate']: |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1252 ui.note(_('updating destination repo\n')) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1253 dr.update(dr.changelog.tip()) |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1254 |
| 1808 | 1255 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
|
1256 """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
|
1257 q = repo.mq |
| 1808 | 1258 r = q.qrepo() |
| 1259 if not r: raise util.Abort('no queue repository') | |
| 1260 commands.commit(r.ui, r, *pats, **opts) | |
| 1261 | |
| 1262 def series(ui, repo, **opts): | |
| 1263 """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
|
1264 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
| 1808 | 1265 return 0 |
| 1266 | |
| 1267 def top(ui, repo, **opts): | |
| 1268 """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
|
1269 repo.mq.top(repo) |
| 1808 | 1270 return 0 |
| 1271 | |
| 1272 def next(ui, repo, **opts): | |
| 1273 """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
|
1274 repo.mq.next(repo) |
| 1808 | 1275 return 0 |
| 1276 | |
| 1277 def prev(ui, repo, **opts): | |
| 1278 """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
|
1279 repo.mq.prev(repo) |
| 1808 | 1280 return 0 |
| 1281 | |
| 1282 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
|
1283 """create a new patch |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1284 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1285 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
|
1286 (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
|
1287 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
|
1288 be initialised with them. |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1289 |
|
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1290 -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
|
1291 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
|
1292 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
|
1293 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1294 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1295 q.new(repo, patch, msg=message, force=opts['force']) |
| 1808 | 1296 q.save_dirty() |
| 1297 return 0 | |
| 1298 | |
| 1299 def refresh(ui, repo, **opts): | |
| 1300 """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
|
1301 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1302 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
|
1303 if opts['edit']: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1304 if message: |
|
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1305 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
|
1306 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
|
1307 (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
|
1308 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
|
1309 q.refresh(repo, msg=message, short=opts['short']) |
| 1808 | 1310 q.save_dirty() |
| 1311 return 0 | |
| 1312 | |
| 1313 def diff(ui, repo, *files, **opts): | |
| 1314 """diff of the current patch""" | |
|
2097
4d2c2597876f
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2086
diff
changeset
|
1315 # 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
|
1316 repo.mq.diff(repo, list(files)) |
| 1808 | 1317 return 0 |
| 1318 | |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1319 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
|
1320 """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
|
1321 |
|
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1322 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
|
1323 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
|
1324 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
|
1325 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
|
1326 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
|
1327 be removed afterwards. |
|
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1328 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1329 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
|
1330 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
|
1331 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1332 q = repo.mq |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1333 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1334 if not files: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1339 message=commands.logmessage(**opts) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1340 if opts['edit']: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1341 if message: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1342 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
|
1343 |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1344 parent = q.lookup('qtip') |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1345 patches = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1346 messages = [] |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1347 for f in files: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1348 patch = q.lookup(f) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1349 if patch in patches or patch == parent: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1350 self.ui.warn(_('Skipping already folded patch %s') % patch) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1351 if q.isapplied(patch): |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1352 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
|
1353 patches.append(patch) |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1354 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1355 for patch in patches: |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1356 if not message: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1357 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
|
1358 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
|
1359 (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
|
1360 if not patchsuccess: |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1361 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
|
1362 |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1363 if not message: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1364 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
|
1365 for msg in messages: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1366 message.append('* * *') |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1367 message.extend(msg) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1368 message = '\n'.join(message) |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1369 |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1370 if opts['edit']: |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1371 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
|
1372 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1373 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
|
1374 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1375 for patch in patches: |
|
2771
519bf0cd28d2
Add -f option to qfold; improve qfold documentation.
Brendan Cully <brendan@kublai.com>
parents:
2770
diff
changeset
|
1376 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
|
1377 |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1378 q.save_dirty() |
|
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
1379 |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1380 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
|
1381 """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
|
1382 q = repo.mq |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1383 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1384 if patch: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1385 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
|
1386 else: |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1387 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
|
1388 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
|
1389 return |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1390 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
|
1391 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
|
1392 |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1393 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
|
1394 |
| 1808 | 1395 def lastsavename(path): |
| 1396 (dir, base) = os.path.split(path) | |
| 1397 names = os.listdir(dir) | |
| 1398 namere = re.compile("%s.([0-9]+)" % base) | |
| 1399 max = None | |
| 1400 maxname = None | |
| 1401 for f in names: | |
| 1402 m = namere.match(f) | |
| 1403 if m: | |
| 1404 index = int(m.group(1)) | |
| 1405 if max == None or index > max: | |
| 1406 max = index | |
| 1407 maxname = f | |
| 1408 if maxname: | |
| 1409 return (os.path.join(dir, maxname), max) | |
| 1410 return (None, None) | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1411 |
| 1808 | 1412 def savename(path): |
| 1413 (last, index) = lastsavename(path) | |
| 1414 if last is None: | |
| 1415 index = 0 | |
| 1416 newpath = path + ".%d" % (index + 1) | |
| 1417 return newpath | |
| 1418 | |
| 1419 def push(ui, repo, patch=None, **opts): | |
| 1420 """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
|
1421 q = repo.mq |
| 1808 | 1422 mergeq = None |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1423 |
| 1808 | 1424 if opts['all']: |
| 1425 patch = q.series[-1] | |
| 1426 if opts['merge']: | |
| 1427 if opts['name']: | |
| 1428 newpath = opts['name'] | |
| 1429 else: | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1430 newpath, i = lastsavename(q.path) |
| 1808 | 1431 if not newpath: |
| 1432 ui.warn("no saved queues found, please use -n\n") | |
| 1433 return 1 | |
| 1434 mergeq = queue(ui, repo.join(""), newpath) | |
| 1435 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
|
1436 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
| 1808 | 1437 mergeq=mergeq) |
| 1438 q.save_dirty() | |
| 1439 return ret | |
| 1440 | |
| 1441 def pop(ui, repo, patch=None, **opts): | |
| 1442 """pop the current patch off the stack""" | |
| 1443 localupdate = True | |
| 1444 if opts['name']: | |
| 1445 q = queue(ui, repo.join(""), repo.join(opts['name'])) | |
| 1446 ui.warn('using patch queue: %s\n' % q.path) | |
| 1447 localupdate = False | |
| 1448 else: | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1449 q = repo.mq |
|
2697
6c540dd14c38
mq: qpop should act like quilt pop
Chris Mason <mason@suse.com>
parents:
2696
diff
changeset
|
1450 q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) |
| 1808 | 1451 q.save_dirty() |
| 1452 return 0 | |
| 1453 | |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1454 def rename(ui, repo, patch, name=None, **opts): |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1455 """rename a patch |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1456 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1457 With one argument, renames the current patch to PATCH1. |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1458 With two arguments, renames PATCH1 to PATCH2.""" |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1459 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1460 q = repo.mq |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1461 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1462 if not name: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1463 name = patch |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1464 patch = None |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1465 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1466 if name in q.series: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1467 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
|
1468 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1469 absdest = os.path.join(q.path, name) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1470 if os.path.exists(absdest): |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1471 raise util.Abort(_('%s already exists') % absdest) |
|
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 patch: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1474 patch = q.lookup(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1475 else: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1476 if not q.applied: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1477 ui.write(_('No patches applied\n')) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1478 return |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1479 patch = q.lookup('qtip') |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1480 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1481 if ui.verbose: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1482 ui.write('Renaming %s to %s\n' % (patch, name)) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1483 i = q.find_series(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1484 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
|
1485 q.parse_series() |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1486 q.series_dirty = 1 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1487 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1488 info = q.isapplied(patch) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1489 if info: |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1490 q.applied[info[0]] = StatusEntry(info[1], name) |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1491 q.applied_dirty = 1 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1492 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1493 util.rename(os.path.join(q.path, patch), absdest) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1494 r = q.qrepo() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1495 if r: |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1496 wlock = r.wlock() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1497 if r.dirstate.state(name) == 'r': |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1498 r.undelete([name], wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1499 r.copy(patch, name, wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1500 r.remove([patch], False, wlock) |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1501 |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1502 q.save_dirty() |
|
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1503 |
| 1808 | 1504 def restore(ui, repo, rev, **opts): |
| 1505 """restore the queue state saved by a rev""" | |
| 1506 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
|
1507 q = repo.mq |
| 1808 | 1508 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
|
1509 qupdate=opts['update']) |
| 1808 | 1510 q.save_dirty() |
| 1511 return 0 | |
| 1512 | |
| 1513 def save(ui, repo, **opts): | |
| 1514 """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
|
1515 q = repo.mq |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1516 message=commands.logmessage(**opts) |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1517 ret = q.save(repo, msg=message) |
| 1808 | 1518 if ret: |
| 1519 return ret | |
| 1520 q.save_dirty() | |
| 1521 if opts['copy']: | |
| 1522 path = q.path | |
| 1523 if opts['name']: | |
| 1524 newpath = os.path.join(q.basepath, opts['name']) | |
| 1525 if os.path.exists(newpath): | |
| 1526 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
|
1527 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
|
1528 'a directory') % newpath) |
| 1808 | 1529 if not opts['force']: |
|
2711
8e5cd8d11b51
mq: move many error messages to util.Abort
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2710
diff
changeset
|
1530 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
|
1531 'use -f to force') % newpath) |
| 1808 | 1532 else: |
| 1533 newpath = savename(path) | |
| 1534 ui.warn("copy %s to %s\n" % (path, newpath)) | |
| 1535 util.copyfiles(path, newpath) | |
| 1536 if opts['empty']: | |
| 1537 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
|
1538 os.unlink(os.path.join(q.path, q.status_path)) |
| 1808 | 1539 except: |
| 1540 pass | |
| 1541 return 0 | |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1542 |
| 1808 | 1543 def strip(ui, repo, rev, **opts): |
| 1544 """strip a revision and all later revs on the same branch""" | |
| 1545 rev = repo.lookup(rev) | |
| 1546 backup = 'all' | |
| 1547 if opts['backup']: | |
| 1548 backup = 'strip' | |
| 1549 elif opts['nobackup']: | |
| 1550 backup = 'none' | |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1551 repo.mq.strip(repo, rev, backup=backup) |
| 1808 | 1552 return 0 |
| 1553 | |
| 1554 def version(ui, q=None): | |
|
2754
19041b8cbc86
Add more verbose help text to mq commands.
Brendan Cully <brendan@kublai.com>
parents:
2753
diff
changeset
|
1555 """print the version number of the mq extension""" |
| 1808 | 1556 ui.write("mq version %s\n" % versionstr) |
| 1557 return 0 | |
| 1558 | |
| 1559 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
|
1560 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
|
1561 def tags(self): |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1562 if self.tagscache: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1563 return self.tagscache |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1564 |
|
2742
2f13f8d3fe80
mq: correct the use of super
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
2738
diff
changeset
|
1565 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
|
1566 |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1567 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
|
1568 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
|
1569 return tagscache |
|
2663
96950d39171d
Mq: modify repo.lookup to resolve applied patches too.
Brendan Cully <brendan@kublai.com>
parents:
2554
diff
changeset
|
1570 |
|
2775
ee48e5ef8753
Use StatusEntry class instead of repeated status line parsing.
Brendan Cully <brendan@kublai.com>
parents:
2765
diff
changeset
|
1571 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
|
1572 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
|
1573 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
|
1574 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
|
1575 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
|
1576 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
|
1577 else: |
|
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1578 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
|
1579 |
|
4e2dc5c16e61
Add mq patch names to tagscache instead of overriding lookup.
Brendan Cully <brendan@kublai.com>
parents:
2677
diff
changeset
|
1580 return tagscache |
|
2664
9b8df8dceeed
Add qtip and qbase to mq qlookup.
Brendan Cully <brendan@kublai.com>
parents:
2663
diff
changeset
|
1581 |
|
2723
04d9b31faeca
mq: do not hold a reference to repo in tags override
Brendan Cully <brendan@kublai.com>
parents:
2720
diff
changeset
|
1582 repo.__class__ = MqRepo |
|
2724
9c41ae1908c7
mq: replace module-wide repo hash with a repo attribute
Brendan Cully <brendan@kublai.com>
parents:
2723
diff
changeset
|
1583 repo.mq = queue(ui, repo.join("")) |
| 1808 | 1584 |
| 1585 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
|
1586 "qapplied": (applied, [], 'hg qapplied [PATCH]'), |
|
2720
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1587 "qclone": (clone, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1588 [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1589 ('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
|
1590 ('', 'uncompressed', None, |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1591 _('use uncompressed transfer (fast over LAN)')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1592 ('e', 'ssh', '', _('specify ssh command to use')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1593 ('p', 'patches', '', _('location of source patch repo')), |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1594 ('', 'remotecmd', '', |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1595 _('specify hg command to run on the remote side'))], |
|
c91ca61c8953
mq: add qclone command
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2712
diff
changeset
|
1596 '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
|
1597 "qcommit|qci": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1598 (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
|
1599 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
|
1600 '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
|
1601 "^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
|
1602 "qdelete": |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1603 (delete, |
|
5dfeda163bb7
Add -f option to qdelete, to remove patch file.
Brendan Cully <brendan@kublai.com>
parents:
2751
diff
changeset
|
1604 [('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
|
1605 'hg qdelete [-f] PATCH'), |
|
2753
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1606 'qfold': |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1607 (fold, |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1608 [('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
|
1609 ('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
|
1610 ('m', 'message', '', _('set patch header to <text>')), |
|
84218111e80f
Add -m, -l, -e options to qfold.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1611 ('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
|
1612 '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
|
1613 'qheader': (header, [], |
|
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2746
diff
changeset
|
1614 _('hg qheader [PATCH]')), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1615 "^qimport": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1616 (qimport, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1617 [('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
|
1618 ('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
|
1619 ('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
|
1620 '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
|
1621 "^qinit": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1622 (init, |
|
2526
37785f986260
mq: Added help for qcommit, consistently talk about queue repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2488
diff
changeset
|
1623 [('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
|
1624 'hg qinit [-c]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1625 "qnew": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1626 (new, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1627 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1628 ('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
|
1629 ('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
|
1630 '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
|
1631 "qnext": (next, [], 'hg qnext'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1632 "qprev": (prev, [], 'hg qprev'), |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1633 "^qpop": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1634 (pop, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1635 [('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
|
1636 ('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
|
1637 ('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
|
1638 '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
|
1639 "^qpush": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1640 (push, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1641 [('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
|
1642 ('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
|
1643 ('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
|
1644 ('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
|
1645 ('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
|
1646 '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
|
1647 "^qrefresh": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1648 (refresh, |
|
2746
0503eb5c0a33
Add option -e/--edit to qrefresh, to edit the existing header.
Brendan Cully <brendan@kublai.com>
parents:
2745
diff
changeset
|
1649 [('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
|
1650 ('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
|
1651 ('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
|
1652 ('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
|
1653 '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
|
1654 'qrename|qmv': |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
1655 (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
|
1656 "qrestore": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1657 (restore, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1658 [('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
|
1659 ('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
|
1660 '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
|
1661 "qsave": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1662 (save, |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1663 [('m', 'message', '', _('use <text> as commit message')), |
|
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1664 ('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
|
1665 ('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
|
1666 ('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
|
1667 ('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
|
1668 ('f', 'force', None, 'force copy')], |
|
2694
0fb28dbf0dc7
MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
2682
diff
changeset
|
1669 '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
|
1670 "qseries": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1671 (series, |
|
2756
caa6d992608b
Add -s option to qseries: display first line of patch header.
Brendan Cully <brendan@kublai.com>
parents:
2754
diff
changeset
|
1672 [('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
|
1673 ('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
|
1674 'hg qseries [-m]'), |
|
1810
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1675 "^strip": |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1676 (strip, |
|
7596611ab3d5
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1808
diff
changeset
|
1677 [('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
|
1678 ('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
|
1679 ('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
|
1680 '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
|
1681 "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
|
1682 "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
|
1683 "qversion": (version, [], 'hg qversion') |
| 1808 | 1684 } |
| 1685 |