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