mq.py
2194 lines
| 78.7 KiB
| text/x-python
|
PythonLexer
/ hgext / mq.py
|
r1808 | # queue.py - patch queues for mercurial | ||
# | ||||
|
r2859 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> | ||
|
r1808 | # | ||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
|
r2554 | '''patch management and development | ||
This extension lets you work with a stack of patches in a Mercurial | ||||
repository. It manages two stacks of patches - all known patches, and | ||||
applied patches (subset of known patches). | ||||
Known patches are represented as patch files in the .hg/patches | ||||
directory. Applied patches are both patch files and changesets. | ||||
Common tasks (use "hg help command" for more details): | ||||
prepare repository to work with patches qinit | ||||
create new patch qnew | ||||
import existing patch qimport | ||||
print patch series qseries | ||||
print applied patches qapplied | ||||
print name of top applied patch qtop | ||||
add known patch to applied stack qpush | ||||
remove patch from applied stack qpop | ||||
refresh contents of top applied patch qrefresh | ||||
''' | ||||
|
r1808 | from mercurial.demandload import * | ||
|
r2867 | from mercurial.i18n import gettext as _ | ||
|
r2984 | from mercurial import commands | ||
|
r1808 | demandload(globals(), "os sys re struct traceback errno bz2") | ||
|
r3708 | demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,util,changegroup") | ||
|
r1808 | |||
|
r2720 | commands.norepo += " qclone qversion" | ||
|
r2818 | class statusentry: | ||
|
r2780 | def __init__(self, rev, name=None): | ||
if not name: | ||||
|
r3091 | fields = rev.split(':', 1) | ||
|
r2816 | if len(fields) == 2: | ||
self.rev, self.name = fields | ||||
else: | ||||
self.rev, self.name = None, None | ||||
|
r2780 | else: | ||
self.rev, self.name = rev, name | ||||
def __str__(self): | ||||
return self.rev + ':' + self.name | ||||
|
r1808 | class queue: | ||
def __init__(self, ui, path, patchdir=None): | ||||
self.basepath = path | ||||
|
r2819 | self.path = patchdir or os.path.join(path, "patches") | ||
|
r1852 | self.opener = util.opener(self.path) | ||
|
r1808 | self.ui = ui | ||
self.applied = [] | ||||
self.full_series = [] | ||||
self.applied_dirty = 0 | ||||
self.series_dirty = 0 | ||||
|
r1852 | self.series_path = "series" | ||
self.status_path = "status" | ||||
|
r2821 | self.guards_path = "guards" | ||
self.active_guards = None | ||||
self.guards_dirty = False | ||||
|
r2874 | self._diffopts = None | ||
|
r1810 | |||
|
r2819 | if os.path.exists(self.join(self.series_path)): | ||
|
r1852 | self.full_series = self.opener(self.series_path).read().splitlines() | ||
|
r2767 | self.parse_series() | ||
|
r1808 | |||
|
r2819 | if os.path.exists(self.join(self.status_path)): | ||
|
r2821 | lines = self.opener(self.status_path).read().splitlines() | ||
self.applied = [statusentry(l) for l in lines] | ||||
|
r1808 | |||
|
r2874 | def diffopts(self): | ||
if self._diffopts is None: | ||||
|
r2888 | self._diffopts = patch.diffopts(self.ui) | ||
|
r2874 | return self._diffopts | ||
|
r2819 | def join(self, *p): | ||
return os.path.join(self.path, *p) | ||||
|
r1808 | def find_series(self, patch): | ||
pre = re.compile("(\s*)([^#]+)") | ||||
index = 0 | ||||
for l in self.full_series: | ||||
m = pre.match(l) | ||||
if m: | ||||
s = m.group(2) | ||||
s = s.rstrip() | ||||
if s == patch: | ||||
return index | ||||
index += 1 | ||||
return None | ||||
|
r2821 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') | ||
|
r2767 | def parse_series(self): | ||
|
r1808 | self.series = [] | ||
|
r2821 | self.series_guards = [] | ||
|
r2767 | for l in self.full_series: | ||
|
r2821 | h = l.find('#') | ||
if h == -1: | ||||
patch = l | ||||
comment = '' | ||||
elif h == 0: | ||||
continue | ||||
else: | ||||
patch = l[:h] | ||||
comment = l[h:] | ||||
patch = patch.strip() | ||||
if patch: | ||||
|
r3184 | if patch in self.series: | ||
raise util.Abort(_('%s appears more than once in %s') % | ||||
(patch, self.join(self.series_path))) | ||||
|
r2821 | self.series.append(patch) | ||
self.series_guards.append(self.guard_re.findall(comment)) | ||||
def check_guard(self, guard): | ||||
bad_chars = '# \t\r\n\f' | ||||
first = guard[0] | ||||
for c in '-+': | ||||
if first == c: | ||||
return (_('guard %r starts with invalid character: %r') % | ||||
(guard, c)) | ||||
for c in bad_chars: | ||||
if c in guard: | ||||
return _('invalid character in guard %r: %r') % (guard, c) | ||||
|
r3223 | |||
|
r2821 | def set_active(self, guards): | ||
for guard in guards: | ||||
bad = self.check_guard(guard) | ||||
if bad: | ||||
raise util.Abort(bad) | ||||
guards = dict.fromkeys(guards).keys() | ||||
guards.sort() | ||||
self.ui.debug('active guards: %s\n' % ' '.join(guards)) | ||||
self.active_guards = guards | ||||
self.guards_dirty = True | ||||
def active(self): | ||||
if self.active_guards is None: | ||||
self.active_guards = [] | ||||
try: | ||||
guards = self.opener(self.guards_path).read().split() | ||||
except IOError, err: | ||||
if err.errno != errno.ENOENT: raise | ||||
guards = [] | ||||
for i, guard in enumerate(guards): | ||||
bad = self.check_guard(guard) | ||||
if bad: | ||||
self.ui.warn('%s:%d: %s\n' % | ||||
(self.join(self.guards_path), i + 1, bad)) | ||||
else: | ||||
self.active_guards.append(guard) | ||||
return self.active_guards | ||||
def set_guards(self, idx, guards): | ||||
for g in guards: | ||||
if len(g) < 2: | ||||
raise util.Abort(_('guard %r too short') % g) | ||||
if g[0] not in '-+': | ||||
raise util.Abort(_('guard %r starts with invalid char') % g) | ||||
bad = self.check_guard(g[1:]) | ||||
if bad: | ||||
raise util.Abort(bad) | ||||
drop = self.guard_re.sub('', self.full_series[idx]) | ||||
self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) | ||||
self.parse_series() | ||||
self.series_dirty = True | ||||
|
r3223 | |||
|
r2821 | def pushable(self, idx): | ||
if isinstance(idx, str): | ||||
idx = self.series.index(idx) | ||||
patchguards = self.series_guards[idx] | ||||
if not patchguards: | ||||
return True, None | ||||
default = False | ||||
guards = self.active() | ||||
exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] | ||||
if exactneg: | ||||
return False, exactneg[0] | ||||
pos = [g for g in patchguards if g[0] == '+'] | ||||
|
r2850 | exactpos = [g for g in pos if g[1:] in guards] | ||
|
r2821 | if pos: | ||
|
r2850 | if exactpos: | ||
return True, exactpos[0] | ||||
return False, pos | ||||
|
r2821 | return True, '' | ||
def explain_pushable(self, idx, all_patches=False): | ||||
write = all_patches and self.ui.write or self.ui.warn | ||||
if all_patches or self.ui.verbose: | ||||
if isinstance(idx, str): | ||||
idx = self.series.index(idx) | ||||
pushable, why = self.pushable(idx) | ||||
if all_patches and pushable: | ||||
if why is None: | ||||
write(_('allowing %s - no guards in effect\n') % | ||||
self.series[idx]) | ||||
else: | ||||
if not why: | ||||
write(_('allowing %s - no matching negative guards\n') % | ||||
self.series[idx]) | ||||
else: | ||||
write(_('allowing %s - guarded by %r\n') % | ||||
(self.series[idx], why)) | ||||
if not pushable: | ||||
|
r2829 | if why: | ||
|
r2821 | write(_('skipping %s - guarded by %r\n') % | ||
|
r3870 | (self.series[idx], why)) | ||
|
r2821 | else: | ||
write(_('skipping %s - no matching guards\n') % | ||||
self.series[idx]) | ||||
|
r1810 | |||
|
r1808 | def save_dirty(self): | ||
|
r2772 | def write_list(items, path): | ||
fp = self.opener(path, 'w') | ||||
for i in items: | ||||
print >> fp, i | ||||
fp.close() | ||||
|
r2781 | if self.applied_dirty: write_list(map(str, self.applied), self.status_path) | ||
|
r2772 | if self.series_dirty: write_list(self.full_series, self.series_path) | ||
|
r2821 | if self.guards_dirty: write_list(self.active_guards, self.guards_path) | ||
|
r1808 | |||
def readheaders(self, patch): | ||||
def eatdiff(lines): | ||||
while lines: | ||||
l = lines[-1] | ||||
|
r1810 | if (l.startswith("diff -") or | ||
l.startswith("Index:") or | ||||
l.startswith("===========")): | ||||
|
r1808 | del lines[-1] | ||
else: | ||||
break | ||||
def eatempty(lines): | ||||
while lines: | ||||
l = lines[-1] | ||||
if re.match('\s*$', l): | ||||
del lines[-1] | ||||
else: | ||||
break | ||||
|
r2819 | pf = self.join(patch) | ||
|
r1808 | message = [] | ||
comments = [] | ||||
user = None | ||||
|
r2299 | date = None | ||
|
r1808 | format = None | ||
subject = None | ||||
diffstart = 0 | ||||
for line in file(pf): | ||||
line = line.rstrip() | ||||
|
r2934 | if line.startswith('diff --git'): | ||
diffstart = 2 | ||||
break | ||||
|
r1808 | if diffstart: | ||
if line.startswith('+++ '): | ||||
diffstart = 2 | ||||
break | ||||
if line.startswith("--- "): | ||||
diffstart = 1 | ||||
continue | ||||
elif format == "hgpatch": | ||||
# parse values when importing the result of an hg export | ||||
if line.startswith("# User "): | ||||
user = line[7:] | ||||
|
r2300 | elif line.startswith("# Date "): | ||
date = line[7:] | ||||
|
r1808 | elif not line.startswith("# ") and line: | ||
message.append(line) | ||||
format = None | ||||
elif line == '# HG changeset patch': | ||||
format = "hgpatch" | ||||
|
r1810 | elif (format != "tagdone" and (line.startswith("Subject: ") or | ||
line.startswith("subject: "))): | ||||
|
r1808 | subject = line[9:] | ||
format = "tag" | ||||
|
r1810 | elif (format != "tagdone" and (line.startswith("From: ") or | ||
line.startswith("from: "))): | ||||
|
r1808 | user = line[6:] | ||
format = "tag" | ||||
elif format == "tag" and line == "": | ||||
# when looking for tags (subject: from: etc) they | ||||
# end once you find a blank line in the source | ||||
format = "tagdone" | ||||
|
r2301 | elif message or line: | ||
|
r1808 | message.append(line) | ||
comments.append(line) | ||||
eatdiff(message) | ||||
eatdiff(comments) | ||||
eatempty(message) | ||||
eatempty(comments) | ||||
# make sure message isn't empty | ||||
if format and format.startswith("tag") and subject: | ||||
message.insert(0, "") | ||||
message.insert(0, subject) | ||||
|
r2299 | return (message, comments, user, date, diffstart > 1) | ||
|
r1808 | |||
|
r2874 | def printdiff(self, repo, node1, node2=None, files=None, | ||
|
r2937 | fp=None, changes=None, opts={}): | ||
fns, matchfn, anypats = cmdutil.matchpats(repo, files, opts) | ||||
patch.diff(repo, node1, node2, fns, match=matchfn, | ||||
|
r2874 | fp=fp, changes=changes, opts=self.diffopts()) | ||
|
r1808 | def mergeone(self, repo, mergeq, head, patch, rev, wlock): | ||
# first try just applying the patch | ||||
|
r1810 | (err, n) = self.apply(repo, [ patch ], update_status=False, | ||
|
r1808 | strict=True, merge=rev, wlock=wlock) | ||
if err == 0: | ||||
return (err, n) | ||||
if n is None: | ||||
|
r2712 | raise util.Abort(_("apply failed for patch %s") % patch) | ||
|
r1808 | |||
self.ui.warn("patch didn't work out, merging %s\n" % patch) | ||||
# apply failed, strip away that rev and merge. | ||||
|
r2808 | hg.clean(repo, head, wlock=wlock) | ||
|
r1808 | self.strip(repo, n, update=False, backup='strip', wlock=wlock) | ||
c = repo.changelog.read(rev) | ||||
|
r2808 | ret = hg.merge(repo, rev, wlock=wlock) | ||
|
r1808 | if ret: | ||
|
r2712 | raise util.Abort(_("update returned %d") % ret) | ||
|
r1808 | n = repo.commit(None, c[4], c[1], force=1, wlock=wlock) | ||
if n == None: | ||||
|
r2712 | raise util.Abort(_("repo commit failed")) | ||
|
r1808 | try: | ||
|
r2299 | message, comments, user, date, patchfound = mergeq.readheaders(patch) | ||
|
r1808 | except: | ||
|
r2712 | raise util.Abort(_("unable to read %s") % patch) | ||
|
r1808 | |||
|
r1852 | patchf = self.opener(patch, "w") | ||
|
r1808 | if comments: | ||
comments = "\n".join(comments) + '\n\n' | ||||
patchf.write(comments) | ||||
|
r2874 | self.printdiff(repo, head, n, fp=patchf) | ||
|
r1808 | patchf.close() | ||
return (0, n) | ||||
|
r1810 | |||
|
r1808 | def qparents(self, repo, rev=None): | ||
if rev is None: | ||||
(p1, p2) = repo.dirstate.parents() | ||||
if p2 == revlog.nullid: | ||||
return p1 | ||||
if len(self.applied) == 0: | ||||
return None | ||||
|
r2780 | return revlog.bin(self.applied[-1].rev) | ||
|
r1808 | pp = repo.changelog.parents(rev) | ||
if pp[1] != revlog.nullid: | ||||
|
r2780 | arevs = [ x.rev for x in self.applied ] | ||
|
r1808 | p0 = revlog.hex(pp[0]) | ||
p1 = revlog.hex(pp[1]) | ||||
if p0 in arevs: | ||||
return pp[0] | ||||
if p1 in arevs: | ||||
return pp[1] | ||||
return pp[0] | ||||
def mergepatch(self, repo, mergeq, series, wlock): | ||||
if len(self.applied) == 0: | ||||
# each of the patches merged in will have two parents. This | ||||
# can confuse the qrefresh, qdiff, and strip code because it | ||||
# needs to know which parent is actually in the patch queue. | ||||
# so, we insert a merge marker with only one parent. This way | ||||
# the first patch in the queue is never a merge patch | ||||
# | ||||
pname = ".hg.patches.merge.marker" | ||||
n = repo.commit(None, '[mq]: merge marker', user=None, force=1, | ||||
wlock=wlock) | ||||
|
r2818 | self.applied.append(statusentry(revlog.hex(n), pname)) | ||
|
r1808 | self.applied_dirty = 1 | ||
head = self.qparents(repo) | ||||
for patch in series: | ||||
|
r2696 | patch = mergeq.lookup(patch, strict=True) | ||
|
r1808 | if not patch: | ||
self.ui.warn("patch %s does not exist\n" % patch) | ||||
return (1, None) | ||||
|
r2821 | pushable, reason = self.pushable(patch) | ||
if not pushable: | ||||
self.explain_pushable(patch, all_patches=True) | ||||
continue | ||||
|
r1808 | info = mergeq.isapplied(patch) | ||
if not info: | ||||
self.ui.warn("patch %s is not applied\n" % patch) | ||||
return (1, None) | ||||
rev = revlog.bin(info[1]) | ||||
(err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock) | ||||
if head: | ||||
|
r2818 | self.applied.append(statusentry(revlog.hex(head), patch)) | ||
|
r1808 | self.applied_dirty = 1 | ||
if err: | ||||
return (err, head) | ||||
return (0, head) | ||||
|
r2748 | def patch(self, repo, patchfile): | ||
'''Apply patchfile to the working directory. | ||||
patchfile: file name of patch''' | ||||
|
r3465 | files = {} | ||
|
r2748 | try: | ||
|
r3465 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, | ||
files=files) | ||||
|
r2919 | except Exception, inst: | ||
self.ui.note(str(inst) + '\n') | ||||
if not self.ui.verbose: | ||||
self.ui.warn("patch failed, unable to continue (try -v)\n") | ||||
|
r3465 | return (False, files, False) | ||
|
r2748 | |||
|
r2934 | return (True, files, fuzz) | ||
|
r2796 | |||
|
r1810 | def apply(self, repo, series, list=False, update_status=True, | ||
|
r1808 | strict=False, patchdir=None, merge=None, wlock=None): | ||
# TODO unify with commands.py | ||||
if not patchdir: | ||||
patchdir = self.path | ||||
err = 0 | ||||
if not wlock: | ||||
wlock = repo.wlock() | ||||
lock = repo.lock() | ||||
tr = repo.transaction() | ||||
n = None | ||||
|
r2934 | for patchname in series: | ||
pushable, reason = self.pushable(patchname) | ||||
|
r2821 | if not pushable: | ||
|
r2934 | self.explain_pushable(patchname, all_patches=True) | ||
|
r2821 | continue | ||
|
r2934 | self.ui.warn("applying %s\n" % patchname) | ||
pf = os.path.join(patchdir, patchname) | ||||
|
r1808 | |||
try: | ||||
|
r2934 | message, comments, user, date, patchfound = self.readheaders(patchname) | ||
|
r1808 | except: | ||
|
r2934 | self.ui.warn("Unable to read %s\n" % patchname) | ||
|
r1808 | err = 1 | ||
break | ||||
if not message: | ||||
|
r2934 | message = "imported patch %s\n" % patchname | ||
|
r1808 | else: | ||
if list: | ||||
|
r2934 | message.append("\nimported patch %s" % patchname) | ||
|
r1808 | message = '\n'.join(message) | ||
|
r2748 | (patcherr, files, fuzz) = self.patch(repo, pf) | ||
patcherr = not patcherr | ||||
|
r1808 | |||
|
r2934 | if merge and files: | ||
|
r1810 | # Mark as merged and update dirstate parent info | ||
|
r2934 | repo.dirstate.update(repo.dirstate.filterfiles(files.keys()), 'm') | ||
|
r1810 | p1, p2 = repo.dirstate.parents() | ||
repo.dirstate.setparents(p1, merge) | ||||
|
r2934 | files = patch.updatedir(self.ui, repo, files, wlock=wlock) | ||
|
r2299 | n = repo.commit(files, message, user, date, force=1, lock=lock, | ||
|
r1808 | wlock=wlock) | ||
if n == None: | ||||
|
r2712 | raise util.Abort(_("repo commit failed")) | ||
|
r1808 | |||
if update_status: | ||||
|
r2934 | self.applied.append(statusentry(revlog.hex(n), patchname)) | ||
|
r1808 | |||
if patcherr: | ||||
if not patchfound: | ||||
|
r2934 | self.ui.warn("patch %s is empty\n" % patchname) | ||
|
r1808 | err = 0 | ||
else: | ||||
self.ui.warn("patch failed, rejects left in working dir\n") | ||||
err = 1 | ||||
break | ||||
if fuzz and strict: | ||||
self.ui.warn("fuzz found when applying patch, stopping\n") | ||||
err = 1 | ||||
break | ||||
tr.close() | ||||
return (err, n) | ||||
|
r3088 | def delete(self, repo, patches, opts): | ||
|
r2905 | realpatches = [] | ||
for patch in patches: | ||||
patch = self.lookup(patch, strict=True) | ||||
info = self.isapplied(patch) | ||||
|
r3373 | if info: | ||
|
r2905 | raise util.Abort(_("cannot delete applied patch %s") % patch) | ||
if patch not in self.series: | ||||
raise util.Abort(_("patch %s not in series file") % patch) | ||||
|
r3373 | realpatches.append(patch) | ||
appliedbase = 0 | ||||
if opts.get('rev'): | ||||
if not self.applied: | ||||
raise util.Abort(_('no patches applied')) | ||||
|
r3707 | revs = cmdutil.revrange(repo, opts['rev']) | ||
|
r3373 | if len(revs) > 1 and revs[0] > revs[1]: | ||
revs.reverse() | ||||
for rev in revs: | ||||
if appliedbase >= len(self.applied): | ||||
raise util.Abort(_("revision %d is not managed") % rev) | ||||
base = revlog.bin(self.applied[appliedbase].rev) | ||||
node = repo.changelog.node(rev) | ||||
if node != base: | ||||
raise util.Abort(_("cannot delete revision %d above " | ||||
"applied patches") % rev) | ||||
realpatches.append(self.applied[appliedbase].name) | ||||
|
r3088 | appliedbase += 1 | ||
|
r2905 | |||
|
r3088 | if not opts.get('keep'): | ||
|
r2752 | r = self.qrepo() | ||
if r: | ||||
|
r2905 | r.remove(realpatches, True) | ||
|
r2752 | else: | ||
|
r3375 | for p in realpatches: | ||
os.unlink(self.join(p)) | ||||
|
r2905 | |||
|
r3373 | if appliedbase: | ||
|
r3088 | del self.applied[:appliedbase] | ||
self.applied_dirty = 1 | ||||
|
r2905 | indices = [self.find_series(p) for p in realpatches] | ||
indices.sort() | ||||
for i in indices[-1::-1]: | ||||
del self.full_series[i] | ||||
|
r2767 | self.parse_series() | ||
|
r1808 | self.series_dirty = 1 | ||
|
r1810 | |||
|
r1808 | def check_toppatch(self, repo): | ||
if len(self.applied) > 0: | ||||
|
r2780 | top = revlog.bin(self.applied[-1].rev) | ||
|
r1808 | pp = repo.dirstate.parents() | ||
if top not in pp: | ||||
|
r2712 | raise util.Abort(_("queue top not at same revision as working directory")) | ||
|
r1808 | return top | ||
return None | ||||
|
r2875 | def check_localchanges(self, repo, force=False, refresh=True): | ||
m, a, r, d = repo.status()[:4] | ||||
if m or a or r or d: | ||||
if not force: | ||||
if refresh: | ||||
raise util.Abort(_("local changes found, refresh first")) | ||||
else: | ||||
raise util.Abort(_("local changes found")) | ||||
return m, a, r, d | ||||
|
r1808 | def new(self, repo, patch, msg=None, force=None): | ||
|
r2819 | if os.path.exists(self.join(patch)): | ||
|
r2711 | raise util.Abort(_('patch "%s" already exists') % patch) | ||
|
r2875 | m, a, r, d = self.check_localchanges(repo, force) | ||
commitfiles = m + a + r | ||||
|
r1808 | self.check_toppatch(repo) | ||
wlock = repo.wlock() | ||||
|
r2698 | insert = self.full_series_end() | ||
|
r1808 | if msg: | ||
|
r2511 | n = repo.commit(commitfiles, "[mq]: %s" % msg, force=True, | ||
wlock=wlock) | ||||
|
r1808 | else: | ||
|
r2511 | n = repo.commit(commitfiles, | ||
|
r1810 | "New patch: %s" % patch, force=True, wlock=wlock) | ||
|
r1808 | if n == None: | ||
|
r2712 | raise util.Abort(_("repo commit failed")) | ||
|
r1808 | self.full_series[insert:insert] = [patch] | ||
|
r2818 | self.applied.append(statusentry(revlog.hex(n), patch)) | ||
|
r2767 | self.parse_series() | ||
|
r1808 | self.series_dirty = 1 | ||
self.applied_dirty = 1 | ||||
|
r1852 | p = self.opener(patch, "w") | ||
|
r1808 | if msg: | ||
msg = msg + "\n" | ||||
p.write(msg) | ||||
p.close() | ||||
wlock = None | ||||
r = self.qrepo() | ||||
if r: r.add([patch]) | ||||
|
r2511 | if commitfiles: | ||
|
r2856 | self.refresh(repo, short=True) | ||
|
r1808 | |||
def strip(self, repo, rev, update=True, backup="all", wlock=None): | ||||
def limitheads(chlog, stop): | ||||
"""return the list of all nodes that have no children""" | ||||
p = {} | ||||
h = [] | ||||
stoprev = 0 | ||||
if stop in chlog.nodemap: | ||||
stoprev = chlog.rev(stop) | ||||
|
r3473 | for r in xrange(chlog.count() - 1, -1, -1): | ||
|
r1808 | n = chlog.node(r) | ||
if n not in p: | ||||
h.append(n) | ||||
if n == stop: | ||||
break | ||||
if r < stoprev: | ||||
break | ||||
for pn in chlog.parents(n): | ||||
p[pn] = 1 | ||||
return h | ||||
def bundle(cg): | ||||
backupdir = repo.join("strip-backup") | ||||
if not os.path.isdir(backupdir): | ||||
os.mkdir(backupdir) | ||||
name = os.path.join(backupdir, "%s" % revlog.short(rev)) | ||||
name = savename(name) | ||||
self.ui.warn("saving bundle to %s\n" % name) | ||||
|
r3708 | return changegroup.writebundle(cg, name, "HG10BZ") | ||
|
r1808 | |||
def stripall(rev, revnum): | ||||
cl = repo.changelog | ||||
c = cl.read(rev) | ||||
mm = repo.manifest.read(c[0]) | ||||
seen = {} | ||||
for x in xrange(revnum, cl.count()): | ||||
c = cl.read(cl.node(x)) | ||||
for f in c[3]: | ||||
if f in seen: | ||||
continue | ||||
seen[f] = 1 | ||||
if f in mm: | ||||
filerev = mm[f] | ||||
else: | ||||
filerev = 0 | ||||
seen[f] = filerev | ||||
# we go in two steps here so the strip loop happens in a | ||||
# sensible order. When stripping many files, this helps keep | ||||
# our disk access patterns under control. | ||||
|
r2794 | seen_list = seen.keys() | ||
seen_list.sort() | ||||
for f in seen_list: | ||||
|
r1808 | ff = repo.file(f) | ||
filerev = seen[f] | ||||
if filerev != 0: | ||||
if filerev in ff.nodemap: | ||||
filerev = ff.rev(filerev) | ||||
else: | ||||
filerev = 0 | ||||
ff.strip(filerev, revnum) | ||||
if not wlock: | ||||
wlock = repo.wlock() | ||||
lock = repo.lock() | ||||
chlog = repo.changelog | ||||
# TODO delete the undo files, and handle undo of merge sets | ||||
pp = chlog.parents(rev) | ||||
revnum = chlog.rev(rev) | ||||
if update: | ||||
|
r2875 | self.check_localchanges(repo, refresh=False) | ||
|
r1808 | urev = self.qparents(repo, rev) | ||
|
r2808 | hg.clean(repo, urev, wlock=wlock) | ||
|
r1808 | repo.dirstate.write() | ||
# save is a list of all the branches we are truncating away | ||||
# that we actually want to keep. changegroup will be used | ||||
# to preserve them and add them back after the truncate | ||||
saveheads = [] | ||||
savebases = {} | ||||
heads = limitheads(chlog, rev) | ||||
seen = {} | ||||
# search through all the heads, finding those where the revision | ||||
# we want to strip away is an ancestor. Also look for merges | ||||
# that might be turned into new heads by the strip. | ||||
while heads: | ||||
h = heads.pop() | ||||
n = h | ||||
while True: | ||||
seen[n] = 1 | ||||
pp = chlog.parents(n) | ||||
|
r4065 | if pp[1] != revlog.nullid: | ||
for p in pp: | ||||
if chlog.rev(p) > revnum and p not in seen: | ||||
heads.append(p) | ||||
|
r1808 | if pp[0] == revlog.nullid: | ||
break | ||||
if chlog.rev(pp[0]) < revnum: | ||||
break | ||||
n = pp[0] | ||||
if n == rev: | ||||
break | ||||
r = chlog.reachable(h, rev) | ||||
if rev not in r: | ||||
saveheads.append(h) | ||||
for x in r: | ||||
if chlog.rev(x) > revnum: | ||||
savebases[x] = 1 | ||||
|
r1810 | |||
|
r1808 | # create a changegroup for all the branches we need to keep | ||
|
r2797 | if backup == "all": | ||
|
r1808 | backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | ||
bundle(backupch) | ||||
if saveheads: | ||||
backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | ||||
chgrpfile = bundle(backupch) | ||||
stripall(rev, revnum) | ||||
change = chlog.read(rev) | ||||
|
r3075 | chlog.strip(revnum, revnum) | ||
|
r1808 | repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | ||
if saveheads: | ||||
self.ui.status("adding branch\n") | ||||
|
r4008 | commands.unbundle(self.ui, repo, "file:%s" % chgrpfile, | ||
update=False) | ||||
|
r2797 | if backup != "strip": | ||
|
r1808 | os.unlink(chgrpfile) | ||
|
r1810 | |||
|
r1808 | def isapplied(self, patch): | ||
"""returns (index, rev, patch)""" | ||||
for i in xrange(len(self.applied)): | ||||
|
r2780 | a = self.applied[i] | ||
if a.name == patch: | ||||
return (i, a.rev, a.name) | ||||
|
r1808 | return None | ||
|
r3223 | # if the exact patch name does not exist, we try a few | ||
|
r2696 | # variations. If strict is passed, we try only #1 | ||
# | ||||
# 1) a number to indicate an offset in the series file | ||||
# 2) a unique substring of the patch name was given | ||||
# 3) patchname[-+]num to indicate an offset in the series file | ||||
def lookup(self, patch, strict=False): | ||||
|
r2844 | patch = patch and str(patch) | ||
|
r2696 | def partial_name(s): | ||
if s in self.series: | ||||
return s | ||||
|
r2765 | matches = [x for x in self.series if s in x] | ||
if len(matches) > 1: | ||||
self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) | ||||
for m in matches: | ||||
self.ui.warn(' %s\n' % m) | ||||
return None | ||||
if matches: | ||||
return matches[0] | ||||
|
r2696 | if len(self.series) > 0 and len(self.applied) > 0: | ||
if s == 'qtip': | ||||
|
r3874 | return self.series[self.series_end(True)-1] | ||
|
r2696 | if s == 'qbase': | ||
return self.series[0] | ||||
return None | ||||
|
r1808 | if patch == None: | ||
return None | ||||
|
r2696 | |||
# we don't want to return a partial match until we make | ||||
# sure the file name passed in does not exist (checked below) | ||||
res = partial_name(patch) | ||||
if res and res == patch: | ||||
return res | ||||
|
r2819 | if not os.path.isfile(self.join(patch)): | ||
|
r1808 | try: | ||
sno = int(patch) | ||||
except(ValueError, OverflowError): | ||||
|
r2696 | pass | ||
else: | ||||
if sno < len(self.series): | ||||
|
r2821 | return self.series[sno] | ||
|
r2696 | if not strict: | ||
# return any partial match made above | ||||
if res: | ||||
return res | ||||
|
r3082 | minus = patch.rfind('-') | ||
if minus >= 0: | ||||
res = partial_name(patch[:minus]) | ||||
|
r2696 | if res: | ||
i = self.series.index(res) | ||||
try: | ||||
|
r3082 | off = int(patch[minus+1:] or 1) | ||
|
r2696 | except(ValueError, OverflowError): | ||
pass | ||||
else: | ||||
if i - off >= 0: | ||||
return self.series[i - off] | ||||
|
r3082 | plus = patch.rfind('+') | ||
if plus >= 0: | ||||
res = partial_name(patch[:plus]) | ||||
|
r2696 | if res: | ||
i = self.series.index(res) | ||||
try: | ||||
|
r3082 | off = int(patch[plus+1:] or 1) | ||
|
r2696 | except(ValueError, OverflowError): | ||
pass | ||||
else: | ||||
if i + off < len(self.series): | ||||
return self.series[i + off] | ||||
|
r2712 | raise util.Abort(_("patch %s not in series") % patch) | ||
|
r1808 | |||
|
r1810 | def push(self, repo, patch=None, force=False, list=False, | ||
|
r1808 | mergeq=None, wlock=None): | ||
if not wlock: | ||||
wlock = repo.wlock() | ||||
|
r1810 | patch = self.lookup(patch) | ||
|
r1808 | if patch and self.isapplied(patch): | ||
|
r3186 | raise util.Abort(_("patch %s is already applied") % patch) | ||
|
r1808 | if self.series_end() == len(self.series): | ||
|
r3186 | raise util.Abort(_("patch series fully applied")) | ||
|
r1808 | if not force: | ||
self.check_localchanges(repo) | ||||
|
r1810 | |||
|
r1808 | self.applied_dirty = 1; | ||
start = self.series_end() | ||||
if start > 0: | ||||
self.check_toppatch(repo) | ||||
if not patch: | ||||
patch = self.series[start] | ||||
end = start + 1 | ||||
else: | ||||
end = self.series.index(patch, start) + 1 | ||||
s = self.series[start:end] | ||||
if mergeq: | ||||
ret = self.mergepatch(repo, mergeq, s, wlock) | ||||
else: | ||||
ret = self.apply(repo, s, list, wlock=wlock) | ||||
|
r2780 | top = self.applied[-1].name | ||
|
r1808 | if ret[0]: | ||
|
r1810 | self.ui.write("Errors during apply, please fix and refresh %s\n" % | ||
|
r1808 | top) | ||
else: | ||||
self.ui.write("Now at: %s\n" % top) | ||||
return ret[0] | ||||
|
r2697 | def pop(self, repo, patch=None, force=False, update=True, all=False, | ||
wlock=None): | ||||
|
r1808 | def getfile(f, rev): | ||
t = repo.file(f).read(rev) | ||||
try: | ||||
repo.wfile(f, "w").write(t) | ||||
except IOError: | ||||
|
r2086 | try: | ||
os.makedirs(os.path.dirname(repo.wjoin(f))) | ||||
except OSError, err: | ||||
if err.errno != errno.EEXIST: raise | ||||
|
r1808 | repo.wfile(f, "w").write(t) | ||
if not wlock: | ||||
wlock = repo.wlock() | ||||
if patch: | ||||
# index, rev, patch | ||||
info = self.isapplied(patch) | ||||
if not info: | ||||
patch = self.lookup(patch) | ||||
info = self.isapplied(patch) | ||||
if not info: | ||||
|
r2712 | raise util.Abort(_("patch %s is not applied") % patch) | ||
|
r1808 | if len(self.applied) == 0: | ||
|
r3186 | raise util.Abort(_("no patches applied")) | ||
|
r1808 | |||
if not update: | ||||
parents = repo.dirstate.parents() | ||||
|
r2780 | rr = [ revlog.bin(x.rev) for x in self.applied ] | ||
|
r1808 | for p in parents: | ||
if p in rr: | ||||
self.ui.warn("qpop: forcing dirstate update\n") | ||||
update = True | ||||
if not force and update: | ||||
self.check_localchanges(repo) | ||||
self.applied_dirty = 1; | ||||
end = len(self.applied) | ||||
if not patch: | ||||
|
r2697 | if all: | ||
popi = 0 | ||||
else: | ||||
popi = len(self.applied) - 1 | ||||
else: | ||||
popi = info[0] + 1 | ||||
if popi >= end: | ||||
self.ui.warn("qpop: %s is already at the top\n" % patch) | ||||
return | ||||
|
r2780 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] | ||
|
r2697 | |||
|
r1808 | start = info[0] | ||
rev = revlog.bin(info[1]) | ||||
# we know there are no local changes, so we can make a simplified | ||||
# form of hg.update. | ||||
if update: | ||||
top = self.check_toppatch(repo) | ||||
qp = self.qparents(repo, rev) | ||||
changes = repo.changelog.read(qp) | ||||
mmap = repo.manifest.read(changes[0]) | ||||
|
r2875 | m, a, r, d, u = repo.status(qp, top)[:5] | ||
|
r1808 | if d: | ||
raise util.Abort("deletions found between repo revs") | ||||
|
r2875 | for f in m: | ||
|
r1808 | getfile(f, mmap[f]) | ||
for f in r: | ||||
getfile(f, mmap[f]) | ||||
|
r2872 | util.set_exec(repo.wjoin(f), mmap.execf(f)) | ||
|
r2875 | repo.dirstate.update(m + r, 'n') | ||
|
r1808 | for f in a: | ||
|
r3699 | try: | ||
os.unlink(repo.wjoin(f)) | ||||
except OSError, e: | ||||
if e.errno != errno.ENOENT: | ||||
raise | ||||
|
r1808 | try: os.removedirs(os.path.dirname(repo.wjoin(f))) | ||
except: pass | ||||
if a: | ||||
repo.dirstate.forget(a) | ||||
repo.dirstate.setparents(qp, revlog.nullid) | ||||
self.strip(repo, rev, update=False, backup='strip', wlock=wlock) | ||||
del self.applied[start:end] | ||||
if len(self.applied): | ||||
|
r2780 | self.ui.write("Now at: %s\n" % self.applied[-1].name) | ||
|
r1808 | else: | ||
self.ui.write("Patch queue now empty\n") | ||||
|
r2937 | def diff(self, repo, pats, opts): | ||
|
r1808 | top = self.check_toppatch(repo) | ||
if not top: | ||||
self.ui.write("No patches applied\n") | ||||
return | ||||
qp = self.qparents(repo, top) | ||||
|
r3697 | if opts.get('git'): | ||
self.diffopts().git = True | ||||
|
r2937 | self.printdiff(repo, qp, files=pats, opts=opts) | ||
|
r1808 | |||
|
r2938 | def refresh(self, repo, pats=None, **opts): | ||
|
r1808 | if len(self.applied) == 0: | ||
self.ui.write("No patches applied\n") | ||||
|
r3004 | return 1 | ||
|
r1808 | wlock = repo.wlock() | ||
self.check_toppatch(repo) | ||||
|
r3027 | (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) | ||
|
r1808 | top = revlog.bin(top) | ||
cparents = repo.changelog.parents(top) | ||||
patchparent = self.qparents(repo, top) | ||||
|
r3027 | message, comments, user, date, patchfound = self.readheaders(patchfn) | ||
|
r1808 | |||
|
r3027 | patchf = self.opener(patchfn, "w") | ||
|
r2938 | msg = opts.get('msg', '').rstrip() | ||
|
r2745 | if msg: | ||
if comments: | ||||
# Remove existing message. | ||||
ci = 0 | ||||
|
r3473 | for mi in xrange(len(message)): | ||
|
r2745 | while message[mi] != comments[ci]: | ||
ci += 1 | ||||
del comments[ci] | ||||
comments.append(msg) | ||||
|
r1808 | if comments: | ||
comments = "\n".join(comments) + '\n\n' | ||||
patchf.write(comments) | ||||
|
r3698 | if opts.get('git'): | ||
self.diffopts().git = True | ||||
|
r2938 | fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | ||
|
r1808 | tip = repo.changelog.tip() | ||
if top == tip: | ||||
|
r1810 | # if the top of our patch queue is also the tip, there is an | ||
|
r1808 | # optimization here. We update the dirstate in place and strip | ||
# off the tip commit. Then just commit the current directory | ||||
# tree. We can also send repo.commit the list of files | ||||
# changed to speed up the diff | ||||
# | ||||
|
r1810 | # in short mode, we only diff the files included in the | ||
|
r1808 | # patch already | ||
# | ||||
# this should really read: | ||||
|
r2875 | # mm, dd, aa, aa2, uu = repo.status(tip, patchparent)[:5] | ||
|
r1808 | # but we do it backwards to take advantage of manifest/chlog | ||
|
r2875 | # caching against the next repo.status call | ||
|
r1810 | # | ||
|
r2875 | mm, aa, dd, aa2, uu = repo.status(patchparent, tip)[:5] | ||
|
r3700 | changes = repo.changelog.read(tip) | ||
man = repo.manifest.read(changes[0]) | ||||
aaa = aa[:] | ||||
|
r2938 | if opts.get('short'): | ||
|
r2875 | filelist = mm + aa + dd | ||
|
r1808 | else: | ||
filelist = None | ||||
|
r2875 | m, a, r, d, u = repo.status(files=filelist)[:5] | ||
|
r1808 | |||
# we might end up with files that were added between tip and | ||||
# the dirstate parent, but then changed in the local dirstate. | ||||
# in this case, we want them to only show up in the added section | ||||
|
r2875 | for x in m: | ||
|
r1808 | if x not in aa: | ||
|
r2875 | mm.append(x) | ||
|
r1808 | # we might end up with files added by the local dirstate that | ||
# were deleted by the patch. In this case, they should only | ||||
# show up in the changed section. | ||||
for x in a: | ||||
if x in dd: | ||||
del dd[dd.index(x)] | ||||
|
r2875 | mm.append(x) | ||
|
r1808 | else: | ||
aa.append(x) | ||||
# make sure any files deleted in the local dirstate | ||||
# are not in the add or change column of the patch | ||||
forget = [] | ||||
for x in d + r: | ||||
if x in aa: | ||||
del aa[aa.index(x)] | ||||
forget.append(x) | ||||
continue | ||||
|
r2875 | elif x in mm: | ||
del mm[mm.index(x)] | ||||
|
r1808 | dd.append(x) | ||
|
r3535 | m = util.unique(mm) | ||
r = util.unique(dd) | ||||
a = util.unique(aa) | ||||
|
r2938 | filelist = filter(matchfn, util.unique(m + r + a)) | ||
|
r3027 | patch.diff(repo, patchparent, files=filelist, match=matchfn, | ||
fp=patchf, changes=(m, a, r, [], u), | ||||
opts=self.diffopts()) | ||||
|
r1808 | patchf.close() | ||
repo.dirstate.setparents(*cparents) | ||||
|
r3700 | copies = {} | ||
for dst in a: | ||||
src = repo.dirstate.copied(dst) | ||||
if src is None: | ||||
continue | ||||
copies.setdefault(src, []).append(dst) | ||||
|
r1808 | repo.dirstate.update(a, 'a') | ||
|
r3700 | # remember the copies between patchparent and tip | ||
# this may be slow, so don't do it if we're not tracking copies | ||||
if self.diffopts().git: | ||||
for dst in aaa: | ||||
f = repo.file(dst) | ||||
src = f.renamed(man[dst]) | ||||
if src: | ||||
copies[src[0]] = copies.get(dst, []) | ||||
if dst in a: | ||||
copies[src[0]].append(dst) | ||||
# we can't copy a file created by the patch itself | ||||
if dst in copies: | ||||
del copies[dst] | ||||
for src, dsts in copies.iteritems(): | ||||
for dst in dsts: | ||||
repo.dirstate.copy(src, dst) | ||||
|
r1808 | repo.dirstate.update(r, 'r') | ||
|
r2938 | # if the patch excludes a modified file, mark that file with mtime=0 | ||
# so status can see it. | ||||
mm = [] | ||||
|
r3473 | for i in xrange(len(m)-1, -1, -1): | ||
|
r2938 | if not matchfn(m[i]): | ||
mm.append(m[i]) | ||||
del m[i] | ||||
|
r2875 | repo.dirstate.update(m, 'n') | ||
|
r2938 | repo.dirstate.update(mm, 'n', st_mtime=0) | ||
|
r1808 | repo.dirstate.forget(forget) | ||
|
r2694 | if not msg: | ||
if not message: | ||||
|
r3027 | message = "patch queue: %s\n" % patchfn | ||
|
r2694 | else: | ||
message = "\n".join(message) | ||||
|
r1808 | else: | ||
|
r2694 | message = msg | ||
|
r1808 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) | ||
n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | ||||
|
r3027 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) | ||
|
r1808 | self.applied_dirty = 1 | ||
else: | ||||
|
r2874 | self.printdiff(repo, patchparent, fp=patchf) | ||
|
r1808 | patchf.close() | ||
|
r3699 | added = repo.status()[1] | ||
for a in added: | ||||
f = repo.wjoin(a) | ||||
try: | ||||
os.unlink(f) | ||||
except OSError, e: | ||||
if e.errno != errno.ENOENT: | ||||
raise | ||||
try: os.removedirs(os.path.dirname(f)) | ||||
except: pass | ||||
# forget the file copies in the dirstate | ||||
# push should readd the files later on | ||||
repo.dirstate.forget(added) | ||||
|
r1808 | self.pop(repo, force=True, wlock=wlock) | ||
self.push(repo, force=True, wlock=wlock) | ||||
def init(self, repo, create=False): | ||||
if os.path.isdir(self.path): | ||||
|
r2712 | raise util.Abort(_("patch queue directory already exists")) | ||
|
r1808 | os.mkdir(self.path) | ||
if create: | ||||
return self.qrepo(create=True) | ||||
def unapplied(self, repo, patch=None): | ||||
if patch and patch not in self.series: | ||||
|
r2712 | raise util.Abort(_("patch %s is not in series file") % patch) | ||
|
r1808 | if not patch: | ||
start = self.series_end() | ||||
else: | ||||
start = self.series.index(patch) + 1 | ||||
|
r2821 | unapplied = [] | ||
for i in xrange(start, len(self.series)): | ||||
pushable, reason = self.pushable(i) | ||||
if pushable: | ||||
unapplied.append((i, self.series[i])) | ||||
self.explain_pushable(i) | ||||
return unapplied | ||||
|
r1810 | |||
|
r3183 | def qseries(self, repo, missing=None, start=0, length=0, status=None, | ||
summary=False): | ||||
def displayname(patchname): | ||||
if summary: | ||||
msg = self.readheaders(patchname)[0] | ||||
msg = msg and ': ' + msg[0] or ': ' | ||||
else: | ||||
msg = '' | ||||
return '%s%s' % (patchname, msg) | ||||
def pname(i): | ||||
if status == 'A': | ||||
return self.applied[i].name | ||||
else: | ||||
return self.series[i] | ||||
|
r3763 | applied = dict.fromkeys([p.name for p in self.applied]) | ||
|
r3183 | if not length: | ||
length = len(self.series) - start | ||||
|
r1808 | if not missing: | ||
|
r3473 | for i in xrange(start, start+length): | ||
|
r3183 | pfx = '' | ||
|
r3763 | patch = pname(i) | ||
|
r1808 | if self.ui.verbose: | ||
|
r3763 | if patch in applied: | ||
stat = 'A' | ||||
|
r2821 | elif self.pushable(i)[0]: | ||
|
r3763 | stat = 'U' | ||
|
r2756 | else: | ||
|
r3763 | stat = 'G' | ||
pfx = '%d %s ' % (i, stat) | ||||
|
r3183 | self.ui.write('%s%s\n' % (pfx, displayname(patch))) | ||
|
r1808 | else: | ||
|
r2794 | msng_list = [] | ||
|
r1808 | for root, dirs, files in os.walk(self.path): | ||
d = root[len(self.path) + 1:] | ||||
for f in files: | ||||
fl = os.path.join(d, f) | ||||
|
r1852 | if (fl not in self.series and | ||
fl not in (self.status_path, self.series_path) | ||||
and not fl.startswith('.')): | ||||
|
r2794 | msng_list.append(fl) | ||
msng_list.sort() | ||||
|
r2795 | for x in msng_list: | ||
|
r3183 | pfx = self.ui.verbose and ('D ') or '' | ||
self.ui.write("%s%s\n" % (pfx, displayname(x))) | ||||
|
r1808 | |||
def issaveline(self, l): | ||||
|
r2816 | if l.name == '.hg.patches.save.line': | ||
|
r1808 | return True | ||
def qrepo(self, create=False): | ||||
|
r2819 | if create or os.path.isdir(self.join(".hg")): | ||
|
r1839 | return hg.repository(self.ui, path=self.path, create=create) | ||
|
r1808 | |||
def restore(self, repo, rev, delete=None, qupdate=None): | ||||
c = repo.changelog.read(rev) | ||||
desc = c[4].strip() | ||||
lines = desc.splitlines() | ||||
i = 0 | ||||
datastart = None | ||||
series = [] | ||||
applied = [] | ||||
qpp = None | ||||
for i in xrange(0, len(lines)): | ||||
if lines[i] == 'Patch Data:': | ||||
datastart = i + 1 | ||||
elif lines[i].startswith('Dirstate:'): | ||||
l = lines[i].rstrip() | ||||
l = l[10:].split(' ') | ||||
qpp = [ hg.bin(x) for x in l ] | ||||
elif datastart != None: | ||||
l = lines[i].rstrip() | ||||
|
r2818 | se = statusentry(l) | ||
|
r2794 | file_ = se.name | ||
if se.rev: | ||||
|
r2780 | applied.append(se) | ||
|
r3185 | else: | ||
series.append(file_) | ||||
|
r1808 | if datastart == None: | ||
self.ui.warn("No saved patch data found\n") | ||||
return 1 | ||||
self.ui.warn("restoring status: %s\n" % lines[0]) | ||||
self.full_series = series | ||||
self.applied = applied | ||||
|
r2767 | self.parse_series() | ||
|
r1808 | self.series_dirty = 1 | ||
self.applied_dirty = 1 | ||||
heads = repo.changelog.heads() | ||||
if delete: | ||||
if rev not in heads: | ||||
self.ui.warn("save entry has children, leaving it alone\n") | ||||
else: | ||||
self.ui.warn("removing save entry %s\n" % hg.short(rev)) | ||||
pp = repo.dirstate.parents() | ||||
if rev in pp: | ||||
update = True | ||||
else: | ||||
update = False | ||||
self.strip(repo, rev, update=update, backup='strip') | ||||
if qpp: | ||||
|
r1810 | self.ui.warn("saved queue repository parents: %s %s\n" % | ||
|
r1808 | (hg.short(qpp[0]), hg.short(qpp[1]))) | ||
if qupdate: | ||||
print "queue directory updating" | ||||
r = self.qrepo() | ||||
if not r: | ||||
self.ui.warn("Unable to load queue repository\n") | ||||
return 1 | ||||
|
r2808 | hg.clean(r, qpp[0]) | ||
|
r1808 | |||
def save(self, repo, msg=None): | ||||
if len(self.applied) == 0: | ||||
self.ui.warn("save: no patches applied, exiting\n") | ||||
return 1 | ||||
if self.issaveline(self.applied[-1]): | ||||
self.ui.warn("status is already saved\n") | ||||
return 1 | ||||
|
r1810 | |||
|
r1808 | ar = [ ':' + x for x in self.full_series ] | ||
if not msg: | ||||
msg = "hg patches saved state" | ||||
else: | ||||
msg = "hg patches: " + msg.rstrip('\r\n') | ||||
r = self.qrepo() | ||||
if r: | ||||
pp = r.dirstate.parents() | ||||
msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | ||||
msg += "\n\nPatch Data:\n" | ||||
|
r2816 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and | ||
"\n".join(ar) + '\n' or "") | ||||
|
r1808 | n = repo.commit(None, text, user=None, force=1) | ||
if not n: | ||||
self.ui.warn("repo commit failed\n") | ||||
return 1 | ||||
|
r2818 | self.applied.append(statusentry(revlog.hex(n),'.hg.patches.save.line')) | ||
|
r1808 | self.applied_dirty = 1 | ||
|
r2698 | def full_series_end(self): | ||
if len(self.applied) > 0: | ||||
|
r2780 | p = self.applied[-1].name | ||
|
r2698 | end = self.find_series(p) | ||
if end == None: | ||||
return len(self.full_series) | ||||
return end + 1 | ||||
return 0 | ||||
|
r2821 | def series_end(self, all_patches=False): | ||
|
r1808 | end = 0 | ||
|
r2821 | def next(start): | ||
if all_patches: | ||||
return start | ||||
i = start | ||||
while i < len(self.series): | ||||
p, reason = self.pushable(i) | ||||
if p: | ||||
break | ||||
self.explain_pushable(i) | ||||
i += 1 | ||||
return i | ||||
|
r1808 | if len(self.applied) > 0: | ||
|
r2780 | p = self.applied[-1].name | ||
|
r1808 | try: | ||
end = self.series.index(p) | ||||
except ValueError: | ||||
return 0 | ||||
|
r2821 | return next(end + 1) | ||
return next(end) | ||||
|
r1808 | |||
def appliedname(self, index): | ||||
|
r2780 | pname = self.applied[index].name | ||
|
r1808 | if not self.ui.verbose: | ||
|
r2677 | p = pname | ||
else: | ||||
|
r2941 | p = str(self.series.index(pname)) + " " + pname | ||
|
r1808 | return p | ||
|
r1810 | |||
|
r3141 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, | ||
|
r3691 | force=None, git=False): | ||
|
r3141 | def checkseries(patchname): | ||
if patchname in self.series: | ||||
raise util.Abort(_('patch %s is already in the series file') | ||||
% patchname) | ||||
def checkfile(patchname): | ||||
if not force and os.path.exists(self.join(patchname)): | ||||
raise util.Abort(_('patch "%s" already exists') | ||||
% patchname) | ||||
if rev: | ||||
if files: | ||||
raise util.Abort(_('option "-r" not valid when importing ' | ||||
'files')) | ||||
|
r3707 | rev = cmdutil.revrange(repo, rev) | ||
|
r3141 | rev.sort(lambda x, y: cmp(y, x)) | ||
if (len(files) > 1 or len(rev) > 1) and patchname: | ||||
|
r2712 | raise util.Abort(_('option "-n" not valid when importing multiple ' | ||
|
r3141 | 'patches')) | ||
|
r1808 | i = 0 | ||
|
r2488 | added = [] | ||
|
r3141 | if rev: | ||
# If mq patches are applied, we can only import revisions | ||||
# that form a linear path to qbase. | ||||
# Otherwise, they should form a linear path to a head. | ||||
heads = repo.changelog.heads(repo.changelog.node(rev[-1])) | ||||
if len(heads) > 1: | ||||
raise util.Abort(_('revision %d is the root of more than one ' | ||||
'branch') % rev[-1]) | ||||
if self.applied: | ||||
base = revlog.hex(repo.changelog.node(rev[0])) | ||||
if base in [n.rev for n in self.applied]: | ||||
raise util.Abort(_('revision %d is already managed') | ||||
% rev[0]) | ||||
if heads != [revlog.bin(self.applied[-1].rev)]: | ||||
raise util.Abort(_('revision %d is not the parent of ' | ||||
'the queue') % rev[0]) | ||||
base = repo.changelog.rev(revlog.bin(self.applied[0].rev)) | ||||
lastparent = repo.changelog.parentrevs(base)[0] | ||||
else: | ||||
if heads != [repo.changelog.node(rev[0])]: | ||||
raise util.Abort(_('revision %d has unmanaged children') | ||||
% rev[0]) | ||||
lastparent = None | ||||
|
r3691 | if git: | ||
self.diffopts().git = True | ||||
|
r3141 | for r in rev: | ||
p1, p2 = repo.changelog.parentrevs(r) | ||||
n = repo.changelog.node(r) | ||||
|
r3578 | if p2 != revlog.nullrev: | ||
|
r3141 | raise util.Abort(_('cannot import merge revision %d') % r) | ||
if lastparent and lastparent != r: | ||||
raise util.Abort(_('revision %d is not the parent of %d') | ||||
% (r, lastparent)) | ||||
lastparent = p1 | ||||
if not patchname: | ||||
patchname = '%d.diff' % r | ||||
checkseries(patchname) | ||||
checkfile(patchname) | ||||
self.full_series.insert(0, patchname) | ||||
patchf = self.opener(patchname, "w") | ||||
patch.export(repo, [n], fp=patchf, opts=self.diffopts()) | ||||
patchf.close() | ||||
se = statusentry(revlog.hex(n), patchname) | ||||
self.applied.insert(0, se) | ||||
added.append(patchname) | ||||
patchname = None | ||||
self.parse_series() | ||||
self.applied_dirty = 1 | ||||
|
r1808 | for filename in files: | ||
if existing: | ||||
|
r3547 | if filename == '-': | ||
raise util.Abort(_('-e is incompatible with import from -')) | ||||
|
r3133 | if not patchname: | ||
patchname = filename | ||||
if not os.path.isfile(self.join(patchname)): | ||||
raise util.Abort(_("patch %s does not exist") % patchname) | ||||
|
r1808 | else: | ||
try: | ||||
|
r3547 | if filename == '-': | ||
if not patchname: | ||||
raise util.Abort(_('need --name to import a patch from -')) | ||||
text = sys.stdin.read() | ||||
else: | ||||
text = file(filename).read() | ||||
|
r1808 | except IOError: | ||
|
r3133 | raise util.Abort(_("unable to read %s") % patchname) | ||
if not patchname: | ||||
patchname = os.path.basename(filename) | ||||
|
r3141 | checkfile(patchname) | ||
|
r3133 | patchf = self.opener(patchname, "w") | ||
|
r1808 | patchf.write(text) | ||
|
r3141 | checkseries(patchname) | ||
|
r2698 | index = self.full_series_end() + i | ||
|
r3133 | self.full_series[index:index] = [patchname] | ||
|
r2767 | self.parse_series() | ||
|
r3133 | self.ui.warn("adding %s to series file\n" % patchname) | ||
|
r1808 | i += 1 | ||
|
r3133 | added.append(patchname) | ||
patchname = None | ||||
|
r1808 | self.series_dirty = 1 | ||
|
r2488 | qrepo = self.qrepo() | ||
if qrepo: | ||||
qrepo.add(added) | ||||
|
r1808 | |||
|
r3373 | def delete(ui, repo, *patches, **opts): | ||
|
r2905 | """remove patches from queue | ||
|
r2752 | |||
|
r3373 | With --rev, mq will stop managing the named revisions. The | ||
|
r3088 | patches must be applied and at the base of the stack. This option | ||
is useful when the patches have been applied upstream. | ||||
Otherwise, the patches must not be applied. | ||||
With --keep, the patch files are preserved in the patch directory.""" | ||||
|
r2724 | q = repo.mq | ||
|
r3373 | q.delete(repo, patches, opts) | ||
|
r1808 | q.save_dirty() | ||
return 0 | ||||
def applied(ui, repo, patch=None, **opts): | ||||
"""print the patches already applied""" | ||||
|
r3183 | q = repo.mq | ||
if patch: | ||||
if patch not in q.series: | ||||
raise util.Abort(_("patch %s is not in series file") % patch) | ||||
end = q.series.index(patch) + 1 | ||||
else: | ||||
end = len(q.applied) | ||||
|
r3186 | if not end: | ||
return | ||||
|
r3183 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) | ||
|
r1808 | |||
def unapplied(ui, repo, patch=None, **opts): | ||||
"""print the patches not yet applied""" | ||||
|
r3183 | q = repo.mq | ||
if patch: | ||||
if patch not in q.series: | ||||
raise util.Abort(_("patch %s is not in series file") % patch) | ||||
start = q.series.index(patch) + 1 | ||||
else: | ||||
start = q.series_end() | ||||
q.qseries(repo, start=start, summary=opts.get('summary')) | ||||
|
r1808 | |||
def qimport(ui, repo, *filename, **opts): | ||||
|
r3141 | """import a patch | ||
The patch will have the same name as its source file unless you | ||||
give it a new one with --name. | ||||
You can register an existing patch inside the patch directory | ||||
with the --existing flag. | ||||
With --force, an existing patch of the same name will be overwritten. | ||||
An existing changeset may be placed under mq control with --rev | ||||
(e.g. qimport --rev tip -n patch will place tip under mq control). | ||||
|
r3691 | With --git, patches imported with --rev will use the git diff | ||
format. | ||||
|
r3141 | """ | ||
|
r2724 | q = repo.mq | ||
|
r3133 | q.qimport(repo, filename, patchname=opts['name'], | ||
|
r3691 | existing=opts['existing'], force=opts['force'], rev=opts['rev'], | ||
git=opts['git']) | ||||
|
r1808 | q.save_dirty() | ||
return 0 | ||||
def init(ui, repo, **opts): | ||||
|
r2754 | """init a new queue repository | ||
The queue repository is unversioned by default. If -c is | ||||
specified, qinit will create a separate nested repository | ||||
for patches. Use qcommit to commit changes to this queue | ||||
repository.""" | ||||
|
r2724 | q = repo.mq | ||
|
r1808 | r = q.init(repo, create=opts['create_repo']) | ||
q.save_dirty() | ||||
if r: | ||||
fp = r.wopener('.hgignore', 'w') | ||||
print >> fp, 'syntax: glob' | ||||
print >> fp, 'status' | ||||
|
r3871 | print >> fp, 'guards' | ||
|
r1808 | fp.close() | ||
r.wopener('series', 'w').close() | ||||
r.add(['.hgignore', 'series']) | ||||
return 0 | ||||
|
r2720 | def clone(ui, source, dest=None, **opts): | ||
'''clone main and patch repository at same time | ||||
If source is local, destination will have no patches applied. If | ||||
source is remote, this command can not check if patches are | ||||
applied in source, so cannot guarantee that patches are not | ||||
applied in destination. If you clone remote repository, be sure | ||||
before that it has no patches applied. | ||||
Source patch repository is looked for in <src>/.hg/patches by | ||||
default. Use -p <url> to change. | ||||
''' | ||||
|
r2766 | commands.setremoteconfig(ui, opts) | ||
|
r2720 | if dest is None: | ||
dest = hg.defaultdest(source) | ||||
sr = hg.repository(ui, ui.expandpath(source)) | ||||
qbase, destrev = None, None | ||||
if sr.local(): | ||||
|
r2725 | if sr.mq.applied: | ||
|
r2780 | qbase = revlog.bin(sr.mq.applied[0].rev) | ||
|
r2720 | if not hg.islocal(dest): | ||
destrev = sr.parents(qbase)[0] | ||||
ui.note(_('cloning main repo\n')) | ||||
sr, dr = hg.clone(ui, sr, dest, | ||||
pull=opts['pull'], | ||||
rev=destrev, | ||||
update=False, | ||||
stream=opts['uncompressed']) | ||||
ui.note(_('cloning patch repo\n')) | ||||
spr, dpr = hg.clone(ui, opts['patches'] or (sr.url() + '/.hg/patches'), | ||||
dr.url() + '/.hg/patches', | ||||
pull=opts['pull'], | ||||
update=not opts['noupdate'], | ||||
stream=opts['uncompressed']) | ||||
if dr.local(): | ||||
if qbase: | ||||
ui.note(_('stripping applied patches from destination repo\n')) | ||||
|
r2725 | dr.mq.strip(dr, qbase, update=False, backup=None) | ||
|
r2720 | if not opts['noupdate']: | ||
ui.note(_('updating destination repo\n')) | ||||
|
r2775 | hg.update(dr, dr.changelog.tip()) | ||
|
r2720 | |||
|
r1808 | def commit(ui, repo, *pats, **opts): | ||
|
r2526 | """commit changes in the queue repository""" | ||
|
r2724 | q = repo.mq | ||
|
r1808 | r = q.qrepo() | ||
if not r: raise util.Abort('no queue repository') | ||||
commands.commit(r.ui, r, *pats, **opts) | ||||
def series(ui, repo, **opts): | ||||
"""print the entire series file""" | ||||
|
r2756 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) | ||
|
r1808 | return 0 | ||
def top(ui, repo, **opts): | ||||
"""print the name of the current patch""" | ||||
|
r3183 | q = repo.mq | ||
t = len(q.applied) | ||||
if t: | ||||
return q.qseries(repo, start=t-1, length=1, status='A', | ||||
summary=opts.get('summary')) | ||||
else: | ||||
ui.write("No patches applied\n") | ||||
return 1 | ||||
|
r1808 | |||
def next(ui, repo, **opts): | ||||
"""print the name of the next patch""" | ||||
|
r3183 | q = repo.mq | ||
end = q.series_end() | ||||
if end == len(q.series): | ||||
ui.write("All patches applied\n") | ||||
return 1 | ||||
return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | ||||
|
r1808 | |||
def prev(ui, repo, **opts): | ||||
"""print the name of the previous patch""" | ||||
|
r3183 | q = repo.mq | ||
l = len(q.applied) | ||||
if l == 1: | ||||
ui.write("Only one patch applied\n") | ||||
return 1 | ||||
if not l: | ||||
ui.write("No patches applied\n") | ||||
return 1 | ||||
return q.qseries(repo, start=l-2, length=1, status='A', | ||||
summary=opts.get('summary')) | ||||
|
r1808 | |||
def new(ui, repo, patch, **opts): | ||||
|
r2754 | """create a new patch | ||
qnew creates a new patch on top of the currently-applied patch | ||||
(if any). It will refuse to run if there are any outstanding | ||||
changes unless -f is specified, in which case the patch will | ||||
be initialised with them. | ||||
|
r2939 | -e, -m or -l set the patch header as well as the commit message. | ||
If none is specified, the patch header is empty and the | ||||
|
r2770 | commit message is 'New patch: PATCH'""" | ||
|
r2724 | q = repo.mq | ||
|
r2804 | message = commands.logmessage(opts) | ||
|
r2939 | if opts['edit']: | ||
message = ui.edit(message, ui.username()) | ||||
|
r2694 | q.new(repo, patch, msg=message, force=opts['force']) | ||
|
r1808 | q.save_dirty() | ||
return 0 | ||||
|
r2938 | def refresh(ui, repo, *pats, **opts): | ||
|
r2940 | """update the current patch | ||
If any file patterns are provided, the refreshed patch will contain only | ||||
the modifications that match those patterns; the remaining modifications | ||||
will remain in the working directory. | ||||
""" | ||||
|
r2724 | q = repo.mq | ||
|
r2804 | message = commands.logmessage(opts) | ||
|
r2746 | if opts['edit']: | ||
if message: | ||||
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | ||||
|
r2780 | patch = q.applied[-1].name | ||
|
r2746 | (message, comment, user, date, hasdiff) = q.readheaders(patch) | ||
message = ui.edit('\n'.join(message), user or ui.username()) | ||||
|
r3004 | ret = q.refresh(repo, pats, msg=message, **opts) | ||
|
r1808 | q.save_dirty() | ||
|
r3004 | return ret | ||
|
r1808 | |||
|
r2937 | def diff(ui, repo, *pats, **opts): | ||
|
r1808 | """diff of the current patch""" | ||
|
r2937 | repo.mq.diff(repo, pats, opts) | ||
|
r1808 | return 0 | ||
|
r2753 | def fold(ui, repo, *files, **opts): | ||
|
r2748 | """fold the named patches into the current patch | ||
|
r2753 | |||
|
r2771 | Patches must not yet be applied. Each patch will be successively | ||
applied to the current patch in the order given. If all the | ||||
patches apply successfully, the current patch will be refreshed | ||||
with the new cumulative patch, and the folded patches will | ||||
|
r2904 | be deleted. With -k/--keep, the folded patch files will not | ||
|
r2771 | be removed afterwards. | ||
|
r2753 | The header for each folded patch will be concatenated with | ||
the current patch header, separated by a line of '* * *'.""" | ||||
|
r2748 | q = repo.mq | ||
if not files: | ||||
raise util.Abort(_('qfold requires at least one patch name')) | ||||
if not q.check_toppatch(repo): | ||||
|
r3072 | raise util.Abort(_('No patches applied')) | ||
|
r2748 | |||
|
r2804 | message = commands.logmessage(opts) | ||
|
r2753 | if opts['edit']: | ||
if message: | ||||
raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | ||||
|
r2748 | parent = q.lookup('qtip') | ||
patches = [] | ||||
messages = [] | ||||
for f in files: | ||||
|
r2936 | p = q.lookup(f) | ||
if p in patches or p == parent: | ||||
ui.warn(_('Skipping already folded patch %s') % p) | ||||
if q.isapplied(p): | ||||
raise util.Abort(_('qfold cannot fold already applied patch %s') % p) | ||||
patches.append(p) | ||||
|
r2748 | |||
|
r2936 | for p in patches: | ||
|
r2753 | if not message: | ||
|
r2936 | messages.append(q.readheaders(p)[0]) | ||
pf = q.join(p) | ||||
|
r2748 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | ||
if not patchsuccess: | ||||
|
r2936 | raise util.Abort(_('Error folding patch %s') % p) | ||
patch.updatedir(ui, repo, files) | ||||
|
r2748 | |||
|
r2753 | if not message: | ||
message, comments, user = q.readheaders(parent)[0:3] | ||||
for msg in messages: | ||||
message.append('* * *') | ||||
message.extend(msg) | ||||
message = '\n'.join(message) | ||||
if opts['edit']: | ||||
message = ui.edit(message, user or ui.username()) | ||||
|
r2748 | |||
q.refresh(repo, msg=message) | ||||
|
r3243 | q.delete(repo, patches, opts) | ||
|
r2748 | q.save_dirty() | ||
|
r2821 | def guard(ui, repo, *args, **opts): | ||
'''set or print guards for a patch | ||||
|
r2940 | Guards control whether a patch can be pushed. A patch with no | ||
guards is always pushed. A patch with a positive guard ("+foo") is | ||||
pushed only if the qselect command has activated it. A patch with | ||||
a negative guard ("-foo") is never pushed if the qselect command | ||||
has activated it. | ||||
|
r2821 | |||
|
r2940 | With no arguments, print the currently active guards. | ||
With arguments, set guards for the named patch. | ||||
|
r2821 | |||
|
r2940 | To set a negative guard "-foo" on topmost patch ("--" is needed so | ||
hg will not interpret "-foo" as an option): | ||||
|
r2821 | hg qguard -- -foo | ||
|
r2940 | To set guards on another patch: | ||
|
r3223 | hg qguard other.patch +2.6.17 -stable | ||
|
r2821 | ''' | ||
def status(idx): | ||||
guards = q.series_guards[idx] or ['unguarded'] | ||||
ui.write('%s: %s\n' % (q.series[idx], ' '.join(guards))) | ||||
q = repo.mq | ||||
patch = None | ||||
args = list(args) | ||||
if opts['list']: | ||||
if args or opts['none']: | ||||
raise util.Abort(_('cannot mix -l/--list with options or arguments')) | ||||
for i in xrange(len(q.series)): | ||||
status(i) | ||||
return | ||||
if not args or args[0][0:1] in '-+': | ||||
if not q.applied: | ||||
raise util.Abort(_('no patches applied')) | ||||
patch = q.applied[-1].name | ||||
if patch is None and args[0][0:1] not in '-+': | ||||
patch = args.pop(0) | ||||
if patch is None: | ||||
raise util.Abort(_('no patch to work with')) | ||||
if args or opts['none']: | ||||
|
r4133 | idx = q.find_series(patch) | ||
if idx is None: | ||||
raise util.Abort(_('no patch named %s') % patch) | ||||
q.set_guards(idx, args) | ||||
|
r2821 | q.save_dirty() | ||
else: | ||||
status(q.series.index(q.lookup(patch))) | ||||
|
r2747 | def header(ui, repo, patch=None): | ||
"""Print the header of the topmost or specified patch""" | ||||
q = repo.mq | ||||
if patch: | ||||
patch = q.lookup(patch) | ||||
else: | ||||
if not q.applied: | ||||
ui.write('No patches applied\n') | ||||
|
r3008 | return 1 | ||
|
r2747 | patch = q.lookup('qtip') | ||
message = repo.mq.readheaders(patch)[0] | ||||
ui.write('\n'.join(message) + '\n') | ||||
|
r1808 | def lastsavename(path): | ||
|
r2794 | (directory, base) = os.path.split(path) | ||
names = os.listdir(directory) | ||||
|
r1808 | namere = re.compile("%s.([0-9]+)" % base) | ||
|
r2794 | maxindex = None | ||
|
r1808 | maxname = None | ||
for f in names: | ||||
m = namere.match(f) | ||||
if m: | ||||
index = int(m.group(1)) | ||||
|
r2794 | if maxindex == None or index > maxindex: | ||
maxindex = index | ||||
|
r1808 | maxname = f | ||
if maxname: | ||||
|
r2794 | return (os.path.join(directory, maxname), maxindex) | ||
|
r1808 | return (None, None) | ||
|
r1810 | |||
|
r1808 | def savename(path): | ||
(last, index) = lastsavename(path) | ||||
if last is None: | ||||
index = 0 | ||||
newpath = path + ".%d" % (index + 1) | ||||
return newpath | ||||
def push(ui, repo, patch=None, **opts): | ||||
"""push the next patch onto the stack""" | ||||
|
r2724 | q = repo.mq | ||
|
r1808 | mergeq = None | ||
|
r1810 | |||
|
r1808 | if opts['all']: | ||
|
r3604 | if not q.series: | ||
raise util.Abort(_('no patches in series')) | ||||
|
r1808 | patch = q.series[-1] | ||
if opts['merge']: | ||||
if opts['name']: | ||||
newpath = opts['name'] | ||||
else: | ||||
|
r1810 | newpath, i = lastsavename(q.path) | ||
|
r1808 | if not newpath: | ||
ui.warn("no saved queues found, please use -n\n") | ||||
return 1 | ||||
mergeq = queue(ui, repo.join(""), newpath) | ||||
ui.warn("merging with queue at: %s\n" % mergeq.path) | ||||
|
r1810 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], | ||
|
r1808 | mergeq=mergeq) | ||
q.save_dirty() | ||||
return ret | ||||
def pop(ui, repo, patch=None, **opts): | ||||
"""pop the current patch off the stack""" | ||||
localupdate = True | ||||
if opts['name']: | ||||
q = queue(ui, repo.join(""), repo.join(opts['name'])) | ||||
ui.warn('using patch queue: %s\n' % q.path) | ||||
localupdate = False | ||||
else: | ||||
|
r2724 | q = repo.mq | ||
|
r2697 | q.pop(repo, patch, force=opts['force'], update=localupdate, all=opts['all']) | ||
|
r1808 | q.save_dirty() | ||
return 0 | ||||
|
r2750 | def rename(ui, repo, patch, name=None, **opts): | ||
"""rename a patch | ||||
With one argument, renames the current patch to PATCH1. | ||||
With two arguments, renames PATCH1 to PATCH2.""" | ||||
q = repo.mq | ||||
if not name: | ||||
name = patch | ||||
patch = None | ||||
if patch: | ||||
patch = q.lookup(patch) | ||||
else: | ||||
if not q.applied: | ||||
ui.write(_('No patches applied\n')) | ||||
return | ||||
patch = q.lookup('qtip') | ||||
|
r3083 | absdest = q.join(name) | ||
if os.path.isdir(absdest): | ||||
name = os.path.join(name, os.path.basename(patch)) | ||||
absdest = q.join(name) | ||||
if os.path.exists(absdest): | ||||
raise util.Abort(_('%s already exists') % absdest) | ||||
|
r3223 | |||
|
r3083 | if name in q.series: | ||
raise util.Abort(_('A patch named %s already exists in the series file') % name) | ||||
|
r2750 | |||
if ui.verbose: | ||||
ui.write('Renaming %s to %s\n' % (patch, name)) | ||||
i = q.find_series(patch) | ||||
|
r3685 | guards = q.guard_re.findall(q.full_series[i]) | ||
q.full_series[i] = name + ''.join([' #' + g for g in guards]) | ||||
|
r2767 | q.parse_series() | ||
|
r2750 | q.series_dirty = 1 | ||
info = q.isapplied(patch) | ||||
if info: | ||||
|
r2818 | q.applied[info[0]] = statusentry(info[1], name) | ||
|
r2750 | q.applied_dirty = 1 | ||
|
r2819 | util.rename(q.join(patch), absdest) | ||
|
r2750 | r = q.qrepo() | ||
if r: | ||||
wlock = r.wlock() | ||||
if r.dirstate.state(name) == 'r': | ||||
r.undelete([name], wlock) | ||||
r.copy(patch, name, wlock) | ||||
r.remove([patch], False, wlock) | ||||
q.save_dirty() | ||||
|
r1808 | def restore(ui, repo, rev, **opts): | ||
"""restore the queue state saved by a rev""" | ||||
rev = repo.lookup(rev) | ||||
|
r2724 | q = repo.mq | ||
|
r1808 | q.restore(repo, rev, delete=opts['delete'], | ||
|
r1810 | qupdate=opts['update']) | ||
|
r1808 | q.save_dirty() | ||
return 0 | ||||
def save(ui, repo, **opts): | ||||
"""save current queue state""" | ||||
|
r2724 | q = repo.mq | ||
|
r2804 | message = commands.logmessage(opts) | ||
|
r2694 | ret = q.save(repo, msg=message) | ||
|
r1808 | if ret: | ||
return ret | ||||
q.save_dirty() | ||||
if opts['copy']: | ||||
path = q.path | ||||
if opts['name']: | ||||
newpath = os.path.join(q.basepath, opts['name']) | ||||
if os.path.exists(newpath): | ||||
if not os.path.isdir(newpath): | ||||
|
r2712 | raise util.Abort(_('destination %s exists and is not ' | ||
'a directory') % newpath) | ||||
|
r1808 | if not opts['force']: | ||
|
r2712 | raise util.Abort(_('destination %s exists, ' | ||
'use -f to force') % newpath) | ||||
|
r1808 | else: | ||
newpath = savename(path) | ||||
ui.warn("copy %s to %s\n" % (path, newpath)) | ||||
util.copyfiles(path, newpath) | ||||
if opts['empty']: | ||||
try: | ||||
|
r2819 | os.unlink(q.join(q.status_path)) | ||
|
r1808 | except: | ||
pass | ||||
return 0 | ||||
|
r1810 | |||
|
r1808 | def strip(ui, repo, rev, **opts): | ||
"""strip a revision and all later revs on the same branch""" | ||||
rev = repo.lookup(rev) | ||||
backup = 'all' | ||||
if opts['backup']: | ||||
backup = 'strip' | ||||
elif opts['nobackup']: | ||||
backup = 'none' | ||||
|
r3087 | update = repo.dirstate.parents()[0] != revlog.nullid | ||
repo.mq.strip(repo, rev, backup=backup, update=update) | ||||
|
r1808 | return 0 | ||
|
r2821 | def select(ui, repo, *args, **opts): | ||
'''set or print guarded patches to push | ||||
|
r2940 | Use the qguard command to set or print guards on patch, then use | ||
qselect to tell mq which guards to use. A patch will be pushed if it | ||||
has no guards or any positive guards match the currently selected guard, | ||||
but will not be pushed if any negative guards match the current guard. | ||||
For example: | ||||
|
r2821 | |||
|
r2940 | qguard foo.patch -stable (negative guard) | ||
qguard bar.patch +stable (positive guard) | ||||
|
r2821 | qselect stable | ||
|
r2940 | This activates the "stable" guard. mq will skip foo.patch (because | ||
it has a negative match) but push bar.patch (because it | ||||
has a positive match). | ||||
|
r2821 | |||
|
r2940 | With no arguments, prints the currently active guards. | ||
With one argument, sets the active guard. | ||||
|
r3223 | |||
|
r2940 | Use -n/--none to deactivate guards (no other arguments needed). | ||
When no guards are active, patches with positive guards are skipped | ||||
and patches with negative guards are pushed. | ||||
|
r2821 | |||
|
r2940 | qselect can change the guards on applied patches. It does not pop | ||
guarded patches by default. Use --pop to pop back to the last applied | ||||
patch that is not guarded. Use --reapply (which implies --pop) to push | ||||
back to the current patch afterwards, but skip guarded patches. | ||||
|
r2844 | |||
|
r2940 | Use -s/--series to print a list of all guards in the series file (no | ||
other arguments needed). Use -v for more information.''' | ||||
|
r2821 | |||
q = repo.mq | ||||
guards = q.active() | ||||
if args or opts['none']: | ||||
|
r2844 | old_unapplied = q.unapplied(repo) | ||
old_guarded = [i for i in xrange(len(q.applied)) if | ||||
not q.pushable(i)[0]] | ||||
|
r2821 | q.set_active(args) | ||
q.save_dirty() | ||||
if not args: | ||||
ui.status(_('guards deactivated\n')) | ||||
|
r2844 | if not opts['pop'] and not opts['reapply']: | ||
unapplied = q.unapplied(repo) | ||||
guarded = [i for i in xrange(len(q.applied)) | ||||
if not q.pushable(i)[0]] | ||||
if len(unapplied) != len(old_unapplied): | ||||
ui.status(_('number of unguarded, unapplied patches has ' | ||||
'changed from %d to %d\n') % | ||||
(len(old_unapplied), len(unapplied))) | ||||
if len(guarded) != len(old_guarded): | ||||
ui.status(_('number of guarded, applied patches has changed ' | ||||
'from %d to %d\n') % | ||||
(len(old_guarded), len(guarded))) | ||||
|
r2821 | elif opts['series']: | ||
guards = {} | ||||
noguards = 0 | ||||
for gs in q.series_guards: | ||||
if not gs: | ||||
noguards += 1 | ||||
for g in gs: | ||||
guards.setdefault(g, 0) | ||||
guards[g] += 1 | ||||
if ui.verbose: | ||||
guards['NONE'] = noguards | ||||
guards = guards.items() | ||||
guards.sort(lambda a, b: cmp(a[0][1:], b[0][1:])) | ||||
if guards: | ||||
ui.note(_('guards in series file:\n')) | ||||
for guard, count in guards: | ||||
ui.note('%2d ' % count) | ||||
ui.write(guard, '\n') | ||||
else: | ||||
ui.note(_('no guards in series file\n')) | ||||
else: | ||||
if guards: | ||||
ui.note(_('active guards:\n')) | ||||
for g in guards: | ||||
ui.write(g, '\n') | ||||
else: | ||||
ui.write(_('no active guards\n')) | ||||
|
r2844 | reapply = opts['reapply'] and q.applied and q.appliedname(-1) | ||
popped = False | ||||
if opts['pop'] or opts['reapply']: | ||||
for i in xrange(len(q.applied)): | ||||
pushable, reason = q.pushable(i) | ||||
if not pushable: | ||||
ui.status(_('popping guarded patches\n')) | ||||
popped = True | ||||
if i == 0: | ||||
q.pop(repo, all=True) | ||||
else: | ||||
q.pop(repo, i-1) | ||||
break | ||||
if popped: | ||||
try: | ||||
if reapply: | ||||
ui.status(_('reapplying unguarded patches\n')) | ||||
q.push(repo, reapply) | ||||
finally: | ||||
q.save_dirty() | ||||
|
r2821 | |||
|
r1808 | def reposetup(ui, repo): | ||
|
r2818 | class mqrepo(repo.__class__): | ||
|
r2848 | def abort_if_wdir_patched(self, errmsg, force=False): | ||
if self.mq.applied and not force: | ||||
parent = revlog.hex(self.dirstate.parents()[0]) | ||||
if parent in [s.rev for s in self.mq.applied]: | ||||
raise util.Abort(errmsg) | ||||
|
r3223 | |||
|
r2845 | def commit(self, *args, **opts): | ||
if len(args) >= 6: | ||||
force = args[5] | ||||
else: | ||||
force = opts.get('force') | ||||
|
r2848 | self.abort_if_wdir_patched( | ||
_('cannot commit over an applied mq patch'), | ||||
force) | ||||
|
r2845 | |||
return super(mqrepo, self).commit(*args, **opts) | ||||
|
r2848 | def push(self, remote, force=False, revs=None): | ||
if self.mq.applied and not force: | ||||
raise util.Abort(_('source has mq patches applied')) | ||||
return super(mqrepo, self).push(remote, force, revs) | ||||
|
r3223 | |||
|
r2723 | def tags(self): | ||
if self.tagscache: | ||||
return self.tagscache | ||||
|
r2818 | tagscache = super(mqrepo, self).tags() | ||
|
r2682 | |||
|
r2724 | q = self.mq | ||
|
r2723 | if not q.applied: | ||
return tagscache | ||||
|
r2663 | |||
|
r2780 | mqtags = [(patch.rev, patch.name) for patch in q.applied] | ||
|
r2723 | mqtags.append((mqtags[-1][0], 'qtip')) | ||
mqtags.append((mqtags[0][0], 'qbase')) | ||||
for patch in mqtags: | ||||
if patch[1] in tagscache: | ||||
self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) | ||||
else: | ||||
tagscache[patch[1]] = revlog.bin(patch[0]) | ||||
|
r2682 | |||
return tagscache | ||||
|
r2664 | |||
|
r3826 | def _branchtags(self): | ||
|
r3492 | q = self.mq | ||
if not q.applied: | ||||
|
r3826 | return super(mqrepo, self)._branchtags() | ||
|
r3492 | |||
self.branchcache = {} # avoid recursion in changectx | ||||
cl = self.changelog | ||||
partial, last, lrev = self._readbranchcache() | ||||
qbase = cl.rev(revlog.bin(q.applied[0].rev)) | ||||
start = lrev + 1 | ||||
if start < qbase: | ||||
# update the cache (excluding the patches) and save it | ||||
self._updatebranchcache(partial, lrev+1, qbase) | ||||
self._writebranchcache(partial, cl.node(qbase-1), qbase-1) | ||||
start = qbase | ||||
# if start = qbase, the cache is as updated as it should be. | ||||
# if start > qbase, the cache includes (part of) the patches. | ||||
# we might as well use it, but we won't save it. | ||||
# update the cache up to the tip | ||||
self._updatebranchcache(partial, start, cl.count()) | ||||
|
r3826 | return partial | ||
|
r3492 | |||
|
r2851 | if repo.local(): | ||
repo.__class__ = mqrepo | ||||
repo.mq = queue(ui, repo.join("")) | ||||
|
r1808 | |||
|
r3183 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] | ||
|
r1808 | cmdtable = { | ||
|
r3183 | "qapplied": (applied, [] + seriesopts, 'hg qapplied [-s] [PATCH]'), | ||
|
r2720 | "qclone": (clone, | ||
[('', 'pull', None, _('use pull protocol to copy metadata')), | ||||
('U', 'noupdate', None, _('do not update the new working directories')), | ||||
('', 'uncompressed', None, | ||||
_('use uncompressed transfer (fast over LAN)')), | ||||
('e', 'ssh', '', _('specify ssh command to use')), | ||||
('p', 'patches', '', _('location of source patch repo')), | ||||
('', 'remotecmd', '', | ||||
_('specify hg command to run on the remote side'))], | ||||
'hg qclone [OPTION]... SOURCE [DEST]'), | ||||
|
r1810 | "qcommit|qci": | ||
(commit, | ||||
|
r2185 | commands.table["^commit|ci"][1], | ||
'hg qcommit [OPTION]... [FILE]...'), | ||||
|
r2937 | "^qdiff": (diff, | ||
|
r3697 | [('g', 'git', None, _('use git extended diff format')), | ||
('I', 'include', [], _('include names matching the given patterns')), | ||||
|
r2937 | ('X', 'exclude', [], _('exclude names matching the given patterns'))], | ||
'hg qdiff [-I] [-X] [FILE]...'), | ||||
|
r2904 | "qdelete|qremove|qrm": | ||
|
r2752 | (delete, | ||
|
r3373 | [('k', 'keep', None, _('keep patch file')), | ||
('r', 'rev', [], _('stop managing a revision'))], | ||||
'hg qdelete [-k] [-r REV]... PATCH...'), | ||||
|
r2753 | 'qfold': | ||
(fold, | ||||
[('e', 'edit', None, _('edit patch header')), | ||||
|
r3857 | ('k', 'keep', None, _('keep folded patch files')) | ||
] + commands.commitopts, | ||||
|
r2753 | 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'), | ||
|
r2821 | 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')), | ||
('n', 'none', None, _('drop all guards'))], | ||||
'hg qguard [PATCH] [+GUARD...] [-GUARD...]'), | ||||
|
r2747 | 'qheader': (header, [], | ||
_('hg qheader [PATCH]')), | ||||
|
r1810 | "^qimport": | ||
(qimport, | ||||
[('e', 'existing', None, 'import file in patch dir'), | ||||
('n', 'name', '', 'patch file name'), | ||||
|
r3141 | ('f', 'force', None, 'overwrite existing files'), | ||
|
r3691 | ('r', 'rev', [], 'place existing revisions under mq control'), | ||
('g', 'git', None, _('use git extended diff format'))], | ||||
'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'), | ||||
|
r1810 | "^qinit": | ||
(init, | ||||
|
r2526 | [('c', 'create-repo', None, 'create queue repository')], | ||
|
r2185 | 'hg qinit [-c]'), | ||
|
r1810 | "qnew": | ||
(new, | ||||
|
r2939 | [('e', 'edit', None, _('edit commit message')), | ||
|
r3857 | ('f', 'force', None, _('import uncommitted changes into patch')) | ||
] + commands.commitopts, | ||||
|
r2939 | 'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'), | ||
|
r3183 | "qnext": (next, [] + seriesopts, 'hg qnext [-s]'), | ||
"qprev": (prev, [] + seriesopts, 'hg qprev [-s]'), | ||||
|
r1810 | "^qpop": | ||
(pop, | ||||
[('a', 'all', None, 'pop all patches'), | ||||
('n', 'name', '', 'queue name to pop'), | ||||
('f', 'force', None, 'forget any local changes')], | ||||
|
r2185 | 'hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]'), | ||
|
r1810 | "^qpush": | ||
(push, | ||||
[('f', 'force', None, 'apply if the patch has rejects'), | ||||
('l', 'list', None, 'list patch name in commit text'), | ||||
('a', 'all', None, 'apply all patches'), | ||||
('m', 'merge', None, 'merge from another queue'), | ||||
('n', 'name', '', 'merge queue name')], | ||||
|
r2185 | 'hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]'), | ||
|
r1810 | "^qrefresh": | ||
(refresh, | ||||
|
r2746 | [('e', 'edit', None, _('edit commit message')), | ||
|
r3086 | ('g', 'git', None, _('use git extended diff format')), | ||
|
r3690 | ('s', 'short', None, 'refresh only files already in the patch'), | ||
|
r2938 | ('I', 'include', [], _('include names matching the given patterns')), | ||
|
r3857 | ('X', 'exclude', [], _('exclude names matching the given patterns')) | ||
] + commands.commitopts, | ||||
|
r2938 | 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'), | ||
|
r2751 | 'qrename|qmv': | ||
|
r2750 | (rename, [], 'hg qrename PATCH1 [PATCH2]'), | ||
|
r1810 | "qrestore": | ||
(restore, | ||||
[('d', 'delete', None, 'delete save entry'), | ||||
('u', 'update', None, 'update queue working dir')], | ||||
|
r2185 | 'hg qrestore [-d] [-u] REV'), | ||
|
r1810 | "qsave": | ||
(save, | ||||
|
r3857 | [('c', 'copy', None, 'copy patch directory'), | ||
|
r1810 | ('n', 'name', '', 'copy directory name'), | ||
('e', 'empty', None, 'clear queue status file'), | ||||
|
r3857 | ('f', 'force', None, 'force copy')] + commands.commitopts, | ||
|
r2694 | 'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'), | ||
|
r2821 | "qselect": (select, | ||
[('n', 'none', None, _('disable all guards')), | ||||
|
r2844 | ('s', 'series', None, _('list all guards in series file')), | ||
('', 'pop', None, | ||||
_('pop to before first guarded applied patch')), | ||||
('', 'reapply', None, _('pop, then reapply patches'))], | ||||
'hg qselect [OPTION...] [GUARD...]'), | ||||
|
r1810 | "qseries": | ||
(series, | ||||
|
r3183 | [('m', 'missing', None, 'print patches not in series')] + seriesopts, | ||
|
r3085 | 'hg qseries [-ms]'), | ||
|
r1810 | "^strip": | ||
(strip, | ||||
[('f', 'force', None, 'force multi-head removal'), | ||||
('b', 'backup', None, 'bundle unrelated changesets'), | ||||
('n', 'nobackup', None, 'no backups')], | ||||
|
r2185 | 'hg strip [-f] [-b] [-n] REV'), | ||
|
r3183 | "qtop": (top, [] + seriesopts, 'hg qtop [-s]'), | ||
"qunapplied": (unapplied, [] + seriesopts, 'hg qunapplied [-s] [PATCH]'), | ||||
|
r1808 | } | ||