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